diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Types/NetworkServersInfo.cs | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs index c40746b..ae19aff 100644 --- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs | |||
@@ -45,9 +45,6 @@ namespace OpenSim.Framework.Types | |||
45 | public string UserRecvKey = ""; | 45 | public string UserRecvKey = ""; |
46 | public bool isSandbox; | 46 | public bool isSandbox; |
47 | 47 | ||
48 | public uint DefaultHomeLocX = 0; | ||
49 | public uint DefaultHomeLocY = 0; | ||
50 | |||
51 | public int HttpListenerPort = 9000; | 48 | public int HttpListenerPort = 9000; |
52 | public int RemotingListenerPort = 8895; | 49 | public int RemotingListenerPort = 8895; |
53 | 50 | ||
@@ -59,9 +56,22 @@ namespace OpenSim.Framework.Types | |||
59 | configMember.performConfigurationRetrieve(); | 56 | configMember.performConfigurationRetrieve(); |
60 | } | 57 | } |
61 | 58 | ||
62 | public NetworkServersInfo( ) | 59 | public NetworkServersInfo( uint defaultHomeLocX, uint defaultHomeLocY ) |
60 | { | ||
61 | m_defaultHomeLocX = defaultHomeLocX; | ||
62 | m_defaultHomeLocY = defaultHomeLocY; | ||
63 | } | ||
64 | |||
65 | private uint? m_defaultHomeLocX; | ||
66 | public uint DefaultHomeLocX | ||
63 | { | 67 | { |
68 | get { return m_defaultHomeLocX.Value; } | ||
69 | } | ||
64 | 70 | ||
71 | private uint? m_defaultHomeLocY; | ||
72 | public uint DefaultHomeLocY | ||
73 | { | ||
74 | get { return m_defaultHomeLocY.Value; } | ||
65 | } | 75 | } |
66 | 76 | ||
67 | public void loadConfigurationOptions() | 77 | public void loadConfigurationOptions() |
@@ -94,10 +104,10 @@ namespace OpenSim.Framework.Types | |||
94 | this.RemotingListenerPort = (int)configuration_object; | 104 | this.RemotingListenerPort = (int)configuration_object; |
95 | break; | 105 | break; |
96 | case "DefaultLocationX": | 106 | case "DefaultLocationX": |
97 | this.DefaultHomeLocX = (uint)configuration_object; | 107 | this.m_defaultHomeLocX = (uint)configuration_object; |
98 | break; | 108 | break; |
99 | case "DefaultLocationY": | 109 | case "DefaultLocationY": |
100 | this.DefaultHomeLocY = (uint)configuration_object; | 110 | this.m_defaultHomeLocY = (uint)configuration_object; |
101 | break; | 111 | break; |
102 | case "GridServerURL": | 112 | case "GridServerURL": |
103 | this.GridURL = (string)configuration_object; | 113 | this.GridURL = (string)configuration_object; |