aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2012-08-25 18:08:10 +0100
committerMelanie2012-08-25 18:08:10 +0100
commit007a45aa76af0029a43b634a0a44a48f15ea5654 (patch)
tree5a5202f11b7b54953ea462d70a25dec77502f5eb /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' into careminster (diff)
parentFollowing on from f8a89a79, do not allow more than one 'type' folder (e.g. ca... (diff)
downloadopensim-SC_OLD-007a45aa76af0029a43b634a0a44a48f15ea5654.zip
opensim-SC_OLD-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.gz
opensim-SC_OLD-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.bz2
opensim-SC_OLD-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.xz
Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster
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 2499460..fcc2953 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3737,7 +3737,7 @@ namespace OpenSim.Region.Framework.Scenes
3737 "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.", 3737 "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.",
3738 sp.Name, sp.UUID, RegionInfo.RegionName); 3738 sp.Name, sp.UUID, RegionInfo.RegionName);
3739 3739
3740 sp.ControllingClient.Close(); 3740 sp.ControllingClient.Close(true);
3741 sp = null; 3741 sp = null;
3742 } 3742 }
3743 3743