diff options
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Types/NetworkServersInfo.cs | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs index c6b81a7..89ebf94 100644 --- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs | |||
@@ -26,8 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using OpenSim.Framework.Console; |
30 | using System.Text; | ||
31 | using OpenSim.Framework.Interfaces; | 30 | using OpenSim.Framework.Interfaces; |
32 | 31 | ||
33 | namespace OpenSim.Framework.Types | 32 | namespace OpenSim.Framework.Types |
@@ -63,7 +62,7 @@ namespace OpenSim.Framework.Types | |||
63 | attri = configData.GetAttribute("HttpListenerPort"); | 62 | attri = configData.GetAttribute("HttpListenerPort"); |
64 | if (attri == "") | 63 | if (attri == "") |
65 | { | 64 | { |
66 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Http Listener Port", "9000"); | 65 | string location = MainLog.Instance.CmdPrompt("Http Listener Port", "9000"); |
67 | configData.SetAttribute("HttpListenerPort", location); | 66 | configData.SetAttribute("HttpListenerPort", location); |
68 | this.HttpListenerPort = Convert.ToInt32(location); | 67 | this.HttpListenerPort = Convert.ToInt32(location); |
69 | } | 68 | } |
@@ -76,7 +75,7 @@ namespace OpenSim.Framework.Types | |||
76 | attri = configData.GetAttribute("RemotingListenerPort"); | 75 | attri = configData.GetAttribute("RemotingListenerPort"); |
77 | if (attri == "") | 76 | if (attri == "") |
78 | { | 77 | { |
79 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895"); | 78 | string location = MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895"); |
80 | configData.SetAttribute("RemotingListenerPort", location); | 79 | configData.SetAttribute("RemotingListenerPort", location); |
81 | this.RemotingListenerPort = Convert.ToInt32(location); | 80 | this.RemotingListenerPort = Convert.ToInt32(location); |
82 | } | 81 | } |
@@ -92,7 +91,7 @@ namespace OpenSim.Framework.Types | |||
92 | attri = configData.GetAttribute("DefaultLocationX"); | 91 | attri = configData.GetAttribute("DefaultLocationX"); |
93 | if (attri == "") | 92 | if (attri == "") |
94 | { | 93 | { |
95 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000"); | 94 | string location = MainLog.Instance.CmdPrompt("Default Home Location X", "1000"); |
96 | configData.SetAttribute("DefaultLocationX", location); | 95 | configData.SetAttribute("DefaultLocationX", location); |
97 | this.DefaultHomeLocX = (uint)Convert.ToUInt32(location); | 96 | this.DefaultHomeLocX = (uint)Convert.ToUInt32(location); |
98 | } | 97 | } |
@@ -106,7 +105,7 @@ namespace OpenSim.Framework.Types | |||
106 | attri = configData.GetAttribute("DefaultLocationY"); | 105 | attri = configData.GetAttribute("DefaultLocationY"); |
107 | if (attri == "") | 106 | if (attri == "") |
108 | { | 107 | { |
109 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000"); | 108 | string location = MainLog.Instance.CmdPrompt("Default Home Location Y", "1000"); |
110 | configData.SetAttribute("DefaultLocationY", location); | 109 | configData.SetAttribute("DefaultLocationY", location); |
111 | this.DefaultHomeLocY = (uint)Convert.ToUInt32(location); | 110 | this.DefaultHomeLocY = (uint)Convert.ToUInt32(location); |
112 | } | 111 | } |
@@ -122,7 +121,7 @@ namespace OpenSim.Framework.Types | |||
122 | attri = configData.GetAttribute("GridServerURL"); | 121 | attri = configData.GetAttribute("GridServerURL"); |
123 | if (attri == "") | 122 | if (attri == "") |
124 | { | 123 | { |
125 | this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/"); | 124 | this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/"); |
126 | configData.SetAttribute("GridServerURL", this.GridURL); | 125 | configData.SetAttribute("GridServerURL", this.GridURL); |
127 | } | 126 | } |
128 | else | 127 | else |
@@ -135,7 +134,7 @@ namespace OpenSim.Framework.Types | |||
135 | attri = configData.GetAttribute("GridSendKey"); | 134 | attri = configData.GetAttribute("GridSendKey"); |
136 | if (attri == "") | 135 | if (attri == "") |
137 | { | 136 | { |
138 | this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null"); | 137 | this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server", "null"); |
139 | configData.SetAttribute("GridSendKey", this.GridSendKey); | 138 | configData.SetAttribute("GridSendKey", this.GridSendKey); |
140 | } | 139 | } |
141 | else | 140 | else |
@@ -148,7 +147,7 @@ namespace OpenSim.Framework.Types | |||
148 | attri = configData.GetAttribute("GridRecvKey"); | 147 | attri = configData.GetAttribute("GridRecvKey"); |
149 | if (attri == "") | 148 | if (attri == "") |
150 | { | 149 | { |
151 | this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null"); | 150 | this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server", "null"); |
152 | configData.SetAttribute("GridRecvKey", this.GridRecvKey); | 151 | configData.SetAttribute("GridRecvKey", this.GridRecvKey); |
153 | } | 152 | } |
154 | else | 153 | else |
@@ -161,7 +160,7 @@ namespace OpenSim.Framework.Types | |||
161 | attri = configData.GetAttribute("UserServerURL"); | 160 | attri = configData.GetAttribute("UserServerURL"); |
162 | if (attri == "") | 161 | if (attri == "") |
163 | { | 162 | { |
164 | this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/"); | 163 | this.UserURL= MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/"); |
165 | configData.SetAttribute("UserServerURL", this.UserURL); | 164 | configData.SetAttribute("UserServerURL", this.UserURL); |
166 | } | 165 | } |
167 | else | 166 | else |
@@ -174,7 +173,7 @@ namespace OpenSim.Framework.Types | |||
174 | attri = configData.GetAttribute("UserSendKey"); | 173 | attri = configData.GetAttribute("UserSendKey"); |
175 | if (attri == "") | 174 | if (attri == "") |
176 | { | 175 | { |
177 | this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null"); | 176 | this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server", "null"); |
178 | configData.SetAttribute("UserSendKey", this.UserSendKey); | 177 | configData.SetAttribute("UserSendKey", this.UserSendKey); |
179 | } | 178 | } |
180 | else | 179 | else |
@@ -187,7 +186,7 @@ namespace OpenSim.Framework.Types | |||
187 | attri = configData.GetAttribute("UserRecvKey"); | 186 | attri = configData.GetAttribute("UserRecvKey"); |
188 | if (attri == "") | 187 | if (attri == "") |
189 | { | 188 | { |
190 | this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); | 189 | this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); |
191 | configData.SetAttribute("GridRecvKey", this.UserRecvKey); | 190 | configData.SetAttribute("GridRecvKey", this.UserRecvKey); |
192 | } | 191 | } |
193 | else | 192 | else |
@@ -199,7 +198,7 @@ namespace OpenSim.Framework.Types | |||
199 | attri = configData.GetAttribute("AssetServerURL"); | 198 | attri = configData.GetAttribute("AssetServerURL"); |
200 | if (attri == "") | 199 | if (attri == "") |
201 | { | 200 | { |
202 | this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/"); | 201 | this.AssetURL = MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/"); |
203 | configData.SetAttribute("AssetServerURL", this.GridURL); | 202 | configData.SetAttribute("AssetServerURL", this.GridURL); |
204 | } | 203 | } |
205 | else | 204 | else |
@@ -212,8 +211,8 @@ namespace OpenSim.Framework.Types | |||
212 | } | 211 | } |
213 | catch (Exception e) | 212 | catch (Exception e) |
214 | { | 213 | { |
215 | OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); | 214 | MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); |
216 | OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); | 215 | MainLog.Instance.Warn(e.ToString()); |
217 | } | 216 | } |
218 | } | 217 | } |
219 | } | 218 | } |