From 6630706dd9507c216a88de66dca8d4439c03ac49 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Sat, 9 Aug 2008 21:01:33 +0000 Subject: * Reinstate grid receive and send keys to user server config * Looks like these weren't so unused after all - oops! * Remove message from grid server config --- OpenSim/Framework/UserConfig.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'OpenSim/Framework/UserConfig.cs') diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index cb3365f..6cf526c 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs @@ -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; -- cgit v1.1