aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.GridInterfaces
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.GridInterfaces')
-rw-r--r--OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs12
-rw-r--r--OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs4
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 70b14c2..87eff49 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -66,17 +66,17 @@ namespace OpenSim.GridInterfaces.Local
66 this._assetRequests = new BlockingQueue<ARequest>(); 66 this._assetRequests = new BlockingQueue<ARequest>();
67 yapfile = System.IO.File.Exists("assets.yap"); 67 yapfile = System.IO.File.Exists("assets.yap");
68 68
69 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Local Asset Server class created"); 69 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Local Asset Server class created");
70 try 70 try
71 { 71 {
72 db = Db4oFactory.OpenFile("assets.yap"); 72 db = Db4oFactory.OpenFile("assets.yap");
73 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Db4 Asset database creation"); 73 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Db4 Asset database creation");
74 } 74 }
75 catch (Exception e) 75 catch (Exception e)
76 { 76 {
77 db.Close(); 77 db.Close();
78 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured"); 78 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");
79 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString()); 79 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
80 } 80 }
81 if (!yapfile) 81 if (!yapfile)
82 { 82 {
@@ -124,7 +124,7 @@ namespace OpenSim.GridInterfaces.Local
124 { 124 {
125 if (db != null) 125 if (db != null)
126 { 126 {
127 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Closing local asset server database"); 127 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Closing local asset server database");
128 db.Close(); 128 db.Close();
129 } 129 }
130 } 130 }
@@ -168,7 +168,7 @@ namespace OpenSim.GridInterfaces.Local
168 try 168 try
169 { 169 {
170 170
171 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Setting up asset database"); 171 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Setting up asset database");
172 172
173 AssetBase Image = new AssetBase(); 173 AssetBase Image = new AssetBase();
174 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001"); 174 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index be00fa7..ca01c68 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
@@ -53,7 +53,7 @@ namespace OpenSim.GridInterfaces.Remote
53 this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests)); 53 this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
54 this._remoteAssetServerThread.IsBackground = true; 54 this._remoteAssetServerThread.IsBackground = true;
55 this._remoteAssetServerThread.Start(); 55 this._remoteAssetServerThread.Start();
56 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Remote Asset Server class created"); 56 OpenSim.Framework.Console.MainLog.Instance.Verbose("Remote Asset Server class created");
57 } 57 }
58 58
59 public void SetReceiver(IAssetReceiver receiver) 59 public void SetReceiver(IAssetReceiver receiver)
@@ -98,7 +98,7 @@ namespace OpenSim.GridInterfaces.Remote
98 // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM 98 // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM
99 ARequest req = this._assetRequests.Dequeue(); 99 ARequest req = this._assetRequests.Dequeue();
100 LLUUID assetID = req.AssetID; 100 LLUUID assetID = req.AssetID;
101 // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW," RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID); 101 // OpenSim.Framework.Console.MainLog.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
102 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID); 102 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);
103 WebResponse AssetResponse = AssetLoad.GetResponse(); 103 WebResponse AssetResponse = AssetLoad.GetResponse();
104 byte[] idata = new byte[(int)AssetResponse.ContentLength]; 104 byte[] idata = new byte[(int)AssetResponse.ContentLength];