diff options
author | Justin Clark-Casey (justincc) | 2011-06-24 21:54:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-06-24 21:54:01 +0100 |
commit | 1a0a9d229013ff7abba17ccd95159ca7d4b47e9f (patch) | |
tree | 933ebbc203ae94f80f722cc74504dc3f22533ff9 /OpenSim/Region/Framework/Scenes | |
parent | minor: method documentation (diff) | |
download | opensim-SC_OLD-1a0a9d229013ff7abba17ccd95159ca7d4b47e9f.zip opensim-SC_OLD-1a0a9d229013ff7abba17ccd95159ca7d4b47e9f.tar.gz opensim-SC_OLD-1a0a9d229013ff7abba17ccd95159ca7d4b47e9f.tar.bz2 opensim-SC_OLD-1a0a9d229013ff7abba17ccd95159ca7d4b47e9f.tar.xz |
Implement the latest mesh mechanism so that rezzing the uploaded mesh now works again.
Many thanks to the aurora project for pioneering this.
This code is almost certainly not bug free, but it does at least appear to handle simple meshes (except when the viewer crashes - but it is beta!).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c6d8c73..f3879f0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -800,7 +800,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
800 | actor.Orientation = GetWorldRotation(); | 800 | actor.Orientation = GetWorldRotation(); |
801 | 801 | ||
802 | // Tell the physics engines that this prim changed. | 802 | // Tell the physics engines that this prim changed. |
803 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); | 803 | if (m_parentGroup.Scene != null) |
804 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); | ||
804 | } | 805 | } |
805 | } | 806 | } |
806 | } | 807 | } |
@@ -1085,11 +1086,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1085 | 1086 | ||
1086 | public Vector3 AbsolutePosition | 1087 | public Vector3 AbsolutePosition |
1087 | { | 1088 | { |
1088 | get { | 1089 | get |
1090 | { | ||
1089 | if (IsAttachment) | 1091 | if (IsAttachment) |
1090 | return GroupPosition; | 1092 | return GroupPosition; |
1091 | 1093 | ||
1092 | return m_offsetPosition + m_groupPosition; } | 1094 | return m_offsetPosition + m_groupPosition; |
1095 | } | ||
1093 | } | 1096 | } |
1094 | 1097 | ||
1095 | public SceneObjectGroup ParentGroup | 1098 | public SceneObjectGroup ParentGroup |