diff options
Diffstat (limited to 'OpenSim/Addons/Groups/Service/GroupsService.cs')
-rw-r--r-- | OpenSim/Addons/Groups/Service/GroupsService.cs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index 710b00a..ea0fedd 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs | |||
@@ -126,7 +126,7 @@ namespace OpenSim.Groups | |||
126 | 126 | ||
127 | #endregion | 127 | #endregion |
128 | 128 | ||
129 | public UUID CreateGroup(string RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, | 129 | public UUID CreateGroup(string RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, |
130 | bool allowPublish, bool maturePublish, UUID founderID, out string reason) | 130 | bool allowPublish, bool maturePublish, UUID founderID, out string reason) |
131 | { | 131 | { |
132 | reason = string.Empty; | 132 | reason = string.Empty; |
@@ -264,7 +264,7 @@ namespace OpenSim.Groups | |||
264 | if (ownerRole != null) | 264 | if (ownerRole != null) |
265 | ownerRoleID = ownerRole.RoleID; | 265 | ownerRoleID = ownerRole.RoleID; |
266 | 266 | ||
267 | // Check visibility? | 267 | // Check visibility? |
268 | // When we don't want to check visibility, we pass it "all" as the requestingAgentID | 268 | // When we don't want to check visibility, we pass it "all" as the requestingAgentID |
269 | bool checkVisibility = !RequestingAgentID.Equals(UUID.Zero.ToString()); | 269 | bool checkVisibility = !RequestingAgentID.Equals(UUID.Zero.ToString()); |
270 | 270 | ||
@@ -307,20 +307,20 @@ namespace OpenSim.Groups | |||
307 | m.Contribution = Int32.Parse(d.Data["Contribution"]); | 307 | m.Contribution = Int32.Parse(d.Data["Contribution"]); |
308 | m.ListInProfile = d.Data["ListInProfile"] == "1" ? true : false; | 308 | m.ListInProfile = d.Data["ListInProfile"] == "1" ? true : false; |
309 | 309 | ||
310 | GridUserData gud = m_GridUserService.Get(d.PrincipalID); | 310 | GridUserData gud = m_GridUserService.Get(d.PrincipalID); |
311 | if (gud != null) | 311 | if (gud != null) |
312 | { | 312 | { |
313 | if (bool.Parse(gud.Data["Online"])) | 313 | if (bool.Parse(gud.Data["Online"])) |
314 | { | 314 | { |
315 | m.OnlineStatus = @"Online"; | 315 | m.OnlineStatus = @"Online"; |
316 | } | 316 | } |
317 | else | 317 | else |
318 | { | 318 | { |
319 | int unixtime = int.Parse(gud.Data["Login"]); | 319 | int unixtime = int.Parse(gud.Data["Login"]); |
320 | // The viewer is very picky about how these strings are formed. Eg. it will crash on malformed dates! | 320 | // The viewer is very picky about how these strings are formed. Eg. it will crash on malformed dates! |
321 | m.OnlineStatus = (unixtime == 0) ? @"unknown" : Util.ToDateTime(unixtime).ToString("MM/dd/yyyy"); | 321 | m.OnlineStatus = (unixtime == 0) ? @"unknown" : Util.ToDateTime(unixtime).ToString("MM/dd/yyyy"); |
322 | } | 322 | } |
323 | } | 323 | } |
324 | 324 | ||
325 | // Is this person an owner of the group? | 325 | // Is this person an owner of the group? |
326 | m.IsOwner = (rolemembershipsList.Find(r => r.RoleID == ownerRoleID) != null) ? true : false; | 326 | m.IsOwner = (rolemembershipsList.Find(r => r.RoleID == ownerRoleID) != null) ? true : false; |
@@ -553,8 +553,8 @@ namespace OpenSim.Groups | |||
553 | { | 553 | { |
554 | newRoleID = r.RoleID; | 554 | newRoleID = r.RoleID; |
555 | break; | 555 | break; |
556 | } | 556 | } |
557 | } | 557 | } |
558 | 558 | ||
559 | MembershipData member = m_Database.RetrieveMember(GroupID, AgentID); | 559 | MembershipData member = m_Database.RetrieveMember(GroupID, AgentID); |
560 | if (member != null) | 560 | if (member != null) |
@@ -712,7 +712,7 @@ namespace OpenSim.Groups | |||
712 | m_Database.StoreMember(membership); | 712 | m_Database.StoreMember(membership); |
713 | } | 713 | } |
714 | 714 | ||
715 | public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, | 715 | public bool AddGroupNotice(string RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, |
716 | bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID) | 716 | bool hasAttachment, byte attType, string attName, UUID attItemID, string attOwnerID) |
717 | { | 717 | { |
718 | // Check perms | 718 | // Check perms |