* Optimized usings

* Shortened type references
* Removed redundant 'this' qualifier

1 files changed, 24 insertions, 19 deletions

diff --git a/OpenSim/Framework/General/UserConfig.cs b/OpenSim/Framework/General/UserConfig.cs
index 3d79fc9..9abe61f 100644
--- a/OpenSim/Framework/General/UserConfig.cs
+++ b/OpenSim/Framework/General/UserConfig.cs
@@ -26,10 +26,6 @@
 * 

 */

 

-using System;

-using System.Collections.Generic;

-using System.Text;

-

 namespace OpenSim.Framework

 {

     /// <summary>

@@ -51,21 +47,30 @@ namespace OpenSim.Framework
 

         public UserConfig(string description, string filename)

         {

-            configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration);

+            configMember =

+                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);

             configMember.performConfigurationRetrieve();

         }

 

         public void loadConfigurationOptions()

         {

-            configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false);

-

-            configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);

-            configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);

-            configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);

-            configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);

+            configMember.addConfigurationOption("default_startup_message",

+                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,

+                                                "Default Startup Message", "Welcome to OGS", false);

 

-            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);

+            configMember.addConfigurationOption("default_grid_server",

+                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,

+                                                "Default Grid Server URI",

+                                                "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);

+            configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,

+                                                "Key to send to grid server", "null", false);

+            configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,

+                                                "Key to expect from grid server", "null", false);

+            configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,

+                                                "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);

 

+            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,

+                                                "Http Listener port", DefaultHttpPort.ToString(), false);

         }

 

         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)

@@ -73,26 +78,26 @@ namespace OpenSim.Framework
             switch (configuration_key)

             {

                 case "default_startup_message":

-                    this.DefaultStartupMsg = (string)configuration_result;

+                    DefaultStartupMsg = (string) configuration_result;

                     break;

                 case "default_grid_server":

-                    this.GridServerURL = (string)configuration_result;

+                    GridServerURL = (string) configuration_result;

                     break;

                 case "grid_send_key":

-                    this.GridSendKey = (string)configuration_result;

+                    GridSendKey = (string) configuration_result;

                     break;

                 case "grid_recv_key":

-                    this.GridRecvKey = (string)configuration_result;

+                    GridRecvKey = (string) configuration_result;

                     break;

                 case "database_provider":

-                    this.DatabaseProvider = (string)configuration_result;

+                    DatabaseProvider = (string) configuration_result;

                     break;

                 case "http_port":

-                    HttpPort = (uint)configuration_result;

+                    HttpPort = (uint) configuration_result;

                     break;

             }

 

             return true;

         }

     }

-}

+}
\ No newline at end of file