diff options
author | Justin Clark-Casey (justincc) | 2013-01-24 00:03:44 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-24 00:03:44 +0000 |
commit | 55c6753b13d4c8cd69cc986db5f6e321b8e65bb7 (patch) | |
tree | 70ae7a976ba9be4e7e8d1cb98d3a6e61e4dfb7d4 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini and... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.zip opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.gz opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.bz2 opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.xz |
Merge branch 'master' into cooptermination
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4859dff..f2cb117 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -68,6 +68,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
68 | public bool EmergencyMonitoring = false; | 68 | public bool EmergencyMonitoring = false; |
69 | 69 | ||
70 | /// <summary> | 70 | /// <summary> |
71 | /// Show debug information about animations. | ||
72 | /// </summary> | ||
73 | public bool DebugAnimations { get; set; } | ||
74 | |||
75 | /// <summary> | ||
71 | /// Show debug information about teleports. | 76 | /// Show debug information about teleports. |
72 | /// </summary> | 77 | /// </summary> |
73 | public bool DebugTeleporting { get; set; } | 78 | public bool DebugTeleporting { get; set; } |
@@ -1978,6 +1983,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
1978 | EventManager.TriggerPrimsLoaded(this); | 1983 | EventManager.TriggerPrimsLoaded(this); |
1979 | } | 1984 | } |
1980 | 1985 | ||
1986 | public bool SupportsRayCastFiltered() | ||
1987 | { | ||
1988 | if (PhysicsScene == null) | ||
1989 | return false; | ||
1990 | return PhysicsScene.SupportsRaycastWorldFiltered(); | ||
1991 | } | ||
1992 | |||
1993 | public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter) | ||
1994 | { | ||
1995 | if (PhysicsScene == null) | ||
1996 | return null; | ||
1997 | return PhysicsScene.RaycastWorld(position, direction, length, Count,filter); | ||
1998 | } | ||
1981 | 1999 | ||
1982 | /// <summary> | 2000 | /// <summary> |
1983 | /// Gets a new rez location based on the raycast and the size of the object that is being rezzed. | 2001 | /// Gets a new rez location based on the raycast and the size of the object that is being rezzed. |