After another heroic and bloody battle, OpenSim Dino Expedition 1, killed off OsSetParcelMediaTime, which was only ever added for testing. And all the logic code of it has been commented out for a long time.

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
 
         #endregion
 
-        public void ParcelMediaSetTime(float time)
-        {
-            //should be doing this by parcel, but as its only for testing
-            // The use of Thread.Sleep here causes the following compiler error under mono 1.2.4
-            // OpenSim/Region/Environment/Scenes/Scene.cs(3675,17): error CS0103: The name `Thread' does not exist
-            // in the context of `<>c__CompilerGenerated17'
-            // MW said it was okay to comment the body of this method out for now since the code is experimental
-            // and will be replaced anyway
-//            ForEachClient(delegate(IClientAPI client)
-//            {
-//                client.SendParcelMediaCommand((uint)(2), ParcelMediaCommandEnum.Pause, 0);
-//                Thread.Sleep(10);
-//                client.SendParcelMediaCommand((uint)(64), ParcelMediaCommandEnum.Time, time);
-//                Thread.Sleep(200);
-//                client.SendParcelMediaCommand((uint)(4), ParcelMediaCommandEnum.Play, 0);
-//            });
-        }
-
         public void RegionHandleRequest(IClientAPI client, UUID regionID)
         {
             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
             return m_ScriptEngine.World.GetSimulatorVersion();
         }
 
-        //for testing purposes only
-        public void osSetParcelMediaTime(double time)
-        {
-            // This gets very high because I have no idea what it does.
-            // If someone knows, please adjust. If it;s no longer needed,
-            // please remove.
-            //This sets the current time on a video. IE, it can be used to skip to a set time in the video. [MW]
-            CheckThreatLevel(ThreatLevel.VeryHigh, "osSetParcelMediaTime");
-
-            m_host.AddScriptLPS(1);
-
-            World.ParcelMediaSetTime((float)time);
-        }
-
         public Hashtable osParseJSON(string JSON)
         {
             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
 
         string osGetScriptEngineName();
         string osGetSimulatorVersion();
-        void osSetParcelMediaTime(double time);
         Hashtable osParseJSON(string JSON);
         
         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
         {
            return m_OSSL_Functions.osGetSimulatorVersion();    
         }
-
-
-        //for testing purposes only
-        public void osSetParcelMediaTime(double time)
-        {
-            m_OSSL_Functions.osSetParcelMediaTime(time);
-        }
         
         public Hashtable osParseJSON(string JSON)
         {