diff options
| author | Melanie | 2013-01-24 23:25:38 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-24 23:25:38 +0000 |
| commit | c6e6614a447b541d9d985c2a3dd3bb50a89f9b07 (patch) | |
| tree | 023ae4d98fdfb20e8d1cd9c6ce4988e4f2dec842 /OpenSim/Region/Physics | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make llGiveMoney async again. The return value is now the constant 1 to make (diff) | |
| download | opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.zip opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.gz opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.bz2 opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Physics')
| -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 f82b597..fe418d3 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
| @@ -357,7 +357,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 357 | return null; | 357 | return null; |
| 358 | } | 358 | } |
| 359 | 359 | ||
| 360 | public virtual bool SuportsRaycastWorldFiltered() | 360 | public virtual bool SupportsRaycastWorldFiltered() |
| 361 | { | 361 | { |
| 362 | return false; | 362 | return false; |
| 363 | } | 363 | } |
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 | } |