diff options
| author | Diva Canto | 2015-11-27 08:24:39 -0800 |
|---|---|---|
| committer | Diva Canto | 2015-11-27 08:24:39 -0800 |
| commit | cade717b5ffd0445c6246a55da5e80da2562450d (patch) | |
| tree | 4e0a182d64905d35524336ee93b1283385494447 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Sometimes the viewer sends a null string as mapName; this made the client thr... (diff) | |
| parent | add a delay to consume other change messages on move and cross (diff) | |
| download | opensim-SC-cade717b5ffd0445c6246a55da5e80da2562450d.zip opensim-SC-cade717b5ffd0445c6246a55da5e80da2562450d.tar.gz opensim-SC-cade717b5ffd0445c6246a55da5e80da2562450d.tar.bz2 opensim-SC-cade717b5ffd0445c6246a55da5e80da2562450d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 | } |