aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-01 00:10:07 +0000
committerJustin Clark-Casey (justincc)2012-02-01 00:10:07 +0000
commit8b3da1bff4344d4dc7738f97e5aaa6d024db8f7e (patch)
tree29f19f38b71b3e6ab1a874fc72d93ce983df3241 /OpenSim/Region/ScriptEngine
parentImplement "xengine status" console command to show various xengine stats (diff)
downloadopensim-SC_OLD-8b3da1bff4344d4dc7738f97e5aaa6d024db8f7e.zip
opensim-SC_OLD-8b3da1bff4344d4dc7738f97e5aaa6d024db8f7e.tar.gz
opensim-SC_OLD-8b3da1bff4344d4dc7738f97e5aaa6d024db8f7e.tar.bz2
opensim-SC_OLD-8b3da1bff4344d4dc7738f97e5aaa6d024db8f7e.tar.xz
Make script console commands only show for selected region.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index c9fb722..459821b 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -324,6 +324,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
324 /// <returns>true if we're okay to proceed, false if not.</returns> 324 /// <returns>true if we're okay to proceed, false if not.</returns>
325 private void HandleScriptsAction(string[] cmdparams, Action<IScriptInstance> action) 325 private void HandleScriptsAction(string[] cmdparams, Action<IScriptInstance> action)
326 { 326 {
327 if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene))
328 return;
329
327 lock (m_Scripts) 330 lock (m_Scripts)
328 { 331 {
329 string rawItemId; 332 string rawItemId;
@@ -367,6 +370,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
367 370
368 private void HandleShowStatus(string module, string[] cmdparams) 371 private void HandleShowStatus(string module, string[] cmdparams)
369 { 372 {
373 if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene))
374 return;
375
370 StringBuilder sb = new StringBuilder(); 376 StringBuilder sb = new StringBuilder();
371 sb.AppendFormat("Status of XEngine instance for {0}\n", m_Scene.RegionInfo.RegionName); 377 sb.AppendFormat("Status of XEngine instance for {0}\n", m_Scene.RegionInfo.RegionName);
372 378
@@ -385,6 +391,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
385 391
386 public void HandleShowScripts(string module, string[] cmdparams) 392 public void HandleShowScripts(string module, string[] cmdparams)
387 { 393 {
394 if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene))
395 return;
396
388 if (cmdparams.Length == 2) 397 if (cmdparams.Length == 2)
389 { 398 {
390 lock (m_Scripts) 399 lock (m_Scripts)