Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-02-21 23:17:39 +00:00

View File

@@ -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();