aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-01 06:52:52 +0100
committerJustin Clark-Casey (justincc)2011-08-01 06:52:52 +0100
commitf9d6a91252366df40ab44220538c9b691156f801 (patch)
treeebb785de1547e493c7b7f0b57c5b44deae7e7152 /OpenSim
parentcomment out unused code in OdeScene.TriCallback() (diff)
downloadopensim-SC_OLD-f9d6a91252366df40ab44220538c9b691156f801.zip
opensim-SC_OLD-f9d6a91252366df40ab44220538c9b691156f801.tar.gz
opensim-SC_OLD-f9d6a91252366df40ab44220538c9b691156f801.tar.bz2
opensim-SC_OLD-f9d6a91252366df40ab44220538c9b691156f801.tar.xz
Instead of preserving old name in geom_name_map in change size or shape, use the Name property instead.
This is equivalent since the prim 'name' is never changed. In fact, this propery is never used for prims
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs10
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 8881c44..0128cbc 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1510,7 +1510,7 @@ Console.WriteLine("changeadd 1");
1510 } 1510 }
1511 } 1511 }
1512 1512
1513 _parent_scene.geom_name_map[prim_geom] = this.Name; 1513 _parent_scene.geom_name_map[prim_geom] = Name;
1514 _parent_scene.actor_name_map[prim_geom] = this; 1514 _parent_scene.actor_name_map[prim_geom] = this;
1515 1515
1516 changeSelectedStatus(timestep); 1516 changeSelectedStatus(timestep);
@@ -1943,8 +1943,6 @@ Console.WriteLine(" JointCreateFixed");
1943 m_log.DebugFormat("[ODE PRIM]: Called changesize"); 1943 m_log.DebugFormat("[ODE PRIM]: Called changesize");
1944#endif 1944#endif
1945 1945
1946 string oldname = _parent_scene.geom_name_map[prim_geom];
1947
1948 if (_size.X <= 0) _size.X = 0.01f; 1946 if (_size.X <= 0) _size.X = 0.01f;
1949 if (_size.Y <= 0) _size.Y = 0.01f; 1947 if (_size.Y <= 0) _size.Y = 0.01f;
1950 if (_size.Z <= 0) _size.Z = 0.01f; 1948 if (_size.Z <= 0) _size.Z = 0.01f;
@@ -2009,7 +2007,7 @@ Console.WriteLine(" JointCreateFixed");
2009 d.BodyEnable(Body); 2007 d.BodyEnable(Body);
2010 } 2008 }
2011 2009
2012 _parent_scene.geom_name_map[prim_geom] = oldname; 2010 _parent_scene.geom_name_map[prim_geom] = Name;
2013 _parent_scene.actor_name_map[prim_geom] = this; 2011 _parent_scene.actor_name_map[prim_geom] = this;
2014 2012
2015 changeSelectedStatus(timestamp); 2013 changeSelectedStatus(timestamp);
@@ -2045,8 +2043,6 @@ Console.WriteLine(" JointCreateFixed");
2045 2043
2046 public void changeshape(float timestamp) 2044 public void changeshape(float timestamp)
2047 { 2045 {
2048 string oldname = _parent_scene.geom_name_map[prim_geom];
2049
2050 // Cleanup of old prim geometry and Bodies 2046 // Cleanup of old prim geometry and Bodies
2051 if (IsPhysical && Body != IntPtr.Zero) 2047 if (IsPhysical && Body != IntPtr.Zero)
2052 { 2048 {
@@ -2108,7 +2104,7 @@ Console.WriteLine(" JointCreateFixed");
2108 } 2104 }
2109 } 2105 }
2110 2106
2111 _parent_scene.geom_name_map[prim_geom] = oldname; 2107 _parent_scene.geom_name_map[prim_geom] = Name;
2112 _parent_scene.actor_name_map[prim_geom] = this; 2108 _parent_scene.actor_name_map[prim_geom] = this;
2113 2109
2114 changeSelectedStatus(timestamp); 2110 changeSelectedStatus(timestamp);