aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2007-12-27 05:26:52 +0000
committerAdam Frisby2007-12-27 05:26:52 +0000
commitaf406bf6fa8286271e6fd2f1705d247ee8aed65a (patch)
tree59d4022c4e15d73de786f2020c35ac96b6733a15 /OpenSim
parent* Added osTerrainSetHeight(int x, int y, double val) to LSL commands (diff)
downloadopensim-SC_OLD-af406bf6fa8286271e6fd2f1705d247ee8aed65a.zip
opensim-SC_OLD-af406bf6fa8286271e6fd2f1705d247ee8aed65a.tar.gz
opensim-SC_OLD-af406bf6fa8286271e6fd2f1705d247ee8aed65a.tar.bz2
opensim-SC_OLD-af406bf6fa8286271e6fd2f1705d247ee8aed65a.tar.xz
* Added osRegionRestart(float secs) to LSL Commands
* Added osRegionNotice(string msg) to LSL Commands * Added PermissionManager checks for osTerrainSetHeight, osRegionRestart.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs29
1 files changed, 27 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 14f66e8..d4f8548 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -2878,8 +2878,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
2878 // 2878 //
2879 public int osTerrainSetHeight(int x, int y, double val) 2879 public int osTerrainSetHeight(int x, int y, double val)
2880 { 2880 {
2881 World.Terrain.Set(x, y, val); 2881 if (World.PermissionsMngr.CanTerraform(m_host.OwnerID, new LLVector3(x, y, 0)))
2882 return 1; 2882 {
2883 World.Terrain.Set(x, y, val);
2884 return 1;
2885 }
2886 else
2887 {
2888 return 0;
2889 }
2883 } 2890 }
2884 2891
2885 public double osTerrainGetHeight(int x, int y) 2892 public double osTerrainGetHeight(int x, int y)
@@ -2887,6 +2894,24 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
2887 return World.Terrain.GetHeight(x, y); 2894 return World.Terrain.GetHeight(x, y);
2888 } 2895 }
2889 2896
2897 public int osRegionRestart(double seconds)
2898 {
2899 if (World.PermissionsMngr.CanRestartSim(m_host.OwnerID))
2900 {
2901 World.Restart((float)ms);
2902 return 1;
2903 }
2904 else
2905 {
2906 return 0;
2907 }
2908 }
2909
2910 public void osRegionNotice(string msg)
2911 {
2912 World.SendGeneralAlert(msg);
2913 }
2914
2890 public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, 2915 public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams,
2891 int timer) 2916 int timer)
2892 { 2917 {