diff options
| author | BlueWall | 2012-04-26 16:40:36 -0400 |
|---|---|---|
| committer | BlueWall | 2012-04-26 16:40:36 -0400 |
| commit | 2542ca2a49d70134394ce23c2594b26668d3a8b5 (patch) | |
| tree | 44c6eee8a3b64571ed64494c238b7308b1509990 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| parent | Add request verb and url to error messages in WebUtil that lack this. (diff) | |
| download | opensim-SC-2542ca2a49d70134394ce23c2594b26668d3a8b5.zip opensim-SC-2542ca2a49d70134394ce23c2594b26668d3a8b5.tar.gz opensim-SC-2542ca2a49d70134394ce23c2594b26668d3a8b5.tar.bz2 opensim-SC-2542ca2a49d70134394ce23c2594b26668d3a8b5.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7a2b2ed..a46c827 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3217,8 +3217,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3217 | try | 3217 | try |
| 3218 | { | 3218 | { |
| 3219 | m_log.DebugFormat( | 3219 | m_log.DebugFormat( |
| 3220 | "[SCENE]: Removing {0} agent {1} from region {2}", | 3220 | "[SCENE]: Removing {0} agent {1} {2} from region {2}", |
| 3221 | (isChildAgent ? "child" : "root"), agentID, RegionInfo.RegionName); | 3221 | (isChildAgent ? "child" : "root"), avatar.Name, agentID, RegionInfo.RegionName); |
| 3222 | 3222 | ||
| 3223 | m_sceneGraph.removeUserCount(!isChildAgent); | 3223 | m_sceneGraph.removeUserCount(!isChildAgent); |
| 3224 | 3224 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e8178ce..7a94215 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1690,9 +1690,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1690 | if (pos.Z - terrainHeight < 0.2) | 1690 | if (pos.Z - terrainHeight < 0.2) |
| 1691 | pos.Z = terrainHeight; | 1691 | pos.Z = terrainHeight; |
| 1692 | 1692 | ||
| 1693 | m_log.DebugFormat( | 1693 | // m_log.DebugFormat( |
| 1694 | "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}", | 1694 | // "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}", |
| 1695 | Name, pos, terrainHeight, m_scene.RegionInfo.RegionName); | 1695 | // Name, pos, terrainHeight, m_scene.RegionInfo.RegionName); |
| 1696 | 1696 | ||
| 1697 | if (noFly) | 1697 | if (noFly) |
| 1698 | Flying = false; | 1698 | Flying = false; |