aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-07 20:15:15 +0000
committerMelanie Thielker2008-09-07 20:15:15 +0000
commite3338bac201cabe4f182526549bd442c5d1f2161 (patch)
treeb8df56aa0dd537d2bb7debc88d16a14a0f171845 /OpenSim
parentMantis #2142 (diff)
downloadopensim-SC_OLD-e3338bac201cabe4f182526549bd442c5d1f2161.zip
opensim-SC_OLD-e3338bac201cabe4f182526549bd442c5d1f2161.tar.gz
opensim-SC_OLD-e3338bac201cabe4f182526549bd442c5d1f2161.tar.bz2
opensim-SC_OLD-e3338bac201cabe4f182526549bd442c5d1f2161.tar.xz
Mantis #2138
Thank you, HomerHorwitz, for a patch that fixes llGetKey()
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 509c866..937ac70 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2530,7 +2530,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2530 public string llGetKey() 2530 public string llGetKey()
2531 { 2531 {
2532 m_host.AddScriptLPS(1); 2532 m_host.AddScriptLPS(1);
2533 return m_host.ToString(); 2533 return m_host.UUID.ToString();
2534 } 2534 }
2535 2535
2536 public void llSetBuoyancy(double buoyancy) 2536 public void llSetBuoyancy(double buoyancy)
@@ -2981,7 +2981,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2981 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); 2981 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
2982 if (part != null) 2982 if (part != null)
2983 { 2983 {
2984 return part.ToString(); 2984 return part.UUID.ToString();
2985 } 2985 }
2986 else 2986 else
2987 { 2987 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 95c0fdd..f67f422 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2401,7 +2401,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2401 public string llGetKey() 2401 public string llGetKey()
2402 { 2402 {
2403 m_host.AddScriptLPS(1); 2403 m_host.AddScriptLPS(1);
2404 return m_host.ToString(); 2404 return m_host.UUID.ToString();
2405 } 2405 }
2406 2406
2407 public void llSetBuoyancy(double buoyancy) 2407 public void llSetBuoyancy(double buoyancy)
@@ -2862,7 +2862,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2862 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); 2862 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
2863 if (part != null) 2863 if (part != null)
2864 { 2864 {
2865 return part.ToString(); 2865 return part.UUID.ToString();
2866 } 2866 }
2867 else 2867 else
2868 { 2868 {