diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs index d37369c..9833086 100644 --- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs +++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs | |||
@@ -131,8 +131,11 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport | |||
131 | { | 131 | { |
132 | foreach (MenuItemData d in m_menuItems[UUID.Zero]) | 132 | foreach (MenuItemData d in m_menuItems[UUID.Zero]) |
133 | { | 133 | { |
134 | if (d.Mode == UserMode.God && (!m_scene.Permissions.IsGod(agentID))) | 134 | if (!m_scene.Permissions.IsGod(agentID)) |
135 | continue; | 135 | { |
136 | if (d.Mode == UserMode.RegionManager && (!m_scene.Permissions.IsAdministrator(agentID))) | ||
137 | continue; | ||
138 | } | ||
136 | 139 | ||
137 | OSDMap loc = null; | 140 | OSDMap loc = null; |
138 | switch (d.Location) | 141 | switch (d.Location) |
@@ -156,7 +159,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport | |||
156 | 159 | ||
157 | if (loc == null) | 160 | if (loc == null) |
158 | continue; | 161 | continue; |
159 | 162 | ||
160 | loc[d.Title] = OSD.FromString(d.Title); | 163 | loc[d.Title] = OSD.FromString(d.Title); |
161 | } | 164 | } |
162 | } | 165 | } |
@@ -190,7 +193,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport | |||
190 | 193 | ||
191 | if (loc == null) | 194 | if (loc == null) |
192 | continue; | 195 | continue; |
193 | 196 | ||
194 | loc[d.Title] = OSD.FromString(d.Title); | 197 | loc[d.Title] = OSD.FromString(d.Title); |
195 | } | 198 | } |
196 | } | 199 | } |