aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2012-08-25 17:34:08 +0100
committerMelanie2012-08-25 17:34:08 +0100
commita5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374 (patch)
tree1465a797a4c6892c0a46d92b56fcafd6ccb5162d /OpenSim/Region/Framework/Scenes/Scene.cs
parentFix and refactor region registration. Reorder checks to short-curcuit expensi... (diff)
parentimplementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParams (diff)
downloadopensim-SC-a5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374.zip
opensim-SC-a5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374.tar.gz
opensim-SC-a5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374.tar.bz2
opensim-SC-a5c6cb2fc9e5fd0c83bbe2bb821fa5e1a2903374.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ad74189..2b4dea4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3562,7 +3562,7 @@ namespace OpenSim.Region.Framework.Scenes
3562 "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.", 3562 "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.",
3563 sp.Name, sp.UUID, RegionInfo.RegionName); 3563 sp.Name, sp.UUID, RegionInfo.RegionName);
3564 3564
3565 sp.ControllingClient.Close(); 3565 sp.ControllingClient.Close(true);
3566 sp = null; 3566 sp = null;
3567 } 3567 }
3568 3568