aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-01-23 20:29:05 +0100
committerMelanie2013-01-23 20:29:05 +0100
commitc75508ec8d236b45c65c80d479ed7c24dd3343ce (patch)
tree379fac7034418a9bacf60b05b35a23b5b17ac61d
parentRemove the return value from llGiveMoney (it was a LSL extension of OpenSim) and (diff)
downloadopensim-SC_OLD-c75508ec8d236b45c65c80d479ed7c24dd3343ce.zip
opensim-SC_OLD-c75508ec8d236b45c65c80d479ed7c24dd3343ce.tar.gz
opensim-SC_OLD-c75508ec8d236b45c65c80d479ed7c24dd3343ce.tar.bz2
opensim-SC_OLD-c75508ec8d236b45c65c80d479ed7c24dd3343ce.tar.xz
Fix a type (Suports => Supports). Also put the normal terrain collision check
into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs2
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs16
4 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9d07537..e3bc8c7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2065,11 +2065,11 @@ namespace OpenSim.Region.Framework.Scenes
2065 EventManager.TriggerPrimsLoaded(this); 2065 EventManager.TriggerPrimsLoaded(this);
2066 } 2066 }
2067 2067
2068 public bool SuportsRayCastFiltered() 2068 public bool SupportsRayCastFiltered()
2069 { 2069 {
2070 if (PhysicsScene == null) 2070 if (PhysicsScene == null)
2071 return false; 2071 return false;
2072 return PhysicsScene.SuportsRaycastWorldFiltered(); 2072 return PhysicsScene.SupportsRaycastWorldFiltered();
2073 } 2073 }
2074 2074
2075 public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter) 2075 public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter)
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index d24ab2a..57e2d20 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Region.Physics.Manager
350 return null; 350 return null;
351 } 351 }
352 352
353 public virtual bool SuportsRaycastWorldFiltered() 353 public virtual bool SupportsRaycastWorldFiltered()
354 { 354 {
355 return false; 355 return false;
356 } 356 }
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 5113210..510cbe9 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -2643,7 +2643,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2643 } 2643 }
2644 } 2644 }
2645 2645
2646 public override bool SuportsRaycastWorldFiltered() 2646 public override bool SupportsRaycastWorldFiltered()
2647 { 2647 {
2648 return true; 2648 return true;
2649 } 2649 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0562c7f..703c54d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12209,7 +12209,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12209 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); 12209 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL);
12210 12210
12211 12211
12212 if (World.SuportsRayCastFiltered()) 12212 if (World.SupportsRayCastFiltered())
12213 { 12213 {
12214 if (dist == 0) 12214 if (dist == 0)
12215 return list; 12215 return list;
@@ -12272,13 +12272,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12272 } 12272 }
12273 else 12273 else
12274 { 12274 {
12275 if (checkTerrain)
12276 {
12277 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd);
12278 if (groundContact != null)
12279 results.Add((ContactResult)groundContact);
12280 }
12281
12282 if (checkAgents) 12275 if (checkAgents)
12283 { 12276 {
12284 ContactResult[] agentHits = AvatarIntersection(rayStart, rayEnd); 12277 ContactResult[] agentHits = AvatarIntersection(rayStart, rayEnd);
@@ -12294,6 +12287,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12294 } 12287 }
12295 } 12288 }
12296 12289
12290 if (checkTerrain)
12291 {
12292 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd);
12293 if (groundContact != null)
12294 results.Add((ContactResult)groundContact);
12295 }
12296
12297 results.Sort(delegate(ContactResult a, ContactResult b) 12297 results.Sort(delegate(ContactResult a, ContactResult b)
12298 { 12298 {
12299 return a.Depth.CompareTo(b.Depth); 12299 return a.Depth.CompareTo(b.Depth);