*Merge.

--HG-- branch : trunk
2009-04-15 17:14:17 -05:00
parent 1f55614e70 c61ab4c9a0
commit 5b124bf73f
4 changed files with 46 additions and 2 deletions
@@ -479,6 +479,8 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
        typedef std::set<WorldObject*> ActiveNonPlayers;
        ActiveNonPlayers m_activeNonPlayers;
        ActiveNonPlayers::iterator m_activeNonPlayersIter;
+
+
    private:
        typedef GridReadGuard ReadGuard;
        typedef GridWriteGuard WriteGuard;