aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorFreaky Tech2015-03-02 20:52:21 +0100
committerBlueWall2015-03-03 16:39:00 -0500
commit7f0995ae318292ffc33da6f20bca767e61849408 (patch)
tree2983d72ee81364ba0bed955683de64630dbd6b26 /OpenSim
parentcorrected osMakeNotecard(string data) text length was calculated wrong. The L... (diff)
downloadopensim-SC-7f0995ae318292ffc33da6f20bca767e61849408.zip
opensim-SC-7f0995ae318292ffc33da6f20bca767e61849408.tar.gz
opensim-SC-7f0995ae318292ffc33da6f20bca767e61849408.tar.bz2
opensim-SC-7f0995ae318292ffc33da6f20bca767e61849408.tar.xz
added llGetEnv() implementation
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs39
-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, 39 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 41b18d6..2149f2b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5620,6 +5620,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5620 return new LSL_Vector(World.RegionInfo.WorldLocX, World.RegionInfo.WorldLocY, 0); 5620 return new LSL_Vector(World.RegionInfo.WorldLocX, World.RegionInfo.WorldLocY, 0);
5621 } 5621 }
5622 5622
5623 public LSL_String llGetEnv(LSL_String name)
5624 {
5625 m_host.AddScriptLPS(1);
5626 if (name == "dynamic_pathfinding")
5627 {
5628 return "0";
5629 }
5630 else if (name == "estate_id")
5631 {
5632 return World.RegionInfo.EstateSettings.EstateID.ToString();
5633 }
5634 else if (name == "frame_number")
5635 {
5636 return World.Frame.ToString();
5637 }
5638 else if (name == "region_idle")
5639 {
5640 return "0";
5641 }
5642 else if (name == "sim_channel")
5643 {
5644 return "OpenSim";
5645 }
5646 else if (name == "sim_version")
5647 {
5648 return "";
5649 }
5650 else
5651 {
5652 return "";
5653 }
5654 }
5655
5623 /// <summary> 5656 /// <summary>
5624 /// Insert the list identified by <paramref name="src"/> into the 5657 /// Insert the list identified by <paramref name="src"/> into the
5625 /// list designated by <paramref name="dest"/> such that the first 5658 /// list designated by <paramref name="dest"/> such that the first
@@ -12324,12 +12357,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12324 // them from this region as they are completed 12357 // them from this region as they are completed
12325 // 12358 //
12326 12359
12327 public void llGetEnv(LSL_String name)
12328 {
12329 m_host.AddScriptLPS(1);
12330 NotImplemented("llGetEnv");
12331 }
12332
12333 public void llSetSoundQueueing(int queue) 12360 public void llSetSoundQueueing(int queue)
12334 { 12361 {
12335 m_host.AddScriptLPS(1); 12362 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 18a1e84..3d58573 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -124,6 +124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
124 LSL_String llGetCreator(); 124 LSL_String llGetCreator();
125 LSL_String llGetDate(); 125 LSL_String llGetDate();
126 LSL_Float llGetEnergy(); 126 LSL_Float llGetEnergy();
127 LSL_String llGetEnv(LSL_String name);
127 LSL_Vector llGetForce(); 128 LSL_Vector llGetForce();
128 LSL_Integer llGetFreeMemory(); 129 LSL_Integer llGetFreeMemory();
129 LSL_Integer llGetFreeURLs(); 130 LSL_Integer llGetFreeURLs();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 49e39fe..35aaf01 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -464,6 +464,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
464 return m_LSL_Functions.llGetEnergy(); 464 return m_LSL_Functions.llGetEnergy();
465 } 465 }
466 466
467 public LSL_String llGetEnv(LSL_String name)
468 {
469 return m_LSL_Functions.llGetEnv(name);
470 }
471
467 public LSL_Vector llGetForce() 472 public LSL_Vector llGetForce()
468 { 473 {
469 return m_LSL_Functions.llGetForce(); 474 return m_LSL_Functions.llGetForce();