diff options
author | mingchen | 2008-05-07 17:33:57 +0000 |
---|---|---|
committer | mingchen | 2008-05-07 17:33:57 +0000 |
commit | 6551f17966975081ac9b9f4c3b19d33e9d2c69a5 (patch) | |
tree | 24fee3acb4381334e3e4cdc46712e20d63803839 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | From: Kurt Taylor <krtaylor@us.ibm.com> (diff) | |
download | opensim-SC-6551f17966975081ac9b9f4c3b19d33e9d2c69a5.zip opensim-SC-6551f17966975081ac9b9f4c3b19d33e9d2c69a5.tar.gz opensim-SC-6551f17966975081ac9b9f4c3b19d33e9d2c69a5.tar.bz2 opensim-SC-6551f17966975081ac9b9f4c3b19d33e9d2c69a5.tar.xz |
*Added SceneExternalChecks.cs that is used to manage checking the results of multiple functions that register with the class and return the result (usually true/false) based on those results. This is useful for module wanting to put their opinion in decisions such as 'can the user rez this object?'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index a875051..72512c7 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -241,6 +241,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
241 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; | 241 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; |
242 | 242 | ||
243 | m_eventManager = new EventManager(); | 243 | m_eventManager = new EventManager(); |
244 | m_externalChecks = new SceneExternalChecks(this); | ||
244 | 245 | ||
245 | //Bind Storage Manager functions to some land manager functions for this scene | 246 | //Bind Storage Manager functions to some land manager functions for this scene |
246 | EventManager.OnLandObjectAdded += | 247 | EventManager.OnLandObjectAdded += |
@@ -829,7 +830,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
829 | { | 830 | { |
830 | ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); }); | 831 | ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); }); |
831 | } | 832 | } |
832 | 833 | ||
833 | /// <summary> | 834 | /// <summary> |
834 | /// | 835 | /// |
835 | /// </summary> | 836 | /// </summary> |
@@ -1244,7 +1245,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1244 | 1245 | ||
1245 | LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f,0.5f,0.5f), false); | 1246 | LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f,0.5f,0.5f), false); |
1246 | 1247 | ||
1247 | if (Permissions.CanRezObject(ownerID, pos)) | 1248 | if (Permissions.CanRezObject(ownerID, pos, 1)) |
1248 | { | 1249 | { |
1249 | // rez ON the ground, not IN the ground | 1250 | // rez ON the ground, not IN the ground |
1250 | pos.Z += 0.25F; | 1251 | pos.Z += 0.25F; |
@@ -3217,5 +3218,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3217 | return visualParams; | 3218 | return visualParams; |
3218 | } | 3219 | } |
3219 | #endregion | 3220 | #endregion |
3221 | |||
3222 | |||
3220 | } | 3223 | } |
3221 | } | 3224 | } |