* Some work in progress code: Inventory cache, start of inventory server/service, userprofile cache, inventory handling. (non of it is enabled yet (or at least it shouldn't be).

* Fixed some of the problems with crossing regions when flying: you should no longer sink to ground level when crossing (should keep roughly your right height). Should no longer sometimes get sent back to the centre of the current region when attempting to border cross. But instead sometimes you will find you avatar stop at the edge of region and you will need to start moving again to retry the crossing (which should then work). This code is partly based on Babblefrog's issue #212 patch. [I think I have some ideas of how to solve the stopping at edges problem, just want to get the inventory code done first]
* Capabilities code has now been moved to the OpenSim.Framework.Communications project as some of the caps code will be tightly tied to inventory/asset handling and it was causing a two way reference problem when it was in its own project/dll.

This is a Big commit as I was going to keep my inventory work local until I had it in a working state, in case it brakes anything, but its getting harder to keep in sync with svn. 

3 files changed, 8 insertions, 4 deletions

diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index e64d9f0..b8e6af5 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -66,8 +66,10 @@ namespace SimpleApp
         public event NewAvatar OnNewAvatar;
         public event GenericCall6 OnRemoveAvatar;
 
+        public event CreateNewInventoryItem OnCreateNewInventoryItem;
         public event CreateInventoryFolder OnCreateNewInventoryFolder;
         public event FetchInventoryDescendents OnFetchInventoryDescendents;
+        public event FetchInventory OnFetchInventory;
         public event RequestTaskInventory OnRequestTaskInventory;
 
         public event UUIDNameRequest OnNameFromUUIDRequest;
@@ -142,7 +144,7 @@ namespace SimpleApp
         public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation) { }
 
         public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items) { }
-        public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item) { }
+        public virtual void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item) { }
         public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { }
         public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { }
         public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname) { }
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 6704a19..1a69e74 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -5,10 +5,11 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Types;
-using OpenSim.Region.Caches;
+ 
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Terrain;
 using OpenSim.Region.Environment;
+using OpenSim.Framework.Communications.Caches;
 
 using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
 
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 5c16d6b..a5bc999 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -8,10 +8,11 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Types;
 using OpenSim.Physics.Manager;
-using OpenSim.Region.Caches;
+ 
 using OpenSim.Region.Capabilities;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.Communications.Local;
+using OpenSim.Framework.Communications.Caches;
 using OpenSim.Region.GridInterfaces.Local;
 using System.Timers;
 using OpenSim.Region.Environment.Scenes;
@@ -47,7 +48,7 @@ namespace SimpleApp
         {
             base.StartUp();
 
-            m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer);
+            m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
 
             m_log.Notice(m_log.LineInfo);