diff options
author | lbsa71 | 2007-09-27 13:25:45 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-27 13:25:45 +0000 |
commit | 8143c597fc5f62ec0d931d2d5b887730e06aec04 (patch) | |
tree | ae67873a5f801b2b7bdf9a7b088db98beb97b5ac /OpenSim/Framework/General/Configuration/UserConfig.cs | |
parent | Terrain: (diff) | |
download | opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.zip opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.gz opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.bz2 opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.xz |
* Tleiades grid mode inventory (#444) - thanx Tleiades!
* updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
Diffstat (limited to 'OpenSim/Framework/General/Configuration/UserConfig.cs')
-rw-r--r-- | OpenSim/Framework/General/Configuration/UserConfig.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/Configuration/UserConfig.cs index 776b911..16a7de4 100644 --- a/OpenSim/Framework/General/Configuration/UserConfig.cs +++ b/OpenSim/Framework/General/Configuration/UserConfig.cs | |||
@@ -18,6 +18,9 @@ namespace OpenSim.Framework.Configuration | |||
18 | 18 | ||
19 | public uint HttpPort = 8002; | 19 | public uint HttpPort = 8002; |
20 | 20 | ||
21 | public int InventoryServerPort; | ||
22 | public string InventoryServerName; | ||
23 | |||
21 | private ConfigurationMember configMember; | 24 | private ConfigurationMember configMember; |
22 | 25 | ||
23 | public UserConfig(string description, string filename) | 26 | public UserConfig(string description, string filename) |
@@ -37,6 +40,8 @@ namespace OpenSim.Framework.Configuration | |||
37 | 40 | ||
38 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8002", false); | 41 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8002", false); |
39 | 42 | ||
43 | configMember.addConfigurationOption("inventory_server_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Portnumber inventory is listening on", "8004", false); | ||
44 | configMember.addConfigurationOption("inventory_server_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DNS name of the inventory server", "127.0.0.1", false); | ||
40 | } | 45 | } |
41 | 46 | ||
42 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 47 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -59,6 +64,12 @@ namespace OpenSim.Framework.Configuration | |||
59 | this.DatabaseProvider = (string)configuration_result; | 64 | this.DatabaseProvider = (string)configuration_result; |
60 | break; | 65 | break; |
61 | 66 | ||
67 | case "inventory_server_port": | ||
68 | this.InventoryServerPort = (int)configuration_result; | ||
69 | break; | ||
70 | case "inventory_server_name": | ||
71 | this.InventoryServerName = (string)configuration_result; | ||
72 | break; | ||
62 | case "http_port": | 73 | case "http_port": |
63 | HttpPort = (uint)configuration_result; | 74 | HttpPort = (uint)configuration_result; |
64 | break; | 75 | break; |