diff options
author | Justin Clark-Casey (justincc) | 2011-08-01 07:04:13 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-01 07:04:13 +0100 |
commit | 05e94ff27e5dea6283a110d7df52892473087392 (patch) | |
tree | bc8360c8009b47c2f59bd355367189aaa5aa3e46 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | Instead of preserving old name in geom_name_map in change size or shape, use ... (diff) | |
download | opensim-SC_OLD-05e94ff27e5dea6283a110d7df52892473087392.zip opensim-SC_OLD-05e94ff27e5dea6283a110d7df52892473087392.tar.gz opensim-SC_OLD-05e94ff27e5dea6283a110d7df52892473087392.tar.bz2 opensim-SC_OLD-05e94ff27e5dea6283a110d7df52892473087392.tar.xz |
Move common gemo/agent map name code into CreateGeom()
Fix build break.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 0128cbc..924d7c2 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -334,6 +334,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
334 | { | 334 | { |
335 | d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories); | 335 | d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories); |
336 | d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags); | 336 | d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags); |
337 | |||
338 | _parent_scene.geom_name_map[prim_geom] = Name; | ||
339 | _parent_scene.actor_name_map[prim_geom] = this; | ||
337 | } | 340 | } |
338 | 341 | ||
339 | if (childPrim) | 342 | if (childPrim) |
@@ -1510,9 +1513,6 @@ Console.WriteLine("changeadd 1"); | |||
1510 | } | 1513 | } |
1511 | } | 1514 | } |
1512 | 1515 | ||
1513 | _parent_scene.geom_name_map[prim_geom] = Name; | ||
1514 | _parent_scene.actor_name_map[prim_geom] = this; | ||
1515 | |||
1516 | changeSelectedStatus(timestep); | 1516 | changeSelectedStatus(timestep); |
1517 | 1517 | ||
1518 | m_taintadd = false; | 1518 | m_taintadd = false; |
@@ -1986,7 +1986,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
1986 | // Don't need to re-enable body.. it's done in SetMesh | 1986 | // Don't need to re-enable body.. it's done in SetMesh |
1987 | 1987 | ||
1988 | if (_parent_scene.needsMeshing(_pbs)) | 1988 | if (_parent_scene.needsMeshing(_pbs)) |
1989 | mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); | 1989 | mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, meshlod, IsPhysical); |
1990 | } | 1990 | } |
1991 | 1991 | ||
1992 | CreateGeom(m_targetSpace, mesh); | 1992 | CreateGeom(m_targetSpace, mesh); |
@@ -2007,9 +2007,6 @@ Console.WriteLine(" JointCreateFixed"); | |||
2007 | d.BodyEnable(Body); | 2007 | d.BodyEnable(Body); |
2008 | } | 2008 | } |
2009 | 2009 | ||
2010 | _parent_scene.geom_name_map[prim_geom] = Name; | ||
2011 | _parent_scene.actor_name_map[prim_geom] = this; | ||
2012 | |||
2013 | changeSelectedStatus(timestamp); | 2010 | changeSelectedStatus(timestamp); |
2014 | if (childPrim) | 2011 | if (childPrim) |
2015 | { | 2012 | { |
@@ -2079,7 +2076,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
2079 | meshlod = _parent_scene.MeshSculptphysicalLOD; | 2076 | meshlod = _parent_scene.MeshSculptphysicalLOD; |
2080 | 2077 | ||
2081 | // createmesh returns null when it doesn't mesh. | 2078 | // createmesh returns null when it doesn't mesh. |
2082 | mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); | 2079 | mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, meshlod, IsPhysical); |
2083 | } | 2080 | } |
2084 | 2081 | ||
2085 | CreateGeom(m_targetSpace, mesh); | 2082 | CreateGeom(m_targetSpace, mesh); |
@@ -2104,9 +2101,6 @@ Console.WriteLine(" JointCreateFixed"); | |||
2104 | } | 2101 | } |
2105 | } | 2102 | } |
2106 | 2103 | ||
2107 | _parent_scene.geom_name_map[prim_geom] = Name; | ||
2108 | _parent_scene.actor_name_map[prim_geom] = this; | ||
2109 | |||
2110 | changeSelectedStatus(timestamp); | 2104 | changeSelectedStatus(timestamp); |
2111 | if (childPrim) | 2105 | if (childPrim) |
2112 | { | 2106 | { |