aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs18
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs7
4 files changed, 0 insertions, 40 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 36b9702..2006c2b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3398,24 +3398,6 @@ namespace OpenSim.Region.Framework.Scenes
3398 3398
3399 #endregion 3399 #endregion
3400 3400
3401 public void ParcelMediaSetTime(float time)
3402 {
3403 //should be doing this by parcel, but as its only for testing
3404 // The use of Thread.Sleep here causes the following compiler error under mono 1.2.4
3405 // OpenSim/Region/Environment/Scenes/Scene.cs(3675,17): error CS0103: The name `Thread' does not exist
3406 // in the context of `<>c__CompilerGenerated17'
3407 // MW said it was okay to comment the body of this method out for now since the code is experimental
3408 // and will be replaced anyway
3409// ForEachClient(delegate(IClientAPI client)
3410// {
3411// client.SendParcelMediaCommand((uint)(2), ParcelMediaCommandEnum.Pause, 0);
3412// Thread.Sleep(10);
3413// client.SendParcelMediaCommand((uint)(64), ParcelMediaCommandEnum.Time, time);
3414// Thread.Sleep(200);
3415// client.SendParcelMediaCommand((uint)(4), ParcelMediaCommandEnum.Play, 0);
3416// });
3417 }
3418
3419 public void RegionHandleRequest(IClientAPI client, UUID regionID) 3401 public void RegionHandleRequest(IClientAPI client, UUID regionID)
3420 { 3402 {
3421 RegionInfo info; 3403 RegionInfo info;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e008ff4..642b1f9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -837,20 +837,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
837 return m_ScriptEngine.World.GetSimulatorVersion(); 837 return m_ScriptEngine.World.GetSimulatorVersion();
838 } 838 }
839 839
840 //for testing purposes only
841 public void osSetParcelMediaTime(double time)
842 {
843 // This gets very high because I have no idea what it does.
844 // If someone knows, please adjust. If it;s no longer needed,
845 // please remove.
846 //This sets the current time on a video. IE, it can be used to skip to a set time in the video. [MW]
847 CheckThreatLevel(ThreatLevel.VeryHigh, "osSetParcelMediaTime");
848
849 m_host.AddScriptLPS(1);
850
851 World.ParcelMediaSetTime((float)time);
852 }
853
854 public Hashtable osParseJSON(string JSON) 840 public Hashtable osParseJSON(string JSON)
855 { 841 {
856 CheckThreatLevel(ThreatLevel.None, "osParseJSON"); 842 CheckThreatLevel(ThreatLevel.None, "osParseJSON");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index c3c5cec..6eccf51 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -99,7 +99,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
99 99
100 string osGetScriptEngineName(); 100 string osGetScriptEngineName();
101 string osGetSimulatorVersion(); 101 string osGetSimulatorVersion();
102 void osSetParcelMediaTime(double time);
103 Hashtable osParseJSON(string JSON); 102 Hashtable osParseJSON(string JSON);
104 103
105 void osMessageObject(key objectUUID,string message); 104 void osMessageObject(key objectUUID,string message);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index d8b9f1f..318ec2f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -238,13 +238,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
238 { 238 {
239 return m_OSSL_Functions.osGetSimulatorVersion(); 239 return m_OSSL_Functions.osGetSimulatorVersion();
240 } 240 }
241
242
243 //for testing purposes only
244 public void osSetParcelMediaTime(double time)
245 {
246 m_OSSL_Functions.osSetParcelMediaTime(time);
247 }
248 241
249 public Hashtable osParseJSON(string JSON) 242 public Hashtable osParseJSON(string JSON)
250 { 243 {