aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2010-12-13 20:19:10 +0000
committerMelanie2010-12-13 20:19:10 +0000
commitd2ff4ebf2d4f30d6ea4a748565d28eacaad363fc (patch)
treef26dfcad312095f3e9d91739f78af08c11bc0f52 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentCorrect Sensor axis for unattached daughter prims. (diff)
parentChanged logging level for message about failure to retrieve a map image from ... (diff)
downloadopensim-SC_OLD-d2ff4ebf2d4f30d6ea4a748565d28eacaad363fc.zip
opensim-SC_OLD-d2ff4ebf2d4f30d6ea4a748565d28eacaad363fc.tar.gz
opensim-SC_OLD-d2ff4ebf2d4f30d6ea4a748565d28eacaad363fc.tar.bz2
opensim-SC_OLD-d2ff4ebf2d4f30d6ea4a748565d28eacaad363fc.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs7
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index db60ae3..a109d68 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3264,13 +3264,6 @@ namespace OpenSim.Region.Framework.Scenes
3264 //} 3264 //}
3265 } 3265 }
3266 3266
3267 public void SetAvatarOnSitTarget(UUID avatarID)
3268 {
3269 m_sitTargetAvatar = avatarID;
3270 if (ParentGroup != null)
3271 ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
3272 }
3273
3274 public void SetAxisRotation(int axis, int rotate) 3267 public void SetAxisRotation(int axis, int rotate)
3275 { 3268 {
3276 if (m_parentGroup != null) 3269 if (m_parentGroup != null)