aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorteravus2013-01-26 07:23:16 -0500
committerteravus2013-01-26 07:23:16 -0500
commit60eb0f36b3e8146eec26aa83cff7d89782026d9d (patch)
tree726fd9aa4d47733f2596bfd032ce215f565117b3 /OpenSim/Region/Physics
parent* Handle a NRE with Baked Textures that may result in a failed appearance. ... (diff)
parentMake llGiveMoney async again. The return value is now the constant 1 to make (diff)
downloadopensim-SC-60eb0f36b3e8146eec26aa83cff7d89782026d9d.zip
opensim-SC-60eb0f36b3e8146eec26aa83cff7d89782026d9d.tar.gz
opensim-SC-60eb0f36b3e8146eec26aa83cff7d89782026d9d.tar.bz2
opensim-SC-60eb0f36b3e8146eec26aa83cff7d89782026d9d.tar.xz
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs2
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs2
2 files changed, 2 insertions, 2 deletions
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 }