brought zircon branch into trunk

1 files changed, 8 insertions, 21 deletions

diff --git a/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index bb9825c..93ed9cc 100644
--- a/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -29,9 +29,10 @@ using System.Collections.Generic;
 using Db4objects.Db4o;

 using Db4objects.Db4o.Query;

 using libsecondlife;

-using GridInterfaces;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Assets;

 

-namespace Db4LocalStorage

+namespace OpenSim.Storage.LocalStorageDb4o

 {

         /// <summary>

         /// 

@@ -45,13 +46,13 @@ namespace Db4LocalStorage
                         try 

                         {

                                 db = Db4oFactory.OpenFile("localworld.yap");

-                                ServerConsole.MainConsole.Instance.WriteLine("Db4LocalStorage creation");

+                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage creation");

                         }

                         catch(Exception e) 

                         {

                                 db.Close();

-                                ServerConsole.MainConsole.Instance.WriteLine("Db4LocalStorage :Constructor - Exception occured");

-                                ServerConsole.MainConsole.Instance.WriteLine(e.ToString());

+                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage :Constructor - Exception occured");

+                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());

                         }

                 }

                 

@@ -84,6 +85,7 @@ namespace Db4LocalStorage
                                 found.ProfileHollow = prim.ProfileHollow;

                                 found.Position = prim.Position;

                                 found.Rotation = prim.Rotation;

+                found.Texture = prim.Texture;

                                 db.Set(found);

                                 db.Commit();

                         }

@@ -109,7 +111,7 @@ namespace Db4LocalStorage
                 public void LoadPrimitives(ILocalStorageReceiver receiver)

                 {

                         IObjectSet result = db.Get(typeof(PrimData));

-                        ServerConsole.MainConsole.Instance.WriteLine("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);

+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);

                         foreach (PrimData prim in result) {

                                 receiver.PrimFromStorage(prim);

                         }

@@ -121,19 +123,4 @@ namespace Db4LocalStorage
                         db.Close();

                 }

         }

-        

-        public class UUIDQuery : Predicate

-        {

-                private LLUUID _findID;

-                

-                public UUIDQuery(LLUUID find)

-                {

-                        _findID = find;

-                }

-                public bool Match(PrimData prim)

-                {

-                        return (prim.FullID == _findID);

-                }

-        }

-        

 }