aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
authorMW2008-07-09 12:02:01 +0000
committerMW2008-07-09 12:02:01 +0000
commit58ce018625384cf21f336584c5bedbf712d7315e (patch)
tree4844f463de4de121a411bf0c69e3edd70fbbc70b /OpenSim/Region/ScriptEngine/Common
parentcorrected the params types on IClientAPI.SendParcelMediaCommand. the command ... (diff)
downloadopensim-SC-58ce018625384cf21f336584c5bedbf712d7315e.zip
opensim-SC-58ce018625384cf21f336584c5bedbf712d7315e.tar.gz
opensim-SC-58ce018625384cf21f336584c5bedbf712d7315e.tar.bz2
opensim-SC-58ce018625384cf21f336584c5bedbf712d7315e.tar.xz
for testing purposes only:
added void osSetParcelMediaTime(double time) command to script engines. which sets the position of the media that is playing. Time is in seconds. Doesn't do any security checking (should be checking that the object/script is owned by the parcel owner). So could be abused, if it is then we should remove it, or add the security. Only tested in dotnet scripting engine, but should work in XEngine too.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs1
3 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 2d9fd09..9dd7e01 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -2034,6 +2034,13 @@ namespace OpenSim.Region.ScriptEngine.Common
2034 return m_LSL_Functions.llList2Float(src, index); 2034 return m_LSL_Functions.llList2Float(src, index);
2035 } 2035 }
2036 2036
2037
2038 //for testing purposes only
2039 public void osSetParcelMediaTime(double time)
2040 {
2041 m_LSL_Functions.osSetParcelMediaTime(time);
2042 }
2043
2037 // LSL CONSTANTS 2044 // LSL CONSTANTS
2038 public const int TRUE = 1; 2045 public const int TRUE = 1;
2039 public const int FALSE = 0; 2046 public const int FALSE = 0;
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
index fc62b02..ca12a42 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
@@ -569,5 +569,11 @@ namespace OpenSim.Region.ScriptEngine.Common
569 return String.Empty; 569 return String.Empty;
570 } 570 }
571 } 571 }
572
573 //for testing purposes only
574 public void osSetParcelMediaTime(double time)
575 {
576 World.ParcelMediaSetTime((float)time);
577 }
572 } 578 }
573} 579}
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs
index 4f7b56e..bbc6d2d 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Region.ScriptEngine.Common
65 void osOpenRemoteDataChannel(string channel); 65 void osOpenRemoteDataChannel(string channel);
66 66
67 string osGetScriptEngineName(); 67 string osGetScriptEngineName();
68 void osSetParcelMediaTime(double time);
68 69
69 } 70 }
70} 71}