diff options
| author | Mic Bowman | 2011-08-30 08:44:28 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-30 08:44:28 -0700 |
| commit | 17dab7245fd3f132264fb4ae5e8e70ebdbde073b (patch) | |
| tree | 4099256b83c94e9c568c316431ebc92a32a85241 /OpenSim/Region/Framework/Scenes | |
| parent | Use GetMeshKey from PrimitiveBaseShape. (diff) | |
| parent | Fix bug in persisting saved appearances for npcs (diff) | |
| download | opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.zip opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.tar.gz opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.tar.bz2 opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4148d4b..4143d44 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1695,9 +1695,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1695 | /// </param> | 1695 | /// </param> |
| 1696 | public void MoveToTarget(Vector3 pos, bool noFly) | 1696 | public void MoveToTarget(Vector3 pos, bool noFly) |
| 1697 | { | 1697 | { |
| 1698 | // m_log.DebugFormat( | 1698 | m_log.DebugFormat( |
| 1699 | // "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", | 1699 | "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", |
| 1700 | // Name, pos, m_scene.RegionInfo.RegionName); | 1700 | Name, pos, m_scene.RegionInfo.RegionName); |
| 1701 | 1701 | ||
| 1702 | if (pos.X < 0 || pos.X >= Constants.RegionSize | 1702 | if (pos.X < 0 || pos.X >= Constants.RegionSize |
| 1703 | || pos.Y < 0 || pos.Y >= Constants.RegionSize | 1703 | || pos.Y < 0 || pos.Y >= Constants.RegionSize |