aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-03 06:15:23 +0000
committerMelanie Thielker2008-10-03 06:15:23 +0000
commitcffd73c59fb8cba3b93a1555173e3f4d5cda1258 (patch)
tree61736afec7c67767f7dd53afdc64ca961f0d5f80 /OpenSim/Region/ScriptEngine/DotNetEngine
parentPlumb in the start parameter in DNE (diff)
downloadopensim-SC_OLD-cffd73c59fb8cba3b93a1555173e3f4d5cda1258.zip
opensim-SC_OLD-cffd73c59fb8cba3b93a1555173e3f4d5cda1258.tar.gz
opensim-SC_OLD-cffd73c59fb8cba3b93a1555173e3f4d5cda1258.tar.bz2
opensim-SC_OLD-cffd73c59fb8cba3b93a1555173e3f4d5cda1258.tar.xz
Reintroduces the discovery mechanism to use llRequestSimulatorData("", 128)
Causes the dataserver event to return "OpenSim" when running on OpenSim. Requires ThreatLevel to be "High" or above to function.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs17
2 files changed, 22 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 76bf41b..433a1c2 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -372,5 +372,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
372 controllingClient.SendScriptRunningReply(objectID, itemID, 372 controllingClient.SendScriptRunningReply(objectID, itemID,
373 id.Running); 373 id.Running);
374 } 374 }
375
376 public IScriptApi GetApi(UUID itemID, string name)
377 {
378 return m_ScriptManager.GetApi(itemID, name);
379 }
375 } 380 }
376} 381}
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 875b29e..fc6024a 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -619,7 +619,24 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
619 619
620 InstanceData id = GetScript(localID, itemID); 620 InstanceData id = GetScript(localID, itemID);
621 621
622 if (id == null)
623 return 0;
624
622 return id.StartParam; 625 return id.StartParam;
623 } 626 }
627
628 public IScriptApi GetApi(UUID itemID, string name)
629 {
630 uint localID = GetLocalID(itemID);
631
632 InstanceData id = GetScript(localID, itemID);
633 if (id == null)
634 return null;
635
636 if (id.Apis.ContainsKey(name))
637 return id.Apis[name];
638
639 return null;
640 }
624 } 641 }
625} 642}