diff options
| author | BlueWall | 2012-02-22 22:29:30 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-22 22:29:30 -0500 |
| commit | af377470e14d9de47e7a67778e1ebd602239e1b1 (patch) | |
| tree | 77efe266c00fcb67ee1cc8a84dc9be411582ecfa /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | V3 Support (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-af377470e14d9de47e7a67778e1ebd602239e1b1.zip opensim-SC_OLD-af377470e14d9de47e7a67778e1ebd602239e1b1.tar.gz opensim-SC_OLD-af377470e14d9de47e7a67778e1ebd602239e1b1.tar.bz2 opensim-SC_OLD-af377470e14d9de47e7a67778e1ebd602239e1b1.tar.xz | |
Merge branch 'master' into v3_support
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0bdd84a..61a6907 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3845,7 +3845,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3845 | // Single prim | 3845 | // Single prim |
| 3846 | if (m_host.LinkNum == 0) | 3846 | if (m_host.LinkNum == 0) |
| 3847 | { | 3847 | { |
| 3848 | if (linknum == 0) | 3848 | if (linknum == 0 || linknum == ScriptBaseClass.LINK_ROOT) |
| 3849 | return m_host.Name; | 3849 | return m_host.Name; |
| 3850 | else | 3850 | else |
| 3851 | return UUID.Zero.ToString(); | 3851 | return UUID.Zero.ToString(); |