aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs6
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs3
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs3
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs3
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs7
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs1
-rw-r--r--OpenSim/Region/Physics/POSPlugin/POSCharacter.cs6
-rw-r--r--OpenSim/Region/Physics/POSPlugin/POSPrim.cs6
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs6
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs6
12 files changed, 15 insertions, 39 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 55ba18a..9f9b4f0 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -46,7 +46,7 @@ using OpenSim.Region.Framework;
46using OpenSim.Region.Framework.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Framework.Scenes; 47using OpenSim.Region.Framework.Scenes;
48using OpenSim.Region.Physics.Manager; 48using OpenSim.Region.Physics.Manager;
49using OpenSim.Server.Base; 49using OpenSim.Server.Base;
50using OpenSim.Services.Base; 50using OpenSim.Services.Base;
51using OpenSim.Services.Interfaces; 51using OpenSim.Services.Interfaces;
52using OpenSim.Services.UserAccountService; 52using OpenSim.Services.UserAccountService;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 526fab3..6f02475 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2530,10 +2530,7 @@ namespace OpenSim.Region.Framework.Scenes
2530 // again here... this comes after the cached appearance check because the avatars 2530 // again here... this comes after the cached appearance check because the avatars
2531 // appearance goes into the avatar update packet 2531 // appearance goes into the avatar update packet
2532 SendAvatarDataToAllAgents(); 2532 SendAvatarDataToAllAgents();
2533 2533 SendAppearanceToAgent(this);
2534 // Sending us our own appearance does not seem to be necessary, and the viewer warns in the log if you do
2535 // this.
2536// SendAppearanceToAgent(this);
2537 2534
2538 // If we are using the the cached appearance then send it out to everyone 2535 // If we are using the the cached appearance then send it out to everyone
2539 if (cachedappearance) 2536 if (cachedappearance)
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index 1e1d5e3..b1a3ff9 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -233,6 +233,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
233 public override Vector3 Acceleration 233 public override Vector3 Acceleration
234 { 234 {
235 get { return _acceleration; } 235 get { return _acceleration; }
236 set { _acceleration = value; }
236 } 237 }
237 238
238 public override bool Kinematic 239 public override bool Kinematic
@@ -253,11 +254,6 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
253 { 254 {
254 } 255 }
255 256
256 public void SetAcceleration(Vector3 accel)
257 {
258 _acceleration = accel;
259 }
260
261 public override void AddForce(Vector3 force, bool pushforce) 257 public override void AddForce(Vector3 force, bool pushforce)
262 { 258 {
263 } 259 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 9a6857b..0cab5d1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -231,7 +231,8 @@ public class BSCharacter : PhysicsActor
231 } 231 }
232 } 232 }
233 public override Vector3 Acceleration { 233 public override Vector3 Acceleration {
234 get { return _acceleration; } 234 get { return _acceleration; }
235 set { _acceleration = value; }
235 } 236 }
236 public override Quaternion Orientation { 237 public override Quaternion Orientation {
237 get { return _orientation; } 238 get { return _orientation; }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 8782e62..898436b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -417,7 +417,8 @@ public sealed class BSPrim : PhysicsActor
417 } 417 }
418 } 418 }
419 public override OMV.Vector3 Acceleration { 419 public override OMV.Vector3 Acceleration {
420 get { return _acceleration; } 420 get { return _acceleration; }
421 set { _acceleration = value; }
421 } 422 }
422 public override OMV.Quaternion Orientation { 423 public override OMV.Quaternion Orientation {
423 get { return _orientation; } 424 get { return _orientation; }
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index c2acf97..0587054 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Physics.Manager
261 261
262 public abstract Vector3 Torque { get; set; } 262 public abstract Vector3 Torque { get; set; }
263 public abstract float CollisionScore { get; set;} 263 public abstract float CollisionScore { get; set;}
264 public abstract Vector3 Acceleration { get; } 264 public abstract Vector3 Acceleration { get; set; }
265 public abstract Quaternion Orientation { get; set; } 265 public abstract Quaternion Orientation { get; set; }
266 public abstract int PhysicsActorType { get; set; } 266 public abstract int PhysicsActorType { get; set; }
267 public abstract bool IsPhysical { get; set; } 267 public abstract bool IsPhysical { get; set; }
@@ -458,6 +458,7 @@ namespace OpenSim.Region.Physics.Manager
458 public override Vector3 Acceleration 458 public override Vector3 Acceleration
459 { 459 {
460 get { return Vector3.Zero; } 460 get { return Vector3.Zero; }
461 set { }
461 } 462 }
462 463
463 public override bool IsPhysical 464 public override bool IsPhysical
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index f2bb4bf..68999fc 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -690,12 +690,7 @@ namespace OpenSim.Region.Physics.OdePlugin
690 public override Vector3 Acceleration 690 public override Vector3 Acceleration
691 { 691 {
692 get { return _acceleration; } 692 get { return _acceleration; }
693 } 693 set { _acceleration = value; }
694
695 public void SetAcceleration(Vector3 accel)
696 {
697 m_pidControllerActive = true;
698 _acceleration = accel;
699 } 694 }
700 695
701 /// <summary> 696 /// <summary>
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 94e6185..75364b7 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2497,6 +2497,7 @@ Console.WriteLine(" JointCreateFixed");
2497 public override Vector3 Acceleration 2497 public override Vector3 Acceleration
2498 { 2498 {
2499 get { return _acceleration; } 2499 get { return _acceleration; }
2500 set { _acceleration = value; }
2500 } 2501 }
2501 2502
2502 public override void AddForce(Vector3 force, bool pushforce) 2503 public override void AddForce(Vector3 force, bool pushforce)
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
index a70179b..ae534ea 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
@@ -231,6 +231,7 @@ namespace OpenSim.Region.Physics.POSPlugin
231 public override Vector3 Acceleration 231 public override Vector3 Acceleration
232 { 232 {
233 get { return _acceleration; } 233 get { return _acceleration; }
234 set { _acceleration = value; }
234 } 235 }
235 236
236 public override bool Kinematic 237 public override bool Kinematic
@@ -251,11 +252,6 @@ namespace OpenSim.Region.Physics.POSPlugin
251 { 252 {
252 } 253 }
253 254
254 public void SetAcceleration(Vector3 accel)
255 {
256 _acceleration = accel;
257 }
258
259 public override void AddForce(Vector3 force, bool pushforce) 255 public override void AddForce(Vector3 force, bool pushforce)
260 { 256 {
261 } 257 }
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index 91ec3df..e4fd7eb 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -193,6 +193,7 @@ namespace OpenSim.Region.Physics.POSPlugin
193 public override Vector3 Acceleration 193 public override Vector3 Acceleration
194 { 194 {
195 get { return _acceleration; } 195 get { return _acceleration; }
196 set { _acceleration = value; }
196 } 197 }
197 198
198 public override bool Kinematic 199 public override bool Kinematic
@@ -201,11 +202,6 @@ namespace OpenSim.Region.Physics.POSPlugin
201 set { } 202 set { }
202 } 203 }
203 204
204 public void SetAcceleration(Vector3 accel)
205 {
206 _acceleration = accel;
207 }
208
209 public override void AddForce(Vector3 force, bool pushforce) 205 public override void AddForce(Vector3 force, bool pushforce)
210 { 206 {
211 } 207 }
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
index 92261cd..9216a9e 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
@@ -233,11 +233,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
233 public override Vector3 Acceleration 233 public override Vector3 Acceleration
234 { 234 {
235 get { return _acceleration; } 235 get { return _acceleration; }
236 } 236 set { _acceleration = value; }
237
238 public void SetAcceleration(Vector3 accel)
239 {
240 _acceleration = accel;
241 } 237 }
242 238
243 public override void AddForce(Vector3 force, bool pushforce) 239 public override void AddForce(Vector3 force, bool pushforce)
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
index c0e24fd..42bd119 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
@@ -207,11 +207,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
207 public override Vector3 Acceleration 207 public override Vector3 Acceleration
208 { 208 {
209 get { return _acceleration; } 209 get { return _acceleration; }
210 } 210 set { _acceleration = value; }
211
212 public void SetAcceleration(Vector3 accel)
213 {
214 _acceleration = accel;
215 } 211 }
216 212
217 public override void AddForce(Vector3 force, bool pushforce) 213 public override void AddForce(Vector3 force, bool pushforce)
generated by cgit v1.1 at 2024-11-17 22:09:40 +0000