aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorAdam Frisby2007-06-20 15:50:06 +0000
committerAdam Frisby2007-06-20 15:50:06 +0000
commit29053589bff370916f4067dade70969499f77ce3 (patch)
tree582e2c839ce2e681dc98087bb12c71241641ffc6 /Common
parent* Removed ClientThreads from avatar (diff)
downloadopensim-SC-29053589bff370916f4067dade70969499f77ce3.zip
opensim-SC-29053589bff370916f4067dade70969499f77ce3.tar.gz
opensim-SC-29053589bff370916f4067dade70969499f77ce3.tar.bz2
opensim-SC-29053589bff370916f4067dade70969499f77ce3.tar.xz
* Replaced old logging mechanism with new shiny logging mechanism
* Console, I bid thee farewall. Use "Log" now where console used to exist.
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenGrid.Framework.UserManager/UserManagerBase.cs22
-rw-r--r--Common/OpenSim.Framework.Console/LogBase.cs (renamed from Common/OpenSim.Framework.Console/ConsoleBase.cs)20
-rw-r--r--Common/OpenSim.Framework.Console/MainLog.cs (renamed from Common/OpenSim.Framework.Console/MainConsole.cs)6
-rw-r--r--Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj31
-rw-r--r--Common/OpenSim.Framework/Types/NetworkServersInfo.cs12
-rw-r--r--Common/OpenSim.Framework/Types/RegionInfo.cs40
-rw-r--r--Common/OpenSim.Servers/BaseHttpServer.cs6
-rw-r--r--Common/OpenSim.Servers/CheckSumServer.cs4
-rw-r--r--Common/OpenSim.Servers/LoginResponse.cs4
9 files changed, 70 insertions, 75 deletions
diff --git a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs b/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
index d6d50c1..eaa53dd 100644
--- a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
+++ b/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
@@ -54,10 +54,10 @@ namespace OpenGrid.Framework.UserManagement
54 /// <param name="FileName">The filename to the user server plugin DLL</param> 54 /// <param name="FileName">The filename to the user server plugin DLL</param>
55 public void AddPlugin(string FileName) 55 public void AddPlugin(string FileName)
56 { 56 {
57 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName); 57 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
58 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 58 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
59 59
60 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 60 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
61 foreach (Type pluginType in pluginAssembly.GetTypes()) 61 foreach (Type pluginType in pluginAssembly.GetTypes())
62 { 62 {
63 if (!pluginType.IsAbstract) 63 if (!pluginType.IsAbstract)
@@ -69,7 +69,7 @@ namespace OpenGrid.Framework.UserManagement
69 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 69 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise(); 70 plug.Initialise();
71 this._plugins.Add(plug.getName(), plug); 71 this._plugins.Add(plug.getName(), plug);
72 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface"); 72 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
73 } 73 }
74 74
75 typeInterface = null; 75 typeInterface = null;
@@ -105,7 +105,7 @@ namespace OpenGrid.Framework.UserManagement
105 } 105 }
106 catch (Exception e) 106 catch (Exception e)
107 { 107 {
108 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 108 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
109 } 109 }
110 } 110 }
111 } 111 }
@@ -127,7 +127,7 @@ namespace OpenGrid.Framework.UserManagement
127 } 127 }
128 catch (Exception e) 128 catch (Exception e)
129 { 129 {
130 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 130 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
131 } 131 }
132 } 132 }
133 133
@@ -152,7 +152,7 @@ namespace OpenGrid.Framework.UserManagement
152 } 152 }
153 catch (Exception e) 153 catch (Exception e)
154 { 154 {
155 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 155 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
156 } 156 }
157 } 157 }
158 158
@@ -184,7 +184,7 @@ namespace OpenGrid.Framework.UserManagement
184 } 184 }
185 catch (Exception e) 185 catch (Exception e)
186 { 186 {
187 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 187 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
188 } 188 }
189 } 189 }
190 190
@@ -206,7 +206,7 @@ namespace OpenGrid.Framework.UserManagement
206 } 206 }
207 catch (Exception e) 207 catch (Exception e)
208 { 208 {
209 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 209 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
210 } 210 }
211 } 211 }
212 212
@@ -228,7 +228,7 @@ namespace OpenGrid.Framework.UserManagement
228 } 228 }
229 catch (Exception e) 229 catch (Exception e)
230 { 230 {
231 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 231 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
232 } 232 }
233 } 233 }
234 234
@@ -251,7 +251,7 @@ namespace OpenGrid.Framework.UserManagement
251 } 251 }
252 catch (Exception e) 252 catch (Exception e)
253 { 253 {
254 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 254 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
255 } 255 }
256 } 256 }
257 257
@@ -336,7 +336,7 @@ namespace OpenGrid.Framework.UserManagement
336 /// <returns>Authenticated?</returns> 336 /// <returns>Authenticated?</returns>
337 public bool AuthenticateUser(ref UserProfileData profile, string password) 337 public bool AuthenticateUser(ref UserProfileData profile, string password)
338 { 338 {
339 OpenSim.Framework.Console.MainConsole.Instance.Verbose( 339 OpenSim.Framework.Console.MainLog.Instance.Verbose(
340 "Authenticating " + profile.username + " " + profile.surname); 340 "Authenticating " + profile.username + " " + profile.surname);
341 341
342 password = password.Remove(0, 3); //remove $1$ 342 password = password.Remove(0, 3); //remove $1$
diff --git a/Common/OpenSim.Framework.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/LogBase.cs
index 80a28e9..b625b75 100644
--- a/Common/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common/OpenSim.Framework.Console/LogBase.cs
@@ -41,14 +41,14 @@ namespace OpenSim.Framework.Console
41 EXTRAVERBOSE 41 EXTRAVERBOSE
42 } 42 }
43 43
44 public class ConsoleBase 44 public class LogBase
45 { 45 {
46 StreamWriter Log; 46 StreamWriter Log;
47 public conscmd_callback cmdparser; 47 public conscmd_callback cmdparser;
48 public string componentname; 48 public string componentname;
49 private bool m_silent; 49 private bool m_silent;
50 50
51 public ConsoleBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent ) 51 public LogBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )
52 { 52 {
53 this.componentname = componentname; 53 this.componentname = componentname;
54 this.cmdparser = cmdparser; 54 this.cmdparser = cmdparser;
@@ -77,19 +77,7 @@ namespace OpenSim.Framework.Console
77 Notice(format,args); 77 Notice(format,args);
78 return; 78 return;
79 } 79 }
80 80
81 [Obsolete("WriteLine(msg,args) has been depreciated, use WriteLine(priority,msg,args) instead.")]
82 public void WriteLine(string format, params object[] args)
83 {
84 Log.WriteLine(format, args);
85 Log.Flush();
86 if (!m_silent)
87 {
88 System.Console.WriteLine(format, args);
89 }
90 return;
91 }
92
93 public void WriteLine(LogPriority importance, string format, params object[] args) 81 public void WriteLine(LogPriority importance, string format, params object[] args)
94 { 82 {
95 Log.WriteLine(format, args); 83 Log.WriteLine(format, args);
@@ -226,7 +214,7 @@ namespace OpenSim.Framework.Console
226 cmdparser.Show(ShowWhat); 214 cmdparser.Show(ShowWhat);
227 } 215 }
228 216
229 public void MainConsolePrompt() 217 public void MainLogPrompt()
230 { 218 {
231 string[] tempstrarray; 219 string[] tempstrarray;
232 string tempstr = this.CmdPrompt(this.componentname + "# "); 220 string tempstr = this.CmdPrompt(this.componentname + "# ");
diff --git a/Common/OpenSim.Framework.Console/MainConsole.cs b/Common/OpenSim.Framework.Console/MainLog.cs
index 01aa3d1..d7f945e 100644
--- a/Common/OpenSim.Framework.Console/MainConsole.cs
+++ b/Common/OpenSim.Framework.Console/MainLog.cs
@@ -29,11 +29,11 @@ using System;
29 29
30namespace OpenSim.Framework.Console 30namespace OpenSim.Framework.Console
31{ 31{
32 public class MainConsole { 32 public class MainLog {
33 33
34 private static ConsoleBase instance; 34 private static LogBase instance;
35 35
36 public static ConsoleBase Instance 36 public static LogBase Instance
37 { 37 {
38 get 38 get
39 { 39 {
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index 7af0eca..fef5108 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Framework.Console</AssemblyName> 13 <AssemblyName>OpenSim.Framework.Console</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim.Framework.Console</RootNamespace> 21 <RootNamespace>OpenSim.Framework.Console</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,10 +61,11 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="System" > 68 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 69 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
@@ -69,13 +76,13 @@
69 <Compile Include="AssemblyInfo.cs"> 76 <Compile Include="AssemblyInfo.cs">
70 <SubType>Code</SubType> 77 <SubType>Code</SubType>
71 </Compile> 78 </Compile>
72 <Compile Include="ConsoleBase.cs"> 79 <Compile Include="LogBase.cs">
73 <SubType>Code</SubType> 80 <SubType>Code</SubType>
74 </Compile> 81 </Compile>
75 <Compile Include="ConsoleCallbacksBase.cs"> 82 <Compile Include="ConsoleCallbacksBase.cs">
76 <SubType>Code</SubType> 83 <SubType>Code</SubType>
77 </Compile> 84 </Compile>
78 <Compile Include="MainConsole.cs"> 85 <Compile Include="MainLog.cs">
79 <SubType>Code</SubType> 86 <SubType>Code</SubType>
80 </Compile> 87 </Compile>
81 </ItemGroup> 88 </ItemGroup>
@@ -86,4 +93,4 @@
86 <PostBuildEvent> 93 <PostBuildEvent>
87 </PostBuildEvent> 94 </PostBuildEvent>
88 </PropertyGroup> 95 </PropertyGroup>
89</Project> 96</Project> \ No newline at end of file
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 }
diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs
index a966ea4..3daec8d 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/Common/OpenSim.Servers/BaseHttpServer.cs
@@ -250,7 +250,7 @@ namespace OpenSim.Servers
250 250
251 public void Start() 251 public void Start()
252 { 252 {
253 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server"); 253 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
254 254
255 m_workerThread = new Thread(new ThreadStart(StartHTTP)); 255 m_workerThread = new Thread(new ThreadStart(StartHTTP));
256 m_workerThread.IsBackground = true; 256 m_workerThread.IsBackground = true;
@@ -261,7 +261,7 @@ namespace OpenSim.Servers
261 { 261 {
262 try 262 try
263 { 263 {
264 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK"); 264 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
265 m_httpListener = new HttpListener(); 265 m_httpListener = new HttpListener();
266 266
267 m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 267 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
@@ -276,7 +276,7 @@ namespace OpenSim.Servers
276 } 276 }
277 catch (Exception e) 277 catch (Exception e)
278 { 278 {
279 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM, e.Message); 279 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
280 } 280 }
281 } 281 }
282 } 282 }
diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/Common/OpenSim.Servers/CheckSumServer.cs
index b988202..14ac11b 100644
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ b/Common/OpenSim.Servers/CheckSumServer.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Servers
44{ 44{
45 public class CheckSumServer : UDPServerBase 45 public class CheckSumServer : UDPServerBase
46 { 46 {
47 //protected ConsoleBase m_console; 47 //protected ConsoleBase m_log;
48 48
49 public CheckSumServer(int port) 49 public CheckSumServer(int port)
50 : base(port) 50 : base(port)
@@ -127,7 +127,7 @@ namespace OpenSim.Servers
127 } 127 }
128 catch (Exception) 128 catch (Exception)
129 { 129 {
130 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection "); 130 OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
131 131
132 } 132 }
133 } 133 }
diff --git a/Common/OpenSim.Servers/LoginResponse.cs b/Common/OpenSim.Servers/LoginResponse.cs
index d26b304..debfe43 100644
--- a/Common/OpenSim.Servers/LoginResponse.cs
+++ b/Common/OpenSim.Servers/LoginResponse.cs
@@ -211,7 +211,7 @@ namespace OpenSim.UserServer
211 } 211 }
212 catch (Exception e) 212 catch (Exception e)
213 { 213 {
214 OpenSim.Framework.Console.MainConsole.Instance.WriteLine( 214 OpenSim.Framework.Console.MainLog.Instance.WriteLine(
215 OpenSim.Framework.Console.LogPriority.LOW, 215 OpenSim.Framework.Console.LogPriority.LOW,
216 "LoginResponse: Unable to set default values: " + e.Message 216 "LoginResponse: Unable to set default values: " + e.Message
217 ); 217 );
@@ -327,7 +327,7 @@ namespace OpenSim.UserServer
327 } 327 }
328 catch (Exception e) 328 catch (Exception e)
329 { 329 {
330 OpenSim.Framework.Console.MainConsole.Instance.WriteLine( 330 OpenSim.Framework.Console.MainLog.Instance.WriteLine(
331 OpenSim.Framework.Console.LogPriority.LOW, 331 OpenSim.Framework.Console.LogPriority.LOW,
332 "LoginResponse: Error creating XML-RPC Response: " + e.Message 332 "LoginResponse: Error creating XML-RPC Response: " + e.Message
333 ); 333 );
generated by cgit v1.1 at 2024-11-16 23:34:23 +0000