diff options
author | Melanie | 2011-12-20 21:51:43 +0000 |
---|---|---|
committer | Melanie | 2011-12-20 21:51:43 +0000 |
commit | ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5 (patch) | |
tree | d89152b691685be8b93699fec8ac5d254c01bb53 /OpenSim | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Though the viewer warns about receiving this, not sending appears to break ba... (diff) | |
download | opensim-SC-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.zip opensim-SC-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.gz opensim-SC-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.bz2 opensim-SC-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index 54e1bf7..57fb808 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
@@ -296,7 +296,7 @@ namespace OpenSim.Framework | |||
296 | if (args["start_pos"] != null) | 296 | if (args["start_pos"] != null) |
297 | Vector3.TryParse(args["start_pos"].AsString(), out startpos); | 297 | Vector3.TryParse(args["start_pos"].AsString(), out startpos); |
298 | 298 | ||
299 | m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos); | 299 | //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos); |
300 | 300 | ||
301 | try | 301 | try |
302 | { | 302 | { |
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 1f22136..6d048f4 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -478,7 +478,7 @@ namespace OpenSim.Framework | |||
478 | /// <param name="hash"></param> | 478 | /// <param name="hash"></param> |
479 | public virtual void Unpack(OSDMap args, IScene scene) | 479 | public virtual void Unpack(OSDMap args, IScene scene) |
480 | { | 480 | { |
481 | m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data"); | 481 | //m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data"); |
482 | 482 | ||
483 | if (args.ContainsKey("region_id")) | 483 | if (args.ContainsKey("region_id")) |
484 | UUID.TryParse(args["region_id"].AsString(), out RegionID); | 484 | UUID.TryParse(args["region_id"].AsString(), out RegionID); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f5b37d3..34b3c1d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2554,10 +2554,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2554 | // again here... this comes after the cached appearance check because the avatars | 2554 | // again here... this comes after the cached appearance check because the avatars |
2555 | // appearance goes into the avatar update packet | 2555 | // appearance goes into the avatar update packet |
2556 | SendAvatarDataToAllAgents(); | 2556 | SendAvatarDataToAllAgents(); |
2557 | 2557 | SendAppearanceToAgent(this); | |
2558 | // Sending us our own appearance does not seem to be necessary, and the viewer warns in the log if you do | ||
2559 | // this. | ||
2560 | // SendAppearanceToAgent(this); | ||
2561 | 2558 | ||
2562 | // If we are using the the cached appearance then send it out to everyone | 2559 | // If we are using the the cached appearance then send it out to everyone |
2563 | if (cachedappearance) | 2560 | if (cachedappearance) |
@@ -2977,7 +2974,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2977 | if (byebyeRegions.Count > 0) | 2974 | if (byebyeRegions.Count > 0) |
2978 | { | 2975 | { |
2979 | m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents"); | 2976 | m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents"); |
2980 | m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions); | 2977 | Util.FireAndForget(delegate |
2978 | { | ||
2979 | m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions); | ||
2980 | }); | ||
2981 | } | 2981 | } |
2982 | 2982 | ||
2983 | foreach (ulong handle in byebyeRegions) | 2983 | 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 | { |