aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTBG Renfold2012-04-24 19:38:37 +0100
committerJustin Clark-Casey (justincc)2012-04-30 17:36:49 +0100
commit9c2a73b61ef1e834c77f5d945ebae435b033ca38 (patch)
tree363d34557661cee94d125aa741bde1ef85029614 /OpenSim
parentrefactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 into... (diff)
downloadopensim-SC-9c2a73b61ef1e834c77f5d945ebae435b033ca38.zip
opensim-SC-9c2a73b61ef1e834c77f5d945ebae435b033ca38.tar.gz
opensim-SC-9c2a73b61ef1e834c77f5d945ebae435b033ca38.tar.bz2
opensim-SC-9c2a73b61ef1e834c77f5d945ebae435b033ca38.tar.xz
llGenerateKey implementation. Creates a random UUID I.E: UUID.Random().ToString();
Signed-off-by: TBG Renfold <tbg.renfold@g2mv.co.uk>
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs5
3 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d641958..62b5c0f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1734,6 +1734,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1734 rgb.y = texcolor.G; 1734 rgb.y = texcolor.G;
1735 rgb.z = texcolor.B; 1735 rgb.z = texcolor.B;
1736 return rgb; 1736 return rgb;
1737
1737 } 1738 }
1738 else 1739 else
1739 { 1740 {
@@ -3192,6 +3193,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3192 return m_host.UUID.ToString(); 3193 return m_host.UUID.ToString();
3193 } 3194 }
3194 3195
3196 public LSL_Key llGenerateKey()
3197 {
3198 m_host.AddScriptLPS(1);
3199 return UUID.Random().ToString();
3200 }
3201
3195 public void llSetBuoyancy(double buoyancy) 3202 public void llSetBuoyancy(double buoyancy)
3196 { 3203 {
3197 m_host.AddScriptLPS(1); 3204 m_host.AddScriptLPS(1);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 69df392..7a797ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -105,6 +105,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
105 LSL_Integer llFloor(double f); 105 LSL_Integer llFloor(double f);
106 void llForceMouselook(int mouselook); 106 void llForceMouselook(int mouselook);
107 LSL_Float llFrand(double mag); 107 LSL_Float llFrand(double mag);
108 LSL_Key llGenerateKey();
108 LSL_Vector llGetAccel(); 109 LSL_Vector llGetAccel();
109 LSL_Integer llGetAgentInfo(string id); 110 LSL_Integer llGetAgentInfo(string id);
110 LSL_String llGetAgentLanguage(string id); 111 LSL_String llGetAgentLanguage(string id);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 3c2f7bd..80fa530 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -369,6 +369,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
369 return m_LSL_Functions.llFrand(mag); 369 return m_LSL_Functions.llFrand(mag);
370 } 370 }
371 371
372 public LSL_Key llGenerateKey()
373 {
374 return m_LSL_Functions.llGenerateKey();
375 }
376
372 public LSL_Vector llGetAccel() 377 public LSL_Vector llGetAccel()
373 { 378 {
374 return m_LSL_Functions.llGetAccel(); 379 return m_LSL_Functions.llGetAccel();