aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
diff options
context:
space:
mode:
authorMelanie2013-01-24 23:25:38 +0000
committerMelanie2013-01-24 23:25:38 +0000
commitc6e6614a447b541d9d985c2a3dd3bb50a89f9b07 (patch)
tree023ae4d98fdfb20e8d1cd9c6ce4988e4f2dec842 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
parentMerge branch 'master' into careminster (diff)
parentMake llGiveMoney async again. The return value is now the constant 1 to make (diff)
downloadopensim-SC-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.zip
opensim-SC-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.gz
opensim-SC-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.bz2
opensim-SC-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs2
1 files changed, 1 insertions, 1 deletions
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 }