*Merge.

--HG-- branch : trunk
2009-03-25 16:00:38 -06:00
parent 53cce67b29 581ae2719d
commit 312b8e5b73
7 changed files with 35 additions and 30 deletions
@@ -140,6 +140,9 @@ class TRINITY_DLL_SPEC Object
        }
        virtual void RemoveFromWorld()
        {
+            if(!m_inWorld)
+                return;
+
            // if we remove from world then sending changes not required
            if(m_uint32Values)
                ClearUpdateMask(true);