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/Local/GroupsServiceLocalConnectorModule.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/Local/GroupsServiceLocalConnectorModule.cs')
-rw-r--r-- | OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs index 8e30df5..c7877c6 100644 --- a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs +++ b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs | |||
@@ -108,7 +108,7 @@ namespace OpenSim.Groups | |||
108 | if (!m_Enabled) | 108 | if (!m_Enabled) |
109 | return; | 109 | return; |
110 | 110 | ||
111 | m_log.DebugFormat("[Groups]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName); | 111 | m_log.DebugFormat("[Groups]: Registering {0} with {1}", this.Name, scene.RegionInfo.RegionName); |
112 | scene.RegisterModuleInterface<IGroupsServicesConnector>(this); | 112 | scene.RegisterModuleInterface<IGroupsServicesConnector>(this); |
113 | m_Scenes.Add(scene); | 113 | m_Scenes.Add(scene); |
114 | } | 114 | } |
@@ -146,16 +146,16 @@ namespace OpenSim.Groups | |||
146 | 146 | ||
147 | #region IGroupsServicesConnector | 147 | #region IGroupsServicesConnector |
148 | 148 | ||
149 | public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, | 149 | public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, |
150 | bool allowPublish, bool maturePublish, UUID founderID, out string reason) | 150 | bool allowPublish, bool maturePublish, UUID founderID, out string reason) |
151 | { | 151 | { |
152 | m_log.DebugFormat("[Groups]: Creating group {0}", name); | 152 | m_log.DebugFormat("[Groups]: Creating group {0}", name); |
153 | reason = string.Empty; | 153 | reason = string.Empty; |
154 | return m_GroupsService.CreateGroup(RequestingAgentID.ToString(), name, charter, showInList, insigniaID, | 154 | return m_GroupsService.CreateGroup(RequestingAgentID.ToString(), name, charter, showInList, insigniaID, |
155 | membershipFee, openEnrollment, allowPublish, maturePublish, founderID, out reason); | 155 | membershipFee, openEnrollment, allowPublish, maturePublish, founderID, out reason); |
156 | } | 156 | } |
157 | 157 | ||
158 | public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, | 158 | public bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, |
159 | bool openEnrollment, bool allowPublish, bool maturePublish, out string reason) | 159 | bool openEnrollment, bool allowPublish, bool maturePublish, out string reason) |
160 | { | 160 | { |
161 | reason = string.Empty; | 161 | reason = string.Empty; |
@@ -296,7 +296,7 @@ namespace OpenSim.Groups | |||
296 | public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, | 296 | public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, |
297 | bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID) | 297 | bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID) |
298 | { | 298 | { |
299 | return m_GroupsService.AddGroupNotice(RequestingAgentID, groupID, noticeID, fromName, subject, message, | 299 | return m_GroupsService.AddGroupNotice(RequestingAgentID, groupID, noticeID, fromName, subject, message, |
300 | hasAttachment, attType, attName, attItemID, attOwnerID); | 300 | hasAttachment, attType, attName, attItemID, attOwnerID); |
301 | } | 301 | } |
302 | 302 | ||