diff options
author | UbitUmarov | 2015-09-08 18:13:15 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-08 18:13:15 +0100 |
commit | ecc19698575a1d0705665f9551a8d69afcad1570 (patch) | |
tree | ae5db0cdc8e8d58acb7d6b043f28cdd122bba269 /OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs | |
parent | opps my files? (diff) | |
download | opensim-SC-ecc19698575a1d0705665f9551a8d69afcad1570.zip opensim-SC-ecc19698575a1d0705665f9551a8d69afcad1570.tar.gz opensim-SC-ecc19698575a1d0705665f9551a8d69afcad1570.tar.bz2 opensim-SC-ecc19698575a1d0705665f9551a8d69afcad1570.tar.xz |
more on compile..
Diffstat (limited to 'OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs index 2e75bc9..344cfcc 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs | |||
@@ -148,7 +148,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde | |||
148 | private UUID? m_assetID; | 148 | private UUID? m_assetID; |
149 | private MeshState m_meshState; | 149 | private MeshState m_meshState; |
150 | 150 | ||
151 | public OdeScene _parent_scene; | 151 | public ODEScene _parent_scene; |
152 | 152 | ||
153 | /// <summary> | 153 | /// <summary> |
154 | /// The physics space which contains prim geometry | 154 | /// The physics space which contains prim geometry |
@@ -1069,7 +1069,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde | |||
1069 | return false; | 1069 | return false; |
1070 | } | 1070 | } |
1071 | 1071 | ||
1072 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, | 1072 | public OdePrim(String primName, ODEScene parent_scene, Vector3 pos, Vector3 size, |
1073 | Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical,bool pisPhantom,byte _shapeType,uint plocalID) | 1073 | Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical,bool pisPhantom,byte _shapeType,uint plocalID) |
1074 | { | 1074 | { |
1075 | Name = primName; | 1075 | Name = primName; |