ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2026-03-15 18:22:50 +00:00
parent 0120e62250
commit da5f1b3f7e
18 changed files with 71 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Addons/Groups/GroupsMessagingModule.cs
View File

@@ -623,8 +623,7 @@ namespace OpenSim.Groups
, OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
);
var update = new GroupChatListAgentUpdateData(AgentID);
var updates = new List<GroupChatListAgentUpdateData> { update };
List<GroupChatListAgentUpdateData> updates = [new GroupChatListAgentUpdateData(AgentID)];
eq.ChatterBoxSessionAgentListUpdates(GroupID, new UUID(msg.toAgentID), updates);
}
}
@@ -663,8 +662,7 @@ namespace OpenSim.Groups
IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
if (queue != null)
{
var update = new GroupChatListAgentUpdateData(AgentID);
var updates = new List<GroupChatListAgentUpdateData> { update };
List<GroupChatListAgentUpdateData> updates = [new GroupChatListAgentUpdateData(AgentID)];
queue.ChatterBoxSessionAgentListUpdates(GroupID, remoteClient.AgentId, updates);
}
}
@@ -673,8 +671,8 @@ namespace OpenSim.Groups
// Send a message from locally connected client to a group
if ((im.dialog == (byte)InstantMessageDialog.SessionSend))
{
UUID GroupID = new UUID(im.imSessionID);
UUID AgentID = new UUID(im.fromAgentID);
UUID GroupID = new(im.imSessionID);
UUID AgentID = new(im.fromAgentID);
if (m_debugEnabled)
m_log.DebugFormat("[Groups.Messaging]: Send message to session for group {0} with session ID {1}", GroupID, im.imSessionID.ToString());

43
OpenSim/Addons/Groups/Service/GroupsService.cs
View File

@@ -142,20 +142,25 @@ namespace OpenSim.Groups
}
// Create the group
GroupData data = new GroupData();
data.GroupID = UUID.Random();
data.Data = new Dictionary<string, string>();
data.Data["Name"] = name;
data.Data["Charter"] = charter;
data.Data["InsigniaID"] = insigniaID.ToString();
data.Data["FounderID"] = founderID.ToString();
data.Data["MembershipFee"] = membershipFee.ToString();
data.Data["OpenEnrollment"] = openEnrollment ? "1" : "0";
data.Data["ShowInList"] = showInList ? "1" : "0";
data.Data["AllowPublish"] = allowPublish ? "1" : "0";
data.Data["MaturePublish"] = maturePublish ? "1" : "0";
UUID ownerRoleID = UUID.Random();
data.Data["OwnerRoleID"] = ownerRoleID.ToString();
string founderIDstr = founderID.ToString();
GroupData data = new()
{
GroupID = UUID.Random(),
Data = new Dictionary<string, string>
{
["Name"] = name,
["Charter"] = charter,
["InsigniaID"] = insigniaID.ToString(),
["FounderID"] = founderIDstr,
["MembershipFee"] = membershipFee.ToString(),
["OpenEnrollment"] = openEnrollment ? "1" : "0",
["ShowInList"] = showInList ? "1" : "0",
["AllowPublish"] = allowPublish ? "1" : "0",
["MaturePublish"] = maturePublish ? "1" : "0",
["OwnerRoleID"] = ownerRoleID.ToString()
}
};
if (!m_Database.StoreGroup(data))
return UUID.Zero;
@@ -171,8 +176,8 @@ namespace OpenSim.Groups
_AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, ownerRoleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true);
// Add founder to group
_AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, ownerRoleID);
_AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, officersRoleID);
_AddAgentToGroup(RequestingAgentID, founderIDstr, data.GroupID, ownerRoleID);
_AddAgentToGroup(RequestingAgentID, founderIDstr, data.GroupID, officersRoleID);
return data.GroupID;
}
@@ -186,7 +191,7 @@ namespace OpenSim.Groups
// Check perms
if (!HasPower(RequestingAgentID, groupID, GroupPowers.ChangeActions))
{
m_log.DebugFormat("[Groups]: ({0}) Attempt at updating group {1} denied because of lack of permission", RequestingAgentID, groupID);
m_log.Debug($"[Groups]: ({RequestingAgentID}) Attempt at updating group {groupID} denied because of lack of permission");
return;
}
@@ -219,7 +224,7 @@ namespace OpenSim.Groups
public List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string search)
{
List<DirGroupsReplyData> groups = new List<DirGroupsReplyData>();
List<DirGroupsReplyData> groups = [];
GroupData[] data = m_Database.RetrieveGroups(search);
@@ -228,7 +233,7 @@ namespace OpenSim.Groups
foreach (GroupData d in data)
{
// Don't list group proxies
if (d.Data.ContainsKey("Location") && d.Data["Location"] != string.Empty)
if (d.Data.TryGetValue("Location", out string loc) && loc != string.Empty)
continue;
int nmembers = m_Database.MemberCount(d.GroupID);
@@ -257,7 +262,7 @@ namespace OpenSim.Groups
public List<ExtendedGroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID)
{
List<ExtendedGroupMembersData> members = new List<ExtendedGroupMembersData>();
List<ExtendedGroupMembersData> members = [];
GroupData group = m_Database.RetrieveGroup(GroupID);
if (group == null)