aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
diff options
context:
space:
mode:
authorubit2012-10-08 00:55:44 +0200
committerubit2012-10-08 00:55:44 +0200
commit2d2c4e3a860756e1e0000d89cc94112abb1d0cef (patch)
tree48d9b4b4a16fdb4dfcb312da6358e0993cf2a870 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent a few changes/fix (?) (diff)
downloadopensim-SC-2d2c4e3a860756e1e0000d89cc94112abb1d0cef.zip
opensim-SC-2d2c4e3a860756e1e0000d89cc94112abb1d0cef.tar.gz
opensim-SC-2d2c4e3a860756e1e0000d89cc94112abb1d0cef.tar.bz2
opensim-SC-2d2c4e3a860756e1e0000d89cc94112abb1d0cef.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs11
1 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 5e4c2a5..ed2a531 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -111,17 +111,6 @@ namespace OpenSim.Region.Physics.OdePlugin
111 light = 7 // compatibility with old viewers 111 light = 7 // compatibility with old viewers
112 } 112 }
113 113
114 public enum AssetState : byte
115 {
116 noNeedAsset = 0,
117 needAsset = 1,
118 loadingAsset = 2,
119 procAsset = 3,
120 AssetOK = 4,
121
122 AssetFailed = 0xff
123 }
124
125 public enum changes : int 114 public enum changes : int
126 { 115 {
127 Add = 0, // arg null. finishs the prim creation. should be used internally only ( to remove later ?) 116 Add = 0, // arg null. finishs the prim creation. should be used internally only ( to remove later ?)