From e9a121e1b203e8880bcaf85d35612fc6706b281a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Jul 2012 21:54:50 +0100
Subject: Add TestCreateDuplicateRootScenePresence() regression test.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6d8ee7b..36452de 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4470,6 +4470,23 @@ namespace OpenSim.Region.Framework.Scenes
}
///
+ /// Gets all the scene presences in this scene.
+ ///
+ ///
+ /// This method will return both root and child scene presences.
+ ///
+ /// Consider using ForEachScenePresence() or ForEachRootScenePresence() if possible since these will not
+ /// involving creating a new List object.
+ ///
+ ///
+ /// A list of the scene presences. Adding or removing from the list will not affect the presences in the scene.
+ ///
+ public List GetScenePresences()
+ {
+ return new List(m_sceneGraph.GetScenePresences());
+ }
+
+ ///
/// Performs action on all avatars in the scene (root scene presences)
/// Avatars may be an NPC or a 'real' client.
///
--
cgit v1.1
From ba80f137b58cfacf46fadb3ec8b63af6896c5b43 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Jul 2012 22:32:27 +0100
Subject: Prevent race conditions between two threads that call
LLClientView.Close() simultaneously (e.g. ack timeout and an attempt to
reconnect)
---
OpenSim/Region/Framework/Scenes/Scene.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 36452de..51a6820 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3517,8 +3517,8 @@ namespace OpenSim.Region.Framework.Scenes
// We have a zombie from a crashed session.
// Or the same user is trying to be root twice here, won't work.
// Kill it.
- m_log.DebugFormat(
- "[SCENE]: Zombie scene presence detected for {0} {1} in {2}",
+ m_log.WarnFormat(
+ "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.",
sp.Name, sp.UUID, RegionInfo.RegionName);
sp.ControllingClient.Close();
@@ -4474,7 +4474,7 @@ namespace OpenSim.Region.Framework.Scenes
///
///
/// This method will return both root and child scene presences.
- ///
+ ///
/// Consider using ForEachScenePresence() or ForEachRootScenePresence() if possible since these will not
/// involving creating a new List object.
///
--
cgit v1.1