*Merge.

--HG--
branch : trunk

1 files changed, 14 insertions, 4 deletions

diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
index 788f3361595..74e10be31a8 100644
--- a/src/game/GridNotifiers.h
+++ b/src/game/GridNotifiers.h
@@ -38,7 +38,7 @@ class Player;
 
 namespace Trinity
 {
-    struct TRINITY_DLL_DECL PlayerRelocationNotifier
+    struct TRINITY_DLL_DECL PlayerVisibilityNotifier
     {
         Player &i_player;
         UpdateData i_data;
@@ -46,17 +46,27 @@ namespace Trinity
         Player::ClientGUIDs i_clientGUIDs;
         std::set<WorldObject*> i_visibleNow;
 
-        PlayerRelocationNotifier(Player &player) : i_player(player),i_clientGUIDs(player.m_clientGUIDs) {}
+        PlayerVisibilityNotifier(Player &player) : i_player(player),i_clientGUIDs(player.m_clientGUIDs) {}
 
         template<class T> inline void Visit(GridRefManager<T> &);
-        #ifdef WIN32
+        /*#ifdef WIN32
         template<> inline void Visit(PlayerMapType &);
         template<> inline void Visit(CreatureMapType &);
-        #endif
+        #endif*/
 
         void Notify(void);
     };
 
+    struct TRINITY_DLL_DECL PlayerRelocationNotifier : public PlayerVisibilityNotifier
+    {
+        PlayerRelocationNotifier(Player &player) : PlayerVisibilityNotifier(player) {}
+        template<class T> inline void Visit(GridRefManager<T> &m) { PlayerVisibilityNotifier::Visit(m); }
+        #ifdef WIN32
+        template<> inline void Visit(PlayerMapType &);
+        template<> inline void Visit(CreatureMapType &);
+        #endif
+    };
+
     struct TRINITY_DLL_DECL CreatureRelocationNotifier
     {
         Creature &i_creature;