aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common/OpenSim.Framework
diff options
context:
space:
mode:
Diffstat (limited to 'Common/OpenSim.Framework')
-rw-r--r--Common/OpenSim.Framework/Types/NetworkServersInfo.cs12
-rw-r--r--Common/OpenSim.Framework/Types/RegionInfo.cs40
2 files changed, 26 insertions, 26 deletions
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
index 10df820..0cf0ea6 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.Types
59 attri = configData.GetAttribute("GridServerURL"); 59 attri = configData.GetAttribute("GridServerURL");
60 if (attri == "") 60 if (attri == "")
61 { 61 {
62 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/"); 62 this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
63 configData.SetAttribute("GridServerURL", this.GridURL); 63 configData.SetAttribute("GridServerURL", this.GridURL);
64 } 64 }
65 else 65 else
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Types
72 attri = configData.GetAttribute("GridSendKey"); 72 attri = configData.GetAttribute("GridSendKey");
73 if (attri == "") 73 if (attri == "")
74 { 74 {
75 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server", "null"); 75 this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
76 configData.SetAttribute("GridSendKey", this.GridSendKey); 76 configData.SetAttribute("GridSendKey", this.GridSendKey);
77 } 77 }
78 else 78 else
@@ -85,7 +85,7 @@ namespace OpenSim.Framework.Types
85 attri = configData.GetAttribute("GridRecvKey"); 85 attri = configData.GetAttribute("GridRecvKey");
86 if (attri == "") 86 if (attri == "")
87 { 87 {
88 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server", "null"); 88 this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
89 configData.SetAttribute("GridRecvKey", this.GridRecvKey); 89 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
90 } 90 }
91 else 91 else
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Types
97 attri = configData.GetAttribute("AssetServerURL"); 97 attri = configData.GetAttribute("AssetServerURL");
98 if (attri == "") 98 if (attri == "")
99 { 99 {
100 this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/"); 100 this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
101 configData.SetAttribute("AssetServerURL", this.GridURL); 101 configData.SetAttribute("AssetServerURL", this.GridURL);
102 } 102 }
103 else 103 else
@@ -110,8 +110,8 @@ namespace OpenSim.Framework.Types
110 } 110 }
111 catch (Exception e) 111 catch (Exception e)
112 { 112 {
113 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Config.cs:InitConfig() - Exception occured"); 113 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
114 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString()); 114 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
115 } 115 }
116 } 116 }
117 } 117 }
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/Common/OpenSim.Framework/Types/RegionInfo.cs
index 2c24327..651cd5b 100644
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ b/Common/OpenSim.Framework/Types/RegionInfo.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Framework.Types
87 attri = configData.GetAttribute("SimName"); 87 attri = configData.GetAttribute("SimName");
88 if (attri == "") 88 if (attri == "")
89 { 89 {
90 this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name", "OpenSim test"); 90 this.RegionName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Name", "OpenSim test");
91 configData.SetAttribute("SimName", this.RegionName); 91 configData.SetAttribute("SimName", this.RegionName);
92 } 92 }
93 else 93 else
@@ -99,7 +99,7 @@ namespace OpenSim.Framework.Types
99 attri = configData.GetAttribute("SimLocationX"); 99 attri = configData.GetAttribute("SimLocationX");
100 if (attri == "") 100 if (attri == "")
101 { 101 {
102 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X", "997"); 102 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");
103 configData.SetAttribute("SimLocationX", location); 103 configData.SetAttribute("SimLocationX", location);
104 this.RegionLocX = (uint)Convert.ToUInt32(location); 104 this.RegionLocX = (uint)Convert.ToUInt32(location);
105 } 105 }
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Types
112 attri = configData.GetAttribute("SimLocationY"); 112 attri = configData.GetAttribute("SimLocationY");
113 if (attri == "") 113 if (attri == "")
114 { 114 {
115 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y", "996"); 115 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");
116 configData.SetAttribute("SimLocationY", location); 116 configData.SetAttribute("SimLocationY", location);
117 this.RegionLocY = (uint)Convert.ToUInt32(location); 117 this.RegionLocY = (uint)Convert.ToUInt32(location);
118 } 118 }
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Types
126 attri = configData.GetAttribute("Datastore"); 126 attri = configData.GetAttribute("Datastore");
127 if (attri == "") 127 if (attri == "")
128 { 128 {
129 string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Filename for local storage", "localworld.yap"); 129 string datastore = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Filename for local storage", "localworld.yap");
130 configData.SetAttribute("Datastore", datastore); 130 configData.SetAttribute("Datastore", datastore);
131 this.DataStore = datastore; 131 this.DataStore = datastore;
132 } 132 }
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.Types
140 attri = configData.GetAttribute("SimListenPort"); 140 attri = configData.GetAttribute("SimListenPort");
141 if (attri == "") 141 if (attri == "")
142 { 142 {
143 string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections", "9000"); 143 string port = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("UDP port for client connections", "9000");
144 configData.SetAttribute("SimListenPort", port); 144 configData.SetAttribute("SimListenPort", port);
145 this.IPListenPort = Convert.ToInt32(port); 145 this.IPListenPort = Convert.ToInt32(port);
146 } 146 }
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Types
154 attri = configData.GetAttribute("SimListenAddress"); 154 attri = configData.GetAttribute("SimListenAddress");
155 if (attri == "") 155 if (attri == "")
156 { 156 {
157 this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1"); 157 this.IPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1");
158 configData.SetAttribute("SimListenAddress", this.IPListenAddr); 158 configData.SetAttribute("SimListenAddress", this.IPListenAddr);
159 } 159 }
160 else 160 else
@@ -184,7 +184,7 @@ namespace OpenSim.Framework.Types
184 attri = configData.GetAttribute("TerrainFile"); 184 attri = configData.GetAttribute("TerrainFile");
185 if (attri == "") 185 if (attri == "")
186 { 186 {
187 this.estateSettings.terrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32"); 187 this.estateSettings.terrainFile = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
188 configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile); 188 configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile);
189 } 189 }
190 else 190 else
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Types
196 attri = configData.GetAttribute("TerrainMultiplier"); 196 attri = configData.GetAttribute("TerrainMultiplier");
197 if (attri == "") 197 if (attri == "")
198 { 198 {
199 string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0"); 199 string re = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
200 this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture); 200 this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
201 configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString()); 201 configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
202 } 202 }
@@ -209,7 +209,7 @@ namespace OpenSim.Framework.Types
209 attri = configData.GetAttribute("MasterAvatarFirstName"); 209 attri = configData.GetAttribute("MasterAvatarFirstName");
210 if (attri == "") 210 if (attri == "")
211 { 211 {
212 this.MasterAvatarFirstName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test"); 212 this.MasterAvatarFirstName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
213 213
214 configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName); 214 configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
215 } 215 }
@@ -222,7 +222,7 @@ namespace OpenSim.Framework.Types
222 attri = configData.GetAttribute("MasterAvatarLastName"); 222 attri = configData.GetAttribute("MasterAvatarLastName");
223 if (attri == "") 223 if (attri == "")
224 { 224 {
225 this.MasterAvatarLastName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User"); 225 this.MasterAvatarLastName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
226 226
227 configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName); 227 configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
228 } 228 }
@@ -237,7 +237,7 @@ namespace OpenSim.Framework.Types
237 attri = configData.GetAttribute("MasterAvatarSandboxPassword"); 237 attri = configData.GetAttribute("MasterAvatarSandboxPassword");
238 if (attri == "") 238 if (attri == "")
239 { 239 {
240 this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test"); 240 this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
241 241
242 //Should I store this? 242 //Should I store this?
243 configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword); 243 configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
@@ -254,17 +254,17 @@ namespace OpenSim.Framework.Types
254 } 254 }
255 catch (Exception e) 255 catch (Exception e)
256 { 256 {
257 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured"); 257 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
258 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); 258 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
259 } 259 }
260 260
261 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Sim settings loaded:"); 261 OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:");
262 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated()); 262 OpenSim.Framework.Console.MainLog.Instance.Verbose( "UUID: " + this.SimUUID.ToStringHyphenated());
263 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName); 263 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Name: " + this.RegionName);
264 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); 264 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
265 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString()); 265 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Handle: " + this.RegionHandle.ToString());
266 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); 266 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
267 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sandbox Mode? " + isSandbox.ToString()); 267 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Sandbox Mode? " + isSandbox.ToString());
268 268
269 } 269 }
270 } 270 }
generated by cgit v1.1 at 2024-11-06 01:33:11 +0000