diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/NetworkServersInfo.cs | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index f720222..b25f8b9 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs | |||
@@ -42,8 +42,6 @@ namespace OpenSim.Framework | |||
42 | public string InventoryURL = String.Empty; | 42 | public string InventoryURL = String.Empty; |
43 | public bool secureInventoryServer = false; | 43 | public bool secureInventoryServer = false; |
44 | public bool isSandbox; | 44 | public bool isSandbox; |
45 | private uint? m_defaultHomeLocX; | ||
46 | private uint? m_defaultHomeLocY; | ||
47 | public string UserRecvKey = String.Empty; | 45 | public string UserRecvKey = String.Empty; |
48 | public string UserSendKey = String.Empty; | 46 | public string UserSendKey = String.Empty; |
49 | public string UserURL = String.Empty; | 47 | public string UserURL = String.Empty; |
@@ -59,24 +57,11 @@ namespace OpenSim.Framework | |||
59 | 57 | ||
60 | public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY) | 58 | public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY) |
61 | { | 59 | { |
62 | m_defaultHomeLocX = defaultHomeLocX; | ||
63 | m_defaultHomeLocY = defaultHomeLocY; | ||
64 | } | 60 | } |
65 | 61 | ||
66 | public uint DefaultHomeLocX | ||
67 | { | ||
68 | get { return m_defaultHomeLocX.Value; } | ||
69 | } | ||
70 | |||
71 | public uint DefaultHomeLocY | ||
72 | { | ||
73 | get { return m_defaultHomeLocY.Value; } | ||
74 | } | ||
75 | 62 | ||
76 | public void loadFromConfiguration(IConfigSource config) | 63 | public void loadFromConfiguration(IConfigSource config) |
77 | { | 64 | { |
78 | m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000); | ||
79 | m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000); | ||
80 | 65 | ||
81 | HttpListenerPort = | 66 | HttpListenerPort = |
82 | (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort); | 67 | (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort); |
@@ -84,8 +69,6 @@ namespace OpenSim.Framework | |||
84 | (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1)); | 69 | (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1)); |
85 | HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); | 70 | HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); |
86 | HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost"); | 71 | HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost"); |
87 | ConfigSettings.DefaultRegionRemotingPort = | ||
88 | (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) ConfigSettings.DefaultRegionRemotingPort); | ||
89 | GridURL = | 72 | GridURL = |
90 | config.Configs["Network"].GetString("grid_server_url", | 73 | config.Configs["Network"].GetString("grid_server_url", |
91 | "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); | 74 | "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); |