diff options
author | Melanie | 2013-08-01 01:23:24 +0100 |
---|---|---|
committer | Melanie | 2013-08-01 01:23:24 +0100 |
commit | 21f5e670303ee978c747567e674e5ebe256ad2c7 (patch) | |
tree | 19c3740cbb8bf78d038e64b2fb66ea837cc8f724 /OpenSim/Addons/Groups/Service | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Include missing reference that probably stops windows build from commit 12995... (diff) | |
download | opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.zip opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.gz opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.bz2 opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
Diffstat (limited to 'OpenSim/Addons/Groups/Service')
-rw-r--r-- | OpenSim/Addons/Groups/Service/GroupsService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index 294b89a..037ef59 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs | |||
@@ -257,8 +257,8 @@ namespace OpenSim.Groups | |||
257 | 257 | ||
258 | // Check visibility? | 258 | // Check visibility? |
259 | // When we don't want to check visibility, we pass it "all" as the requestingAgentID | 259 | // When we don't want to check visibility, we pass it "all" as the requestingAgentID |
260 | bool checkVisibility = !RequestingAgentID.Equals("all"); | 260 | bool checkVisibility = !RequestingAgentID.Equals(UUID.Zero.ToString()); |
261 | m_log.DebugFormat("[ZZZ]: AgentID is {0}. checkVisibility is {1}", RequestingAgentID, checkVisibility); | 261 | |
262 | if (checkVisibility) | 262 | if (checkVisibility) |
263 | { | 263 | { |
264 | // Is the requester a member of the group? | 264 | // Is the requester a member of the group? |