aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-28 20:47:15 -0700
committerDiva Canto2013-07-28 20:47:15 -0700
commit7eee9eb312e9f947d201e0ef3e2f34bceec4568d (patch)
tree5ff743311ac7d68fffb9a3d479bcbbf1b9a07b5d
parentGroup chat: prevent a situation where dupe IMs could occur. (diff)
downloadopensim-SC-7eee9eb312e9f947d201e0ef3e2f34bceec4568d.zip
opensim-SC-7eee9eb312e9f947d201e0ef3e2f34bceec4568d.tar.gz
opensim-SC-7eee9eb312e9f947d201e0ef3e2f34bceec4568d.tar.bz2
opensim-SC-7eee9eb312e9f947d201e0ef3e2f34bceec4568d.tar.xz
Groups: Better warning messages to the user.
Diffstat (limited to '')
-rw-r--r--OpenSim/Addons/Groups/GroupsModule.cs4
-rw-r--r--OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs10
2 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 826fcbf..da8030c 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -991,6 +991,10 @@ namespace OpenSim.Groups
991 991
992 // Should this send updates to everyone in the group? 992 // Should this send updates to everyone in the group?
993 SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); 993 SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient));
994
995 if (reason != string.Empty)
996 // A warning
997 remoteClient.SendAlertMessage("Warning: " + reason);
994 } 998 }
995 else 999 else
996 remoteClient.SendJoinGroupReply(groupID, false); 1000 remoteClient.SendJoinGroupReply(groupID, false);
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index 5e53981..c33168c 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -399,17 +399,21 @@ namespace OpenSim.Groups
399 399
400 if (success) 400 if (success)
401 { 401 {
402 // Here we always return true. The user has been added to the local group,
403 // independent of whether the remote operation succeeds or not
402 url = m_UserManagement.GetUserServerURL(uid, "GroupsServerURI"); 404 url = m_UserManagement.GetUserServerURL(uid, "GroupsServerURI");
403 if (url == string.Empty) 405 if (url == string.Empty)
404 { 406 {
405 reason = "User doesn't have a groups server"; 407 reason = "You don't have have an accessible groups server in your home world. You membership to this group in only within this grid.";
406 return false; 408 return true;
407 } 409 }
408 410
409 GroupsServiceHGConnector c = GetConnector(url); 411 GroupsServiceHGConnector c = GetConnector(url);
410 if (c != null) 412 if (c != null)
411 return c.CreateProxy(AgentUUI(RequestingAgentID), AgentID, token, GroupID, m_LocalGroupsServiceLocation, name, out reason); 413 c.CreateProxy(AgentUUI(RequestingAgentID), AgentID, token, GroupID, m_LocalGroupsServiceLocation, name, out reason);
414 return true;
412 } 415 }
416 return false;
413 } 417 }
414 } 418 }
415 else if (m_UserManagement.IsLocalGridUser(uid)) // local user 419 else if (m_UserManagement.IsLocalGridUser(uid)) // local user