From 00473fcfee36015f8c5059fede54ff6203ea06bc Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sat, 9 Aug 2008 17:40:48 +0000
Subject: * minor: remove redundant welcome message from inventory grid server
 configuration

---
 OpenSim/Framework/InventoryConfig.cs | 10 ++--------
 OpenSim/Grid/InventoryServer/Main.cs |  1 -
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 66719c6..eeed3d2 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -30,7 +30,7 @@ using System;
 namespace OpenSim.Framework
 {
     /// <summary>
-    /// UserConfig -- For User Server Configuration
+    /// Defines and handles inventory grid server configuration
     /// </summary>
     public class InventoryConfig
     {
@@ -55,9 +55,6 @@ namespace OpenSim.Framework
 
         public void loadConfigurationOptions()
         {
-            configMember.addConfigurationOption("default_startup_message",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Default Startup Message", "Welcome to OGS", false);
             configMember.addConfigurationOption("default_user_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default User Server URI",
@@ -73,16 +70,13 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
             configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
-                                               "Enable Session lookup security", "True", false);
+                                                "Enable session lookup security", "True", false);
         }
 
         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
         {
             switch (configuration_key)
             {
-                case "default_startup_message":
-                    DefaultStartupMsg = (string) configuration_result;
-                    break;
                 case "default_user_server":
                     UserServerURL = (string) configuration_result;
                     break;
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 67889ac..fda1c96 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -70,7 +70,6 @@ namespace OpenSim.Grid.InventoryServer
             
             m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
 
-            //m_inventoryService = new GridInventoryService();
             m_inventoryService = new GridInventoryService(m_config.UserServerURL);
             m_inventoryService.DoLookup = m_config.SessionLookUp;
             m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
-- 
cgit v1.1