Fixed a bug where collision mesh was not loaded when UUID field conta…

…ined the real collision data.
pallarim · Oct 27, 2010 · d874e58 · d874e58
1 parent c5a6346
commit d874e58
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ModularRex/RexFramework/RexObjectProperties.cs b/ModularRex/RexFramework/RexObjectProperties.cs
@@ -347,7 +347,7 @@ public string RexCollisionMeshURI
                 if (m_rexCollisionMeshURL != String.Empty && RexEventManager != null && oldValue != value)
                     RexEventManager.TriggerOnChangeCollisionUri(parentObjectID);
 
-                if (m_rexCollisionMeshURL == String.Empty)
+                if (m_rexCollisionMeshURL == UUID.Zero.ToString())
                     RexCollisionMeshUUID = UUID.Zero;
                 else
                     TriggerChangedRexObjectProperties();
@@ -475,7 +475,8 @@ public void SetRexPrimDataFromObject(RexObjectProperties source)
                 RexSelectPriority = source.RexSelectPriority;
 
                 RexAnimationPackageURI = source.RexAnimationPackageURI;
-                RexCollisionMeshURI = source.RexCollisionMeshURI;
+                if(source.RexCollisionMeshUUID == UUID.Zero)
+                    RexCollisionMeshURI = source.RexCollisionMeshURI;
                 RexMeshURI = source.RexMeshURI;
                 RexParticleScriptURI = source.RexParticleScriptURI;
                 RexSoundURI = source.RexSoundURI;