aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-18 11:51:27 +0000
committerJustin Clarke Casey2008-07-18 11:51:27 +0000
commit03bd6c91a9e7e18c4f0d529e8cb63bd6d834d03c (patch)
tree88da54b387beb98d466e0cc47b3d348ab6169af6 /OpenSim
parent* Try new ruth avatar settings correction suggested by jenni in http://opensi... (diff)
downloadopensim-SC_OLD-03bd6c91a9e7e18c4f0d529e8cb63bd6d834d03c.zip
opensim-SC_OLD-03bd6c91a9e7e18c4f0d529e8cb63bd6d834d03c.tar.gz
opensim-SC_OLD-03bd6c91a9e7e18c4f0d529e8cb63bd6d834d03c.tar.bz2
opensim-SC_OLD-03bd6c91a9e7e18c4f0d529e8cb63bd6d834d03c.tar.xz
* Fix http://opensimulator.org/mantis/view.php?id=1761
* Now llGetLinkNumber() returns 0 if the prim is not linked, instead of 1
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 3e5e12c..42c5abc 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2569,7 +2569,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2569 { 2569 {
2570 m_host.AddScriptLPS(1); 2570 m_host.AddScriptLPS(1);
2571 2571
2572 if (m_host.ParentGroup.Children.Count > 0) 2572 if (m_host.ParentGroup.Children.Count > 1)
2573 { 2573 {
2574 return m_host.LinkNum + 1; 2574 return m_host.LinkNum + 1;
2575 } 2575 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7f24f0e..e396bb4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2457,7 +2457,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2457 { 2457 {
2458 m_host.AddScriptLPS(1); 2458 m_host.AddScriptLPS(1);
2459 2459
2460 if (m_host.ParentGroup.Children.Count > 0) 2460 if (m_host.ParentGroup.Children.Count > 1)
2461 { 2461 {
2462 return m_host.LinkNum + 1; 2462 return m_host.LinkNum + 1;
2463 } 2463 }