diff options
| author | Mic Bowman | 2011-08-26 15:23:46 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-26 15:23:46 -0700 |
| commit | 23f10f1d22d5ecf542119e39503230994c521bf0 (patch) | |
| tree | 2498e8cccf2ed398052dfa53e9a1faf6e998d039 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'master' into bulletsim (diff) | |
| parent | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar (diff) | |
| download | opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.zip opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.gz opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.bz2 opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a0e87d0..e510611 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -221,9 +221,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 221 | public scriptEvents AggregateScriptEvents; | 221 | public scriptEvents AggregateScriptEvents; |
| 222 | 222 | ||
| 223 | 223 | ||
| 224 | public UUID AttachedAvatar; | ||
| 225 | |||
| 226 | |||
| 227 | public Vector3 AttachedPos; | 224 | public Vector3 AttachedPos; |
| 228 | 225 | ||
| 229 | 226 | ||
| @@ -728,7 +725,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 728 | 725 | ||
| 729 | if (IsAttachment) | 726 | if (IsAttachment) |
| 730 | { | 727 | { |
| 731 | ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar); | 728 | ScenePresence sp = m_parentGroup.Scene.GetScenePresence(ParentGroup.AttachedAvatar); |
| 732 | if (sp != null) | 729 | if (sp != null) |
| 733 | return sp.AbsolutePosition; | 730 | return sp.AbsolutePosition; |
| 734 | } | 731 | } |