diff options
Diffstat (limited to 'OpenSim/Addons/Groups/Hypergrid')
-rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 20 | ||||
-rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index 7d57de1..9852581 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | |||
@@ -103,7 +103,7 @@ namespace OpenSim.Groups | |||
103 | if (!m_Enabled) | 103 | if (!m_Enabled) |
104 | return; | 104 | return; |
105 | 105 | ||
106 | m_log.DebugFormat("[Groups]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName); | 106 | m_log.DebugFormat("[Groups]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName); |
107 | scene.RegisterModuleInterface<IGroupsServicesConnector>(this); | 107 | scene.RegisterModuleInterface<IGroupsServicesConnector>(this); |
108 | m_Scenes.Add(scene); | 108 | m_Scenes.Add(scene); |
109 | 109 | ||
@@ -135,7 +135,7 @@ namespace OpenSim.Groups | |||
135 | { | 135 | { |
136 | m_LocalGroupsConnector = new GroupsServiceLocalConnectorModule(m_Config, m_UserManagement); | 136 | m_LocalGroupsConnector = new GroupsServiceLocalConnectorModule(m_Config, m_UserManagement); |
137 | // Also, if local, create the endpoint for the HGGroupsService | 137 | // Also, if local, create the endpoint for the HGGroupsService |
138 | new HGGroupsServiceRobustConnector(m_Config, MainServer.Instance, string.Empty, | 138 | new HGGroupsServiceRobustConnector(m_Config, MainServer.Instance, string.Empty, |
139 | scene.RequestModuleInterface<IOfflineIMService>(), scene.RequestModuleInterface<IUserAccountService>()); | 139 | scene.RequestModuleInterface<IOfflineIMService>(), scene.RequestModuleInterface<IUserAccountService>()); |
140 | 140 | ||
141 | } | 141 | } |
@@ -170,7 +170,7 @@ namespace OpenSim.Groups | |||
170 | if (sp is ScenePresence && ((ScenePresence)sp).PresenceType != PresenceType.Npc) | 170 | if (sp is ScenePresence && ((ScenePresence)sp).PresenceType != PresenceType.Npc) |
171 | { | 171 | { |
172 | AgentCircuitData aCircuit = ((ScenePresence)sp).Scene.AuthenticateHandler.GetAgentCircuitData(client.AgentId); | 172 | AgentCircuitData aCircuit = ((ScenePresence)sp).Scene.AuthenticateHandler.GetAgentCircuitData(client.AgentId); |
173 | if (aCircuit != null && (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0 && | 173 | if (aCircuit != null && (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0 && |
174 | m_OfflineIM != null && m_Messaging != null) | 174 | m_OfflineIM != null && m_Messaging != null) |
175 | { | 175 | { |
176 | List<GridInstantMessage> ims = m_OfflineIM.GetMessages(aCircuit.AgentID); | 176 | List<GridInstantMessage> ims = m_OfflineIM.GetMessages(aCircuit.AgentID); |
@@ -184,12 +184,12 @@ namespace OpenSim.Groups | |||
184 | 184 | ||
185 | #region IGroupsServicesConnector | 185 | #region IGroupsServicesConnector |
186 | 186 | ||
187 | public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, | 187 | public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, |
188 | bool allowPublish, bool maturePublish, UUID founderID, out string reason) | 188 | bool allowPublish, bool maturePublish, UUID founderID, out string reason) |
189 | { | 189 | { |
190 | reason = string.Empty; | 190 | reason = string.Empty; |
191 | if (m_UserManagement.IsLocalGridUser(RequestingAgentID)) | 191 | if (m_UserManagement.IsLocalGridUser(RequestingAgentID)) |
192 | return m_LocalGroupsConnector.CreateGroup(RequestingAgentID, name, charter, showInList, insigniaID, | 192 | return m_LocalGroupsConnector.CreateGroup(RequestingAgentID, name, charter, showInList, insigniaID, |
193 | membershipFee, openEnrollment, allowPublish, maturePublish, founderID, out reason); | 193 | membershipFee, openEnrollment, allowPublish, maturePublish, founderID, out reason); |
194 | else | 194 | else |
195 | { | 195 | { |
@@ -198,14 +198,14 @@ namespace OpenSim.Groups | |||
198 | } | 198 | } |
199 | } | 199 | } |
200 | 200 | ||
201 | public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, | 201 | public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, |
202 | bool openEnrollment, bool allowPublish, bool maturePublish, out string reason) | 202 | bool openEnrollment, bool allowPublish, bool maturePublish, out string reason) |
203 | { | 203 | { |
204 | reason = string.Empty; | 204 | reason = string.Empty; |
205 | string url = string.Empty; | 205 | string url = string.Empty; |
206 | string name = string.Empty; | 206 | string name = string.Empty; |
207 | if (IsLocal(groupID, out url, out name)) | 207 | if (IsLocal(groupID, out url, out name)) |
208 | return m_LocalGroupsConnector.UpdateGroup(AgentUUI(RequestingAgentID), groupID, charter, showInList, insigniaID, membershipFee, | 208 | return m_LocalGroupsConnector.UpdateGroup(AgentUUI(RequestingAgentID), groupID, charter, showInList, insigniaID, membershipFee, |
209 | openEnrollment, allowPublish, maturePublish, out reason); | 209 | openEnrollment, allowPublish, maturePublish, out reason); |
210 | else | 210 | else |
211 | { | 211 | { |
@@ -374,7 +374,7 @@ namespace OpenSim.Groups | |||
374 | 374 | ||
375 | } | 375 | } |
376 | } | 376 | } |
377 | 377 | ||
378 | return new List<GroupRoleMembersData>(); | 378 | return new List<GroupRoleMembersData>(); |
379 | } | 379 | } |
380 | 380 | ||
@@ -626,7 +626,7 @@ namespace OpenSim.Groups | |||
626 | } | 626 | } |
627 | if (agent != null) | 627 | if (agent != null) |
628 | return Util.ProduceUserUniversalIdentifier(agent); | 628 | return Util.ProduceUserUniversalIdentifier(agent); |
629 | 629 | ||
630 | // we don't know anything about this foreign user | 630 | // we don't know anything about this foreign user |
631 | // try asking the user management module, which may know more | 631 | // try asking the user management module, which may know more |
632 | return m_UserManagement.GetUserUUI(AgentID); | 632 | return m_UserManagement.GetUserUUI(AgentID); |
@@ -664,7 +664,7 @@ namespace OpenSim.Groups | |||
664 | string url = string.Empty, first = string.Empty, last = string.Empty, tmp = string.Empty; | 664 | string url = string.Empty, first = string.Empty, last = string.Empty, tmp = string.Empty; |
665 | if (Util.ParseUniversalUserIdentifier(uID, out userID, out url, out first, out last, out tmp)) | 665 | if (Util.ParseUniversalUserIdentifier(uID, out userID, out url, out first, out last, out tmp)) |
666 | m_UserManagement.AddUser(userID, first, last, url); | 666 | m_UserManagement.AddUser(userID, first, last, url); |
667 | 667 | ||
668 | return userID; | 668 | return userID; |
669 | } | 669 | } |
670 | 670 | ||
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index f60c1a5..af00770 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | |||
@@ -64,8 +64,8 @@ namespace OpenSim.Groups | |||
64 | 64 | ||
65 | m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName); | 65 | m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName); |
66 | 66 | ||
67 | string homeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", | 67 | string homeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", |
68 | new string[] { "Startup", "Hypergrid", m_ConfigName}, string.Empty); | 68 | new string[] { "Startup", "Hypergrid", m_ConfigName}, string.Empty); |
69 | if (homeURI == string.Empty) | 69 | if (homeURI == string.Empty) |
70 | throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName)); | 70 | throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName)); |
71 | 71 | ||