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/Framework/Scenes/Scene.cs | |
| 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/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f229e33..9cdcd96 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2052,11 +2052,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2052 | EventManager.TriggerPrimsLoaded(this); | 2052 | EventManager.TriggerPrimsLoaded(this); |
| 2053 | } | 2053 | } |
| 2054 | 2054 | ||
| 2055 | public bool SuportsRayCastFiltered() | 2055 | public bool SupportsRayCastFiltered() |
| 2056 | { | 2056 | { |
| 2057 | if (PhysicsScene == null) | 2057 | if (PhysicsScene == null) |
| 2058 | return false; | 2058 | return false; |
| 2059 | return PhysicsScene.SuportsRaycastWorldFiltered(); | 2059 | return PhysicsScene.SupportsRaycastWorldFiltered(); |
| 2060 | } | 2060 | } |
| 2061 | 2061 | ||
| 2062 | public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter) | 2062 | public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter) |