diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/GodController.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/GodController.cs | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs index f8b576c..36483fb 100644 --- a/OpenSim/Region/Framework/Scenes/GodController.cs +++ b/OpenSim/Region/Framework/Scenes/GodController.cs | |||
@@ -53,7 +53,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
53 | protected bool m_forceGridGodsOnly; | 53 | protected bool m_forceGridGodsOnly; |
54 | protected bool m_regionOwnerIsGod; | 54 | protected bool m_regionOwnerIsGod; |
55 | protected bool m_regionManagerIsGod; | 55 | protected bool m_regionManagerIsGod; |
56 | protected bool m_parcelOwnerIsGod; | ||
57 | protected bool m_forceGodModeAlwaysOn; | 56 | protected bool m_forceGodModeAlwaysOn; |
58 | protected bool m_allowGodActionsWithoutGodMode; | 57 | protected bool m_allowGodActionsWithoutGodMode; |
59 | 58 | ||
@@ -94,10 +93,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
94 | Util.GetConfigVarFromSections<bool>(config, | 93 | Util.GetConfigVarFromSections<bool>(config, |
95 | "region_manager_is_god", sections, false); | 94 | "region_manager_is_god", sections, false); |
96 | 95 | ||
97 | // Parcel owners are gods in their own parcels only. | ||
98 | m_parcelOwnerIsGod = | ||
99 | Util.GetConfigVarFromSections<bool>(config, | ||
100 | "parcel_owner_is_god", sections, false); | ||
101 | } | 96 | } |
102 | else | 97 | else |
103 | m_allowGridGods = true; // reduce user mistakes increased by this over complex options set | 98 | m_allowGridGods = true; // reduce user mistakes increased by this over complex options set |
@@ -140,14 +135,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
140 | if (m_regionManagerIsGod && m_scene.Permissions.IsEstateManager(m_scenePresence.UUID)) | 135 | if (m_regionManagerIsGod && m_scene.Permissions.IsEstateManager(m_scenePresence.UUID)) |
141 | return true; | 136 | return true; |
142 | 137 | ||
143 | if (m_parcelOwnerIsGod) // Skip expensive check if we're already god! | ||
144 | { | ||
145 | Vector3 pos = m_scenePresence.AbsolutePosition; | ||
146 | ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); | ||
147 | if (parcel != null && parcel.LandData.OwnerID == m_scenePresence.UUID) | ||
148 | return true; | ||
149 | } | ||
150 | |||
151 | return false; | 138 | return false; |
152 | } | 139 | } |
153 | 140 | ||