aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-28 18:08:50 -0700
committerDiva Canto2013-07-28 18:08:50 -0700
commit33b54807a1646a9457a7a718f767ccec1c0cb39f (patch)
tree731ae3e5359f7b22036adea31dc593042c96d8f6
parentSame issue. (diff)
downloadopensim-SC_OLD-33b54807a1646a9457a7a718f767ccec1c0cb39f.zip
opensim-SC_OLD-33b54807a1646a9457a7a718f767ccec1c0cb39f.tar.gz
opensim-SC_OLD-33b54807a1646a9457a7a718f767ccec1c0cb39f.tar.bz2
opensim-SC_OLD-33b54807a1646a9457a7a718f767ccec1c0cb39f.tar.xz
Changing the visibility test in groups service to be UUID.Zero.ToString() instead of "all" because some paths in the code assume there's a UUI in the RequestingAgent string.
-rw-r--r--OpenSim/Addons/Groups/GroupsMessagingModule.cs4
-rw-r--r--OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs5
-rw-r--r--OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs1
-rw-r--r--OpenSim/Addons/Groups/Service/GroupsService.cs4
4 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index 5de1fb4..cd45432 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Groups
246 public void SendMessageToGroup(GridInstantMessage im, UUID groupID) 246 public void SendMessageToGroup(GridInstantMessage im, UUID groupID)
247 { 247 {
248 UUID fromAgentID = new UUID(im.fromAgentID); 248 UUID fromAgentID = new UUID(im.fromAgentID);
249 List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers("all", groupID); 249 List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(UUID.Zero.ToString(), groupID);
250 int groupMembersCount = groupMembers.Count; 250 int groupMembersCount = groupMembers.Count;
251 PresenceInfo[] onlineAgents = null; 251 PresenceInfo[] onlineAgents = null;
252 252
@@ -403,7 +403,7 @@ namespace OpenSim.Groups
403 Scene aScene = m_sceneList[0]; 403 Scene aScene = m_sceneList[0];
404 GridRegion regionOfOrigin = aScene.GridService.GetRegionByUUID(aScene.RegionInfo.ScopeID, regionID); 404 GridRegion regionOfOrigin = aScene.GridService.GetRegionByUUID(aScene.RegionInfo.ScopeID, regionID);
405 405
406 List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers("all", GroupID); 406 List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(UUID.Zero.ToString(), GroupID);
407 List<UUID> alreadySeen = new List<UUID>(); 407 List<UUID> alreadySeen = new List<UUID>();
408 408
409 //if (m_debugEnabled) 409 //if (m_debugEnabled)
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index daa0728..5e53981 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -254,7 +254,10 @@ namespace OpenSim.Groups
254 { 254 {
255 string url = string.Empty, gname = string.Empty; 255 string url = string.Empty, gname = string.Empty;
256 if (IsLocal(GroupID, out url, out gname)) 256 if (IsLocal(GroupID, out url, out gname))
257 return m_LocalGroupsConnector.GetGroupMembers(AgentUUI(RequestingAgentID), GroupID); 257 {
258 string agentID = AgentUUI(RequestingAgentID);
259 return m_LocalGroupsConnector.GetGroupMembers(agentID, GroupID);
260 }
258 else if (!string.IsNullOrEmpty(url)) 261 else if (!string.IsNullOrEmpty(url))
259 { 262 {
260 ExtendedGroupMembershipData membership = m_LocalGroupsConnector.GetAgentGroupMembership(RequestingAgentID, RequestingAgentID, GroupID); 263 ExtendedGroupMembershipData membership = m_LocalGroupsConnector.GetAgentGroupMembership(RequestingAgentID, RequestingAgentID, GroupID);
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
index 9a3e125..161ca0c 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
@@ -256,6 +256,7 @@ namespace OpenSim.Groups
256 Dictionary<string, object> sendData = new Dictionary<string, object>(); 256 Dictionary<string, object> sendData = new Dictionary<string, object>();
257 sendData["GroupID"] = GroupID.ToString(); 257 sendData["GroupID"] = GroupID.ToString();
258 sendData["RequestingAgentID"] = RequestingAgentID; 258 sendData["RequestingAgentID"] = RequestingAgentID;
259
259 Dictionary<string, object> ret = MakeRequest("GETGROUPMEMBERS", sendData); 260 Dictionary<string, object> ret = MakeRequest("GETGROUPMEMBERS", sendData);
260 261
261 if (ret == null) 262 if (ret == null)
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?