diff options
| author | Justin Clark-Casey (justincc) | 2012-08-24 22:38:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-24 22:43:14 +0100 |
| commit | 3edfa585ec7d8147cc97299724e4db46fed70477 (patch) | |
| tree | e66865207c1391e75040097c049771da787f5a77 | |
| parent | Bump version number to 0.7.4-rc2 (diff) | |
| download | opensim-SC_OLD-3edfa585ec7d8147cc97299724e4db46fed70477.zip opensim-SC_OLD-3edfa585ec7d8147cc97299724e4db46fed70477.tar.gz opensim-SC_OLD-3edfa585ec7d8147cc97299724e4db46fed70477.tar.bz2 opensim-SC_OLD-3edfa585ec7d8147cc97299724e4db46fed70477.tar.xz | |
If a connecting scene presence is replacing an existing scene presence then bypass close checks.
| -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 b2592d4..61b04ba 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3529,7 +3529,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3529 | "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.", | 3529 | "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.", |
| 3530 | sp.Name, sp.UUID, RegionInfo.RegionName); | 3530 | sp.Name, sp.UUID, RegionInfo.RegionName); |
| 3531 | 3531 | ||
| 3532 | sp.ControllingClient.Close(); | 3532 | sp.ControllingClient.Close(true); |
| 3533 | sp = null; | 3533 | sp = null; |
| 3534 | } | 3534 | } |
| 3535 | 3535 | ||