* Stop warnings about non existent scene presences/entities being removed on client log off

* This is being done by preventing close from being called twice on child agent closure (nres which would have been thrown are being swallowed).  
* However, it should be possible to do much better cleanup on this code in the future

1 files changed, 11 insertions, 11 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index c4e4919..cdc05ee 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -584,26 +584,26 @@ namespace OpenSim.Region.Environment.Scenes
         {
             lock (Entities)
             {
-                if (Entities.Remove(agentID))
-                {
-                    //m_log.InfoFormat("[SCENE] Removed scene presence {0} from entities list", agentID);
-                }
-                else
+                if (!Entities.Remove(agentID))
                 {
                     m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene Entities list", agentID);
                 }
+//                else
+//                {
+//                    m_log.InfoFormat("[SCENE] Removed scene presence {0} from entities list", agentID);
+//                }
             }
 
             lock (ScenePresences)
             {
-                if (ScenePresences.Remove(agentID))
-                {
-                    //m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID);
-                }
-                else
+                if (!ScenePresences.Remove(agentID))
                 {
-                    m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
+                    m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);                                        
                 }
+//                else
+//                {
+//                    m_log.InfoFormat("[SCENE] Removed scene presence {0} from scene presences list", agentID);
+//                }
             }
         }