aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authoralondria2008-01-12 03:23:11 +0000
committeralondria2008-01-12 03:23:11 +0000
commitc2ca98519b4c43b1a4f98f12621ea241053ac05f (patch)
tree08c95665c7a11dde29142daf352056398d675d6f /OpenSim
parent* For your enjoyment, some RAdmin improvements, namely a new LoadHeightmap me... (diff)
downloadopensim-SC_OLD-c2ca98519b4c43b1a4f98f12621ea241053ac05f.zip
opensim-SC_OLD-c2ca98519b4c43b1a4f98f12621ea241053ac05f.tar.gz
opensim-SC_OLD-c2ca98519b4c43b1a4f98f12621ea241053ac05f.tar.bz2
opensim-SC_OLD-c2ca98519b4c43b1a4f98f12621ea241053ac05f.tar.xz
Linking osTerrainGetHeight, osTerrainSetHeight, and osRegionRestart to LSL_BaseClass to allow them to be called in LSL scripts.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs15
2 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index b4e68cd..b622c5d 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -636,5 +636,8 @@ namespace OpenSim.Region.ScriptEngine.Common
636 636
637 //OpenSim functions 637 //OpenSim functions
638 string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer); 638 string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer);
639 double osTerrainGetHeight(int x, int y);
640 int osTerrainSetHeight(int x, int y, double val);
641 int osRegionRestart(double seconds);
639 } 642 }
640} \ No newline at end of file 643} \ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index b86552b..7c1d66e 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -1819,6 +1819,21 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
1819 return m_LSL_Functions.osSetDynamicTextureURL(dynamicID, contentType, url, extraParams, timer); 1819 return m_LSL_Functions.osSetDynamicTextureURL(dynamicID, contentType, url, extraParams, timer);
1820 } 1820 }
1821 1821
1822 public double osTerrainGetHeight(int x, int y)
1823 {
1824 return m_LSL_Functions.osTerrainGetHeight(x, y);
1825 }
1826
1827 public int osTerrainSetHeight(int x, int y, double val)
1828 {
1829 return m_LSL_Functions.osTerrainSetHeight(x, y, val);
1830 }
1831
1832 public int osRegionRestart(double seconds)
1833 {
1834 return m_LSL_Functions.osRegionRestart(seconds);
1835 }
1836
1822 // LSL CONSTANTS 1837 // LSL CONSTANTS
1823 public const int TRUE = 1; 1838 public const int TRUE = 1;
1824 public const int FALSE = 0; 1839 public const int FALSE = 0;