aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.GridInterfaces
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.GridInterfaces/Local/LocalAssetServer.cs11
-rw-r--r--OpenSim.GridInterfaces/Local/LocalGridServer.cs3
2 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 9162bd3..962cd40 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -6,6 +6,7 @@ using System.IO;
6using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
7using OpenSim.Framework.Types; 7using OpenSim.Framework.Types;
8using OpenSim.Framework.Utilities; 8using OpenSim.Framework.Utilities;
9using OpenSim.Framework.Console;
9using libsecondlife; 10using libsecondlife;
10using Db4objects.Db4o; 11using Db4objects.Db4o;
11using Db4objects.Db4o.Query; 12using Db4objects.Db4o.Query;
@@ -38,16 +39,16 @@ namespace OpenSim.GridInterfaces.Local
38 this._assetRequests = new BlockingQueue<ARequest>(); 39 this._assetRequests = new BlockingQueue<ARequest>();
39 yapfile = System.IO.File.Exists("assets.yap"); 40 yapfile = System.IO.File.Exists("assets.yap");
40 41
41 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Asset Server class created"); 42 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Asset Server class created");
42 try 43 try
43 { 44 {
44 db = Db4oFactory.OpenFile("assets.yap"); 45 db = Db4oFactory.OpenFile("assets.yap");
45 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4 Asset database creation"); 46 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Db4 Asset database creation");
46 } 47 }
47 catch (Exception e) 48 catch (Exception e)
48 { 49 {
49 db.Close(); 50 db.Close();
50 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4 Asset server :Constructor - Exception occured"); 51 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"Db4 Asset server :Constructor - Exception occured");
51 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString()); 52 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
52 } 53 }
53 if (!yapfile) 54 if (!yapfile)
@@ -96,7 +97,7 @@ namespace OpenSim.GridInterfaces.Local
96 { 97 {
97 if (db != null) 98 if (db != null)
98 { 99 {
99 Console.WriteLine("Closing local Asset server database"); 100 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Closing local asset server database");
100 db.Close(); 101 db.Close();
101 } 102 }
102 } 103 }
@@ -140,7 +141,7 @@ namespace OpenSim.GridInterfaces.Local
140 try 141 try
141 { 142 {
142 143
143 Console.WriteLine("setting up Asset database"); 144 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Setting up asset database");
144 145
145 AssetBase Image = new AssetBase(); 146 AssetBase Image = new AssetBase();
146 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001"); 147 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
diff --git a/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index e08d635..622eb53 100644
--- a/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
@@ -30,6 +30,7 @@ using System.Threading;
30using System.IO; 30using System.IO;
31using OpenSim.Framework.Interfaces; 31using OpenSim.Framework.Interfaces;
32using OpenSim.Framework.Types; 32using OpenSim.Framework.Types;
33using OpenSim.Framework.Console;
33using libsecondlife; 34using libsecondlife;
34using Db4objects.Db4o; 35using Db4objects.Db4o;
35using Db4objects.Db4o.Query; 36using Db4objects.Db4o.Query;
@@ -60,7 +61,7 @@ namespace OpenSim.GridInterfaces.Local
60 public LocalGridServer() 61 public LocalGridServer()
61 { 62 {
62 Sessions = new List<Login>(); 63 Sessions = new List<Login>();
63 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Grid Server class created"); 64 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Grid Server class created");
64 } 65 }
65 66
66 public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) 67 public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)