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

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2023-03-01 21:08:35 +00:00
parent 49eabf2c0c
commit 9c2aa87acf
6 changed files with 291 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Addons/Groups/GroupsModule.cs
View File

@@ -1575,17 +1575,12 @@ namespace OpenSim.Groups
private string GetRequestingAgentIDStr(IClientAPI client)
{
return GetRequestingAgentID(client).ToString();
return client is null ? UUID.ZeroString : client.AgentId.ToString();
}
private UUID GetRequestingAgentID(IClientAPI client)
{
UUID requestingAgentID = UUID.Zero;
if (client != null)
{
requestingAgentID = client.AgentId;
}
return requestingAgentID;
return client is null ? UUID.Zero : client.AgentId;
}
}

21
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@@ -127,10 +127,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
}
m_regionConsole = scene.RequestModuleInterface<IRegionConsole>();
if (m_regionConsole is not null)
{
m_regionConsole.AddCommand("AttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner or estate managers to obtain attach permissions without asking the user", HandleSetAutoGrantAttachPerms);
}
m_regionConsole?.AddCommand("AttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner or estate managers to obtain attach permissions without asking the user", HandleSetAutoGrantAttachPerms);
scene.AddCommand(
"Debug",
@@ -208,7 +205,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
optionalTargetLastName = cmd[3];
}
StringBuilder sb = new StringBuilder();
StringBuilder sb = new();
sm.ForEachSelectedScene(
scene =>
{
@@ -269,7 +266,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
private void HandleSetAutoGrantAttachPerms(string module, string[] parms)
{
UUID agentID = new(parms[parms.Length - 1]);
UUID agentID = new(parms[^1]);
Array.Resize(ref parms, parms.Length - 1);
if (parms.Length != 3)
@@ -496,7 +493,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
for (int indx = 0; indx < attachments.Count; ++indx)
{
InventoryItemBase attItem = attItems[indx];
if (attItem is null || attItem.Owner != sp.UUID)
if (attItem is null || attItem.Owner.NotEqual(sp.UUID))
continue;
AvatarAttachment attach = attachments[indx];
uint attachmentPt = (uint)attach.AttachPoint;
@@ -802,7 +799,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
public void DetachSingleAttachmentToGround(IScenePresence sp, uint soLocalId)
{
Vector3 pos = new Vector3(2.5f, 0f, 0f);
Vector3 pos = new(2.5f, 0f, 0f);
pos *= ((ScenePresence)sp).Rotation;
pos += sp.AbsolutePosition;
DetachSingleAttachmentToGround(sp, soLocalId, pos, Quaternion.Identity);
@@ -1400,9 +1397,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
private ISceneEntity Client_OnRezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
{
if (!Enabled)
return null;
if (DebugLevel > 0)
m_log.Debug(
$"[ATTACHMENTS MODULE]: Rezzing attachment to point {(AttachmentPoint)AttachmentPt} from item {itemID} for {remoteClient.Name}");
@@ -1419,9 +1413,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
private void Client_OnRezMultipleAttachmentsFromInv(IClientAPI remoteClient, List<KeyValuePair<UUID, uint>> rezlist)
{
if (!Enabled)
return;
if (remoteClient.SceneAgent is ScenePresence sp)
RezMultipleAttachmentsFromInventory(sp, rezlist);
else
@@ -1503,7 +1494,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
List<SceneObjectGroup> attachments = sp.GetAttachments();
foreach (SceneObjectGroup group in attachments)
{
if (group.FromItemID.Equals(itemID) && !group.FromItemID.IsZero())
if (group.FromItemID.Equals(itemID) && group.FromItemID.IsNotZero())
{
DetachSingleAttachmentToInv(sp, group);
return;

626
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

File diff suppressed because it is too large Load Diff

9
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@@ -74,7 +74,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private List<Scene> m_sceneList = new List<Scene>();
private List<Scene> m_sceneList = new();
private IMessageTransferModule m_msgTransferModule;
@@ -1701,12 +1701,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
private UUID GetRequestingAgentID(IClientAPI client)
{
UUID requestingAgentID = UUID.Zero;
if (client != null)
{
requestingAgentID = client.AgentId;
}
return requestingAgentID;
return client is null ? UUID.Zero : client.AgentId;
}
}

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -4433,7 +4433,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Key llGetObjectLinkKey(LSL_Key objectid, int linknum)
{
if (!UUID.TryParse(objectid, out UUID oID))
if (!UUID.TryParse(objectid, out UUID oID) || oID.IsZero())
return ScriptBaseClass.NULL_KEY;
if (!World.TryGetSceneObjectPart(oID, out SceneObjectPart sop))

3
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@@ -662,9 +662,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_LSL_Functions.llGetLinkKey(linknum);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public LSL_Key llGetObjectLinkKey(LSL_Key objectid, int linknum)
{
return m_LSL_Functions.llGetObjectLinkKey(objectid, linknum); ;
return m_LSL_Functions.llGetObjectLinkKey(objectid, linknum);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]