diff options
| author | UbitUmarov | 2013-01-26 03:16:45 +0000 |
|---|---|---|
| committer | UbitUmarov | 2013-01-26 03:16:45 +0000 |
| commit | c58ec342ffaa4f020f3f37ab8ab53517d4a83b71 (patch) | |
| tree | 0710d530094ec72d8fc99d627d35d5a29389cc3c /OpenSim/Region/Physics | |
| parent | revert the test, sending again appearance to self in (diff) | |
| parent | Make llGiveMoney async again. The return value is now the constant 1 to make (diff) | |
| download | opensim-SC-c58ec342ffaa4f020f3f37ab8ab53517d4a83b71.zip opensim-SC-c58ec342ffaa4f020f3f37ab8ab53517d4a83b71.tar.gz opensim-SC-c58ec342ffaa4f020f3f37ab8ab53517d4a83b71.tar.bz2 opensim-SC-c58ec342ffaa4f020f3f37ab8ab53517d4a83b71.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 2 |
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 | } |