Merge branch 'master' into careminster

2012-02-21 23:17:39 +00:00 · 2012-02-21 23:17:39 +00:00 · 1273ec6c7d
parent 24a49011cb 1c533eb520
commit 1273ec6c7d
1 changed files with 1 additions and 1 deletions
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@ -4186,7 +4186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // Single prim
            if (m_host.LinkNum == 0)
            {
-                if (linknum == 0)
+                if (linknum == 0 || linknum == ScriptBaseClass.LINK_ROOT)
                    return m_host.Name;
                else
                    return UUID.Zero.ToString();