brought zircon branch into trunk

1 files changed, 40 insertions, 95 deletions

diff --git a/src/LocalServers/LocalGridServers/LocalGrid.cs b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index bd377d3..d70e989 100644
--- a/src/LocalServers/LocalGridServers/LocalGrid.cs
+++ b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
@@ -27,10 +27,14 @@
 using System;

 using System.Collections.Generic;

 using System.Threading;

-using OpenSim.GridServers;

+using System.IO;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Assets;

 using libsecondlife;

+using Db4objects.Db4o;

+using Db4objects.Db4o.Query;

 

-namespace LocalGridServers

+namespace OpenSim.GridInterfaces.Local

 {

         /// <summary>

         /// 

@@ -49,86 +53,26 @@ namespace LocalGridServers
                 }

         }

         

-        public class LocalAssetPlugin : IAssetPlugin

-        {

-                public LocalAssetPlugin()

-                {

-                        

-                }

-                

-                public IAssetServer GetAssetServer()

-                {

-                        return(new LocalAssetServer());

-                }

-        }

-        

-        public class LocalAssetServer : IAssetServer

-        {

-                private IAssetReceiver _receiver;

-                private BlockingQueue<ARequest> _assetRequests;

-                

-                public LocalAssetServer()

-                {

-                        this._assetRequests = new BlockingQueue<ARequest>();

-                        ServerConsole.MainConsole.Instance.WriteLine("Local Asset Server class created");

-                }

-                

-                public void SetReceiver(IAssetReceiver receiver)

-                {

-                        this._receiver = receiver;

-                }

-                

-                public void RequestAsset(LLUUID assetID, bool isTexture)

-                {

-                        ARequest req = new ARequest();

-                        req.AssetID = assetID;

-                        req.IsTexture = isTexture;

-                        //this._assetRequests.Enqueue(req);

-                }

-                

-                public void UpdateAsset(AssetBase asset)

-                {

-                        

-                }

-                

-                public void UploadNewAsset(AssetBase asset)

-                {

-                        

-                }

-                

-                public void SetServerInfo(string ServerUrl, string SendKey)

-                {

-                        

-                }

-                

-                private void RunRequests()

-                {

-                        while(true)

-                        {

-                                Thread.Sleep(1000);     

-                        }

-                }

-        }

-        

         public class LocalGridServer : LocalGridBase

         {

                 public List<Login> Sessions = new List<Login>();  

-        

+                

                 public LocalGridServer()

                 {

                         Sessions = new List<Login>();

-                        ServerConsole.MainConsole.Instance.WriteLine("Local Grid Server class created");

-                }

-                

-                public override string GetName()

-                {

-                        return "Local";

+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Grid Server class created");

                 }

                 

                 public override bool RequestConnection()

                 {

                         return true;

                 }

+

+        public override string GetName()

+        {

+            return "Local";

+        }

+

                 public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)

                 {

                         //we are running local

@@ -159,17 +103,22 @@ namespace LocalGridServers
                         UUIDBlock uuidBlock = new UUIDBlock();

                         return(uuidBlock);

                 }

-                

-                public override neighbourinfo[] RequestNeighbours(ulong regionhandle)

+

+        public override NeighbourInfo[] RequestNeighbours()

                 {

-                        return new neighbourinfo[8];

+                        return null;

                 }

-                

-                public override void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey)

+

+        public override void SetServerInfo(string ServerUrl, string SendKey, string RecvKey)

                 {

                         

                 }

                 

+                public override void Close()

+                {

+                        

+                }

+

                 /// <summary>

                 /// used by the local login server to inform us of new sessions

                 /// </summary>

@@ -182,30 +131,26 @@ namespace LocalGridServers
                         }

                 }

         }

-        

-        public class BlockingQueue< T > {

-                private Queue< T > _queue = new Queue< T >();

-                private object _queueSync = new object();

 

-                public void Enqueue(T value)

+        public class AssetUUIDQuery : Predicate

+        {

+                private LLUUID _findID;

+                

+                public AssetUUIDQuery(LLUUID find)

                 {

-                        lock(_queueSync)

-                        {

-                                _queue.Enqueue(value);

-                                Monitor.Pulse(_queueSync);

-                        }

+                        _findID = find;

                 }

-

-                public T Dequeue()

+                public bool Match(AssetStorage asset)

                 {

-                        lock(_queueSync)

-                        {

-                                if( _queue.Count < 1)

-                                        Monitor.Wait(_queueSync);

-

-                                return _queue.Dequeue();

-                        }

+                        return (asset.UUID == _findID);

                 }

         }

-

+        

+        public class AssetStorage

+        {

+                public byte[] Data;

+                public sbyte Type;

+                public string Name;

+                public LLUUID UUID;

+        }

 }