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 | |
parent | Terrain: (diff) | |
download | opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.zip opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.gz opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.bz2 opensim-SC_OLD-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 '')
4 files changed, 84 insertions, 3 deletions
diff --git a/OpenSim/Framework/General/Configuration/InventoryConfig.cs b/OpenSim/Framework/General/Configuration/InventoryConfig.cs new file mode 100644 index 0000000..d84609b --- /dev/null +++ b/OpenSim/Framework/General/Configuration/InventoryConfig.cs | |||
@@ -0,0 +1,67 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Framework.Configuration | ||
6 | { | ||
7 | /// <summary> | ||
8 | /// UserConfig -- For User Server Configuration | ||
9 | /// </summary> | ||
10 | public class InventoryConfig | ||
11 | { | ||
12 | public string DefaultStartupMsg = ""; | ||
13 | public string UserServerURL = ""; | ||
14 | public string UserSendKey = ""; | ||
15 | public string UserRecvKey = ""; | ||
16 | |||
17 | public string DatabaseProvider = ""; | ||
18 | |||
19 | public int RemotingPort = 8004; | ||
20 | |||
21 | private ConfigurationMember configMember; | ||
22 | |||
23 | public InventoryConfig(string description, string filename) | ||
24 | { | ||
25 | configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); | ||
26 | configMember.performConfigurationRetrieve(); | ||
27 | } | ||
28 | |||
29 | public void loadConfigurationOptions() | ||
30 | { | ||
31 | configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false); | ||
32 | configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", false); | ||
33 | configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); | ||
34 | configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false); | ||
35 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | ||
36 | configMember.addConfigurationOption("remoting_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Remoting Listener port", "8004", false); | ||
37 | |||
38 | } | ||
39 | |||
40 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | ||
41 | { | ||
42 | switch (configuration_key) | ||
43 | { | ||
44 | case "default_startup_message": | ||
45 | this.DefaultStartupMsg = (string)configuration_result; | ||
46 | break; | ||
47 | case "default_user_server": | ||
48 | this.UserServerURL = (string)configuration_result; | ||
49 | break; | ||
50 | case "user_send_key": | ||
51 | this.UserSendKey = (string)configuration_result; | ||
52 | break; | ||
53 | case "user_recv_key": | ||
54 | this.UserRecvKey = (string)configuration_result; | ||
55 | break; | ||
56 | case "database_provider": | ||
57 | this.DatabaseProvider = (string)configuration_result; | ||
58 | break; | ||
59 | case "remoting_port": | ||
60 | RemotingPort = (int)configuration_result; | ||
61 | break; | ||
62 | } | ||
63 | |||
64 | return true; | ||
65 | } | ||
66 | } | ||
67 | } | ||
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; |
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs index b65488a..cf194fc 100644 --- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs | |||
@@ -49,6 +49,8 @@ namespace OpenSim.Framework.Types | |||
49 | public int HttpListenerPort = 9000; | 49 | public int HttpListenerPort = 9000; |
50 | public int RemotingListenerPort = 8895; | 50 | public int RemotingListenerPort = 8895; |
51 | 51 | ||
52 | public int InventoryServerPort; | ||
53 | public string InventoryServerName = ""; | ||
52 | 54 | ||
53 | public NetworkServersInfo() | 55 | public NetworkServersInfo() |
54 | { | 56 | { |
@@ -86,7 +88,8 @@ namespace OpenSim.Framework.Types | |||
86 | UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); | 88 | UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); |
87 | UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); | 89 | UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); |
88 | AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003"); | 90 | AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003"); |
89 | 91 | InventoryServerPort = config.Configs["Network"].GetInt("inventory_server_port", 8004); | |
92 | InventoryServerName = config.Configs["Network"].GetString("inventory_server_name", "127.0.0.1"); | ||
90 | } | 93 | } |
91 | } | 94 | } |
92 | } | 95 | } |
diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs index 9e9654d..feae4ae 100644 --- a/OpenSim/Framework/General/Types/UUID.cs +++ b/OpenSim/Framework/General/Types/UUID.cs | |||
@@ -91,12 +91,12 @@ namespace OpenSim.Framework.Types | |||
91 | 91 | ||
92 | public void Combine(UUID other) | 92 | public void Combine(UUID other) |
93 | { | 93 | { |
94 | llUUID.Combine(other.GetLLUUID()); | 94 | LLUUID.Combine(llUUID, other.GetLLUUID()); |
95 | } | 95 | } |
96 | 96 | ||
97 | public void Combine(LLUUID other) | 97 | public void Combine(LLUUID other) |
98 | { | 98 | { |
99 | llUUID.Combine(other); | 99 | LLUUID.Combine(llUUID, other); |
100 | } | 100 | } |
101 | 101 | ||
102 | public override bool Equals(Object other) | 102 | public override bool Equals(Object other) |