aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorCharles Krinke2008-02-17 21:15:43 +0000
committerCharles Krinke2008-02-17 21:15:43 +0000
commite6a74344e71941d0d09b1c0bc95501b3171f142d (patch)
treebc1fc28c6e593de16897e873559dd25aba1082c2 /OpenSim
parent* Last bit of cleanup now. As long as you keep physical prim off, you should... (diff)
downloadopensim-SC-e6a74344e71941d0d09b1c0bc95501b3171f142d.zip
opensim-SC-e6a74344e71941d0d09b1c0bc95501b3171f142d.tar.gz
opensim-SC-e6a74344e71941d0d09b1c0bc95501b3171f142d.tar.bz2
opensim-SC-e6a74344e71941d0d09b1c0bc95501b3171f142d.tar.xz
Thank you Hashbox for adding the
osConsoleCommand Feature to ll-functions.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs3
4 files changed, 20 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 7805c78..36f75d1 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment
74 m_scene.EventManager.TriggerPermissionError(user, reason); 74 m_scene.EventManager.TriggerPermissionError(user, reason);
75 } 75 }
76 76
77 protected virtual bool IsAdministrator(LLUUID user) 77 public virtual bool IsAdministrator(LLUUID user)
78 { 78 {
79 if (m_bypassPermissions) 79 if (m_bypassPermissions)
80 { 80 {
@@ -612,4 +612,4 @@ namespace OpenSim.Region.Environment
612 612
613 #endregion 613 #endregion
614 } 614 }
615} \ No newline at end of file 615}
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
index e3d0451..088b985 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
@@ -1865,6 +1865,11 @@ namespace OpenSim.Region.ScriptEngine.Common
1865 m_LSL_Functions.osRegionNotice(msg); 1865 m_LSL_Functions.osRegionNotice(msg);
1866 } 1866 }
1867 1867
1868 public int osConsoleCommand(string Command)
1869 {
1870 return m_LSL_Functions.osConsoleCommand(Command);
1871 }
1872
1868 public double llList2Float(LSL_Types.list src, int index) 1873 public double llList2Float(LSL_Types.list src, int index)
1869 { 1874 {
1870 return m_LSL_Functions.llList2Float(src, index); 1875 return m_LSL_Functions.llList2Float(src, index);
@@ -2203,4 +2208,4 @@ namespace OpenSim.Region.ScriptEngine.Common
2203 public rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0); 2208 public rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0);
2204 2209
2205 } 2210 }
2206} \ No newline at end of file 2211}
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index c350301..a7d4ecf 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3676,6 +3676,16 @@ namespace OpenSim.Region.ScriptEngine.Common
3676 return LLUUID.Zero.ToString(); 3676 return LLUUID.Zero.ToString();
3677 } 3677 }
3678 3678
3679 public int osConsoleCommand(string Command)
3680 {
3681 if (World.PermissionsMngr.IsAdministrator(m_host.OwnerID)) {
3682 OpenSim.Framework.Console.MainConsole.Instance.RunCommand(Command);
3683 return 1;
3684 } else {
3685 return 0;
3686 }
3687 }
3688
3679 private void NotImplemented(string Command) 3689 private void NotImplemented(string Command)
3680 { 3690 {
3681 m_host.AddScriptLPS(1); 3691 m_host.AddScriptLPS(1);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index ba463df..81478e0 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -641,5 +641,6 @@ namespace OpenSim.Region.ScriptEngine.Common
641 int osTerrainSetHeight(int x, int y, double val); 641 int osTerrainSetHeight(int x, int y, double val);
642 int osRegionRestart(double seconds); 642 int osRegionRestart(double seconds);
643 void osRegionNotice(string msg); 643 void osRegionNotice(string msg);
644 int osConsoleCommand(string Command);
644 } 645 }
645} \ No newline at end of file 646}