diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs')
-rw-r--r-- | OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs index d4739c6..b6c75a8 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Groups | |||
113 | if (!m_Enabled) | 113 | if (!m_Enabled) |
114 | return; | 114 | return; |
115 | 115 | ||
116 | m_log.DebugFormat("[Groups.RemoteConnector]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName); | 116 | m_log.DebugFormat("[Groups.RemoteConnector]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName); |
117 | scene.RegisterModuleInterface<IGroupsServicesConnector>(this); | 117 | scene.RegisterModuleInterface<IGroupsServicesConnector>(this); |
118 | m_Scenes.Add(scene); | 118 | m_Scenes.Add(scene); |
119 | } | 119 | } |
@@ -151,7 +151,7 @@ namespace OpenSim.Groups | |||
151 | 151 | ||
152 | #region IGroupsServicesConnector | 152 | #region IGroupsServicesConnector |
153 | 153 | ||
154 | public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, | 154 | public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, |
155 | bool allowPublish, bool maturePublish, UUID founderID, out string reason) | 155 | bool allowPublish, bool maturePublish, UUID founderID, out string reason) |
156 | { | 156 | { |
157 | m_log.DebugFormat("[Groups.RemoteConnector]: Creating group {0}", name); | 157 | m_log.DebugFormat("[Groups.RemoteConnector]: Creating group {0}", name); |
@@ -167,7 +167,7 @@ namespace OpenSim.Groups | |||
167 | return groupID; | 167 | return groupID; |
168 | } | 168 | } |
169 | 169 | ||
170 | public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, | 170 | public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, |
171 | bool openEnrollment, bool allowPublish, bool maturePublish, out string reason) | 171 | bool openEnrollment, bool allowPublish, bool maturePublish, out string reason) |
172 | { | 172 | { |
173 | string r = string.Empty; | 173 | string r = string.Empty; |
@@ -186,9 +186,9 @@ namespace OpenSim.Groups | |||
186 | if (GroupID == UUID.Zero && (GroupName == null || GroupName != null && GroupName == string.Empty)) | 186 | if (GroupID == UUID.Zero && (GroupName == null || GroupName != null && GroupName == string.Empty)) |
187 | return null; | 187 | return null; |
188 | 188 | ||
189 | return m_CacheWrapper.GetGroupRecord(RequestingAgentID,GroupID,GroupName, delegate | 189 | return m_CacheWrapper.GetGroupRecord(RequestingAgentID,GroupID,GroupName, delegate |
190 | { | 190 | { |
191 | return m_GroupsService.GetGroupRecord(RequestingAgentID, GroupID, GroupName); | 191 | return m_GroupsService.GetGroupRecord(RequestingAgentID, GroupID, GroupName); |
192 | }); | 192 | }); |
193 | } | 193 | } |
194 | 194 | ||
@@ -362,7 +362,7 @@ namespace OpenSim.Groups | |||
362 | m_GroupsService.RemoveAgentToGroupInvite(RequestingAgentID, inviteID); | 362 | m_GroupsService.RemoveAgentToGroupInvite(RequestingAgentID, inviteID); |
363 | } | 363 | } |
364 | 364 | ||
365 | public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, | 365 | public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, |
366 | bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID) | 366 | bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID) |
367 | { | 367 | { |
368 | GroupNoticeInfo notice = new GroupNoticeInfo(); | 368 | GroupNoticeInfo notice = new GroupNoticeInfo(); |