diff options
| author | Robert Adams | 2013-12-01 15:51:42 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-12-01 15:51:42 -0800 |
| commit | 31bacfbb63a3871af1ff1fbaec2acd5f5021c926 (patch) | |
| tree | fe9b9d826c1fdef55840d346ff5c9c481a4bfc82 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | varregion: Add MaxRegionSize constant and enforce in RegionInfo. (diff) | |
| parent | Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced fo... (diff) | |
| download | opensim-SC-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.zip opensim-SC-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.gz opensim-SC-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.bz2 opensim-SC-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index dcbb509..ea9d0d8 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -789,16 +789,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 789 | m_log.ErrorFormat("[SCENEOBJECTPART]: GROUP POSITION. {0}", e); | 789 | m_log.ErrorFormat("[SCENEOBJECTPART]: GROUP POSITION. {0}", e); |
| 790 | } | 790 | } |
| 791 | } | 791 | } |
| 792 | |||
| 793 | // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too | ||
| 794 | if (SitTargetAvatar != UUID.Zero) | ||
| 795 | { | ||
| 796 | ScenePresence avatar; | ||
| 797 | if (ParentGroup.Scene.TryGetScenePresence(SitTargetAvatar, out avatar)) | ||
| 798 | { | ||
| 799 | avatar.ParentPosition = GetWorldPosition(); | ||
| 800 | } | ||
| 801 | } | ||
| 802 | } | 792 | } |
| 803 | } | 793 | } |
| 804 | 794 | ||