* merge

--HG--
branch : trunk

1 files changed, 6 insertions, 1 deletions

diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h
index 7f8a2a74e60..d185550764f 100644
--- a/src/game/InstanceSaveMgr.h
+++ b/src/game/InstanceSaveMgr.h
@@ -115,6 +115,8 @@ class InstanceSave
         bool m_canReset;
 };
 
+typedef UNORDERED_MAP<uint32 /*PAIR32(map,difficulty)*/,time_t /*resetTime*/> ResetTimeByMapDifficultyMap;
+
 class TRINITY_DLL_DECL InstanceSaveManager : public Trinity::Singleton<InstanceSaveManager, Trinity::ClassLevelLockable<InstanceSaveManager, ACE_Thread_Mutex> >
 {
     friend class InstanceSave;
@@ -140,7 +142,6 @@ class TRINITY_DLL_DECL InstanceSaveManager : public Trinity::Singleton<InstanceS
             bool operator == (const InstResetEvent& e) { return e.instanceId == instanceId; }
         };
         typedef std::multimap<time_t /*resetTime*/, InstResetEvent> ResetTimeQueue;
-        typedef UNORDERED_MAP<uint32 /*PAIR32(map,difficulty)*/,time_t /*resetTime*/> ResetTimeByMapDifficultyMap;
 
         void CleanupInstances();
         void PackInstances();
@@ -155,6 +156,10 @@ class TRINITY_DLL_DECL InstanceSaveManager : public Trinity::Singleton<InstanceS
         {
             m_resetTimeByMapDifficulty[MAKE_PAIR32(mapid,d)] = t;
         }
+        ResetTimeByMapDifficultyMap const& GetResetTimeMap() const
+        {
+            return m_resetTimeByMapDifficulty;
+        }
         void ScheduleReset(bool add, time_t time, InstResetEvent event);
 
         void Update();