aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/POS
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/POS/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/PhysicsModules/POS/POSCharacter.cs11
-rw-r--r--OpenSim/Region/PhysicsModules/POS/POSPrim.cs5
-rw-r--r--OpenSim/Region/PhysicsModules/POS/POSScene.cs8
4 files changed, 17 insertions, 9 deletions
diff --git a/OpenSim/Region/PhysicsModules/POS/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/POS/AssemblyInfo.cs
index e3a3e35..23fe9ae 100644
--- a/OpenSim/Region/PhysicsModules/POS/AssemblyInfo.cs
+++ b/OpenSim/Region/PhysicsModules/POS/AssemblyInfo.cs
@@ -56,7 +56,7 @@ using Mono.Addins;
56// You can specify all values by your own or you can build default build and revision 56// You can specify all values by your own or you can build default build and revision
57// numbers with the '*' character (the default): 57// numbers with the '*' character (the default):
58 58
59[assembly : AssemblyVersion("0.8.2.*")] 59[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
60 60
61[assembly: Addin("OpenSim.Region.PhysicsModule.POS", OpenSim.VersionInfo.VersionNumber)] 61[assembly: Addin("OpenSim.Region.PhysicsModule.POS", OpenSim.VersionInfo.VersionNumber)]
62[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] 62[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
diff --git a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs
index 32469d9..341530e 100644
--- a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs
+++ b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs
@@ -248,7 +248,7 @@ namespace OpenSim.Region.PhysicsModule.POS
248 { 248 {
249 } 249 }
250 250
251 public override void LockAngularMotion(Vector3 axis) 251 public override void LockAngularMotion(byte axislocks)
252 { 252 {
253 } 253 }
254 254
@@ -273,10 +273,10 @@ namespace OpenSim.Region.PhysicsModule.POS
273 set { return; } 273 set { return; }
274 } 274 }
275 275
276 public override bool PIDActive 276 public override bool PIDActive
277 { 277 {
278 get { return false; } 278 get { return false; }
279 set { return; } 279 set { return; }
280 } 280 }
281 281
282 public override float PIDTau 282 public override float PIDTau
@@ -291,6 +291,7 @@ namespace OpenSim.Region.PhysicsModule.POS
291 291
292 public override bool PIDHoverActive 292 public override bool PIDHoverActive
293 { 293 {
294 get { return false; }
294 set { return; } 295 set { return; }
295 } 296 }
296 297
@@ -303,7 +304,7 @@ namespace OpenSim.Region.PhysicsModule.POS
303 { 304 {
304 set { return; } 305 set { return; }
305 } 306 }
306 307
307 public override Quaternion APIDTarget 308 public override Quaternion APIDTarget
308 { 309 {
309 set { return; } 310 set { return; }
diff --git a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs
index 8aae716..180885d 100644
--- a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs
+++ b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs
@@ -250,7 +250,7 @@ namespace OpenSim.Region.PhysicsModule.POS
250 { 250 {
251 } 251 }
252 252
253 public override void LockAngularMotion(Vector3 axis) 253 public override void LockAngularMotion(byte axislocks)
254 { 254 {
255 } 255 }
256 256
@@ -286,6 +286,7 @@ namespace OpenSim.Region.PhysicsModule.POS
286 286
287 public override bool PIDHoverActive 287 public override bool PIDHoverActive
288 { 288 {
289 get { return false; }
289 set { return; } 290 set { return; }
290 } 291 }
291 292
@@ -298,7 +299,7 @@ namespace OpenSim.Region.PhysicsModule.POS
298 { 299 {
299 set { return; } 300 set { return; }
300 } 301 }
301 302
302 public override Quaternion APIDTarget 303 public override Quaternion APIDTarget
303 { 304 {
304 set { return; } 305 set { return; }
diff --git a/OpenSim/Region/PhysicsModules/POS/POSScene.cs b/OpenSim/Region/PhysicsModules/POS/POSScene.cs
index 6375f18..e62d876 100644
--- a/OpenSim/Region/PhysicsModules/POS/POSScene.cs
+++ b/OpenSim/Region/PhysicsModules/POS/POSScene.cs
@@ -54,6 +54,11 @@ namespace OpenSim.Region.PhysicsModule.POS
54 get { return "POS"; } 54 get { return "POS"; }
55 } 55 }
56 56
57 public string Version
58 {
59 get { return "1.0"; }
60 }
61
57 public Type ReplaceableInterface 62 public Type ReplaceableInterface
58 { 63 {
59 get { return null; } 64 get { return null; }
@@ -83,6 +88,7 @@ namespace OpenSim.Region.PhysicsModule.POS
83 88
84 EngineType = Name; 89 EngineType = Name;
85 PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; 90 PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName;
91 EngineName = Name + " " + Version;
86 92
87 scene.RegisterModuleInterface<PhysicsScene>(this); 93 scene.RegisterModuleInterface<PhysicsScene>(this);
88 base.Initialise(scene.PhysicsRequestAsset, 94 base.Initialise(scene.PhysicsRequestAsset,
@@ -288,7 +294,7 @@ namespace OpenSim.Region.PhysicsModule.POS
288 character._velocity.Z = (character.Position.Z - oldposZ)/timeStep; 294 character._velocity.Z = (character.Position.Z - oldposZ)/timeStep;
289 } 295 }
290 } 296 }
291 return fps; 297 return 1.0f;
292 } 298 }
293 299
294 public override void GetResults() 300 public override void GetResults()