diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 277081a..8545425 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1851,7 +1851,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1851 | if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f)) | 1851 | if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f)) |
| 1852 | { | 1852 | { |
| 1853 | SitRaycastFindEdge(collisionPoint, normal); | 1853 | SitRaycastFindEdge(collisionPoint, normal); |
| 1854 | m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal ); | 1854 | m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal); |
| 1855 | } | 1855 | } |
| 1856 | else | 1856 | else |
| 1857 | { | 1857 | { |