diff options
| author | Diva Canto | 2012-03-08 18:29:08 -0800 |
|---|---|---|
| committer | Diva Canto | 2012-03-08 18:29:08 -0800 |
| commit | c22446ede08c720b4c20b87cd144c77882e44ffe (patch) | |
| tree | 139c4135772cba2bc958f500d19c281e5f3d5061 /OpenSim/Region/Framework | |
| parent | HG inventory/asset transfers: serialize asset posts. I'm using the same patte... (diff) | |
| parent | Remove a race condition from SP.Set_AbsolutePosition where we assume the Pare... (diff) | |
| download | opensim-SC-c22446ede08c720b4c20b87cd144c77882e44ffe.zip opensim-SC-c22446ede08c720b4c20b87cd144c77882e44ffe.tar.gz opensim-SC-c22446ede08c720b4c20b87cd144c77882e44ffe.tar.bz2 opensim-SC-c22446ede08c720b4c20b87cd144c77882e44ffe.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/ScenePresence.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9d5cdfa..be56fe1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -455,12 +455,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 455 | // in the sim unless the avatar is on a sit target. While | 455 | // in the sim unless the avatar is on a sit target. While |
| 456 | // on a sit target, m_pos will contain the desired offset | 456 | // on a sit target, m_pos will contain the desired offset |
| 457 | // without the parent rotation applied. | 457 | // without the parent rotation applied. |
| 458 | if (ParentID != 0) | 458 | SceneObjectPart sitPart = ParentPart; |
| 459 | { | 459 | |
| 460 | SceneObjectPart part = ParentPart; | 460 | if (sitPart != null) |
| 461 | return part.AbsolutePosition + (m_pos * part.GetWorldRotation()); | 461 | return sitPart.AbsolutePosition + (m_pos * sitPart.GetWorldRotation()); |
| 462 | } | ||
| 463 | } | 462 | } |
| 463 | |||
| 464 | return m_pos; | 464 | return m_pos; |
| 465 | } | 465 | } |
| 466 | set | 466 | set |