aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
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/Shared/Api
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/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs7
3 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 3e1c930..b7ff9b6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -581,5 +581,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
581 return String.Empty; 581 return String.Empty;
582 } 582 }
583 } 583 }
584
585
586 //for testing purposes only
587 public void osSetParcelMediaTime(double time)
588 {
589 World.ParcelMediaSetTime((float)time);
590 }
584 } 591 }
585} 592}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index d55491c..87b3ef4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -66,5 +66,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
66 void osSetRegionWaterHeight(double height); 66 void osSetRegionWaterHeight(double height);
67 67
68 string osGetScriptEngineName(); 68 string osGetScriptEngineName();
69 void osSetParcelMediaTime(double time);
69 } 70 }
70} 71}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 90c4419..9d0c337 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -200,5 +200,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
200 { 200 {
201 return m_OSSL_Functions.osGetScriptEngineName(); 201 return m_OSSL_Functions.osGetScriptEngineName();
202 } 202 }
203
204
205 //for testing purposes only
206 public void osSetParcelMediaTime(double time)
207 {
208 m_OSSL_Functions.osSetParcelMediaTime(time);
209 }
203 } 210 }
204} 211}