aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-06-01 20:55:03 +0100
committerJustin Clark-Casey (justincc)2011-06-01 20:55:03 +0100
commita3e0895f12fa81074138a356c01fbcbc40d6aba2 (patch)
tree5f3b32fdbaf5d14c1e260596c9cc99ad85a6466f /OpenSim/Region
parentA final couple of tweaks to GroupsModule.cs. Remove unneeded delegate, and pr... (diff)
downloadopensim-SC_OLD-a3e0895f12fa81074138a356c01fbcbc40d6aba2.zip
opensim-SC_OLD-a3e0895f12fa81074138a356c01fbcbc40d6aba2.tar.gz
opensim-SC_OLD-a3e0895f12fa81074138a356c01fbcbc40d6aba2.tar.bz2
opensim-SC_OLD-a3e0895f12fa81074138a356c01fbcbc40d6aba2.tar.xz
a few minor formatting tweaks
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 61c5503..630fcab 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1234,15 +1234,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1234 1234
1235 // cScene and property accessor 'isGod' are in support of the opertions to bypass 'hidden' group attributes for 1235 // cScene and property accessor 'isGod' are in support of the opertions to bypass 'hidden' group attributes for
1236 // those with a GodLike aspect. 1236 // those with a GodLike aspect.
1237 Scene cScene = (Scene) requestingClient.Scene; 1237 Scene cScene = (Scene)requestingClient.Scene;
1238 bool isGod = cScene.Permissions.IsGod(requestingClient.AgentId); 1238 bool isGod = cScene.Permissions.IsGod(requestingClient.AgentId);
1239 1239
1240 if (isGod) { 1240 if (isGod)
1241 {
1241 membershipArray = membershipData.ToArray(); 1242 membershipArray = membershipData.ToArray();
1242 } 1243 }
1243 else 1244 else
1244 { 1245 {
1245
1246 if (requestingClient.AgentId != dataForAgentID) 1246 if (requestingClient.AgentId != dataForAgentID)
1247 { 1247 {
1248 Predicate<GroupMembershipData> showInProfile = delegate(GroupMembershipData membership) 1248 Predicate<GroupMembershipData> showInProfile = delegate(GroupMembershipData membership)
@@ -1257,6 +1257,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1257 membershipArray = membershipData.ToArray(); 1257 membershipArray = membershipData.ToArray();
1258 } 1258 }
1259 } 1259 }
1260
1260 if (m_debugEnabled) 1261 if (m_debugEnabled)
1261 { 1262 {
1262 m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId); 1263 m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId);