aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 3 insertions, 3 deletions
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
3517 // We have a zombie from a crashed session. 3517 // We have a zombie from a crashed session.
3518 // Or the same user is trying to be root twice here, won't work. 3518 // Or the same user is trying to be root twice here, won't work.
3519 // Kill it. 3519 // Kill it.
3520 m_log.DebugFormat( 3520 m_log.WarnFormat(
3521 "[SCENE]: Zombie scene presence detected for {0} {1} in {2}", 3521 "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.",
3522 sp.Name, sp.UUID, RegionInfo.RegionName); 3522 sp.Name, sp.UUID, RegionInfo.RegionName);
3523 3523
3524 sp.ControllingClient.Close(); 3524 sp.ControllingClient.Close();
@@ -4474,7 +4474,7 @@ namespace OpenSim.Region.Framework.Scenes
4474 /// </summary> 4474 /// </summary>
4475 /// <remarks> 4475 /// <remarks>
4476 /// This method will return both root and child scene presences. 4476 /// This method will return both root and child scene presences.
4477 /// 4477 ///
4478 /// Consider using ForEachScenePresence() or ForEachRootScenePresence() if possible since these will not 4478 /// Consider using ForEachScenePresence() or ForEachRootScenePresence() if possible since these will not
4479 /// involving creating a new List object. 4479 /// involving creating a new List object.
4480 /// </remarks> 4480 /// </remarks>