aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMW2009-03-02 11:03:11 +0000
committerMW2009-03-02 11:03:11 +0000
commit202f990d2a6875ecfda8237d75b9738ab52a2d9c (patch)
tree76a4a647f438adc3be28e0b1a8b61b26abaa994a /OpenSim/Region/ScriptEngine
parentAs part of a dinosaur hunting expedition, IScenePresenceBody.cs was terminate... (diff)
downloadopensim-SC_OLD-202f990d2a6875ecfda8237d75b9738ab52a2d9c.zip
opensim-SC_OLD-202f990d2a6875ecfda8237d75b9738ab52a2d9c.tar.gz
opensim-SC_OLD-202f990d2a6875ecfda8237d75b9738ab52a2d9c.tar.bz2
opensim-SC_OLD-202f990d2a6875ecfda8237d75b9738ab52a2d9c.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-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
3 files changed, 0 insertions, 22 deletions
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 {