aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs21
-rw-r--r--OpenSim/Framework/Servers/MessageServerInfo.cs4
2 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 2859c25..5cef362 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -41,6 +41,10 @@ namespace OpenSim.Framework
41 public string UserSendKey = ""; 41 public string UserSendKey = "";
42 public string UserRecvKey = ""; 42 public string UserRecvKey = "";
43 43
44 public string GridServerURL = "";
45 public string GridSendKey = "";
46 public string GridRecvKey = "";
47
44 public string DatabaseProvider = ""; 48 public string DatabaseProvider = "";
45 public string GridCommsProvider = ""; 49 public string GridCommsProvider = "";
46 50
@@ -68,6 +72,14 @@ namespace OpenSim.Framework
68 "Key to send to user server", "null", false); 72 "Key to send to user server", "null", false);
69 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 73 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
70 "Key to expect from user server", "null", false); 74 "Key to expect from user server", "null", false);
75 configMember.addConfigurationOption("default_grid_server",
76 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
77 "Default Grid Server URI",
78 "http://127.0.0.1:8002/", false);
79 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
80 "Key to send to grid server", "null", false);
81 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
82 "Key to expect from user server", "null", false);
71 83
72 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 84 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
73 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 85 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
@@ -96,6 +108,15 @@ namespace OpenSim.Framework
96 case "user_recv_key": 108 case "user_recv_key":
97 UserRecvKey = (string)configuration_result; 109 UserRecvKey = (string)configuration_result;
98 break; 110 break;
111 case "default_grid_server":
112 GridServerURL = (string)configuration_result;
113 break;
114 case "grid_send_key":
115 GridSendKey = (string)configuration_result;
116 break;
117 case "grid_recv_key":
118 GridRecvKey = (string)configuration_result;
119 break;
99 case "database_provider": 120 case "database_provider":
100 DatabaseProvider = (string)configuration_result; 121 DatabaseProvider = (string)configuration_result;
101 break; 122 break;
diff --git a/OpenSim/Framework/Servers/MessageServerInfo.cs b/OpenSim/Framework/Servers/MessageServerInfo.cs
index 13d65f9..9d5fa8a 100644
--- a/OpenSim/Framework/Servers/MessageServerInfo.cs
+++ b/OpenSim/Framework/Servers/MessageServerInfo.cs
@@ -13,5 +13,9 @@ namespace OpenSim.Framework.Servers
13 public MessageServerInfo() 13 public MessageServerInfo()
14 { 14 {
15 } 15 }
16 public override string ToString()
17 {
18 return URI;
19 }
16 } 20 }
17} 21}