diff options
| author | Melanie | 2012-02-21 23:17:39 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-21 23:17:39 +0000 |
| commit | 1273ec6c7df1e08315c48d88f3291f8a957bbe59 (patch) | |
| tree | ddb1153c12184dd887617fa30bcbe717465c85ef /OpenSim | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim (diff) | |
| download | opensim-SC_OLD-1273ec6c7df1e08315c48d88f3291f8a957bbe59.zip opensim-SC_OLD-1273ec6c7df1e08315c48d88f3291f8a957bbe59.tar.gz opensim-SC_OLD-1273ec6c7df1e08315c48d88f3291f8a957bbe59.tar.bz2 opensim-SC_OLD-1273ec6c7df1e08315c48d88f3291f8a957bbe59.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim')
| -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 1529140..2a23c59 100644 --- 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 | |||
| 4186 | // Single prim | 4186 | // Single prim |
| 4187 | if (m_host.LinkNum == 0) | 4187 | if (m_host.LinkNum == 0) |
| 4188 | { | 4188 | { |
| 4189 | if (linknum == 0) | 4189 | if (linknum == 0 || linknum == ScriptBaseClass.LINK_ROOT) |
| 4190 | return m_host.Name; | 4190 | return m_host.Name; |
| 4191 | else | 4191 | else |
| 4192 | return UUID.Zero.ToString(); | 4192 | return UUID.Zero.ToString(); |