diff options
| author | Justin Clark-Casey (justincc) | 2012-08-24 22:38:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-24 22:38:07 +0100 |
| commit | 476996bee86702227eedd3c953000891027faac4 (patch) | |
| tree | 8f6a95479cbdd5d5348fc79033fb010c21f0b421 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-476996bee86702227eedd3c953000891027faac4.zip opensim-SC_OLD-476996bee86702227eedd3c953000891027faac4.tar.gz opensim-SC_OLD-476996bee86702227eedd3c953000891027faac4.tar.bz2 opensim-SC_OLD-476996bee86702227eedd3c953000891027faac4.tar.xz | |
If a connecting scene presence is replacing an existing scene presence then bypass close checks.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
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 | ||