From 646bbbc84b8010e0dacbeed5342cdb045f46cc49 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 27 Jun 2007 15:28:52 +0000
Subject: Some work on restructuring the namespaces / project names. Note this
doesn't compile yet as not all the code has been changed to use the new
namespaces. Am committing it now for feedback on the namespaces.
---
OpenSim/Region/Application/Application.cs | 121 +++++++
OpenSim/Region/Application/OpenSim.csproj | 181 ++++++++++
OpenSim/Region/Application/OpenSim.csproj.user | 13 +
OpenSim/Region/Application/OpenSimMain.cs | 476 +++++++++++++++++++++++++
4 files changed, 791 insertions(+)
create mode 100644 OpenSim/Region/Application/Application.cs
create mode 100644 OpenSim/Region/Application/OpenSim.csproj
create mode 100644 OpenSim/Region/Application/OpenSim.csproj.user
create mode 100644 OpenSim/Region/Application/OpenSimMain.cs
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
new file mode 100644
index 0000000..40701b0
--- /dev/null
+++ b/OpenSim/Region/Application/Application.cs
@@ -0,0 +1,121 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.
+* * Neither the name of the OpenSim Project nor the
+* 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;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Console;
+
+namespace OpenSim
+{
+ public class Application
+ {
+ //could move our main function into OpenSimMain and kill this class
+ [STAThread]
+ public static void Main(string[] args)
+ {
+ Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
+ Console.WriteLine("Starting...\n");
+
+ bool sandBoxMode = false;
+ bool startLoginServer = false;
+ string physicsEngine = "basicphysics";
+ bool allowFlying = false;
+ bool userAccounts = false;
+ bool gridLocalAsset = false;
+ bool useConfigFile = false;
+ bool silent = false;
+ string configFile = "simconfig.xml";
+
+ for (int i = 0; i < args.Length; i++)
+ {
+ if (args[i] == "-sandbox")
+ {
+ sandBoxMode = true;
+ startLoginServer = true;
+ }
+ /*
+ if (args[i] == "-loginserver")
+ {
+ startLoginServer = true;
+ }*/
+ if (args[i] == "-accounts")
+ {
+ userAccounts = true;
+ }
+ if (args[i] == "-realphysx")
+ {
+ physicsEngine = "RealPhysX";
+ allowFlying = true;
+ }
+ if (args[i] == "-ode")
+ {
+ physicsEngine = "OpenDynamicsEngine";
+ allowFlying = true;
+ }
+ if (args[i] == "-localasset")
+ {
+ gridLocalAsset = true;
+ }
+ if (args[i] == "-configfile")
+ {
+ useConfigFile = true;
+ }
+ if (args[i] == "-noverbose")
+ {
+ silent = true;
+ }
+ if (args[i] == "-config")
+ {
+ try
+ {
+ i++;
+ configFile = args[i];
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine("-config: Please specify a config file. (" + e.ToString() + ")");
+ }
+ }
+ }
+
+ OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, silent, configFile);
+ // OpenSimRoot.Instance.Application = sim;
+ sim.m_sandbox = sandBoxMode;
+ sim.user_accounts = userAccounts;
+ sim.gridLocalAsset = gridLocalAsset;
+ OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
+
+ sim.StartUp();
+
+ while (true)
+ {
+ OpenSim.Framework.Console.MainLog.Instance.MainLogPrompt();
+ }
+ }
+ }
+}
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
new file mode 100644
index 0000000..214f2cf
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -0,0 +1,181 @@
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {438A9556-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ OpenSim
+ JScript
+ Grid
+ IE50
+ false
+ Exe
+
+ OpenSim
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ ..\..\..\bin\Axiom.MathLib.dll
+ False
+
+
+ ..\..\..\bin\Db4objects.Db4o.dll
+ False
+
+
+ ..\..\..\bin\libsecondlife.dll
+ False
+
+
+ System.dll
+ False
+
+
+ System.Xml.dll
+ False
+
+
+ ..\..\..\bin\XMLRPC.dll
+ False
+
+
+
+
+ OpenSim.Framework
+ {8ACA2445-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Communications
+ {CB52B7E7-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Communications.OGS1
+ {6109024D-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Console
+ {A7CD0630-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.GenericConfig.Xml
+ {C74E4A30-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.UserManagement
+ {586E2916-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Caches
+ {61FCCDB3-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.ClientStack
+ {DC3698B2-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.LocalCommunications
+ {EB3A1BA8-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Simulation
+ {C0DAB338-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Terrain.BasicTerrain
+ {C9E0F891-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/Region/Application/OpenSim.csproj.user b/OpenSim/Region/Application/OpenSim.csproj.user
new file mode 100644
index 0000000..2ff1c4c
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSim.csproj.user
@@ -0,0 +1,13 @@
+
+
+ Debug
+ AnyCPU
+ -loginserver -sandbox -accounts
+ C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\
+ 8.0.50727
+ ProjectFiles
+ 0
+
+
+
+
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
new file mode 100644
index 0000000..7da2263
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -0,0 +1,476 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.
+* * Neither the name of the OpenSim Project nor the
+* 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;
+using System.Text;
+using System.IO;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Region;
+using OpenSim.Region.Scenes;
+using OpenSim.Terrain;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework;
+using OpenSim.Assets;
+using OpenSim.Caches;
+using OpenSim.Framework.Console;
+using OpenSim.Physics.Manager;
+using Nwc.XmlRpc;
+using OpenSim.Servers;
+using OpenSim.GenericConfig;
+using OpenGrid.Framework.Communications;
+using OpenSim.LocalCommunications;
+using OpenGrid.Framework.Communications.OGS1;
+
+namespace OpenSim
+{
+
+ public class OpenSimMain : RegionApplicationBase, conscmd_callback
+ {
+ // private CheckSumServer checkServer;
+ protected CommunicationsManager commsManager;
+
+ private bool m_silent;
+ private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
+
+ public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
+ {
+ this.configFileSetup = useConfigFile;
+ m_sandbox = sandBoxMode;
+ m_loginserver = startLoginServer;
+ m_physicsEngine = physicsEngine;
+ m_config = configFile;
+ m_silent = silent;
+ }
+
+ ///
+ /// Performs initialisation of the world, such as loading configuration from disk.
+ ///
+ public override void StartUp()
+ {
+ this.serversData = new NetworkServersInfo();
+
+ this.localConfig = new XmlConfig(m_config);
+ this.localConfig.LoadData();
+
+ if (this.configFileSetup)
+ {
+ this.SetupFromConfigFile(this.localConfig);
+ }
+
+ m_log = new LogBase(m_logFilename, "Region", this, m_silent);
+ OpenSim.Framework.Console.MainLog.Instance = m_log;
+
+ m_log.Verbose( "Main.cs:Startup() - Loading configuration");
+ this.serversData.InitConfig(this.m_sandbox, this.localConfig);
+ this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
+
+ ScenePresence.LoadTextureFile("avatar-texture.dat");
+
+ ClientView.TerrainManager = new TerrainManager(new SecondLife());
+
+ CommunicationsLocal sandboxCommunications = null;
+ if (m_sandbox)
+ {
+ this.SetupLocalGridServers();
+ // this.checkServer = new CheckSumServer(12036);
+ // this.checkServer.ServerListener();
+ sandboxCommunications = new CommunicationsLocal(this.serversData);
+ this.commsManager = sandboxCommunications;
+ }
+ else
+ {
+ this.SetupRemoteGridServers();
+ this.commsManager = new GridCommsManager(this.serversData);
+ }
+
+ startuptime = DateTime.Now;
+
+ this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
+ this.physManager.LoadPlugins();
+
+ this.SetupHttpListener();
+
+ this.SetupWorld();
+
+ m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server");
+
+
+
+ if (m_sandbox)
+ {
+ httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);
+ }
+
+ //Start http server
+ m_log.Verbose( "Main.cs:Startup() - Starting HTTP server");
+ httpServer.Start();
+
+ // Start UDP servers
+ for (int i = 0; i < m_udpServer.Count; i++)
+ {
+ this.m_udpServer[i].ServerListener();
+ }
+
+ }
+
+ # region Setup methods
+ protected override void SetupLocalGridServers()
+ {
+ try
+ {
+ AssetCache = new AssetCache("OpenSim.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+ InventoryCache = new InventoryCache();
+ }
+ catch (Exception e)
+ {
+ m_log.Error( e.Message + "\nSorry, could not setup local cache");
+ Environment.Exit(1);
+ }
+
+ }
+
+ protected override void SetupRemoteGridServers()
+ {
+ try
+ {
+ AssetCache = new AssetCache("OpenSim.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+ InventoryCache = new InventoryCache();
+ }
+ catch (Exception e)
+ {
+ m_log.Error( e.Message + "\nSorry, could not setup remote cache");
+ Environment.Exit(1);
+ }
+ }
+
+ protected override void SetupWorld()
+ {
+ IGenericConfig regionConfig;
+ Scene LocalWorld;
+ UDPServer udpServer;
+ RegionInfo regionDat = new RegionInfo();
+ AuthenticateSessionsBase authenBase;
+
+ string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions");
+ string[] configFiles = Directory.GetFiles(path, "*.xml");
+
+ if (configFiles.Length == 0)
+ {
+ string path2 = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions");
+ string path3 = Path.Combine(path2, "default.xml");
+ Console.WriteLine("Creating default region config file");
+ //TODO create default region
+ IGenericConfig defaultConfig = new XmlConfig(path3);
+ defaultConfig.LoadData();
+ defaultConfig.Commit();
+ defaultConfig.Close();
+ defaultConfig = null;
+ configFiles = Directory.GetFiles(path, "*.xml");
+ }
+
+ for (int i = 0; i < configFiles.Length; i++)
+ {
+ regionDat = new RegionInfo();
+ if (m_sandbox)
+ {
+ AuthenticateSessionsBase authen = new AuthenticateSessionsBase(); // new AuthenticateSessionsLocal();
+ this.AuthenticateSessionsHandler.Add(authen);
+ authenBase = authen;
+ }
+ else
+ {
+ AuthenticateSessionsBase authen = new AuthenticateSessionsBase(); //new AuthenticateSessionsRemote();
+ this.AuthenticateSessionsHandler.Add(authen);
+ authenBase = authen;
+ }
+ Console.WriteLine("Loading region config file");
+ regionConfig = new XmlConfig(configFiles[i]);
+ regionConfig.LoadData();
+ regionDat.InitConfig(this.m_sandbox, regionConfig);
+ regionConfig.Close();
+
+ udpServer = new UDPServer(regionDat.CommsIPListenPort, this.AssetCache, this.InventoryCache, this.m_log, authenBase);
+
+ m_udpServer.Add(udpServer);
+ this.regionData.Add(regionDat);
+
+ /*
+ m_log.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
+ m_log.Verbose( "Initialising world");
+ m_log.componentname = "Region " + regionData.RegionName;
+ */
+
+ LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager, this.AssetCache, httpServer);
+ this.m_localWorld.Add(LocalWorld);
+ //LocalWorld.InventoryCache = InventoryCache;
+ //LocalWorld.AssetCache = AssetCache;
+
+ udpServer.LocalWorld = LocalWorld;
+
+ LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
+ LocalWorld.LoadWorldMap();
+
+ m_log.Verbose( "Main.cs:Startup() - Starting up messaging system");
+ LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
+ LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
+ LocalWorld.LoadPrimsFromStorage();
+ LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+
+
+ LocalWorld.StartTimer();
+ }
+ }
+
+ protected override void SetupHttpListener()
+ {
+ httpServer = new BaseHttpServer(this.serversData.HttpListenerPort); //regionData[0].IPListenPort);
+
+ if (!this.m_sandbox)
+ {
+
+ // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
+
+
+ httpServer.AddRestHandler("GET", "/simstatus/",
+ delegate(string request, string path, string param)
+ {
+ return "OK";
+ });
+ }
+ }
+
+ protected override void ConnectToRemoteGridServer()
+ {
+
+ }
+
+ #endregion
+
+ private void SetupFromConfigFile(IGenericConfig configData)
+ {
+ // Log filename
+ string attri = "";
+ attri = configData.GetAttribute("LogFilename");
+ if (String.IsNullOrEmpty(attri))
+ {
+ }
+ else
+ {
+ m_logFilename = attri;
+ }
+
+ // SandBoxMode
+ attri = "";
+ attri = configData.GetAttribute("SandBox");
+ if ((attri == "") || ((attri != "false") && (attri != "true")))
+ {
+ this.m_sandbox = false;
+ configData.SetAttribute("SandBox", "false");
+ }
+ else
+ {
+ this.m_sandbox = Convert.ToBoolean(attri);
+ }
+
+ // LoginServer
+ attri = "";
+ attri = configData.GetAttribute("LoginServer");
+ if ((attri == "") || ((attri != "false") && (attri != "true")))
+ {
+ this.m_loginserver = false;
+ configData.SetAttribute("LoginServer", "false");
+ }
+ else
+ {
+ this.m_loginserver = Convert.ToBoolean(attri);
+ }
+
+ // Sandbox User accounts
+ attri = "";
+ attri = configData.GetAttribute("UserAccount");
+ if ((attri == "") || ((attri != "false") && (attri != "true")))
+ {
+ this.user_accounts = false;
+ configData.SetAttribute("UserAccounts", "false");
+ }
+ else if (attri == "true")
+ {
+ this.user_accounts = Convert.ToBoolean(attri);
+ }
+
+ // Grid mode hack to use local asset server
+ attri = "";
+ attri = configData.GetAttribute("LocalAssets");
+ if ((attri == "") || ((attri != "false") && (attri != "true")))
+ {
+ this.gridLocalAsset = false;
+ configData.SetAttribute("LocalAssets", "false");
+ }
+ else if (attri == "true")
+ {
+ this.gridLocalAsset = Convert.ToBoolean(attri);
+ }
+
+
+ attri = "";
+ attri = configData.GetAttribute("PhysicsEngine");
+ switch (attri)
+ {
+ default:
+ m_log.Warn( "Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
+ Environment.Exit(1);
+ break;
+
+ case "":
+ this.m_physicsEngine = "basicphysics";
+ configData.SetAttribute("PhysicsEngine", "basicphysics");
+ OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+ break;
+
+ case "basicphysics":
+ this.m_physicsEngine = "basicphysics";
+ configData.SetAttribute("PhysicsEngine", "basicphysics");
+ OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+ break;
+
+ case "RealPhysX":
+ this.m_physicsEngine = "RealPhysX";
+ OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+ break;
+
+ case "OpenDynamicsEngine":
+ this.m_physicsEngine = "OpenDynamicsEngine";
+ OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+ break;
+ }
+
+ configData.Commit();
+
+ }
+
+ ///
+ /// Performs any last-minute sanity checking and shuts down the region server
+ ///
+ public virtual void Shutdown()
+ {
+ m_log.Verbose( "Main.cs:Shutdown() - Closing all threads");
+ m_log.Verbose( "Main.cs:Shutdown() - Killing listener thread");
+ m_log.Verbose( "Main.cs:Shutdown() - Killing clients");
+ // IMPLEMENT THIS
+ m_log.Verbose( "Main.cs:Shutdown() - Closing console and terminating");
+ for (int i = 0; i < m_localWorld.Count; i++)
+ {
+ ((Scene)m_localWorld[i]).Close();
+ }
+ m_log.Close();
+ Environment.Exit(0);
+ }
+
+ #region Console Commands
+ ///
+ /// Runs commands issued by the server console from the operator
+ ///
+ /// The first argument of the parameter (the command)
+ /// Additional arguments passed to the command
+ public void RunCmd(string command, string[] cmdparams)
+ {
+ switch (command)
+ {
+ case "help":
+ m_log.Error( "show users - show info about connected users");
+ m_log.Error( "shutdown - disconnect all clients and shutdown");
+ break;
+
+ case "show":
+ if (cmdparams.Length > 0)
+ {
+ Show(cmdparams[0]);
+ }
+ break;
+
+ case "terrain":
+ string result = "";
+ for (int i = 0; i < m_localWorld.Count; i++)
+ {
+ if (!((Scene)m_localWorld[i]).Terrain.RunTerrainCmd(cmdparams, ref result))
+ {
+ m_log.Error(result);
+ }
+ }
+ break;
+
+ case "shutdown":
+ Shutdown();
+ break;
+
+ default:
+ m_log.Error( "Unknown command");
+ break;
+ }
+ }
+
+ ///
+ /// Outputs to the console information about the region
+ ///
+ /// What information to display (valid arguments are "uptime", "users")
+ public void Show(string ShowWhat)
+ {
+ switch (ShowWhat)
+ {
+ case "uptime":
+ m_log.Error( "OpenSim has been running since " + startuptime.ToString());
+ m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
+ break;
+ case "users":
+ OpenSim.Region.Scenes.ScenePresence TempAv;
+ m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
+ /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
+ {
+ if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
+ {
+ TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID];
+ m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
+ }
+ }*/
+ break;
+ }
+ }
+ #endregion
+ }
+
+
+}
\ No newline at end of file
--
cgit v1.1
From e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 16:39:11 +0000
Subject: *Some more restructuring/fixing -- should compile, but high chance I
forgot to add/remove something
---
OpenSim/Region/Application/Application.cs | 3 +-
OpenSim/Region/Application/OpenSim.csproj | 79 ++++++++++++++++---------------
OpenSim/Region/Application/OpenSimMain.cs | 28 ++++++-----
3 files changed, 58 insertions(+), 52 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 40701b0..1dcd99b 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -29,6 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Console;
+using OpenSim.Region.ClientStack;
namespace OpenSim
{
@@ -108,7 +109,7 @@ namespace OpenSim
sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts;
sim.gridLocalAsset = gridLocalAsset;
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
sim.StartUp();
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 214f2cf..fcde555 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -1,4 +1,4 @@
-
+
Local
8.0.50727
@@ -6,7 +6,8 @@
{438A9556-0000-0000-0000-000000000000}
Debug
AnyCPU
-
+
+
OpenSim
@@ -15,9 +16,11 @@
IE50
false
Exe
-
+
+
OpenSim
-
+
+
@@ -28,7 +31,8 @@
TRACE;DEBUG
-
+
+
True
4096
False
@@ -37,7 +41,8 @@
False
False
4
-
+
+
False
@@ -46,7 +51,8 @@
TRACE
-
+
+
False
4096
True
@@ -55,30 +61,31 @@
False
False
4
-
+
+
-
+
..\..\..\bin\Axiom.MathLib.dll
False
-
+
..\..\..\bin\Db4objects.Db4o.dll
False
-
+
..\..\..\bin\libsecondlife.dll
False
-
+
System.dll
False
-
+
System.Xml.dll
False
-
+
..\..\..\bin\XMLRPC.dll
False
@@ -88,79 +95,75 @@
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.Communications
{CB52B7E7-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.Communications.OGS1
- {6109024D-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.GenericConfig.Xml
{C74E4A30-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.Servers
{2CC71860-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.UserManagement
{586E2916-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.Caches
{61FCCDB3-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.ClientStack
{DC3698B2-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
-
- OpenSim.Region.LocalCommunications
+
{EB3A1BA8-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ OpenSim.Region.Communications.Local
+
+
+ {6109024D-0000-0000-0000-000000000000}
+ OpenSim.Region.Communications.OGS1
OpenSim.Region.Physics.Manager
{F4FF31EB-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
-
- OpenSim.Region.Simulation
+
+ OpenSim.Region.Environment
{C0DAB338-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.Terrain.BasicTerrain
{C9E0F891-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
@@ -178,4 +181,4 @@
-
+
\ No newline at end of file
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7da2263..db4185c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -38,22 +38,24 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Region;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
using OpenSim.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
using OpenSim.Framework.Console;
using OpenSim.Physics.Manager;
using Nwc.XmlRpc;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
using OpenSim.GenericConfig;
-using OpenGrid.Framework.Communications;
-using OpenSim.LocalCommunications;
-using OpenGrid.Framework.Communications.OGS1;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Communications.OGS1;
+using OpenSim.Region.Communications.Local;
+
+using OpenSim.Region.ClientStack;
namespace OpenSim
{
@@ -241,7 +243,7 @@ namespace OpenSim
udpServer.LocalWorld = LocalWorld;
- LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
+ LocalWorld.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
LocalWorld.LoadWorldMap();
m_log.Verbose( "Main.cs:Startup() - Starting up messaging system");
@@ -358,23 +360,23 @@ namespace OpenSim
case "":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
break;
case "basicphysics":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
break;
case "RealPhysX":
this.m_physicsEngine = "RealPhysX";
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
break;
case "OpenDynamicsEngine":
this.m_physicsEngine = "OpenDynamicsEngine";
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
break;
}
@@ -456,7 +458,7 @@ namespace OpenSim
m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
break;
case "users":
- OpenSim.Region.Scenes.ScenePresence TempAv;
+ OpenSim.Region.Environment.Scenes.ScenePresence TempAv;
m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
/* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
{
--
cgit v1.1
From fe120533efd0ec6b2248d96b9a1f8b7637c5dadd Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 17:12:32 +0000
Subject: *Updated prebuild.xml and ran prebuild again *Removed .user, .suo,
and unneccessary files in /bin/Physics/ *OpenSim.sln should compile with nant
and on windows now
---
OpenSim/Region/Application/OpenSim.csproj | 75 +++++++++++++-------------
OpenSim/Region/Application/OpenSim.csproj.user | 13 -----
2 files changed, 36 insertions(+), 52 deletions(-)
delete mode 100644 OpenSim/Region/Application/OpenSim.csproj.user
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index fcde555..d5730a4 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -1,4 +1,4 @@
-
+
Local
8.0.50727
@@ -6,8 +6,7 @@
{438A9556-0000-0000-0000-000000000000}
Debug
AnyCPU
-
-
+
OpenSim
@@ -16,11 +15,9 @@
IE50
false
Exe
-
-
+
OpenSim
-
-
+
@@ -31,8 +28,7 @@
TRACE;DEBUG
-
-
+
True
4096
False
@@ -41,8 +37,7 @@
False
False
4
-
-
+
False
@@ -51,8 +46,7 @@
TRACE
-
-
+
False
4096
True
@@ -61,31 +55,30 @@
False
False
4
-
-
+
-
+
..\..\..\bin\Axiom.MathLib.dll
False
-
+
..\..\..\bin\Db4objects.Db4o.dll
False
-
+
..\..\..\bin\libsecondlife.dll
False
-
+
System.dll
False
-
+
System.Xml.dll
False
-
+
..\..\..\bin\XMLRPC.dll
False
@@ -95,82 +88,86 @@
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.Communications
{CB52B7E7-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.GenericConfig.Xml
{C74E4A30-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.Servers
{2CC71860-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.UserManagement
{586E2916-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.Caches
{61FCCDB3-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.ClientStack
{DC3698B2-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
- {EB3A1BA8-0000-0000-0000-000000000000}
OpenSim.Region.Communications.Local
+ {BFB5D807-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
- {6109024D-0000-0000-0000-000000000000}
OpenSim.Region.Communications.OGS1
+ {4806E378-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
OpenSim.Region.Physics.Manager
{F4FF31EB-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
-
- OpenSim.Region.Environment
+
+ OpenSim.Region.Simulation
{C0DAB338-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.Terrain.BasicTerrain
{C9E0F891-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
-
+
Code
-
+
Code
@@ -181,4 +178,4 @@
-
\ No newline at end of file
+
diff --git a/OpenSim/Region/Application/OpenSim.csproj.user b/OpenSim/Region/Application/OpenSim.csproj.user
deleted file mode 100644
index 2ff1c4c..0000000
--- a/OpenSim/Region/Application/OpenSim.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- Debug
- AnyCPU
- -loginserver -sandbox -accounts
- C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\
- 8.0.50727
- ProjectFiles
- 0
-
-
-
-
--
cgit v1.1
From 1dcc814b703771c4dd96592b73727db2b54028a3 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 17:20:45 +0000
Subject: *More compile fixes (should be it on OpenSim.sln)
---
OpenSim/Region/Application/OpenSim.csproj | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index d5730a4..8e50e92 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -144,15 +144,15 @@
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Region.Physics.Manager
- {F4FF31EB-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Environment
+ {DCBA491C-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Region.Simulation
- {C0DAB338-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
--
cgit v1.1
From 9eaecabdd0884cfe17d249440badce1ecdbcc142 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 19:04:23 +0000
Subject: *Moved VersionInfo.cs to its correct place in OpenSim.csproj *Added
OpenSim.Region.Caps *Updated prebuild.xml and ran prebuild
---
OpenSim/Region/Application/OpenSim.csproj | 7 ++++--
OpenSim/Region/Application/OpenSimMain.cs | 2 +-
OpenSim/Region/Application/VersionInfo.cs | 38 +++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 OpenSim/Region/Application/VersionInfo.cs
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 8e50e92..8960664 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -164,10 +164,13 @@
-
+
Code
-
+
+ Code
+
+
Code
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index db4185c..e06d38c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -40,7 +40,7 @@ using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework;
diff --git a/OpenSim/Region/Application/VersionInfo.cs b/OpenSim/Region/Application/VersionInfo.cs
new file mode 100644
index 0000000..5d1354e
--- /dev/null
+++ b/OpenSim/Region/Application/VersionInfo.cs
@@ -0,0 +1,38 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.
+* * Neither the name of the OpenSim Project nor the
+* 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;
+
+namespace OpenSim
+{
+ ///
+ ///
+ public class VersionInfo
+ {
+ public static string Version = "0.3, SVN build ";
+ }
+}
--
cgit v1.1
From 0232f01a58a3c0a88e95c22589efec21f502f081 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 19:43:46 +0000
Subject: *Moved all the classes into their own file from LLSDHelpers.cs *Some
folder renaming to follow project Name *Updated prebuild.xml
---
OpenSim/Region/Application/OpenSim.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 8960664..3801067 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -144,7 +144,7 @@
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Region.Environment
{DCBA491C-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
--
cgit v1.1
From 440bb4a358cdc01559f624dbcbb7391d260616e0 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 02:07:59 +0000
Subject: *Fixed UserServer and OpenSim so now they start without crashing.
---
OpenSim/Region/Application/OpenSimMain.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e06d38c..7bf6b8d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -154,7 +154,7 @@ namespace OpenSim
{
try
{
- AssetCache = new AssetCache("OpenSim.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+ AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
InventoryCache = new InventoryCache();
}
catch (Exception e)
@@ -169,7 +169,7 @@ namespace OpenSim
{
try
{
- AssetCache = new AssetCache("OpenSim.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+ AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
InventoryCache = new InventoryCache();
}
catch (Exception e)
--
cgit v1.1
From 3456d951d89fbc83f742d40ca8ca2a1a79d414eb Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 28 Jun 2007 13:13:17 +0000
Subject: Imported the scripting changes, so now should be up to date with
sugilite.
---
OpenSim/Region/Application/OpenSim.csproj | 4 +-
OpenSim/Region/Application/OpenSim.exe.build | 59 ++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 OpenSim/Region/Application/OpenSim.exe.build
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 3801067..5cefa96 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -167,10 +167,10 @@
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
new file mode 100644
index 0000000..74eee5b
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.1
From 108d89f89436556c8f4662197903c374db943f7d Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 16:17:20 +0000
Subject: *Master User is now set up *Added support for getting user profile
information from remote grid server (untested) *Updated prebuild.xml
---
OpenSim/Region/Application/OpenSim.csproj | 12 +++++++++---
OpenSim/Region/Application/OpenSim.exe.build | 3 ++-
OpenSim/Region/Application/OpenSimMain.cs | 11 ++++++++++-
3 files changed, 21 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 5cefa96..f5da23d 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -102,6 +102,12 @@
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
OpenSim.Framework.GenericConfig.Xml
{C74E4A30-0000-0000-0000-000000000000}
@@ -164,13 +170,13 @@
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 74eee5b..9890cfa 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
+
-
@@ -26,6 +26,7 @@
+
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7bf6b8d..6e600b8 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -42,6 +42,8 @@ using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Terrain;
using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Data;
+
using OpenSim.Framework.Types;
using OpenSim.Framework;
using OpenSim.Assets;
@@ -250,7 +252,14 @@ namespace OpenSim
LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
LocalWorld.LoadPrimsFromStorage();
- LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+
+ //Master Avatar Setup
+ UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
+ if (masterAvatar != null)
+ {
+ LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
+ LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+ }
LocalWorld.StartTimer();
--
cgit v1.1
From d3363bbc28442d70ea8c196e47e6c734f4c01a92 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 17:03:09 +0000
Subject: *Renamed GridCommsManager to CommunicationsOGS1 to match
CommunicationsLocal -- its sandbox mode counterpart
---
OpenSim/Region/Application/OpenSimMain.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6e600b8..a5150e6 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -118,7 +118,7 @@ namespace OpenSim
else
{
this.SetupRemoteGridServers();
- this.commsManager = new GridCommsManager(this.serversData);
+ this.commsManager = new CommunicationsOGS1(this.serversData);
}
startuptime = DateTime.Now;
--
cgit v1.1
From fe0528b98cfc13d26ac7f1bf6bc23655be1f52e5 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 19:09:50 +0000
Subject: *Added UUIDNameRequest packet support (untested, but should work --
at least in sandbox mode) *Various small renamings
---
OpenSim/Region/Application/OpenSimMain.cs | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index a5150e6..fcb2493 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -64,8 +64,8 @@ namespace OpenSim
public class OpenSimMain : RegionApplicationBase, conscmd_callback
{
- // private CheckSumServer checkServer;
protected CommunicationsManager commsManager;
+ // private CheckSumServer checkServer;
private bool m_silent;
private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
@@ -106,14 +106,12 @@ namespace OpenSim
ClientView.TerrainManager = new TerrainManager(new SecondLife());
- CommunicationsLocal sandboxCommunications = null;
if (m_sandbox)
{
this.SetupLocalGridServers();
// this.checkServer = new CheckSumServer(12036);
// this.checkServer.ServerListener();
- sandboxCommunications = new CommunicationsLocal(this.serversData);
- this.commsManager = sandboxCommunications;
+ this.commsManager = new CommunicationsLocal(this.serversData);
}
else
{
@@ -136,7 +134,7 @@ namespace OpenSim
if (m_sandbox)
{
- httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);
+ httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
}
//Start http server
--
cgit v1.1
From 135e9b1f538ae77dfd8bf68139c960fb8e016c16 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 28 Jun 2007 19:35:20 +0000
Subject: * Removed J# language support because it has issues with Mono.
---
OpenSim/Region/Application/OpenSim.csproj | 6 +++---
OpenSim/Region/Application/OpenSim.exe.build | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index f5da23d..bec85cc 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -170,15 +170,15 @@
-
- Code
-
Code
Code
+
+ Code
+
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 9890cfa..6c7d7ac 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
-
+
--
cgit v1.1