Merge branch 'master' into careminster

avinationmerge
Melanie 2012-02-21 23:17:39 +00:00
commit 1273ec6c7d
1 changed files with 1 additions and 1 deletions

View File

@ -4186,7 +4186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// Single prim // Single prim
if (m_host.LinkNum == 0) if (m_host.LinkNum == 0)
{ {
if (linknum == 0) if (linknum == 0 || linknum == ScriptBaseClass.LINK_ROOT)
return m_host.Name; return m_host.Name;
else else
return UUID.Zero.ToString(); return UUID.Zero.ToString();