1 files changed, 29 insertions, 31 deletions
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 1e22fe8..67abbaf 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -34,18 +34,16 @@ namespace OpenSim.Framework
    /// </summary>
    public class InventoryConfig
    {
-        public string DefaultStartupMsg = String.Empty;
-        public string UserServerURL = String.Empty;
-        public string UserSendKey = String.Empty;
-        public string UserRecvKey = String.Empty;
-        public string DatabaseProvider = String.Empty;
-        public string DatabaseConnect = String.Empty;
        public static uint DefaultHttpPort = 8004;
-        public uint HttpPort = DefaultHttpPort;
        private ConfigurationMember configMember;
+        public string DatabaseConnect = String.Empty;
+        public string DatabaseProvider = String.Empty;
+        public string DefaultStartupMsg = String.Empty;
+        public uint HttpPort = DefaultHttpPort;
+        public string UserRecvKey = String.Empty;
+        public string UserSendKey = String.Empty;
+        public string UserServerURL = String.Empty;
        public InventoryConfig(string description, string filename)
        {
@@ -79,30 +77,30 @@ namespace OpenSim.Framework
        {
            switch (configuration_key)
            {
-            case "default_startup_message":
+                case "default_startup_message":
-                DefaultStartupMsg = (string) configuration_result;
+                    DefaultStartupMsg = (string) configuration_result;
-                break;
+                    break;
-            case "default_user_server":
+                case "default_user_server":
-                UserServerURL = (string) configuration_result;
+                    UserServerURL = (string) configuration_result;
-                break;
+                    break;
-            case "user_send_key":
+                case "user_send_key":
-                UserSendKey = (string) configuration_result;
+                    UserSendKey = (string) configuration_result;
-                break;
+                    break;
-            case "user_recv_key":
+                case "user_recv_key":
-                UserRecvKey = (string) configuration_result;
+                    UserRecvKey = (string) configuration_result;
-                break;
+                    break;
-            case "database_provider":
+                case "database_provider":
-                DatabaseProvider = (string) configuration_result;
+                    DatabaseProvider = (string) configuration_result;
-                break;
+                    break;
-            case "database_connect":
+                case "database_connect":
-                DatabaseConnect = (string) configuration_result;
+                    DatabaseConnect = (string) configuration_result;
-                break;
+                    break;
-            case "http_port":
+                case "http_port":
-                HttpPort = (uint) configuration_result;
+                    HttpPort = (uint) configuration_result;
-                break;
+                    break;
            }
            return true;
        }
    }
-}
+}
+\ No newline at end of file

diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs index 1e22fe8..67abbaf 100644 --- a/OpenSim/Framework/InventoryConfig.cs +++ b/OpenSim/Framework/InventoryConfig.cs
@@ -34,18 +34,16 @@ namespace OpenSim.Framework
34	/// </summary>	34	/// </summary>
35	public class InventoryConfig	35	public class InventoryConfig
36	{	36	{
37	public string DefaultStartupMsg = String.Empty;
38	public string UserServerURL = String.Empty;
39	public string UserSendKey = String.Empty;
40	public string UserRecvKey = String.Empty;
41
42	public string DatabaseProvider = String.Empty;
43	public string DatabaseConnect = String.Empty;
44	public static uint DefaultHttpPort = 8004;	37	public static uint DefaultHttpPort = 8004;
45		38
46	public uint HttpPort = DefaultHttpPort;
47
48	private ConfigurationMember configMember;	39	private ConfigurationMember configMember;
		40	public string DatabaseConnect = String.Empty;
		41	public string DatabaseProvider = String.Empty;
		42	public string DefaultStartupMsg = String.Empty;
		43	public uint HttpPort = DefaultHttpPort;
		44	public string UserRecvKey = String.Empty;
		45	public string UserSendKey = String.Empty;
		46	public string UserServerURL = String.Empty;
49		47
50	public InventoryConfig(string description, string filename)	48	public InventoryConfig(string description, string filename)
51	{	49	{
@@ -79,30 +77,30 @@ namespace OpenSim.Framework
79	{	77	{
80	switch (configuration_key)	78	switch (configuration_key)
81	{	79	{
82	case "default_startup_message":	80	case "default_startup_message":
83	DefaultStartupMsg = (string) configuration_result;	81	DefaultStartupMsg = (string) configuration_result;
84	break;	82	break;
85	case "default_user_server":	83	case "default_user_server":
86	UserServerURL = (string) configuration_result;	84	UserServerURL = (string) configuration_result;
87	break;	85	break;
88	case "user_send_key":	86	case "user_send_key":
89	UserSendKey = (string) configuration_result;	87	UserSendKey = (string) configuration_result;
90	break;	88	break;
91	case "user_recv_key":	89	case "user_recv_key":
92	UserRecvKey = (string) configuration_result;	90	UserRecvKey = (string) configuration_result;
93	break;	91	break;
94	case "database_provider":	92	case "database_provider":
95	DatabaseProvider = (string) configuration_result;	93	DatabaseProvider = (string) configuration_result;
96	break;	94	break;
97	case "database_connect":	95	case "database_connect":
98	DatabaseConnect = (string) configuration_result;	96	DatabaseConnect = (string) configuration_result;
99	break;	97	break;
100	case "http_port":	98	case "http_port":
101	HttpPort = (uint) configuration_result;	99	HttpPort = (uint) configuration_result;
102	break;	100	break;
103	}	101	}
104		102
105	return true;	103	return true;
106	}	104	}
107	}	105	}
108	}	106	} \ No newline at end of file