OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
OpenSimMirror/OpenSim/Region/Application/OpenSim.cs

1265 lines
52 KiB
C#
Raw Normal View History

From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
* * Neither the name of the OpenSimulator Project nor the
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
* Assorted spring cleanings.
2008-05-01 14:45:56 +00:00
using System.Collections;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
using System.Collections.Generic;
using System.IO;
* Assorted spring cleanings.
2008-05-01 14:45:56 +00:00
using System.Reflection;
* optimized usings.
2009-02-12 09:53:12 +00:00
using System.Timers;
* Assorted spring cleanings.
2008-05-01 14:45:56 +00:00
using log4net;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
using Nini.Config;
* optimized usings.
2009-02-12 09:53:12 +00:00
using OpenMetaverse;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Statistics;
This changeset is the step 1 of 2 in refactoring OpenSim.Region.Environment into a "framework" part and a modules only part. This first changeset refactors OpenSim.Region.Environment.Scenes, OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region modules in OpenSim.Region.Environment. The next step will be to move region modules up from OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and then sort out which modules are really core modules and which should move out to forge. I've been very careful to NOT BREAK anything. i hope i've succeeded. as this is the work of a whole week i hope i managed to keep track with the applied patches of the last week --- could any of you that did check in stuff have a look at whether it survived? thx!
2009-02-06 16:55:34 +00:00
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
namespace OpenSim
{
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
/// <summary>
* Refactor: Split opensim background server into a separate class
2008-06-01 01:01:16 +00:00
/// Interactive OpenSim region server
/// </summary>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
public class OpenSim : OpenSimBase
Formatting cleanup.
2008-05-16 01:22:11 +00:00
{
* Assorted spring cleanings.
2008-05-01 14:45:56 +00:00
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
protected string m_startupCommandsFile;
protected string m_shutdownCommandsFile;
- turn private m_gui into protected m_gui to allow manipulation in derived classes - make OpenSimBackground inherit from OpenSim instead of OpenSimBase so that it will have a MainConsole instance and we can use console commands, setting m_gui to false
2009-04-16 12:10:50 +00:00
protected bool m_gui = false;
Add the ability to use -console=rest to the region server. User and pass are specified the same way as for the ROBUST server
2009-08-17 08:21:39 +00:00
protected string m_consoleType = "local";
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
private string m_timedScript = "disabled";
private Timer m_scriptTimer;
Update svn properties, formatting cleanup.
2008-08-19 02:59:27 +00:00
* Refactor: Split opensim background server into a separate class
2008-06-01 01:01:16 +00:00
public OpenSim(IConfigSource configSource) : base(configSource)
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
}
moved the initial loading/setting of the config settings to its own class, ConfigurationLoader. To make it easier to customise the loading of those settings and possible in the future move it to a plugin.
2008-11-05 20:14:52 +00:00
protected override void ReadExtraConfigSettings()
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
a little bit more refactoring of startup
2008-11-06 20:17:20 +00:00
base.ReadExtraConfigSettings();
small change to last commit
2008-06-26 17:23:05 +00:00
IConfig startupConfig = m_config.Source.Configs["Startup"];
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation) * Only initialize Util's SmartThreadPool if it is actually being used * No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
2009-10-22 08:30:12 +00:00
int stpMaxThreads = 15;
Add MaxPoolThreads in startup to limit the size of the thread pool used for FireAndForget. This lets us limit concurrency to make OpenSim play nice
2009-10-22 01:28:53 +00:00
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
if (startupConfig != null)
{
update some ini defaults in code - all defaults from beginning of OpenSim.ini.example thru DefaultScriptEngine = "XEngine"
2009-03-11 09:31:02 +00:00
m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt");
m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "shutdown_commands.txt");
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
Add the ability to use -console=rest to the region server. User and pass are specified the same way as for the ROBUST server
2009-08-17 08:21:39 +00:00
if (startupConfig.GetString("console", String.Empty) == String.Empty)
m_gui = startupConfig.GetBoolean("gui", false);
else
m_consoleType= startupConfig.GetString("console", String.Empty);
Stopgap measure: To use gridlaunch, or GUI, start opensim with OpenSim.exe -gui=true
2009-02-10 12:25:29 +00:00
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
m_timedScript = startupConfig.GetString("timer_Script", "disabled");
Intermediate commit. WILL NOT COMPILE!
2009-05-04 20:15:39 +00:00
if (m_logFileAppender != null)
{
if (m_logFileAppender is log4net.Appender.FileAppender)
{
log4net.Appender.FileAppender appender =
(log4net.Appender.FileAppender)m_logFileAppender;
Add the asset service connectors and sample config. READ WARNINGS!!!
2009-05-09 02:49:55 +00:00
string fileName = startupConfig.GetString("LogFile", String.Empty);
if (fileName != String.Empty)
Make the opensim.ini logfile option really work (port of a fix from ROBUST)
2009-08-07 13:15:59 +00:00
{
Add the asset service connectors and sample config. READ WARNINGS!!!
2009-05-09 02:49:55 +00:00
appender.File = fileName;
Make the opensim.ini logfile option really work (port of a fix from ROBUST)
2009-08-07 13:15:59 +00:00
appender.ActivateOptions();
}
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget() * Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-22 06:03:18 +00:00
m_log.InfoFormat("[LOGGING]: Logging started to file {0}", appender.File);
Intermediate commit. WILL NOT COMPILE!
2009-05-04 20:15:39 +00:00
}
}
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget() * Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-22 06:03:18 +00:00
string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty);
FireAndForgetMethod asyncCallMethod;
if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod))
Util.FireAndForgetMethod = asyncCallMethod;
* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation) * Only initialize Util's SmartThreadPool if it is actually being used * No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
2009-10-22 08:30:12 +00:00
stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15);
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget() * Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-22 06:03:18 +00:00
* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation) * Only initialize Util's SmartThreadPool if it is actually being used * No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
2009-10-22 08:30:12 +00:00
if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
Util.InitThreadPool(stpMaxThreads);
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget() * Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-22 06:03:18 +00:00
m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod);
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
/// <summary>
/// Performs initialisation of the scene, such as loading configuration from disk.
/// </summary>
* oops, fix region startup to be in the correct sequence (though it appeared to work anyway)
2008-10-03 15:41:27 +00:00
protected override void StartupSpecific()
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
m_log.Info("====================================================================");
m_log.Info("========================= STARTING OPENSIM =========================");
m_log.Info("====================================================================");
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode",
(ConfigurationSettings.Standalone ? "sandbox" : "grid"));
Fixed Mantis #2756
2008-12-05 16:20:12 +00:00
//m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString());
Fix: removed m_log.InfoFormat("[OPENSIM MAIN]: GC Latency Mode: {0}", GCSettings.LatencyMode.ToString());
2008-12-05 12:59:50 +00:00
// http://msdn.microsoft.com/en-us/library/bb384202.aspx
//GCSettings.LatencyMode = GCLatencyMode.Batch;
save file before commit is often useful
2008-12-05 13:12:16 +00:00
//m_log.InfoFormat("[OPENSIM MAIN]: GC Latency Mode: {0}", GCSettings.LatencyMode.ToString());
Formatting cleanup.
2008-05-16 01:22:11 +00:00
Refactor. Make ConsoleBase a true base class. Create CommandConsole as a simple console capable of processing commands. Create LocalConsole as a console that uses cursor control and context help. Precursor to a distributed console system for the new grid services. No functional change intended :)
2009-05-04 12:15:55 +00:00
if (m_gui) // Driven by external GUI
m_console = new CommandConsole("Region");
else
Add the ability to use -console=rest to the region server. User and pass are specified the same way as for the ROBUST server
2009-08-17 08:21:39 +00:00
{
switch (m_consoleType)
{
case "basic":
m_console = new CommandConsole("Region");
break;
case "rest":
m_console = new RemoteConsole("Region");
((RemoteConsole)m_console).ReadConfig(m_config.Source);
break;
default:
m_console = new LocalConsole("Region");
break;
}
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
MainConsole.Instance = m_console;
Added IRegistryCore and RegistryCore to OpenSim.Framework. Added a ApplicationRegistry to OpenSimBase. Changed LoadRegionsPlugin so it registers itself to that application registry. Added a event to LoadRegionsPlugin, that is triggered when it creates a new scene ,although maybe this event should actually be in opensimBase incase other plugins are creating regions (like the RemoteAdminPlugin).
2009-02-26 20:01:20 +00:00
RegisterConsoleCommands();
Refactor. Instantiate sim status handlers in opensim base, not in a plugin
2010-01-11 05:12:01 +00:00
MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler());
MainServer.Instance.AddStreamHandler(new OpenSim.XSimStatusHandler(this));
if (userStatsURI != String.Empty)
MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this));
Added IRegistryCore and RegistryCore to OpenSim.Framework. Added a ApplicationRegistry to OpenSimBase. Changed LoadRegionsPlugin so it registers itself to that application registry. Added a event to LoadRegionsPlugin, that is triggered when it creates a new scene ,although maybe this event should actually be in opensimBase incase other plugins are creating regions (like the RemoteAdminPlugin).
2009-02-26 20:01:20 +00:00
base.StartupSpecific();
Add the ability to use -console=rest to the region server. User and pass are specified the same way as for the ROBUST server
2009-08-17 08:21:39 +00:00
if (m_console is RemoteConsole)
((RemoteConsole)m_console).SetServer(m_httpServer);
Added IRegistryCore and RegistryCore to OpenSim.Framework. Added a ApplicationRegistry to OpenSimBase. Changed LoadRegionsPlugin so it registers itself to that application registry. Added a event to LoadRegionsPlugin, that is triggered when it creates a new scene ,although maybe this event should actually be in opensimBase incase other plugins are creating regions (like the RemoteAdminPlugin).
2009-02-26 20:01:20 +00:00
//Run Startup Commands
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
if (String.IsNullOrEmpty(m_startupCommandsFile))
Added IRegistryCore and RegistryCore to OpenSim.Framework. Added a ApplicationRegistry to OpenSimBase. Changed LoadRegionsPlugin so it registers itself to that application registry. Added a event to LoadRegionsPlugin, that is triggered when it creates a new scene ,although maybe this event should actually be in opensimBase incase other plugins are creating regions (like the RemoteAdminPlugin).
2009-02-26 20:01:20 +00:00
{
m_log.Info("[STARTUP]: No startup command script specified. Moving on...");
}
else
{
RunCommandScript(m_startupCommandsFile);
}
// Start timer script (run a script every xx seconds)
if (m_timedScript != "disabled")
{
m_scriptTimer = new Timer();
m_scriptTimer.Enabled = true;
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
m_scriptTimer.Interval = 1200*1000;
Added IRegistryCore and RegistryCore to OpenSim.Framework. Added a ApplicationRegistry to OpenSimBase. Changed LoadRegionsPlugin so it registers itself to that application registry. Added a event to LoadRegionsPlugin, that is triggered when it creates a new scene ,although maybe this event should actually be in opensimBase incase other plugins are creating regions (like the RemoteAdminPlugin).
2009-02-26 20:01:20 +00:00
m_scriptTimer.Elapsed += RunAutoTimerScript;
}
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 19:33:23 +00:00
// Hook up to the watchdog timer
Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler;
Added IRegistryCore and RegistryCore to OpenSim.Framework. Added a ApplicationRegistry to OpenSimBase. Changed LoadRegionsPlugin so it registers itself to that application registry. Added a event to LoadRegionsPlugin, that is triggered when it creates a new scene ,although maybe this event should actually be in opensimBase incase other plugins are creating regions (like the RemoteAdminPlugin).
2009-02-26 20:01:20 +00:00
PrintFileToConsole("startuplogo.txt");
// For now, start at the 'root' level by default
if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
ChangeSelectedRegion("region",
new string[] {"change", "region", m_sceneManager.Scenes[0].RegionInfo.RegionName});
Added IRegistryCore and RegistryCore to OpenSim.Framework. Added a ApplicationRegistry to OpenSimBase. Changed LoadRegionsPlugin so it registers itself to that application registry. Added a event to LoadRegionsPlugin, that is triggered when it creates a new scene ,although maybe this event should actually be in opensimBase incase other plugins are creating regions (like the RemoteAdminPlugin).
2009-02-26 20:01:20 +00:00
else
ChangeSelectedRegion("region", new string[] {"change", "region", "root"});
}
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Register standard set of region console commands
/// </summary>
Added IRegistryCore and RegistryCore to OpenSim.Framework. Added a ApplicationRegistry to OpenSimBase. Changed LoadRegionsPlugin so it registers itself to that application registry. Added a event to LoadRegionsPlugin, that is triggered when it creates a new scene ,although maybe this event should actually be in opensimBase incase other plugins are creating regions (like the RemoteAdminPlugin).
2009-02-26 20:01:20 +00:00
private void RegisterConsoleCommands()
{
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "clear assets",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"clear assets",
"Clear the asset cache", HandleClearAssets);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "force update",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"force update",
"Force the update of all objects on clients",
HandleForceUpdate);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "debug packet",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"debug packet <level>",
"Turn on packet debugging", Debug);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "debug scene",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"debug scene <cripting> <collisions> <physics>",
"Turn on scene debugging", Debug);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "change region",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"change region <region name>",
"Change current console region", ChangeSelectedRegion);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "save xml",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"save xml",
"Save a region's data in XML format", SaveXml);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "save xml2",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"save xml2",
"Save a region's data in XML2 format", SaveXml2);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "load xml",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"load xml [-newIDs [<x> <y> <z>]]",
"Load a region's data from XML format", LoadXml);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "load xml2",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"load xml2",
"Load a region's data from XML2 format", LoadXml2);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "save prims xml2",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"save prims xml2 [<prim name> <file name>]",
"Save named prim to XML2", SavePrimsXml2);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "load oar",
minor: remove some mono compiler warnings, add --merge load oar switch to help information
2009-11-25 16:14:08 +00:00
"load oar [--merge] <oar name>",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"Load a region's data from OAR archive", LoadOar);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "save oar",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"save oar <oar name>",
"Save a region's data to an OAR archive",
"More information on forthcoming options here soon", SaveOar);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "edit scale",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"edit scale <name> <x> <y> <z>",
"Change the scale of a named prim", HandleEditScale);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "kick user",
enhances the console command "kick user" with an optional alert message which will be dialog-ed to the user just before being kicked.
2009-03-25 18:04:33 +00:00
"kick user <first> <last> [message]",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"Kick a user off the simulator", KickUserCommand);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "show assets",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"show assets",
"Show asset data", HandleShow);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "show users",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"show users [full]",
"Show user data", HandleShow);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
* Added the "show connections" command to print out all of the currently tracked IClientAPIs
2009-10-14 20:00:42 +00:00
m_console.Commands.AddCommand("region", false, "show connections",
"show connections",
"Show connection data", HandleShow);
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "show users full",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"show users full",
String.Empty, HandleShow);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "show modules",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"show modules",
"Show module data", HandleShow);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "show regions",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"show regions",
"Show region data", HandleShow);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "show queues",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"show queues",
"Show queue data", HandleShow);
Thank you kindly, Patnad, for a patch that: This patch allow you to see region rating from the console. Type "show ratings" and it will show you the rating of all your regions.
2009-05-12 03:35:07 +00:00
m_console.Commands.AddCommand("region", false, "show ratings",
"show ratings",
"Show rating data", HandleShow);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "backup",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"backup",
"Persist objects to the database now", RunCommand);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "create region",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"create region",
"Create a new region", HandleCreateRegion);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "login enable",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"login enable",
"Enable logins to the simulator", HandleLoginEnable);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "login disable",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"login disable",
"Disable logins to the simulator", HandleLoginDisable);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "login status",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"login status",
"Display status of logins", HandleLoginStatus);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "restart",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"restart",
"Restart all sims in this instance", RunCommand);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "config set",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"config set <section> <field> <value>",
"Set a config option", HandleConfig);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "config get",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"config get <section> <field>",
"Read a config option", HandleConfig);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "config save",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"config save",
"Save current configuration", HandleConfig);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "command-script",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"command-script <script>",
"Run a command script from file", RunCommand);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "remove-region",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"remove-region <name>",
"Remove a region from this simulator", RunCommand);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "delete-region",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"delete-region <name>",
"Delete a region from disk", RunCommand);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "modules list",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"modules list",
"List modules", HandleModules);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "modules load",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"modules load <name>",
"Load a module", HandleModules);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "modules unload",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"modules unload <name>",
"Unload a module", HandleModules);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Add proper handling for shared vs. unshared modules to the command interface. Shared modules will now only get added once, so the command handler is called once per module, not once per scene. Removal of scenes has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
m_console.Commands.AddCommand("region", false, "Add-InventoryHost",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"Add-InventoryHost <host>",
String.Empty, RunCommand);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
m_console.Commands.AddCommand("region", false, "kill uuid",
"kill uuid <UUID>",
"Kill an object by UUID", KillUUID);
patch kill by UUID Signed-off-by: Melanie <melanie@t-data.com>
2009-10-23 14:11:25 +00:00
Getting rid of -hypergrid=true on the command line. This config now goes inside OpenSim.ini in the Startup section. This makes the HG compatible with -background, and prepares the way for further work on HG-related config vars. Might help with mantis #3527.
2009-04-27 00:16:59 +00:00
m_console.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
"Set local coordinate to map HG regions to", RunCommand);
m_console.Commands.AddCommand("hypergrid", false, "link-region",
"link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
"Link a hypergrid region", RunCommand);
m_console.Commands.AddCommand("hypergrid", false, "unlink-region",
"unlink-region <local name> or <HostName>:<HttpPort> <cr>",
"Unlink a hypergrid region", RunCommand);
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
Reimplemented running of ShutdownCommandFile. Mantis #2800
2008-12-11 14:31:58 +00:00
public override void ShutdownSpecific()
{
if (m_shutdownCommandsFile != String.Empty)
{
RunCommandScript(m_shutdownCommandsFile);
}
base.ShutdownSpecific();
}
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Timer to run a specific text file as console commands. Configured in in the main ini file
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
private void RunAutoTimerScript(object sender, EventArgs e)
{
if (m_timedScript != "disabled")
{
RunCommandScript(m_timedScript);
}
}
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 19:33:23 +00:00
private void WatchdogTimeoutHandler(System.Threading.Thread thread, int lastTick)
{
int now = Environment.TickCount & Int32.MaxValue;
m_log.ErrorFormat("[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago",
thread.Name, thread.ThreadState, now - lastTick);
}
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
#region Console Commands
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Kicks users off the region
/// </summary>
/// <param name="module"></param>
/// <param name="cmdparams">name of avatar to kick</param>
Reinstate the KickUserCommand handler, which was commented out by another dev whiel I was putting the reference to it back in
2009-02-09 16:34:21 +00:00
private void KickUserCommand(string module, string[] cmdparams)
{
if (cmdparams.Length < 4)
return;
enhances the console command "kick user" with an optional alert message which will be dialog-ed to the user just before being kicked.
2009-03-25 18:04:33 +00:00
string alert = null;
if (cmdparams.Length > 4)
adding presence.ControllingClient.Kick(msg) to the brew.
2009-03-25 18:48:30 +00:00
alert = String.Format("\n{0}\n", String.Join(" ", cmdparams, 4, cmdparams.Length - 4));
enhances the console command "kick user" with an optional alert message which will be dialog-ed to the user just before being kicked.
2009-03-25 18:04:33 +00:00
Reinstate the KickUserCommand handler, which was commented out by another dev whiel I was putting the reference to it back in
2009-02-09 16:34:21 +00:00
IList agents = m_sceneManager.GetCurrentSceneAvatars();
foreach (ScenePresence presence in agents)
{
RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) &&
presence.Lastname.ToLower().Contains(cmdparams[3].ToLower()))
Reinstate the KickUserCommand handler, which was commented out by another dev whiel I was putting the reference to it back in
2009-02-09 16:34:21 +00:00
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info(
Reinstate the KickUserCommand handler, which was commented out by another dev whiel I was putting the reference to it back in
2009-02-09 16:34:21 +00:00
String.Format(
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"Kicking user: {0,-16}{1,-16}{2,-37} in region: {3,-16}",
adding presence.ControllingClient.Kick(msg) to the brew.
2009-03-25 18:48:30 +00:00
presence.Firstname, presence.Lastname, presence.UUID, regionInfo.RegionName));
Reinstate the KickUserCommand handler, which was commented out by another dev whiel I was putting the reference to it back in
2009-02-09 16:34:21 +00:00
adding presence.ControllingClient.Kick(msg) to the brew.
2009-03-25 18:48:30 +00:00
// kick client...
if (alert != null)
presence.ControllingClient.Kick(alert);
else
presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
// ...and close on our side
Reinstate the KickUserCommand handler, which was commented out by another dev whiel I was putting the reference to it back in
2009-02-09 16:34:21 +00:00
presence.Scene.IncomingCloseAgent(presence.UUID);
}
}
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("");
Reinstate the KickUserCommand handler, which was commented out by another dev whiel I was putting the reference to it back in
2009-02-09 16:34:21 +00:00
}
Changed the kickuser command to use the new console RegisterCmd feature.
2008-06-22 05:08:58 +00:00
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
/// <summary>
* Stop console misleadingly reporting an error if it cannot find a startup commands file
2008-11-28 21:09:20 +00:00
/// Run an optional startup list of commands
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
/// </summary>
/// <param name="fileName"></param>
private void RunCommandScript(string fileName)
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
{
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
if (File.Exists(fileName))
{
* Stop console misleadingly reporting an error if it cannot find a startup commands file
2008-11-28 21:09:20 +00:00
m_log.Info("[COMMANDFILE]: Running " + fileName);
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
Add a using() block around the timer script
2009-09-11 20:52:49 +00:00
using (StreamReader readFile = File.OpenText(fileName))
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
Add a using() block around the timer script
2009-09-11 20:52:49 +00:00
string currentCommand;
while ((currentCommand = readFile.ReadLine()) != null)
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
Add a using() block around the timer script
2009-09-11 20:52:49 +00:00
if (currentCommand != String.Empty)
{
m_log.Info("[COMMANDFILE]: Running '" + currentCommand + "'");
m_console.RunCommand(currentCommand);
}
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
}
}
}
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Opens a file and uses it as input to the console command parser.
/// </summary>
/// <param name="fileName">name of file to use as input to the console</param>
* In ur code. Making it static. * Converted a bunch of functions to static functions.
2008-05-01 16:03:53 +00:00
private static void PrintFileToConsole(string fileName)
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
if (File.Exists(fileName))
{
StreamReader readFile = File.OpenText(fileName);
* Commit 2/3 - Please dont attempt to update to this revision until all 3 are in.
2008-05-02 16:41:08 +00:00
string currentLine;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
while ((currentLine = readFile.ReadLine()) != null)
{
m_log.Info("[!]" + currentLine);
}
}
}
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
private void HandleClearAssets(string module, string[] args)
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
Removed IAssetCache. WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
2009-08-10 15:14:57 +00:00
m_log.Info("Not implemented.");
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
}
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Force resending of all updates to all clients in active region(s)
/// </summary>
/// <param name="module"></param>
/// <param name="args"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
private void HandleForceUpdate(string module, string[] args)
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Updating all clients");
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
m_sceneManager.ForceCurrentSceneClientUpdate();
}
Update svn properties. Formatting cleanup.
2008-05-25 23:27:38 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Edits the scale of a primative with the name specified
/// </summary>
/// <param name="module"></param>
/// <param name="args">0,1, name, x, y, z</param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
private void HandleEditScale(string module, string[] args)
{
* Fix edit scale command - was looking for one too few arguments
2009-03-24 19:04:28 +00:00
if (args.Length == 6)
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
{
m_sceneManager.HandleEditCommandOnCurrentScene(args);
}
else
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Argument error: edit scale <prim name> <x> <y> <z>");
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
}
}
Added "save-prims-xml2 <PrimName> <FileName>", as we were lacking a method to save a single primitive or small group of them. This command will save all prims in the current scene that name matches the "PrimName" parameter. The saved file is in standard xml2 format, so can be loaded using load-xml2
2008-07-01 19:23:45 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Creates a new region based on the parameters specified. This will ask the user questions on the console
/// </summary>
/// <param name="module"></param>
/// <param name="cmd">0,1,region name, region XML file</param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
private void HandleCreateRegion(string module, string[] cmd)
{
Make create region save the new region to ini file format if the name specifies an ini file. If the ini file exists, the region will be added.
2009-06-25 23:31:55 +00:00
if (cmd.Length < 4)
{
Change command help text to show .ini in place of .xml when creating regions
2009-09-30 08:12:43 +00:00
m_log.Error("Usage: create region <region name> <region_file.ini>");
Make create region save the new region to ini file format if the name specifies an ini file. If the ini file exists, the region will be added.
2009-06-25 23:31:55 +00:00
return;
}
if (cmd[3].EndsWith(".xml"))
{
string regionsDir = ConfigSource.Source.Configs["Startup"].GetString("regionload_regionsdir", "Regions").Trim();
string regionFile = String.Format("{0}/{1}", regionsDir, cmd[3]);
// Allow absolute and relative specifiers
if (cmd[3].StartsWith("/") || cmd[3].StartsWith("\\") || cmd[3].StartsWith(".."))
regionFile = cmd[3];
IScene scene;
CreateRegion(new RegionInfo(cmd[2], regionFile, false, ConfigSource.Source), true, out scene);
}
else if (cmd[3].EndsWith(".ini"))
{
string regionsDir = ConfigSource.Source.Configs["Startup"].GetString("regionload_regionsdir", "Regions").Trim();
string regionFile = String.Format("{0}/{1}", regionsDir, cmd[3]);
// Allow absolute and relative specifiers
if (cmd[3].StartsWith("/") || cmd[3].StartsWith("\\") || cmd[3].StartsWith(".."))
regionFile = cmd[3];
IScene scene;
CreateRegion(new RegionInfo(cmd[2], regionFile, false, ConfigSource.Source, cmd[2]), true, out scene);
}
else
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
{
Change command help text to show .ini in place of .xml when creating regions
2009-09-30 08:12:43 +00:00
m_log.Error("Usage: create region <region name> <region_file.ini>");
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
return;
}
}
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Enable logins
/// </summary>
/// <param name="module"></param>
/// <param name="cmd"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
private void HandleLoginEnable(string module, string[] cmd)
{
ProcessLogin(true);
}
* Apply http://opensimulator.org/mantis/view.php?id=2294 * This is an initial basic experimental code for inventory import and export from the region server * Probably not yet ready for general use * Thanks Kayne!
2008-09-29 14:41:16 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Disable logins
/// </summary>
/// <param name="module"></param>
/// <param name="cmd"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
private void HandleLoginDisable(string module, string[] cmd)
{
ProcessLogin(false);
}
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Log login status to the console
/// </summary>
/// <param name="module"></param>
/// <param name="cmd"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
private void HandleLoginStatus(string module, string[] cmd)
{
Moved the property RegionLoginsEnabled from GridComms to the Scene -- not the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff.
2009-09-25 15:39:09 +00:00
if (m_sceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled == false)
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
m_log.Info("[ Login ] Login are disabled ");
else
m_log.Info("[ Login ] Login are enabled");
}
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Change and load configuration file data.
/// </summary>
/// <param name="module"></param>
/// <param name="cmd"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
private void HandleConfig(string module, string[] cmd)
{
List<string> args = new List<string>(cmd);
args.RemoveAt(0);
string[] cmdparams = args.ToArray();
string n = "CONFIG";
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams.Length > 0)
{
switch (cmdparams[0].ToLower())
{
case "set":
if (cmdparams.Length < 4)
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("SYNTAX: " + n + " SET SECTION KEY VALUE");
m_log.Error("EXAMPLE: " + n + " SET ScriptEngine.DotNetEngine NumberOfScriptThreads 5");
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
}
else
{
IConfig c;
IConfigSource source = new IniConfigSource();
c = source.AddConfig(cmdparams[1]);
if (c != null)
{
string _value = String.Join(" ", cmdparams, 3, cmdparams.Length - 3);
c.Set(cmdparams[2], _value);
m_config.Source.Merge(source);
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error(n + " " + n + " " + cmdparams[1] + " " + cmdparams[2] + " " +
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
_value);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
}
}
break;
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
case "get":
if (cmdparams.Length < 3)
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("SYNTAX: " + n + " GET SECTION KEY");
m_log.Error("EXAMPLE: " + n + " GET ScriptEngine.DotNetEngine NumberOfScriptThreads");
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
}
else
{
Implement .ini file includes. Anything that begins with "Include-" will be treated as another ini source to load. For example: Include-Asset = AssetSetup.ini will load AssetSetup.ini after all other ini files are done. This works recursively, too
2009-05-21 23:06:10 +00:00
IConfig c = m_config.Source.Configs[cmdparams[1]];
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (c == null)
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Section \"" + cmdparams[1] + "\" does not exist.");
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
break;
}
else
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info(n + " GET " + cmdparams[1] + " " + cmdparams[2] + ": " +
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
c.GetString(cmdparams[2]));
}
}
Thanks SachaMagne for a patch which adds the following console commands: login-enable : Allow login at sim level (opensim.exe) login-disable: Stop any login BUT keep the logged avt login-status : Return the actual status
2008-11-24 09:53:49 +00:00
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
break;
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
case "save":
Change "config save" to "config save <filename>", which is mandatory. File name is enforced to NOT be OpenSim.ini
2009-10-20 13:02:11 +00:00
if (cmdparams.Length < 2)
{
m_log.Error("SYNTAX: " + n + " SAVE FILE");
return;
}
if (Application.iniFilePath == cmdparams[1])
{
m_log.Error("FILE can not be "+Application.iniFilePath);
return;
}
m_log.Info("Saving configuration file: " + cmdparams[1]);
m_config.Save(cmdparams[1]);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
break;
}
}
}
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Load, Unload, and list Region modules in use
/// </summary>
/// <param name="module"></param>
/// <param name="cmd"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
private void HandleModules(string module, string[] cmd)
{
List<string> args = new List<string>(cmd);
args.RemoveAt(0);
string[] cmdparams = args.ToArray();
Allow create-region to load files from arbitrary locations
2008-09-30 10:50:41 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams.Length > 0)
{
switch (cmdparams[0].ToLower())
{
case "list":
foreach (IRegionModule irm in m_moduleLoader.GetLoadedSharedModules)
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Shared region module: " + irm.Name);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
}
break;
case "unload":
if (cmdparams.Length > 1)
{
foreach (IRegionModule rm in new ArrayList(m_moduleLoader.GetLoadedSharedModules))
{
if (rm.Name.ToLower() == cmdparams[1].ToLower())
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Unloading module: " + rm.Name);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
m_moduleLoader.UnloadModule(rm);
}
}
}
break;
case "load":
if (cmdparams.Length > 1)
{
foreach (Scene s in new ArrayList(m_sceneManager.Scenes))
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Loading module: " + cmdparams[1]);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
m_moduleLoader.LoadRegionModules(cmdparams[1], s);
}
}
break;
}
}
}
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
/// <summary>
/// Runs commands issued by the server console from the operator
/// </summary>
/// <param name="command">The first argument of the parameter (the command)</param>
/// <param name="cmdparams">Additional arguments passed to the command</param>
public void RunCommand(string module, string[] cmdparams)
{
List<string> args = new List<string>(cmdparams);
if (args.Count < 1)
return;
adds support to delete a region completely and offers that functionality via the console command "delete-region" and also via RemoteAdminPlugin. minor typo fix.
2008-09-18 15:44:05 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
string command = args[0];
args.RemoveAt(0);
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
cmdparams = args.ToArray();
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
switch (command)
{
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
case "command-script":
if (cmdparams.Length > 0)
{
RunCommandScript(cmdparams[0]);
}
break;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
case "backup":
m_sceneManager.BackupCurrentScene();
break;
case "remove-region":
string regRemoveName = CombineParams(cmdparams, 0);
Scene removeScene;
if (m_sceneManager.TryGetScene(regRemoveName, out removeScene))
RemoveRegion(removeScene, false);
else
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("no region with that name");
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
break;
case "delete-region":
string regDeleteName = CombineParams(cmdparams, 0);
Scene killScene;
if (m_sceneManager.TryGetScene(regDeleteName, out killScene))
RemoveRegion(killScene, true);
else
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("no region with that name");
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
break;
case "restart":
m_sceneManager.RestartCurrentScene();
break;
case "Add-InventoryHost":
if (cmdparams.Length > 0)
{
First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore.
2009-08-10 17:48:21 +00:00
m_log.Info("Not implemented.");
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
}
break;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
* refactor: clean up code for selecting regions on the region console
2008-08-05 17:00:35 +00:00
/// <summary>
* refactor: change method name
2008-08-05 17:03:06 +00:00
/// Change the currently selected region. The selected region is that operated upon by single region commands.
* refactor: clean up code for selecting regions on the region console
2008-08-05 17:00:35 +00:00
/// </summary>
/// <param name="cmdParams"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
protected void ChangeSelectedRegion(string module, string[] cmdparams)
* refactor: clean up code for selecting regions on the region console
2008-08-05 17:00:35 +00:00
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams.Length > 2)
* refactor: clean up code for selecting regions on the region console
2008-08-05 17:00:35 +00:00
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
string newRegionName = CombineParams(cmdparams, 2);
* refactor: clean up code for selecting regions on the region console
2008-08-05 17:00:35 +00:00
* Try and make the contents of the region prompt more obvious by returning to printing the selected region after a change attempt has been made.
2008-08-05 17:52:06 +00:00
if (!m_sceneManager.TrySetCurrentScene(newRegionName))
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("Couldn't select region " + newRegionName);
* refactor: clean up code for selecting regions on the region console
2008-08-05 17:00:35 +00:00
}
* Try and make the contents of the region prompt more obvious by returning to printing the selected region after a change attempt has been made.
2008-08-05 17:52:06 +00:00
else
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("Usage: change region <region name>");
Formatting cleanup.
2008-08-18 00:39:10 +00:00
}
* Try and make the contents of the region prompt more obvious by returning to printing the selected region after a change attempt has been made.
2008-08-05 17:52:06 +00:00
Formatting cleanup.
2008-08-18 00:39:10 +00:00
string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info(String.Format("Currently selected region is {0}", regionName));
Formatting cleanup.
2008-08-18 00:39:10 +00:00
m_console.DefaultPrompt = String.Format("Region ({0}) ", regionName);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
m_console.ConsoleScene = m_sceneManager.CurrentScene;
* refactor: clean up code for selecting regions on the region console
2008-08-05 17:00:35 +00:00
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
* Refactor: Minor cleanup of Debug method in OpenSim.cs
2008-07-12 19:47:45 +00:00
/// <summary>
/// Turn on some debugging values for OpenSim.
/// </summary>
/// <param name="args"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
protected void Debug(string module, string[] args)
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (args.Length == 1)
* Refactor: Minor cleanup of Debug method in OpenSim.cs
2008-07-12 19:47:45 +00:00
return;
Formatting cleanup.
2008-08-18 00:39:10 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
switch (args[1])
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
case "packet":
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (args.Length > 2)
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
int newDebug;
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (int.TryParse(args[2], out newDebug))
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
* minor: change m_debug to m_debugPacketLevel since that's what it is
2008-10-14 18:53:56 +00:00
m_sceneManager.SetDebugPacketLevelOnCurrentScene(newDebug);
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
else
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("packet debug should be 0..255");
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("New packet debug: " + newDebug.ToString());
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
break;
Formatting cleanup.
2008-08-18 00:39:10 +00:00
* refactor: collapse scene debug settings into same format as packet debug settings
2008-07-12 20:04:31 +00:00
case "scene":
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (args.Length == 5)
* refactor: collapse scene debug settings into same format as packet debug settings
2008-07-12 20:04:31 +00:00
{
if (m_sceneManager.CurrentScene == null)
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Please use 'change region <regioname>' first");
* refactor: collapse scene debug settings into same format as packet debug settings
2008-07-12 20:04:31 +00:00
}
else
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
bool scriptingOn = !Convert.ToBoolean(args[2]);
bool collisionsOn = !Convert.ToBoolean(args[3]);
bool physicsOn = !Convert.ToBoolean(args[4]);
* refactor: collapse scene debug settings into same format as packet debug settings
2008-07-12 20:04:31 +00:00
m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn);
Formatting cleanup.
2008-08-18 00:39:10 +00:00
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info(
* refactor: collapse scene debug settings into same format as packet debug settings
2008-07-12 20:04:31 +00:00
String.Format(
Formatting cleanup.
2008-08-18 00:39:10 +00:00
"Set debug scene scripting = {0}, collisions = {1}, physics = {2}",
* refactor: collapse scene debug settings into same format as packet debug settings
2008-07-12 20:04:31 +00:00
!scriptingOn, !collisionsOn, !physicsOn));
}
}
else
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)");
* refactor: collapse scene debug settings into same format as packet debug settings
2008-07-12 20:04:31 +00:00
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
break;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
default:
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("Unknown debug");
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
break;
}
}
Update svn properties, formatting cleanup.
2008-08-19 02:59:27 +00:00
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
// see BaseOpenSimServer
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Many commands list objects for debugging. Some of the types are listed here
/// </summary>
/// <param name="mod"></param>
/// <param name="cmd"></param>
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
public override void HandleShow(string mod, string[] cmd)
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
* Restore show information for the OpenSim region server (version, info, threads, etc.)
2009-02-09 18:11:09 +00:00
base.HandleShow(mod, cmd);
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
List<string> args = new List<string>(cmd);
args.RemoveAt(0);
string[] showParams = args.ToArray();
Formatting cleanup.
2008-05-16 01:22:11 +00:00
Changed "show users" command to display only root agents, "show users full" to display root and child agents (mantis #2171).
2008-09-12 22:39:17 +00:00
switch (showParams[0])
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
case "assets":
Removed IAssetCache. WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
2009-08-10 15:14:57 +00:00
m_log.Info("Not implemented.");
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
break;
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
Adding basic show users functionality back in to console. Mantis 1212
2008-05-22 04:55:23 +00:00
case "users":
Changed "show users" command to display only root agents, "show users full" to display root and child agents (mantis #2171).
2008-09-12 22:39:17 +00:00
IList agents;
if (showParams.Length > 1 && showParams[1] == "full")
{
agents = m_sceneManager.GetCurrentScenePresences();
}
else
{
agents = m_sceneManager.GetCurrentSceneAvatars();
}
Update svn properties. Formatting cleanup.
2008-05-25 23:27:38 +00:00
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info(String.Format("\nAgents connected: {0}\n", agents.Count));
Update svn properties. Formatting cleanup.
2008-05-25 23:27:38 +00:00
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info(
add agent position to output of "show users" console command
2009-11-30 09:09:03 +00:00
String.Format("{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}", "Firstname", "Lastname",
"Agent ID", "Root/Child", "Region", "Position"));
Adding basic show users functionality back in to console. Mantis 1212
2008-05-22 04:55:23 +00:00
foreach (ScenePresence presence in agents)
{
RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
string regionName;
if (regionInfo == null)
{
regionName = "Unresolvable";
}
else
{
regionName = regionInfo.RegionName;
}
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info(
Adding basic show users functionality back in to console. Mantis 1212
2008-05-22 04:55:23 +00:00
String.Format(
add agent position to output of "show users" console command
2009-11-30 09:09:03 +00:00
"{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}",
Mantis#2105. Thank you kindly, HomerHorwitz for a patch that addresses: Due to the many problems with not cleaned up child-agents, I thought it might make sense to be able to see them on the console. 'show users' on the region-server's console now outputs root- and child-agents (with "root" or "child" column)
2008-09-03 03:32:29 +00:00
presence.Firstname,
presence.Lastname,
presence.UUID,
presence.IsChildAgent ? "Child" : "Root",
add agent position to output of "show users" console command
2009-11-30 09:09:03 +00:00
regionName,
presence.AbsolutePosition.ToString()));
Adding basic show users functionality back in to console. Mantis 1212
2008-05-22 04:55:23 +00:00
}
Update svn properties. Formatting cleanup.
2008-05-25 23:27:38 +00:00
* Added the "show connections" command to print out all of the currently tracked IClientAPIs
2009-10-14 20:00:42 +00:00
m_log.Info(String.Empty);
break;
case "connections":
System.Text.StringBuilder connections = new System.Text.StringBuilder("Connections:\n");
m_sceneManager.ForEachScene(
delegate(Scene scene)
{
Removing the ClientManager reference from IScene and hiding it entirely inside Scene as an implementation detail. This will reduce programming error and make it easier to refactor the avatar vs client vs presence mess later on
2009-10-26 23:48:43 +00:00
scene.ForEachClient(
* Added the "show connections" command to print out all of the currently tracked IClientAPIs
2009-10-14 20:00:42 +00:00
delegate(IClientAPI client)
{
connections.AppendFormat("{0}: {1} ({2}) from {3} on circuit {4}\n",
scene.RegionInfo.RegionName, client.Name, client.AgentId, client.RemoteEndPoint, client.CircuitCode);
Removing the ClientManager reference from IScene and hiding it entirely inside Scene as an implementation detail. This will reduce programming error and make it easier to refactor the avatar vs client vs presence mess later on
2009-10-26 23:48:43 +00:00
}, false
* Added the "show connections" command to print out all of the currently tracked IClientAPIs
2009-10-14 20:00:42 +00:00
);
}
);
m_log.Info(connections.ToString());
Adding basic show users functionality back in to console. Mantis 1212
2008-05-22 04:55:23 +00:00
break;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
case "modules":
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("The currently loaded shared modules are:");
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Shared Module: " + module.Name);
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
break;
case "regions":
m_sceneManager.ForEachScene(
delegate(Scene scene)
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Region Name: " + scene.RegionInfo.RegionName + " , Region XLoc: " +
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
scene.RegionInfo.RegionLocX + " , Region YLoc: " +
scene.RegionInfo.RegionLocY + " , Region Port: " +
scene.RegionInfo.InternalEndPoint.Port.ToString());
});
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
break;
* Added "show queues" command that shows throttling queues for all clients. *** This only works for LLCLientView at the moment ***
2008-12-18 13:16:41 +00:00
case "queues":
Notice(GetQueuesReport());
break;
Thank you kindly, Patnad, for a patch that: This patch allow you to see region rating from the console. Type "show ratings" and it will show you the rating of all your regions.
2009-05-12 03:35:07 +00:00
case "ratings":
m_sceneManager.ForEachScene(
delegate(Scene scene)
{
string rating = "";
if (scene.RegionInfo.RegionSettings.Maturity == 1)
{
rating = "MATURE";
}
else if (scene.RegionInfo.RegionSettings.Maturity == 2)
{
rating = "ADULT";
}
else
{
rating = "PG";
}
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Info("Region Name: " + scene.RegionInfo.RegionName + " , Region Rating: " +
Thank you kindly, Patnad, for a patch that: This patch allow you to see region rating from the console. Type "show ratings" and it will show you the rating of all your regions.
2009-05-12 03:35:07 +00:00
rating);
});
break;
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
}
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// print UDP Queue data for each client
/// </summary>
/// <returns></returns>
* Added "show queues" command that shows throttling queues for all clients. *** This only works for LLCLientView at the moment ***
2008-12-18 13:16:41 +00:00
private string GetQueuesReport()
{
string report = String.Empty;
m_sceneManager.ForEachScene(delegate(Scene scene)
{
scene.ForEachClient(delegate(IClientAPI client)
{
if (client is IStatsCollector)
{
report = report + client.FirstName +
" " + client.LastName + "\n";
IStatsCollector stats =
(IStatsCollector) client;
report = report + string.Format("{0,7} {1,7} {2,7} {3,7} {4,7} {5,7} {6,7} {7,7} {8,7} {9,7}\n",
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
"Send",
"In",
"Out",
"Resend",
"Land",
"Wind",
"Cloud",
"Task",
"Texture",
"Asset");
* Added "show queues" command that shows throttling queues for all clients. *** This only works for LLCLientView at the moment ***
2008-12-18 13:16:41 +00:00
report = report + stats.Report() +
"\n\n";
}
});
});
return report;
}
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Use XML2 format to serialize data to a file
/// </summary>
/// <param name="module"></param>
/// <param name="cmdparams"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
protected void SavePrimsXml2(string module, string[] cmdparams)
{
if (cmdparams.Length > 5)
{
m_sceneManager.SaveNamedPrimsToXml2(cmdparams[3], cmdparams[4]);
}
else
{
m_sceneManager.SaveNamedPrimsToXml2("Primitive", DEFAULT_PRIM_BACKUP_FILENAME);
}
}
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Use XML format to serialize data to a file
/// </summary>
/// <param name="module"></param>
/// <param name="cmdparams"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
protected void SaveXml(string module, string[] cmdparams)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason.");
if (cmdparams.Length > 0)
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
m_sceneManager.SaveCurrentSceneToXml(cmdparams[2]);
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
}
else
{
m_sceneManager.SaveCurrentSceneToXml(DEFAULT_PRIM_BACKUP_FILENAME);
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
}
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Loads data and region objects from XML format.
/// </summary>
/// <param name="module"></param>
/// <param name="cmdparams"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
protected void LoadXml(string module, string[] cmdparams)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason.");
* This is the fabled LibOMV update with all of the libOMV types from JHurliman * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
2008-09-06 07:52:41 +00:00
Vector3 loadOffset = new Vector3(0, 0, 0);
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams.Length > 2)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
bool generateNewIDS = false;
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams.Length > 3)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams[3] == "-newUID")
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
generateNewIDS = true;
}
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams.Length > 4)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
loadOffset.X = (float) Convert.ToDecimal(cmdparams[4]);
if (cmdparams.Length > 5)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
loadOffset.Y = (float) Convert.ToDecimal(cmdparams[5]);
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
}
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams.Length > 6)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
loadOffset.Z = (float) Convert.ToDecimal(cmdparams[6]);
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
}
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("loadOffsets <X,Y,Z> = <" + loadOffset.X + "," + loadOffset.Y + "," +
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
loadOffset.Z + ">");
}
}
m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
}
else
{
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
try
{
m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false, loadOffset);
}
* minor: Adjust exception catching on load/save xml[2]/oar. * Allow non FileNotFoundExceptions to propogate rather than post a misleading error message
2009-03-25 19:21:28 +00:00
catch (FileNotFoundException)
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("Default xml not found. Usage: load-xml <filename>");
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
}
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
}
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Serialize region data to XML2Format
/// </summary>
/// <param name="module"></param>
/// <param name="cmdparams"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
protected void SaveXml2(string module, string[] cmdparams)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams.Length > 2)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
* minor: Adjust exception catching on load/save xml[2]/oar. * Allow non FileNotFoundExceptions to propogate rather than post a misleading error message
2009-03-25 19:21:28 +00:00
m_sceneManager.SaveCurrentSceneToXml2(cmdparams[2]);
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
}
else
{
m_sceneManager.SaveCurrentSceneToXml2(DEFAULT_PRIM_BACKUP_FILENAME);
}
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
* minor: Comments
2009-08-13 02:54:57 +00:00
/// <summary>
/// Load region data from Xml2Format
/// </summary>
/// <param name="module"></param>
/// <param name="cmdparams"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
protected void LoadXml2(string module, string[] cmdparams)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
if (cmdparams.Length > 2)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
* Apply http://opensimulator.org/mantis/view.php?id=3191 * Make load/save oar and load/save xml2 behave a little better when there is an io problem * Thanks dslake
2009-02-26 21:00:33 +00:00
try
{
m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]);
}
* minor: Adjust exception catching on load/save xml[2]/oar. * Allow non FileNotFoundExceptions to propogate rather than post a misleading error message
2009-03-25 19:21:28 +00:00
catch (FileNotFoundException)
* Apply http://opensimulator.org/mantis/view.php?id=3191 * Make load/save oar and load/save xml2 behave a little better when there is an io problem * Thanks dslake
2009-02-26 21:00:33 +00:00
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("Specified xml not found. Usage: load xml2 <filename>");
* Apply http://opensimulator.org/mantis/view.php?id=3191 * Make load/save oar and load/save xml2 behave a little better when there is an io problem * Thanks dslake
2009-02-26 21:00:33 +00:00
}
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
}
else
{
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
try
{
m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME);
}
* minor: Adjust exception catching on load/save xml[2]/oar. * Allow non FileNotFoundExceptions to propogate rather than post a misleading error message
2009-03-25 19:21:28 +00:00
catch (FileNotFoundException)
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error("Default xml not found. Usage: load xml2 <filename>");
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
}
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
}
* Put in stub code for inventory backup. * No user functionality yet (and not for quite some time)
2008-07-29 14:28:08 +00:00
/// <summary>
Now we are past revision 10000, I think its time to start to fix that massive bug that was introduced in revision 1. So here is the first part of that fix.
2009-07-10 11:03:38 +00:00
/// Load a whole region from an opensimulator archive.
* Put in stub code for inventory backup. * No user functionality yet (and not for quite some time)
2008-07-29 14:28:08 +00:00
/// </summary>
/// <param name="cmdparams"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
protected void LoadOar(string module, string[] cmdparams)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
* minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191 * didn't realize that we were getting back plain old exceptions
2009-05-18 18:44:55 +00:00
try
Formatting cleanup.
2009-09-30 16:00:09 +00:00
{
pass all command parameters to load/save oar, not just the filename unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
2009-11-24 17:28:38 +00:00
m_sceneManager.LoadArchiveToCurrentScene(cmdparams);
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
}
* minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191 * didn't realize that we were getting back plain old exceptions
2009-05-18 18:44:55 +00:00
catch (Exception e)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
m_log.Error(e.Message);
Formatting cleanup.
2009-09-30 16:00:09 +00:00
}
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
}
Formatting cleanup.
2008-08-18 00:39:10 +00:00
* Put in stub code for inventory backup. * No user functionality yet (and not for quite some time)
2008-07-29 14:28:08 +00:00
/// <summary>
/// Save a region to a file, including all the assets needed to restore it.
/// </summary>
/// <param name="cmdparams"></param>
Replace the console for all OpenSim apps with a new console featuring command line editing, context sensitive help (press ? at any time), command line history, a new plugin command system and new appender features thet let you type while the console is scrolling. Seamlessly integrates the ICommander interfaces.
2009-02-07 12:25:39 +00:00
protected void SaveOar(string module, string[] cmdparams)
* refactor: Move xml/archive loading and saving code into separate methods ready for future modularization
2008-07-12 20:14:17 +00:00
{
pass all command parameters to load/save oar, not just the filename unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
2009-11-24 17:28:38 +00:00
m_sceneManager.SaveCurrentSceneToArchive(cmdparams);
Formatting cleanup.
2008-08-18 00:39:10 +00:00
}
Caught exceptions in some console commands From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2009-01-12 15:34:05 +00:00
* In ur code. Making it static. * Converted a bunch of functions to static functions.
2008-05-01 16:03:53 +00:00
private static string CombineParams(string[] commandParams, int pos)
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
{
string result = String.Empty;
for (int i = pos; i < commandParams.Length; i++)
{
result += commandParams[i] + " ";
}
result = result.TrimEnd(' ');
return result;
}
patch kill by UUID Signed-off-by: Melanie <melanie@t-data.com>
2009-10-23 14:11:25 +00:00
/// <summary>
/// Kill an object given its UUID.
/// </summary>
/// <param name="cmdparams"></param>
protected void KillUUID(string module, string[] cmdparams)
{
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
if (cmdparams.Length > 2)
patch kill by UUID Signed-off-by: Melanie <melanie@t-data.com>
2009-10-23 14:11:25 +00:00
{
UUID id = UUID.Zero;
SceneObjectGroup grp = null;
Scene sc = null;
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
if (!UUID.TryParse(cmdparams[2], out id))
patch kill by UUID Signed-off-by: Melanie <melanie@t-data.com>
2009-10-23 14:11:25 +00:00
{
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
MainConsole.Instance.Output("[KillUUID]: Error bad UUID format!");
patch kill by UUID Signed-off-by: Melanie <melanie@t-data.com>
2009-10-23 14:11:25 +00:00
return;
}
m_sceneManager.ForEachScene(
delegate(Scene scene)
{
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
SceneObjectPart part = scene.GetSceneObjectPart(id);
if (part == null)
return;
grp = part.ParentGroup;
sc = scene;
patch kill by UUID Signed-off-by: Melanie <melanie@t-data.com>
2009-10-23 14:11:25 +00:00
});
if (grp == null)
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
{
MainConsole.Instance.Output(String.Format("[KillUUID]: Given UUID {0} not found!", id));
}
patch kill by UUID Signed-off-by: Melanie <melanie@t-data.com>
2009-10-23 14:11:25 +00:00
else
{
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
MainConsole.Instance.Output(String.Format("[KillUUID]: Found UUID {0} in scene {1}", id, sc.RegionInfo.RegionName));
patch kill by UUID Signed-off-by: Melanie <melanie@t-data.com>
2009-10-23 14:11:25 +00:00
try
{
sc.DeleteSceneObject(grp, false);
}
catch (Exception e)
{
m_log.ErrorFormat("[KillUUID]: Error while removing objects from scene: " + e);
}
}
}
else
{
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
MainConsole.Instance.Output("[KillUUID]: Usage: kill uuid <UUID>");
patch kill by UUID Signed-off-by: Melanie <melanie@t-data.com>
2009-10-23 14:11:25 +00:00
}
}
From: Dr Scofield <hud@zurich.ibm.com> Note: This is the first part of some changes from Dr Scofield to support console-less operation of an OpenSim region server. The changes are not yet complete. * refactors OpenSimMain into two classes: OpenSimMain and OpenSimMainConsole. OpenSimMainConsole derives from OpenSimMain and basically is the "old" OpenSimMain * drops StartConsole from RegionApplicationBase (was only called from the "old" OpenSimMain anyhow) * reverts the changes to TryGetScene(string, out scene) as that seems to work perfectly fine * adds a check to region-remove to see whether m_sceneManger.CurrentScene is non-null before comparing it against the region-to-be-removed
2008-04-28 14:41:46 +00:00
#endregion
Update svn properties. Formatting cleanup.
2008-06-09 08:46:33 +00:00
}
Directory defaults for region xml files when creating a new region got changed/lost with svn 8550 when a check was added for the file name having .xml extension. The extension check has been moved slightly earlier and the original directory logic restored. Fixes Mantis #3386
2009-04-05 10:31:18 +00:00
}