diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index d76ed3e..58a7b20 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -204,13 +204,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
204 | /// <param name="regionslst"></param> | 204 | /// <param name="regionslst"></param> |
205 | public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst) | 205 | public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst) |
206 | { | 206 | { |
207 | Util.FireAndForget(delegate | 207 | foreach (ulong handle in regionslst) |
208 | { | 208 | { |
209 | foreach (ulong handle in regionslst) | 209 | SendCloseChildAgent(agentID, handle); |
210 | { | 210 | } |
211 | SendCloseChildAgent(agentID, handle); | ||
212 | } | ||
213 | }); | ||
214 | } | 211 | } |
215 | 212 | ||
216 | public List<GridRegion> RequestNamedRegions(string name, int maxNumber) | 213 | public List<GridRegion> RequestNamedRegions(string name, int maxNumber) |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9cad3fe..36d8c0b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2952,7 +2952,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2952 | if (byebyeRegions.Count > 0) | 2952 | if (byebyeRegions.Count > 0) |
2953 | { | 2953 | { |
2954 | m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents"); | 2954 | m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents"); |
2955 | m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions); | 2955 | Util.FireAndForget(delegate |
2956 | { | ||
2957 | m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions); | ||
2958 | }); | ||
2956 | } | 2959 | } |
2957 | 2960 | ||
2958 | foreach (ulong handle in byebyeRegions) | 2961 | foreach (ulong handle in byebyeRegions) |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index f716687..04ba738 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -3430,7 +3430,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3430 | private void SetTerrain(float[] heightMap, Vector3 pOffset) | 3430 | private void SetTerrain(float[] heightMap, Vector3 pOffset) |
3431 | { | 3431 | { |
3432 | int startTime = Util.EnvironmentTickCount(); | 3432 | int startTime = Util.EnvironmentTickCount(); |
3433 | m_log.DebugFormat("[ODE SCENE]: Setting terrain for {0}", Name); | 3433 | m_log.DebugFormat("[ODE SCENE]: Setting terrain for {0} with offset {1}", Name, pOffset); |
3434 | 3434 | ||
3435 | // this._heightmap[i] = (double)heightMap[i]; | 3435 | // this._heightmap[i] = (double)heightMap[i]; |
3436 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around | 3436 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around |
@@ -3544,7 +3544,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3544 | 3544 | ||
3545 | d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle); | 3545 | d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle); |
3546 | d.GeomSetRotation(GroundGeom, ref R); | 3546 | d.GeomSetRotation(GroundGeom, ref R); |
3547 | d.GeomSetPosition(GroundGeom, (pOffset.X + ((int)Constants.RegionSize * 0.5f)) - 1, (pOffset.Y + ((int)Constants.RegionSize * 0.5f)) - 1, 0); | 3547 | d.GeomSetPosition(GroundGeom, (pOffset.X + ((int)Constants.RegionSize * 0.5f)), (pOffset.Y + ((int)Constants.RegionSize * 0.5f)), 0); |
3548 | IntPtr testGround = IntPtr.Zero; | 3548 | IntPtr testGround = IntPtr.Zero; |
3549 | if (RegionTerrain.TryGetValue(pOffset, out testGround)) | 3549 | if (RegionTerrain.TryGetValue(pOffset, out testGround)) |
3550 | { | 3550 | { |