aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2011-06-10 09:17:06 -0700
committerDiva Canto2011-06-10 09:17:06 -0700
commiteeac2275c9f8a826e8612c64241daeb2ace1d866 (patch)
treedcd8a3d415f2596bff6b7bcc1b0650c7cea62f10 /OpenSim/Region
parentNew method for resetting the map on HG: do it only once upon changing grids, ... (diff)
parentpartial update for new mesh asset format - handle both old and new formats fo... (diff)
downloadopensim-SC_OLD-eeac2275c9f8a826e8612c64241daeb2ace1d866.zip
opensim-SC_OLD-eeac2275c9f8a826e8612c64241daeb2ace1d866.tar.gz
opensim-SC_OLD-eeac2275c9f8a826e8612c64241daeb2ace1d866.tar.bz2
opensim-SC_OLD-eeac2275c9f8a826e8612c64241daeb2ace1d866.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs11
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs6
2 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index cdb4e41..a078291 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1504,7 +1504,7 @@ namespace OpenSim.Region.Framework.Scenes
1504 } 1504 }
1505 1505
1506 /// <summary> 1506 /// <summary>
1507 /// 1507 /// Handle a prim description set request from a viewer.
1508 /// </summary> 1508 /// </summary>
1509 /// <param name="primLocalID"></param> 1509 /// <param name="primLocalID"></param>
1510 /// <param name="description"></param> 1510 /// <param name="description"></param>
@@ -1521,8 +1521,17 @@ namespace OpenSim.Region.Framework.Scenes
1521 } 1521 }
1522 } 1522 }
1523 1523
1524 /// <summary>
1525 /// Set a click action for the prim.
1526 /// </summary>
1527 /// <param name="remoteClient"></param>
1528 /// <param name="primLocalID"></param>
1529 /// <param name="clickAction"></param>
1524 protected internal void PrimClickAction(IClientAPI remoteClient, uint primLocalID, string clickAction) 1530 protected internal void PrimClickAction(IClientAPI remoteClient, uint primLocalID, string clickAction)
1525 { 1531 {
1532// m_log.DebugFormat(
1533// "[SCENEGRAPH]: User {0} set click action for {1} to {2}", remoteClient.Name, primLocalID, clickAction);
1534
1526 SceneObjectGroup group = GetGroupByPrim(primLocalID); 1535 SceneObjectGroup group = GetGroupByPrim(primLocalID);
1527 if (group != null) 1536 if (group != null)
1528 { 1537 {
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
303 if (meshOsd is OSDMap) 303 if (meshOsd is OSDMap)
304 { 304 {
305 OSDMap map = (OSDMap)meshOsd; 305 OSDMap map = (OSDMap)meshOsd;
306 OSDMap physicsParms = (OSDMap)map["physics_shape"]; 306 OSDMap physicsParms = (OSDMap)map["physics_shape"]; // old asset format
307
308 if (physicsParms.Count == 0)
309 physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
310
307 int physOffset = physicsParms["offset"].AsInteger() + (int)start; 311 int physOffset = physicsParms["offset"].AsInteger() + (int)start;
308 int physSize = physicsParms["size"].AsInteger(); 312 int physSize = physicsParms["size"].AsInteger();
309 313