EXTERM-INATED. (Add warnings produced by WriteLine change have been updated to include Log Priority)

author: Adam Frisby 2007-05-12 15:44:10 +0000
committer: Adam Frisby 2007-05-12 15:44:10 +0000
commit: ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d (patch)
tree: 569da9ef2e6e528ea799d8c7e1eac637cdffa889 /OpenSim.Storage
parent: 93 warnings in the compiler, 93 warnings appear, you fix one up, create two m... (diff)
download: opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.zip
opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.gz
opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.bz2
opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.xz
2 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 95cae8a..5dceb7f 100644
--- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -50,18 +50,18 @@ namespace OpenSim.Storage.LocalStorageDb4o
        public void Initialise(string dfile)
        {
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage Opening " + dfile);
+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage Opening " + dfile);
            datastore = dfile;
            try
            {
                db = Db4oFactory.OpenFile(datastore);
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage creation");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage creation");
            }
            catch (Exception e)
            {
                db.Close();
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage :Constructor - Exception occured");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage :Constructor - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
            }
        }
                
@@ -120,7 +120,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
                public void LoadPrimitives(ILocalStorageReceiver receiver)
                {
                        IObjectSet result = db.Get(typeof(PrimData));
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
                        foreach (PrimData prim in result) {
                                receiver.PrimFromStorage(prim);
                        }
@@ -128,14 +128,14 @@ namespace OpenSim.Storage.LocalStorageDb4o
        public float[] LoadWorld()
        {
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Loading world....");
+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Loading world....");
            //World blank = new World();
            float[] heightmap = null;
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Looking for a heightmap in local DB");
+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Looking for a heightmap in local DB");
            IObjectSet world_result = db.Get(typeof(MapStorage));
            if (world_result.Count > 0)
            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Found a heightmap in local database, loading");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Found a heightmap in local database, loading");
                MapStorage map = (MapStorage)world_result.Next();
                //blank.LandMap = map.Map;
                heightmap = map.Map;
@@ -163,7 +163,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
            IObjectSet world_result = db.Get(typeof(MapStorage));
            if (world_result.Count > 0)
            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SaveWorld() - updating saved copy of heightmap in local database");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SaveWorld() - updating saved copy of heightmap in local database");
                MapStorage map = (MapStorage)world_result.Next();
                db.Delete(map);
            }
diff --git a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 35875a1..368405b 100644
--- a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -54,8 +54,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
            catch (Exception e)
            {
                db.Close();
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SQLiteLocalStorage :Constructor - Exception occured");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :Constructor - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
            }
        }
@@ -117,8 +117,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
            }
            catch (Exception e)
            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SQLiteLocalStorage :StorePrim - Exception occured");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :StorePrim - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
            }
            cmd.Dispose();
@@ -144,8 +144,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
            }
            catch (Exception e)
            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SQLiteLocalStorage :RemovePrim - Exception occured");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :RemovePrim - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
            }
            cmd.Dispose();
author	Adam Frisby	2007-05-12 15:44:10 +0000
committer	Adam Frisby	2007-05-12 15:44:10 +0000
commit	ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d (patch)
tree	569da9ef2e6e528ea799d8c7e1eac637cdffa889 /OpenSim.Storage
parent	93 warnings in the compiler, 93 warnings appear, you fix one up, create two m... (diff)
download	opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.zip opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.gz opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.bz2 opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.xz

diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs index 95cae8a..5dceb7f 100644 --- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs +++ b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -50,18 +50,18 @@ namespace OpenSim.Storage.LocalStorageDb4o
50		50
51	public void Initialise(string dfile)	51	public void Initialise(string dfile)
52	{	52	{
53	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage Opening " + dfile);	53	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage Opening " + dfile);
54	datastore = dfile;	54	datastore = dfile;
55	try	55	try
56	{	56	{
57	db = Db4oFactory.OpenFile(datastore);	57	db = Db4oFactory.OpenFile(datastore);
58	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage creation");	58	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage creation");
59	}	59	}
60	catch (Exception e)	60	catch (Exception e)
61	{	61	{
62	db.Close();	62	db.Close();
63	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage :Constructor - Exception occured");	63	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage :Constructor - Exception occured");
64	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());	64	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
65	}	65	}
66	}	66	}
67		67
@@ -120,7 +120,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
120	public void LoadPrimitives(ILocalStorageReceiver receiver)	120	public void LoadPrimitives(ILocalStorageReceiver receiver)
121	{	121	{
122	IObjectSet result = db.Get(typeof(PrimData));	122	IObjectSet result = db.Get(typeof(PrimData));
123	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);	123	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
124	foreach (PrimData prim in result) {	124	foreach (PrimData prim in result) {
125	receiver.PrimFromStorage(prim);	125	receiver.PrimFromStorage(prim);
126	}	126	}
@@ -128,14 +128,14 @@ namespace OpenSim.Storage.LocalStorageDb4o
128		128
129	public float[] LoadWorld()	129	public float[] LoadWorld()
130	{	130	{
131	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Loading world....");	131	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Loading world....");
132	//World blank = new World();	132	//World blank = new World();
133	float[] heightmap = null;	133	float[] heightmap = null;
134	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Looking for a heightmap in local DB");	134	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Looking for a heightmap in local DB");
135	IObjectSet world_result = db.Get(typeof(MapStorage));	135	IObjectSet world_result = db.Get(typeof(MapStorage));
136	if (world_result.Count > 0)	136	if (world_result.Count > 0)
137	{	137	{
138	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Found a heightmap in local database, loading");	138	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Found a heightmap in local database, loading");
139	MapStorage map = (MapStorage)world_result.Next();	139	MapStorage map = (MapStorage)world_result.Next();
140	//blank.LandMap = map.Map;	140	//blank.LandMap = map.Map;
141	heightmap = map.Map;	141	heightmap = map.Map;
@@ -163,7 +163,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
163	IObjectSet world_result = db.Get(typeof(MapStorage));	163	IObjectSet world_result = db.Get(typeof(MapStorage));
164	if (world_result.Count > 0)	164	if (world_result.Count > 0)
165	{	165	{
166	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SaveWorld() - updating saved copy of heightmap in local database");	166	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SaveWorld() - updating saved copy of heightmap in local database");
167	MapStorage map = (MapStorage)world_result.Next();	167	MapStorage map = (MapStorage)world_result.Next();
168	db.Delete(map);	168	db.Delete(map);
169	}	169	}


diff --git a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs index 35875a1..368405b 100644 --- a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs +++ b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -54,8 +54,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
54	catch (Exception e)	54	catch (Exception e)
55	{	55	{
56	db.Close();	56	db.Close();
57	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SQLiteLocalStorage :Constructor - Exception occured");	57	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :Constructor - Exception occured");
58	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());	58	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
59	}	59	}
60	}	60	}
61		61
@@ -117,8 +117,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
117	}	117	}
118	catch (Exception e)	118	catch (Exception e)
119	{	119	{
120	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SQLiteLocalStorage :StorePrim - Exception occured");	120	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :StorePrim - Exception occured");
121	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());	121	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
122	}	122	}
123		123
124	cmd.Dispose();	124	cmd.Dispose();
@@ -144,8 +144,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
144	}	144	}
145	catch (Exception e)	145	catch (Exception e)
146	{	146	{
147	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SQLiteLocalStorage :RemovePrim - Exception occured");	147	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :RemovePrim - Exception occured");
148	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());	148	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
149	}	149	}
150		150
151	cmd.Dispose();	151	cmd.Dispose();