diff options
Diffstat (limited to 'OpenSim/Addons/Groups')
6 files changed, 12 insertions, 9 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs index 59fec6f..653dbac 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs | |||
@@ -101,7 +101,7 @@ namespace OpenSim.Groups | |||
101 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 101 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
102 | if (GroupID != UUID.Zero) | 102 | if (GroupID != UUID.Zero) |
103 | sendData["GroupID"] = GroupID.ToString(); | 103 | sendData["GroupID"] = GroupID.ToString(); |
104 | if (GroupName != null && GroupName != string.Empty) | 104 | if (!string.IsNullOrEmpty(GroupName)) |
105 | sendData["Name"] = GroupsDataUtils.Sanitize(GroupName); | 105 | sendData["Name"] = GroupsDataUtils.Sanitize(GroupName); |
106 | 106 | ||
107 | sendData["RequestingAgentID"] = RequestingAgentID; | 107 | sendData["RequestingAgentID"] = RequestingAgentID; |
@@ -275,7 +275,7 @@ namespace OpenSim.Groups | |||
275 | 275 | ||
276 | //m_log.DebugFormat("[XXX]: reply was {0}", reply); | 276 | //m_log.DebugFormat("[XXX]: reply was {0}", reply); |
277 | 277 | ||
278 | if (reply == string.Empty || reply == null) | 278 | if (string.IsNullOrEmpty(reply)) |
279 | return null; | 279 | return null; |
280 | 280 | ||
281 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( | 281 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( |
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index 4642b2a..7d48516 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | |||
@@ -623,10 +623,13 @@ namespace OpenSim.Groups | |||
623 | if (agent != null) | 623 | if (agent != null) |
624 | break; | 624 | break; |
625 | } | 625 | } |
626 | if (agent == null) // oops | 626 | if (agent != null) |
627 | return AgentID.ToString(); | 627 | return Util.ProduceUserUniversalIdentifier(agent); |
628 | |||
629 | // we don't know anything about this foreign user | ||
630 | // try asking the user management module, which may know more | ||
631 | return m_UserManagement.GetUserUUI(AgentID); | ||
628 | 632 | ||
629 | return Util.ProduceUserUniversalIdentifier(agent); | ||
630 | } | 633 | } |
631 | 634 | ||
632 | private string AgentUUIForOutside(string AgentIDStr) | 635 | private string AgentUUIForOutside(string AgentIDStr) |
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index 6f58922..d2bcba5 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | |||
@@ -112,7 +112,7 @@ namespace OpenSim.Groups | |||
112 | m_GroupsService = service; | 112 | m_GroupsService = service; |
113 | } | 113 | } |
114 | 114 | ||
115 | public override byte[] Handle(string path, Stream requestData, | 115 | protected override byte[] ProcessRequest(string path, Stream requestData, |
116 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 116 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
117 | { | 117 | { |
118 | StreamReader sr = new StreamReader(requestData); | 118 | StreamReader sr = new StreamReader(requestData); |
diff --git a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs index 5ccd7fe..16fe03b 100644 --- a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs +++ b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs | |||
@@ -30,7 +30,7 @@ using Mono.Addins; | |||
30 | // Build Number | 30 | // Build Number |
31 | // Revision | 31 | // Revision |
32 | // | 32 | // |
33 | [assembly: AssemblyVersion("0.7.6.*")] | 33 | [assembly: AssemblyVersion("0.8.0.*")] |
34 | 34 | ||
35 | [assembly: Addin("OpenSim.Groups", "0.1")] | 35 | [assembly: Addin("OpenSim.Groups", "0.1")] |
36 | [assembly: AddinDependency("OpenSim", "0.5")] | 36 | [assembly: AddinDependency("OpenSim", "0.5")] |
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs index 161ca0c..ed41978 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs | |||
@@ -120,7 +120,7 @@ namespace OpenSim.Groups | |||
120 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 120 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
121 | if (GroupID != UUID.Zero) | 121 | if (GroupID != UUID.Zero) |
122 | sendData["GroupID"] = GroupID.ToString(); | 122 | sendData["GroupID"] = GroupID.ToString(); |
123 | if (GroupName != null && GroupName != string.Empty) | 123 | if (!string.IsNullOrEmpty(GroupName)) |
124 | sendData["Name"] = GroupsDataUtils.Sanitize(GroupName); | 124 | sendData["Name"] = GroupsDataUtils.Sanitize(GroupName); |
125 | 125 | ||
126 | sendData["RequestingAgentID"] = RequestingAgentID; | 126 | sendData["RequestingAgentID"] = RequestingAgentID; |
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs index 7e55d3c..249d974 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | |||
@@ -75,7 +75,7 @@ namespace OpenSim.Groups | |||
75 | m_GroupsService = service; | 75 | m_GroupsService = service; |
76 | } | 76 | } |
77 | 77 | ||
78 | public override byte[] Handle(string path, Stream requestData, | 78 | protected override byte[] ProcessRequest(string path, Stream requestData, |
79 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 79 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
80 | { | 80 | { |
81 | StreamReader sr = new StreamReader(requestData); | 81 | StreamReader sr = new StreamReader(requestData); |