aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-10-04 08:14:52 +0100
committerUbitUmarov2012-10-04 08:14:52 +0100
commit89d342b5ce9ac5d9fc4fd493eead8e050f99c91a (patch)
treed3065f478fc17ed546b7e0a610f6b0e921e6e3e8 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
parentapply cmic fix to multi layer wearables (diff)
downloadopensim-SC-89d342b5ce9ac5d9fc4fd493eead8e050f99c91a.zip
opensim-SC-89d342b5ce9ac5d9fc4fd493eead8e050f99c91a.tar.gz
opensim-SC-89d342b5ce9ac5d9fc4fd493eead8e050f99c91a.tar.bz2
opensim-SC-89d342b5ce9ac5d9fc4fd493eead8e050f99c91a.tar.xz
more changes and more non active code
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index d426112..d758c85 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -77,8 +77,9 @@ namespace OpenSim.Region.Physics.OdePlugin
77 77
78 public float physCost = 0.0f; 78 public float physCost = 0.0f;
79 public float streamCost = 0; 79 public float streamCost = 0;
80 public MeshWorkerChange changed;
80 public byte shapetype = 0; 81 public byte shapetype = 0;
81 public bool canColide = true; 82 public bool NoColide = false;
82 public bool hasOBB = false; 83 public bool hasOBB = false;
83 public bool hasMeshVolume = false; 84 public bool hasMeshVolume = false;
84 } 85 }
@@ -132,6 +133,14 @@ namespace OpenSim.Region.Physics.OdePlugin
132 133
133 light = 7 // compatibility with old viewers 134 light = 7 // compatibility with old viewers
134 } 135 }
136 [Flags]
137 public enum MeshWorkerChange : uint
138 {
139 none = 0,
140 size = 1,
141 shape = 2,
142 shapetype = 3,
143 }
135 144
136 public enum changes : int 145 public enum changes : int
137 { 146 {
@@ -170,6 +179,7 @@ namespace OpenSim.Region.Physics.OdePlugin
170 179
171 Size, 180 Size,
172 Shape, 181 Shape,
182 PhysRepData,
173 183
174 CollidesWater, 184 CollidesWater,
175 VolumeDtc, 185 VolumeDtc,