aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
authorlbsa712007-09-27 14:57:43 +0000
committerlbsa712007-09-27 14:57:43 +0000
commit863195612bdef56165f2b4354bab280c371618b9 (patch)
tree63cec15a6c0338a8777640ed13fd7c3ce05eeba7 /OpenSim/Framework/General
parentrevert change to libsecondlife.dll.config which breaks Linux (diff)
downloadopensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.zip
opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.gz
opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.bz2
opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.xz
Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/Configuration/InventoryConfig.cs67
-rw-r--r--OpenSim/Framework/General/Configuration/UserConfig.cs11
-rw-r--r--OpenSim/Framework/General/Types/NetworkServersInfo.cs5
-rw-r--r--OpenSim/Framework/General/Types/UUID.cs4
4 files changed, 3 insertions, 84 deletions
diff --git a/OpenSim/Framework/General/Configuration/InventoryConfig.cs b/OpenSim/Framework/General/Configuration/InventoryConfig.cs
deleted file mode 100644
index d84609b..0000000
--- a/OpenSim/Framework/General/Configuration/InventoryConfig.cs
+++ /dev/null
@@ -1,67 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace 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 16a7de4..776b911 100644
--- a/OpenSim/Framework/General/Configuration/UserConfig.cs
+++ b/OpenSim/Framework/General/Configuration/UserConfig.cs
@@ -18,9 +18,6 @@ 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
24 private ConfigurationMember configMember; 21 private ConfigurationMember configMember;
25 22
26 public UserConfig(string description, string filename) 23 public UserConfig(string description, string filename)
@@ -40,8 +37,6 @@ namespace OpenSim.Framework.Configuration
40 37
41 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8002", false); 38 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8002", false);
42 39
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);
45 } 40 }
46 41
47 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 42 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -64,12 +59,6 @@ namespace OpenSim.Framework.Configuration
64 this.DatabaseProvider = (string)configuration_result; 59 this.DatabaseProvider = (string)configuration_result;
65 break; 60 break;
66 61
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;
73 case "http_port": 62 case "http_port":
74 HttpPort = (uint)configuration_result; 63 HttpPort = (uint)configuration_result;
75 break; 64 break;
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index cf194fc..b65488a 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -49,8 +49,6 @@ 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 = "";
54 52
55 public NetworkServersInfo() 53 public NetworkServersInfo()
56 { 54 {
@@ -88,8 +86,7 @@ namespace OpenSim.Framework.Types
88 UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); 86 UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
89 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); 87 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
90 AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003"); 88 AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003");
91 InventoryServerPort = config.Configs["Network"].GetInt("inventory_server_port", 8004); 89
92 InventoryServerName = config.Configs["Network"].GetString("inventory_server_name", "127.0.0.1");
93 } 90 }
94 } 91 }
95} 92}
diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs
index feae4ae..9e9654d 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(llUUID, other.GetLLUUID()); 94 llUUID.Combine(other.GetLLUUID());
95 } 95 }
96 96
97 public void Combine(LLUUID other) 97 public void Combine(LLUUID other)
98 { 98 {
99 LLUUID.Combine(llUUID, other); 99 llUUID.Combine(other);
100 } 100 }
101 101
102 public override bool Equals(Object other) 102 public override bool Equals(Object other)