From 387b228d68b579bf978c091d8873608e016d0c3d Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 10 Jun 2011 00:38:38 -0700
Subject: partial update for new mesh asset format - handle both old and new
 formats for physics mesh

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/Meshing')

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index f89b824..99b2d84 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -303,7 +303,11 @@ namespace OpenSim.Region.Physics.Meshing
                     if (meshOsd is OSDMap)
                     {
                         OSDMap map = (OSDMap)meshOsd;
-                        OSDMap physicsParms = (OSDMap)map["physics_shape"];
+                        OSDMap physicsParms = (OSDMap)map["physics_shape"]; // old asset format
+
+                        if (physicsParms.Count == 0)
+                            physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
+
                         int physOffset = physicsParms["offset"].AsInteger() + (int)start;
                         int physSize = physicsParms["size"].AsInteger();
 
-- 
cgit v1.1