diff options
| author | Melanie | 2012-06-11 23:15:38 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-11 23:15:38 +0100 |
| commit | 76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00 (patch) | |
| tree | 85d2293d9a860ab88d58d084a6299a5977813466 /OpenSim/Region/Framework | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Comment out the scene presence sitting debug log messages for now (diff) | |
| download | opensim-SC-76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00.zip opensim-SC-76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00.tar.gz opensim-SC-76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00.tar.bz2 opensim-SC-76a9885ad2cc5964e85dc2d47d9ea1d6a5b57e00.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6feb883..310e21a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2053,9 +2053,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2053 | { | 2053 | { |
| 2054 | if (SitTargetUnOccupied) | 2054 | if (SitTargetUnOccupied) |
| 2055 | { | 2055 | { |
| 2056 | m_log.DebugFormat( | 2056 | // m_log.DebugFormat( |
| 2057 | "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is set and unoccupied", | 2057 | // "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is set and unoccupied", |
| 2058 | Name, part.Name, part.LocalId); | 2058 | // Name, part.Name, part.LocalId); |
| 2059 | 2059 | ||
| 2060 | part.SitTargetAvatar = UUID; | 2060 | part.SitTargetAvatar = UUID; |
| 2061 | offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); | 2061 | offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); |
| @@ -2067,9 +2067,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2067 | { | 2067 | { |
| 2068 | if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10) | 2068 | if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10) |
| 2069 | { | 2069 | { |
| 2070 | m_log.DebugFormat( | 2070 | // m_log.DebugFormat( |
| 2071 | "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is unset and within 10m", | 2071 | // "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is unset and within 10m", |
| 2072 | Name, part.Name, part.LocalId); | 2072 | // Name, part.Name, part.LocalId); |
| 2073 | 2073 | ||
| 2074 | AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight); | 2074 | AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight); |
| 2075 | canSit = true; | 2075 | canSit = true; |