aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-03-22 20:10:38 +0000
committerMelanie2012-03-22 20:10:38 +0000
commit45b588cf008c514f461bf43c168dcdc9902b7bb9 (patch)
tree4400b38f11e37fbab0cad9540f0d03ad05840bac /OpenSim/Region/Framework
parentSimple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu... (diff)
downloadopensim-SC_OLD-45b588cf008c514f461bf43c168dcdc9902b7bb9.zip
opensim-SC_OLD-45b588cf008c514f461bf43c168dcdc9902b7bb9.tar.gz
opensim-SC_OLD-45b588cf008c514f461bf43c168dcdc9902b7bb9.tar.bz2
opensim-SC_OLD-45b588cf008c514f461bf43c168dcdc9902b7bb9.tar.xz
Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."
This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs17
1 files changed, 0 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index a4605c4..e1fedf4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -90,7 +90,6 @@ namespace OpenSim.Region.Framework.Scenes
90 public delegate bool TeleportHandler(UUID userID, Scene scene); 90 public delegate bool TeleportHandler(UUID userID, Scene scene);
91 public delegate bool ControlPrimMediaHandler(UUID userID, UUID primID, int face); 91 public delegate bool ControlPrimMediaHandler(UUID userID, UUID primID, int face);
92 public delegate bool InteractWithPrimMediaHandler(UUID userID, UUID primID, int face); 92 public delegate bool InteractWithPrimMediaHandler(UUID userID, UUID primID, int face);
93 public delegate void SendLandPropertiesHandler(UUID userID, ILandObject realLand, out ILandObject landToSend);
94 #endregion 93 #endregion
95 94
96 public class ScenePermissions 95 public class ScenePermissions
@@ -158,7 +157,6 @@ namespace OpenSim.Region.Framework.Scenes
158 public event TeleportHandler OnTeleport; 157 public event TeleportHandler OnTeleport;
159 public event ControlPrimMediaHandler OnControlPrimMedia; 158 public event ControlPrimMediaHandler OnControlPrimMedia;
160 public event InteractWithPrimMediaHandler OnInteractWithPrimMedia; 159 public event InteractWithPrimMediaHandler OnInteractWithPrimMedia;
161 public event SendLandPropertiesHandler OnSendLandProperties;
162 #endregion 160 #endregion
163 161
164 #region Object Permission Checks 162 #region Object Permission Checks
@@ -1100,20 +1098,5 @@ namespace OpenSim.Region.Framework.Scenes
1100 } 1098 }
1101 return true; 1099 return true;
1102 } 1100 }
1103
1104 public void LandObjectForClient(UUID userID, ILandObject realLand, out ILandObject landToSend)
1105 {
1106 landToSend = realLand;
1107 SendLandPropertiesHandler handler = OnSendLandProperties;
1108 if (handler != null)
1109 {
1110 Delegate[] list = handler.GetInvocationList();
1111 foreach (SendLandPropertiesHandler h in list)
1112 {
1113 h(userID, realLand, out landToSend);
1114 }
1115 }
1116 }
1117
1118 } 1101 }
1119} 1102}