From 15f0b1190a7d10f3b407eaa2eb5711cb1ea192e4 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 16 Aug 2020 11:08:41 +0100 Subject: [PATCH] it is NULL_KEY const, not UUID.Zero.Tostring() calls --- .../Shared/Api/Implementation/LSL_Api.cs | 47 +++++++------- .../Shared/Api/Implementation/OSSL_Api.cs | 62 +++++++++---------- 2 files changed, 56 insertions(+), 53 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8cab070e9c..932ed9e558 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -2607,7 +2607,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } else { - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } } @@ -4723,7 +4723,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api linknum -= (m_host.ParentGroup.PrimCount) + 1; if (linknum < 0) - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; List avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET); if (avatars.Count > linknum) @@ -4731,7 +4731,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return avatars[linknum].UUID.ToString(); } } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } } @@ -5716,7 +5716,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api TaskInventoryItem item = m_host.Inventory.GetInventoryItem(name); if (item == null) - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; if ((item.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) @@ -5725,7 +5725,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return item.AssetID.ToString(); } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public void llAllowInventoryDrop(LSL_Integer add) @@ -5837,7 +5837,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } else { - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } } @@ -6871,6 +6871,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); + if(string.IsNullOrWhiteSpace(name)) + return ScriptBaseClass.NULL_KEY; + foreach (ScenePresence sp in World.GetScenePresences()) { if (sp.IsDeleted || sp.IsChildAgent) @@ -6884,7 +6887,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return sp.UUID.ToString(); } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) @@ -7012,7 +7015,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); ILandObject land = World.LandChannel.GetLandObject((float)pos.x, (float)pos.y); if (land == null) - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; return land.LandData.OwnerID.ToString(); } @@ -8015,11 +8018,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api linknum == ScriptBaseClass.LINK_ALL_CHILDREN || linknum == ScriptBaseClass.LINK_ALL_OTHERS || linknum == 0) - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; List parts = GetLinkParts(linknum); if (parts.Count == 0) - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; return parts[0].SitTargetAvatar.ToString(); } @@ -8308,7 +8311,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { new LSL_Integer(1), new LSL_String(channelID.ToString()), - new LSL_String(UUID.Zero.ToString()), + new LSL_String(ScriptBaseClass.NULL_KEY), new LSL_String(String.Empty), new LSL_Integer(0), new LSL_String(String.Empty) @@ -11939,7 +11942,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } private void getLSLFaceMaterial(ref LSL_List res, int code, SceneObjectPart part, Primitive.TextureEntryFace texface) @@ -11985,7 +11988,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // material not found if(code == (int)ScriptBaseClass.PRIM_NORMAL || code == (int)ScriptBaseClass.PRIM_SPECULAR) { - res.Add(new LSL_String(UUID.Zero.ToString())); + res.Add(new LSL_String(ScriptBaseClass.NULL_KEY)); res.Add(new LSL_Vector(1.0, 1.0, 0)); res.Add(new LSL_Vector(0, 0, 0)); res.Add(new LSL_Float(0)); @@ -12971,7 +12974,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); if (m_UrlModule != null) return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID, null).ToString(); - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public LSL_Key llRequestSimulatorData(string simulator, int data) @@ -13013,7 +13016,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api break; default: ScriptSleep(m_sleepMsOnRequestSimulatorData); - return UUID.Zero.ToString(); // Raise no event + return ScriptBaseClass.NULL_KEY; // Raise no event } string ltid = m_AsyncCommands.DataserverPlugin.RequestWithImediatePost(m_host.LocalId, m_item.ItemID, lreply); @@ -13082,7 +13085,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api catch(Exception) { //m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString()); - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } } @@ -13092,7 +13095,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (m_UrlModule != null) return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID, null).ToString(); - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public void llForceMouselook(int mouselook) @@ -14084,7 +14087,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return ""; if(!httpScriptMod.CheckThrottle(m_host.LocalId, m_host.OwnerID)) - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; List param = new List(); bool ok; @@ -14511,10 +14514,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ret.Add(new LSL_Key((string)id)); break; case ScriptBaseClass.OBJECT_GROUP: - ret.Add(new LSL_String(UUID.Zero.ToString())); + ret.Add(new LSL_String(ScriptBaseClass.NULL_KEY)); break; case ScriptBaseClass.OBJECT_CREATOR: - ret.Add(new LSL_Key(UUID.Zero.ToString())); + ret.Add(new LSL_Key(ScriptBaseClass.NULL_KEY)); break; // For the following 8 see the Object version below case ScriptBaseClass.OBJECT_RUNNING_SCRIPT_COUNT: @@ -15033,7 +15036,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { // => complain loudly, as specified by the LSL docs Error("llGetNumberOfNotecardLines", "Can't find notecard '" + name + "'"); - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } Action act = eventID => @@ -15079,7 +15082,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // => complain loudly, as specified by the LSL docs Error("llGetNotecardLine", "Can't find notecard '" + name + "'"); - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } Action act = eventID => diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 02ddd133cf..ecd78aa6a3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -796,7 +796,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, @@ -817,7 +817,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, @@ -838,7 +838,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, @@ -873,7 +873,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, @@ -901,7 +901,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, @@ -929,7 +929,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public bool osConsoleCommand(string command) @@ -2504,7 +2504,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public string osKey2Name(string id) @@ -2933,7 +2933,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // have to get the npc module also here to set the default Not Owned INPCModule module = World.RequestModuleInterface(); if(module == null) - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); bool owned = (module.NPCOptionFlags & NPCOptionsFlags.AllowNotOwned) == 0; @@ -2957,14 +2957,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z))) { OSSLError("no permission to rez NPC at requested location"); - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); } INPCModule module = World.RequestModuleInterface(); if(module == null) { OSSLError("NPC module not enabled"); - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); } string groupTitle = String.Empty; @@ -2996,7 +2996,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (member == null) { OSSLError(string.Format("osNpcCreate: the object owner is not member of the object group")); - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); } groupID = m_host.GroupID; @@ -3037,7 +3037,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (appearanceSerialized == null) { OSSLError(string.Format("osNpcCreate: Notecard '{0}' not found.", notecard)); - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); } try @@ -3049,7 +3049,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api catch { OSSLError(string.Format("osNpcCreate: Error processing notecard '{0}'", notecard)); - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); } } } @@ -3101,15 +3101,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (npcModule != null) { if (!UUID.TryParse(npc.m_string, out UUID npcId)) - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); if (!npcModule.CheckPermissions(npcId, m_host.OwnerID)) - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); return SaveAppearanceToNotecard(npcId, notecard, NoHUds); } - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); } public void osNpcLoadAppearance(LSL_Key npc, string notecard) @@ -3159,7 +3159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); } public LSL_Vector osNpcGetPos(LSL_Key npc) @@ -3595,7 +3595,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api CheckThreatLevel(ThreatLevel.VeryHigh, "osAgentSaveAppearance"); if (!UUID.TryParse(avatarKey, out UUID avatarId)) - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); return SaveAppearanceToNotecard(avatarId, notecard, false); } @@ -3605,7 +3605,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api CheckThreatLevel(ThreatLevel.VeryHigh, "osAgentSaveAppearance"); if (!UUID.TryParse(avatarKey, out UUID avatarId)) - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); return SaveAppearanceToNotecard(avatarId, notecard, includeHuds == 0); } @@ -3614,7 +3614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { ScenePresence sp = World.GetScenePresence(avatarId); if (sp == null || sp.IsChildAgent) - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); return SaveAppearanceToNotecard(sp, notecard, NoHuds); } @@ -3635,7 +3635,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } else { - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); } } @@ -4016,7 +4016,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api CheckThreatLevel(ThreatLevel.High, "osSetProjectionParams"); SceneObjectPart obj = null; - if (prim == UUID.Zero.ToString()) + if (prim == ScriptBaseClass.NULL_KEY) { obj = m_host; } @@ -4478,7 +4478,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID rezID = m_host.ParentGroup.RezzerID; if(rezID == UUID.Zero || m_host.ParentGroup.Scene.GetScenePresence(rezID) != null) - return new LSL_Key(UUID.Zero.ToString()); + return new LSL_Key(ScriptBaseClass.NULL_KEY); return new LSL_Key(rezID.ToString()); } @@ -4651,7 +4651,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (m_UrlModule != null) return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID, opts).ToString(); - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public LSL_String osRequestSecureURL(LSL_List options) @@ -4668,7 +4668,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (m_UrlModule != null) return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID, opts).ToString(); - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public void osCollisionSound(string impact_sound, double impact_volume) @@ -5587,7 +5587,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api item = m_host.Inventory.GetInventoryItem(itemNameorid); if (item == null) - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; UUID id = item.LastOwnerID; if(id == UUID.Zero) @@ -5602,7 +5602,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api TaskInventoryItem item = m_host.Inventory.GetInventoryItem(name); if (item == null) - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; if ((item.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) @@ -5611,7 +5611,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return item.ItemID.ToString(); } - return UUID.Zero.ToString(); + return ScriptBaseClass.NULL_KEY; } public LSL_String osGetInventoryName(LSL_Key itemId) @@ -5840,7 +5840,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if(sp == null || sp.IsChildAgent || sp.IsNPC || sp.IsInTransit) return -4; - if(string.IsNullOrEmpty(daycycle) || daycycle == UUID.Zero.ToString()) + if(string.IsNullOrEmpty(daycycle) || daycycle == ScriptBaseClass.NULL_KEY) { sp.Environment = null; m_envModule.WindlightRefreshForced(sp, transition); @@ -5894,7 +5894,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api VEnv = parcel.LandData.Environment; bool changed = false; - if (!string.IsNullOrEmpty(daycycle) || !(daycycle == UUID.Zero.ToString())) + if (!string.IsNullOrEmpty(daycycle) || !(daycycle == ScriptBaseClass.NULL_KEY)) { UUID envID = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, daycycle); @@ -5939,7 +5939,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ViewerEnvironment VEnv = m_envModule.GetRegionEnvironment().Clone(); bool changed = false; - if (!string.IsNullOrEmpty(daycycle) || !(daycycle == UUID.Zero.ToString())) + if (!string.IsNullOrEmpty(daycycle) || !(daycycle == ScriptBaseClass.NULL_KEY)) { UUID envID = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, daycycle);