From 65268a51ca094cd4510f5e30d0f15602bff1e4ee Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 5 Jun 2007 20:22:10 +0000 Subject: [PATCH] * Weird didnt commit inventory before --- .../GridConfigDb4o/DbGridConfig.cs | 2 +- .../DB4oGridData.cs | 2 +- .../DB4oManager.cs | 2 +- .../DB4oUserData.cs | 2 +- .../MSSQLGridData.cs | 2 +- .../MSSQLManager.cs | 2 +- .../MySQLGridData.cs | 2 +- .../MySQLInventoryData.cs | 2 +- .../MySQLLogData.cs | 2 +- .../MySQLManager.cs | 2 +- .../MySQLUserData.cs | 2 +- .../SQLiteGridData.cs | 2 +- .../SQLiteManager.cs | 2 +- .../OpenGrid.Framework.Data/GridData.cs | 2 +- .../OpenGrid.Framework.Data/ILogData.cs | 2 +- .../OpenGrid.Framework.Data/IniConfig.cs | 2 +- .../OpenGrid.Framework.Data/InventoryData.cs | 2 +- .../OpenGrid.Framework.Data/SimProfileData.cs | 2 +- .../OpenGrid.Framework.Data/UserData.cs | 2 +- .../UserProfileData.cs | 2 +- .../GridManagementAgent.cs | 2 +- .../GridServerManager.cs | 2 +- .../AssetHttpServer.cs | 2 +- .../InventoryManager.cs | 98 ++++++++++++++ .../OpenGridServices.InventoryServer/Main.cs | 61 +++++++++ .../OpenGridServices.InventoryServer.csproj | 128 ++++++++++++++++++ .../UserConfigDb4o/DbUserConfig.cs | 2 +- .../ServiceManager/ServiceManager.cs | 2 +- 28 files changed, 312 insertions(+), 25 deletions(-) create mode 100644 OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs create mode 100644 OpenGridServices/OpenGridServices.InventoryServer/Main.cs create mode 100644 OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs index 19cf6ac0d3..bd3a01b7cf 100644 --- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs +++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs index 723ff69581..1c014cd8a3 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs index 408b21363d..9bf0f3abfa 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs index db4deb88d8..489f8728d5 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs index 8362a1d750..884a6fd0a6 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs index 85e31295c4..7aa6fb8a19 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs index 5c2e567ea1..72538dae7b 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs index 9177cc3279..6accad7ab0 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs index 3765ae1b2a..fd89c184cb 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs index 6ddd02c1d3..cf0a3636cc 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs index 1bb91255f2..cd0ffd1377 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs index a67b2cd4f2..6baacfa9c8 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs index 87794386ed..1cec15d403 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data/GridData.cs b/OpenGridServices/OpenGrid.Framework.Data/GridData.cs index 4d1c0da995..5ba36e454d 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/GridData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data/GridData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs b/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs index 53d0204b35..0d87285da4 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs b/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs index df4f38bd00..e92eae386a 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs +++ b/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs b/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs index 88e58d62f5..c255e68923 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs b/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs index 3e654208c9..8747c364ee 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data/UserData.cs b/OpenGridServices/OpenGrid.Framework.Data/UserData.cs index d37ea717db..1600bd152d 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/UserData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data/UserData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs index 35ebcf38ea..f7dffb8d28 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs +++ b/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs index 0ee0e3d9d8..f2eabe4abf 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs +++ b/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs index c892f0f020..e6e68bf080 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs +++ b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs index 023e4c16a0..63186f8f3f 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs +++ b/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs b/OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs new file mode 100644 index 0000000000..a16d3d25c4 --- /dev/null +++ b/OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Text; +using OpenGrid.Framework.Data; +using libsecondlife; +using System.Reflection; + +using System.Xml; +using Nwc.XmlRpc; +using OpenSim.Framework.Sims; +using OpenSim.Framework.Inventory; +using OpenSim.Framework.Utilities; + +using System.Security.Cryptography; + +namespace OpenGridServices.InventoryServer +{ + class InventoryManager + { + Dictionary _plugins = new Dictionary(); + + /// + /// Adds a new inventory server plugin - user servers will be requested in the order they were loaded. + /// + /// The filename to the inventory server plugin DLL + public void AddPlugin(string FileName) + { + OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Invenstorage: Attempting to load " + FileName); + Assembly pluginAssembly = Assembly.LoadFrom(FileName); + + OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Invenstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); + foreach (Type pluginType in pluginAssembly.GetTypes()) + { + if (!pluginType.IsAbstract) + { + Type typeInterface = pluginType.GetInterface("IInventoryData", true); + + if (typeInterface != null) + { + IInventoryData plug = (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); + plug.Initialise(); + this._plugins.Add(plug.getName(), plug); + OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Invenstorage: Added IUserData Interface"); + } + + typeInterface = null; + } + } + + pluginAssembly = null; + } + + public List getRootFolders(LLUUID user) + { + foreach (KeyValuePair kvp in _plugins) + { + try + { + return kvp.Value.getUserRootFolders(user); + } + catch (Exception e) + { + OpenSim.Framework.Console.MainConsole.Instance.Notice("Unable to get root folders via " + kvp.Key + " (" + e.ToString() + ")"); + } + } + return null; + } + + public XmlRpcResponse XmlRpcInventoryRequest(XmlRpcRequest request) + { + XmlRpcResponse response = new XmlRpcResponse(); + Hashtable requestData = (Hashtable)request.Params[0]; + + Hashtable responseData = new Hashtable(); + + // Stuff happens here + + if (requestData.ContainsKey("Access-type")) + { + if (requestData["access-type"] == "rootfolders") + { +// responseData["rootfolders"] = + } + } + else + { + responseData["error"] = "No access-type specified."; + } + + + // Stuff stops happening here + + response.Value = responseData; + return response; + } + } +} diff --git a/OpenGridServices/OpenGridServices.InventoryServer/Main.cs b/OpenGridServices/OpenGridServices.InventoryServer/Main.cs new file mode 100644 index 0000000000..7bce96501f --- /dev/null +++ b/OpenGridServices/OpenGridServices.InventoryServer/Main.cs @@ -0,0 +1,61 @@ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Reflection; +using System.IO; +using System.Text; +using libsecondlife; +using OpenSim.Framework.User; +using OpenSim.Framework.Sims; +using OpenSim.Framework.Inventory; +using OpenSim.Framework.Interfaces; +using OpenSim.Framework.Console; +using OpenSim.Servers; +using OpenSim.Framework.Utilities; + +namespace OpenGridServices.InventoryServer +{ + public class OpenInventory_Main : BaseServer, conscmd_callback + { + ConsoleBase m_console; + InventoryManager m_inventoryManager; + + public static void Main(string[] args) + { + } + + public OpenInventory_Main() + { + m_console = new ConsoleBase("opengrid-inventory-console.log", "OpenInventory", this, false); + MainConsole.Instance = m_console; + } + + public void Startup() + { + MainConsole.Instance.Notice("Initialising inventory manager..."); + m_inventoryManager = new InventoryManager(); + + MainConsole.Instance.Notice("Starting HTTP server"); + BaseHttpServer httpServer = new BaseHttpServer(8004); + + httpServer.AddXmlRPCHandler("rootfolders", m_inventoryManager.XmlRpcInventoryRequest); + //httpServer.AddRestHandler("GET","/rootfolders/",Rest + } + + public void RunCmd(string cmd, string[] cmdparams) + { + switch (cmd) + { + case "shutdown": + m_console.Close(); + Environment.Exit(0); + break; + } + } + + public void Show(string ShowWhat) + { + } + } +} diff --git a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj new file mode 100644 index 0000000000..0836b8d948 --- /dev/null +++ b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj @@ -0,0 +1,128 @@ + + + Local + 8.0.50727 + 2.0 + {338FA00B-0000-0000-0000-000000000000} + Debug + AnyCPU + + + + OpenGridServices.InventoryServer + JScript + Grid + IE50 + false + Exe + + OpenGridServices.InventoryServer + + + + + + 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 + + + + + System.dll + False + + + System.Data.dll + False + + + System.Xml.dll + False + + + OpenSim.Framework.dll + False + + + OpenSim.Framework.Console.dll + False + + + OpenSim.GridInterfaces.Local.dll + False + + + OpenSim.Servers.dll + False + + + ..\..\bin\libsecondlife.dll + False + + + ..\..\bin\Db4objects.Db4o.dll + False + + + XMLRPC.dll + False + + + + + OpenGrid.Framework.Data + {62CDF671-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + + + Code + + + Code + + + Code + + + + + + + + + + diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs index 25ba74a4c3..cb33d0d066 100644 --- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs +++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) OpenSim project, http://www.openmetaverse.org/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/OpenGridServices/ServiceManager/ServiceManager.cs b/OpenGridServices/ServiceManager/ServiceManager.cs index 8200b5beb0..1bba266f1f 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.cs +++ b/OpenGridServices/ServiceManager/ServiceManager.cs @@ -225,7 +225,7 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase { try { ServiceBase.Run(new OpenGridMasterService()); } catch(Exception e) { - Console.WriteLine("THIS SHOULD NEVER HAPPEN!!!!!!!!!!!!!!!!!!!!!"); + Console.WriteLine("An error occured while initialising OGS master service."); Console.WriteLine(e.ToString()); } }