ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Reinstate grid receive and send keys to user server config

Browse Source 
* Looks like these weren't so unused after all - oops!
* Remove message from grid server config
This commit is contained in:
Justin Clarke Casey
2008-08-09 21:01:33 +00:00
parent e73b9c5f0a
commit 6630706dd9
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/UserConfig.cs
View File

@@ -42,6 +42,8 @@ namespace OpenSim.Framework
public string DefaultStartupMsg = String.Empty;
public uint DefaultX = 1000;
public uint DefaultY = 1000;
public string GridRecvKey = String.Empty;
public string GridSendKey = String.Empty;
public uint HttpPort = DefaultHttpPort;
public bool HttpSSL = DefaultHttpSSL;
@@ -96,6 +98,10 @@ namespace OpenSim.Framework
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default Grid Server URI",
"http://127.0.0.1:" + GridConfig.DefaultHttpPort + "/", false);
configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to send to grid server", "null", false);
configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to expect from grid server", "null", false);
configMember.addConfigurationOption("default_inventory_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -129,6 +135,12 @@ namespace OpenSim.Framework
case "default_grid_server":
GridServerURL = new Uri( (string) configuration_result );
break;
case "grid_send_key":
GridSendKey = (string) configuration_result;
break;
case "grid_recv_key":
GridRecvKey = (string) configuration_result;
break;
case "default_inventory_server":
InventoryUrl = new Uri((string) configuration_result);
break;