diff options
| author | UbitUmarov | 2015-11-25 04:13:13 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-25 04:13:13 +0000 |
| commit | 172bb05ec257b1abb3554eeb6c5b8bcbdae89b78 (patch) | |
| tree | c30e0d54a4ff412102f1d9bdba114e3176630944 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-172bb05ec257b1abb3554eeb6c5b8bcbdae89b78.zip opensim-SC_OLD-172bb05ec257b1abb3554eeb6c5b8bcbdae89b78.tar.gz opensim-SC_OLD-172bb05ec257b1abb3554eeb6c5b8bcbdae89b78.tar.bz2 opensim-SC_OLD-172bb05ec257b1abb3554eeb6c5b8bcbdae89b78.tar.xz | |
suspend the use of DisableSimulator, that is causing teleport and crossing issues
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5903274..0d2c8c3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -4143,8 +4143,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4143 | { | 4143 | { |
| 4144 | byebyeRegions.Add(handle); | 4144 | byebyeRegions.Add(handle); |
| 4145 | // this should not be here | 4145 | // this should not be here |
| 4146 | if(eventQueue != null) | 4146 | // if(eventQueue != null) |
| 4147 | eventQueue.DisableSimulator(handle,UUID); | 4147 | /// eventQueue.DisableSimulator(handle,UUID); |
| 4148 | } | 4148 | } |
| 4149 | } | 4149 | } |
| 4150 | else | 4150 | else |
| @@ -4154,8 +4154,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4154 | { | 4154 | { |
| 4155 | byebyeRegions.Add(handle); | 4155 | byebyeRegions.Add(handle); |
| 4156 | // this should not be here | 4156 | // this should not be here |
| 4157 | if(eventQueue != null) | 4157 | // if(eventQueue != null) |
| 4158 | eventQueue.DisableSimulator(handle,UUID); | 4158 | // eventQueue.DisableSimulator(handle,UUID); |
| 4159 | } | 4159 | } |
| 4160 | } | 4160 | } |
| 4161 | } | 4161 | } |