diff options
author | Adam Frisby | 2007-06-05 12:55:12 +0000 |
---|---|---|
committer | Adam Frisby | 2007-06-05 12:55:12 +0000 |
commit | 1e716260c8166005d3bd33f4cda68502a09994bb (patch) | |
tree | 457d68f241ca0d8b28e03fdcd1a93f6aaf75ec44 /OpenSim/OpenSim.GridInterfaces/Local | |
parent | * Removing dead comments (diff) | |
download | opensim-SC-1e716260c8166005d3bd33f4cda68502a09994bb.zip opensim-SC-1e716260c8166005d3bd33f4cda68502a09994bb.tar.gz opensim-SC-1e716260c8166005d3bd33f4cda68502a09994bb.tar.bz2 opensim-SC-1e716260c8166005d3bd33f4cda68502a09994bb.tar.xz |
* Removed MainConsole.Instance.WriteLine completely
* Now exists MainConsole.Instance.Error/Warn/Notice/Verbose -- use those instead
* Removed some instances of System.Console use - aiming to depreciate this in favour of MainConsole completely.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs | 12 | ||||
-rw-r--r-- | OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs index 5f75821..a5fb636 100644 --- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs +++ b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs | |||
@@ -39,17 +39,17 @@ namespace OpenSim.GridInterfaces.Local | |||
39 | this._assetRequests = new BlockingQueue<ARequest>(); | 39 | this._assetRequests = new BlockingQueue<ARequest>(); |
40 | yapfile = System.IO.File.Exists("assets.yap"); | 40 | yapfile = System.IO.File.Exists("assets.yap"); |
41 | 41 | ||
42 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Asset Server class created"); | 42 | MainConsole.Instance.Verbose("Local Asset Server class created"); |
43 | try | 43 | try |
44 | { | 44 | { |
45 | db = Db4oFactory.OpenFile("assets.yap"); | 45 | db = Db4oFactory.OpenFile("assets.yap"); |
46 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Db4 Asset database creation"); | 46 | MainConsole.Instance.Verbose("Db4 Asset database creation"); |
47 | } | 47 | } |
48 | catch (Exception e) | 48 | catch (Exception e) |
49 | { | 49 | { |
50 | db.Close(); | 50 | db.Close(); |
51 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"Db4 Asset server :Constructor - Exception occured"); | 51 | MainConsole.Instance.Warn("Db4 Asset server :Constructor - Exception occured"); |
52 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString()); | 52 | MainConsole.Instance.Warn(e.ToString()); |
53 | } | 53 | } |
54 | if (!yapfile) | 54 | if (!yapfile) |
55 | { | 55 | { |
@@ -97,7 +97,7 @@ namespace OpenSim.GridInterfaces.Local | |||
97 | { | 97 | { |
98 | if (db != null) | 98 | if (db != null) |
99 | { | 99 | { |
100 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Closing local asset server database"); | 100 | MainConsole.Instance.Verbose( "Closing local asset server database"); |
101 | db.Close(); | 101 | db.Close(); |
102 | } | 102 | } |
103 | } | 103 | } |
@@ -141,7 +141,7 @@ namespace OpenSim.GridInterfaces.Local | |||
141 | try | 141 | try |
142 | { | 142 | { |
143 | 143 | ||
144 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Setting up asset database"); | 144 | MainConsole.Instance.Verbose( "Setting up asset database"); |
145 | 145 | ||
146 | AssetBase Image = new AssetBase(); | 146 | AssetBase Image = new AssetBase(); |
147 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001"); | 147 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001"); |
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs index fdd6ba4..36b7cbc 100644 --- a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs +++ b/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.GridInterfaces.Local | |||
62 | public LocalGridServer() | 62 | public LocalGridServer() |
63 | { | 63 | { |
64 | Sessions = new List<Login>(); | 64 | Sessions = new List<Login>(); |
65 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Grid Server class created"); | 65 | MainConsole.Instance.Verbose("Local Grid Server class created"); |
66 | } | 66 | } |
67 | 67 | ||
68 | public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) | 68 | public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) |