aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General/NetworkServersInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/General/NetworkServersInfo.cs')
-rw-r--r--OpenSim/Framework/General/NetworkServersInfo.cs22
1 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim/Framework/General/NetworkServersInfo.cs b/OpenSim/Framework/General/NetworkServersInfo.cs
index 358e496..98d489e 100644
--- a/OpenSim/Framework/General/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/NetworkServersInfo.cs
@@ -25,12 +25,9 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using OpenSim.Framework.Console;
30using OpenSim.Framework.Interfaces;
31using OpenSim.Framework;
32 28
33using Nini.Config; 29using Nini.Config;
30
34namespace OpenSim.Framework 31namespace OpenSim.Framework
35{ 32{
36 public class NetworkServersInfo 33 public class NetworkServersInfo
@@ -63,12 +60,14 @@ namespace OpenSim.Framework
63 } 60 }
64 61
65 private uint? m_defaultHomeLocX; 62 private uint? m_defaultHomeLocX;
63
66 public uint DefaultHomeLocX 64 public uint DefaultHomeLocX
67 { 65 {
68 get { return m_defaultHomeLocX.Value; } 66 get { return m_defaultHomeLocX.Value; }
69 } 67 }
70 68
71 private uint? m_defaultHomeLocY; 69 private uint? m_defaultHomeLocY;
70
72 public uint DefaultHomeLocY 71 public uint DefaultHomeLocY
73 { 72 {
74 get { return m_defaultHomeLocY.Value; } 73 get { return m_defaultHomeLocY.Value; }
@@ -76,19 +75,22 @@ namespace OpenSim.Framework
76 75
77 public void loadFromConfiguration(IConfigSource config) 76 public void loadFromConfiguration(IConfigSource config)
78 { 77 {
79 m_defaultHomeLocX = (uint)config.Configs["StandAlone"].GetInt("default_location_x", 1000); 78 m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000);
80 m_defaultHomeLocY = (uint)config.Configs["StandAlone"].GetInt("default_location_y", 1000); 79 m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
81 80
82 HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort); 81 HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);
83 RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort); 82 RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort);
84 GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); 83 GridURL =
84 config.Configs["Network"].GetString("grid_server_url",
85 "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
85 GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null"); 86 GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
86 GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null"); 87 GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
87 UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()); 88 UserURL =
89 config.Configs["Network"].GetString("user_server_url",
90 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
88 UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); 91 UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
89 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); 92 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
90 AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL); 93 AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
91
92 } 94 }
93 } 95 }
94} 96} \ No newline at end of file