aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2009-12-22 00:41:56 +0000
committerMelanie2009-12-22 00:41:56 +0000
commitfa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f (patch)
treef644f2171b694ac6997c887ba442be9770fdce73 /OpenSim/Region
parentMerge branch 'master' into careminster (diff)
parentGlue code for a couple of new LSL function implementations (diff)
downloadopensim-SC_OLD-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.zip
opensim-SC_OLD-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.gz
opensim-SC_OLD-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.bz2
opensim-SC_OLD-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs22
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs1
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs1
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs15
-rw-r--r--OpenSim/Region/Physics/POSPlugin/POSPrim.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs1
9 files changed, 31 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index eacd219..f8498c6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1853,7 +1853,7 @@ namespace OpenSim.Region.Framework.Scenes
1853 } 1853 }
1854 } 1854 }
1855 } 1855 }
1856 1856
1857 public void rotLookAt(Quaternion target, float strength, float damping) 1857 public void rotLookAt(Quaternion target, float strength, float damping)
1858 { 1858 {
1859 SceneObjectPart rootpart = m_rootPart; 1859 SceneObjectPart rootpart = m_rootPart;
@@ -1880,6 +1880,7 @@ namespace OpenSim.Region.Framework.Scenes
1880 } 1880 }
1881 } 1881 }
1882 } 1882 }
1883
1883 public void stopLookAt() 1884 public void stopLookAt()
1884 { 1885 {
1885 SceneObjectPart rootpart = m_rootPart; 1886 SceneObjectPart rootpart = m_rootPart;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0eddbfd..6b562e5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2684,7 +2684,7 @@ namespace OpenSim.Region.Framework.Scenes
2684 ParentGroup.HasGroupChanged = true; 2684 ParentGroup.HasGroupChanged = true;
2685 ScheduleFullUpdate(); 2685 ScheduleFullUpdate();
2686 } 2686 }
2687 2687
2688 /// <summary> 2688 /// <summary>
2689 /// Set the text displayed for this part. 2689 /// Set the text displayed for this part.
2690 /// </summary> 2690 /// </summary>
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
index 98681d6..88f5d3e 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
@@ -620,11 +620,25 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
620 set { return; } 620 set { return; }
621 } 621 }
622 622
623 public override Quaternion APIDTarget { set { return; } } 623 public override Quaternion APIDTarget
624 public override bool APIDActive { set { return; } } 624 {
625 public override float APIDStrength { set { return; } } 625 set { return; }
626 public override float APIDDamping { set { return; } } 626 }
627
628 public override bool APIDActive
629 {
630 set { return; }
631 }
627 632
633 public override float APIDStrength
634 {
635 set { return; }
636 }
637
638 public override float APIDDamping
639 {
640 set { return; }
641 }
628 642
629 /// <summary> 643 /// <summary>
630 /// Adds the force supplied to the Target Velocity 644 /// Adds the force supplied to the Target Velocity
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index d931f126..9603ea4 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -570,7 +570,6 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
570 public override float APIDStrength { set { return; } } 570 public override float APIDStrength { set { return; } }
571 public override float APIDDamping { set { return; } } 571 public override float APIDDamping { set { return; } }
572 572
573
574 public override void AddForce(Vector3 force, bool pushforce) 573 public override void AddForce(Vector3 force, bool pushforce)
575 { 574 {
576 m_forcelist.Add(force); 575 m_forcelist.Add(force);
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index b82586f..10b153d 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -487,7 +487,6 @@ namespace OpenSim.Region.Physics.Manager
487 public override float APIDStrength { set { return; } } 487 public override float APIDStrength { set { return; } }
488 public override float APIDDamping { set { return; } } 488 public override float APIDDamping { set { return; } }
489 489
490
491 public override void SetMomentum(Vector3 momentum) 490 public override void SetMomentum(Vector3 momentum)
492 { 491 {
493 } 492 }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index b99baa2..75b5b5a 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1217,8 +1217,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1217 set { return; } 1217 set { return; }
1218 } 1218 }
1219 1219
1220
1221
1222 public override void SubscribeEvents(int ms) 1220 public override void SubscribeEvents(int ms)
1223 { 1221 {
1224 m_requestedUpdateFrequency = ms; 1222 m_requestedUpdateFrequency = ms;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 688be83..3765123 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2886,16 +2886,19 @@ Console.WriteLine(" JointCreateFixed");
2886 public override bool PIDActive { set { m_usePID = value; } } 2886 public override bool PIDActive { set { m_usePID = value; } }
2887 public override float PIDTau { set { m_PIDTau = value; } } 2887 public override float PIDTau { set { m_PIDTau = value; } }
2888 2888
2889 // For RotLookAt
2890 public override Quaternion APIDTarget { set { m_APIDTarget = value; } }
2891 public override bool APIDActive { set { m_useAPID = value; } }
2892 public override float APIDStrength { set { m_APIDStrength = value; } }
2893 public override float APIDDamping { set { m_APIDDamping = value; } }
2894
2895 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } 2889 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
2896 public override bool PIDHoverActive { set { m_useHoverPID = value; } } 2890 public override bool PIDHoverActive { set { m_useHoverPID = value; } }
2897 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } 2891 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
2898 public override float PIDHoverTau { set { m_PIDHoverTau = value; } } 2892 public override float PIDHoverTau { set { m_PIDHoverTau = value; } }
2893
2894 public override Quaternion APIDTarget{ set { return; } }
2895
2896 public override bool APIDActive{ set { return; } }
2897
2898 public override float APIDStrength{ set { return; } }
2899
2900 public override float APIDDamping{ set { return; } }
2901
2899 2902
2900 private void createAMotor(Vector3 axis) 2903 private void createAMotor(Vector3 axis)
2901 { 2904 {
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index 847b634..edccf47 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -299,6 +299,7 @@ namespace OpenSim.Region.Physics.POSPlugin
299 { 299 {
300 set { return; } 300 set { return; }
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/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c3edaef..28932b6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2742,7 +2742,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2742 2742
2743 } 2743 }
2744 2744
2745
2746 public void llStopLookAt() 2745 public void llStopLookAt()
2747 { 2746 {
2748 m_host.AddScriptLPS(1); 2747 m_host.AddScriptLPS(1);