From 6c3db99a2745f627d0b52ca9a7406c063061ac29 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sun, 27 Jul 2008 19:32:43 +0000 Subject: [PATCH] Addresses Mantis #1688 Changes erroneous return value of llGetLinkname() to "" for nonexistent prims. Corrects an issue where the root prim of a linked set, upon delink, retains the part number 1. --- OpenSim/Region/Environment/Scenes/InnerScene.cs | 2 +- OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 +- .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 55b3ca7811..359b6f3959 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -1432,7 +1432,7 @@ namespace OpenSim.Region.Environment.Scenes // The link set has been completely torn down // This is the case if you select a link set and delink // - parenPrim.RootPart.LinkNum = 1; + parenPrim.RootPart.LinkNum = 0; if (sendEvents) parenPrim.TriggerScriptChangedEvent(Changed.LINK); } diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 684c0cb0af..59d5f083e0 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -2813,7 +2813,7 @@ namespace OpenSim.Region.ScriptEngine.Common } else { - return LLUUID.Zero.ToString(); + return ""; } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 44383955e8..c5f1763947 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -2699,7 +2699,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } else { - return LLUUID.Zero.ToString(); + return ""; } }