updated libsecondlife.dll to a 1.18 version (from the libsecondlife aditi branch, so when they have a trunk version that is 1.18 ready, best to update again).

Started some work on a userProfile/inventory cache.

8 files changed, 209 insertions, 12 deletions

diff --git a/OpenSim/Region/Caches/CachedUserInfo.cs b/OpenSim/Region/Caches/CachedUserInfo.cs
new file mode 100644
index 0000000..08a7848
--- /dev/null
+++ b/OpenSim/Region/Caches/CachedUserInfo.cs
@@ -0,0 +1,20 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim.Framework.Data;

+using libsecondlife;

+

+namespace OpenSim.Region.Caches

+{

+    public class CachedUserInfo

+    {

+        public UserProfileData UserProfile;

+        //public Dictionary<LLUUID, InventoryFolder> Folders = new Dictionary<LLUUID, InventoryFolder>();

+        public InventoryFolder RootFolder;

+

+        public CachedUserInfo()

+        {

+

+        }

+    }

+}

diff --git a/OpenSim/Region/Caches/InventoryFolder.cs b/OpenSim/Region/Caches/InventoryFolder.cs
new file mode 100644
index 0000000..364a184
--- /dev/null
+++ b/OpenSim/Region/Caches/InventoryFolder.cs
@@ -0,0 +1,51 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using libsecondlife;

+using OpenSim.Framework.Data;

+

+namespace OpenSim.Region.Caches

+{

+    public class InventoryFolder : InventoryFolderBase

+    {

+        public Dictionary<LLUUID, InventoryFolder> SubFolders = new Dictionary<LLUUID, InventoryFolder>();

+        public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>();

+

+        public InventoryFolder()

+        {

+        }

+

+        public InventoryFolder HasSubFolder(LLUUID folderID)

+        {

+            InventoryFolder returnFolder = null;

+            if (this.SubFolders.ContainsKey(folderID))

+            {

+                returnFolder = this.SubFolders[folderID];

+            }

+            else

+            {

+                foreach (InventoryFolder folder in this.SubFolders.Values)

+                {

+                   returnFolder = folder.HasSubFolder(folderID);

+                   if (returnFolder != null)

+                   {

+                       break;

+                   }

+                }

+            }

+            return returnFolder;

+        }

+

+        public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type)

+        {

+            InventoryFolder subFold = new InventoryFolder();

+            subFold.name = folderName;

+            subFold.folderID = folderID;

+            subFold.type = type;

+            subFold.parentID = this.folderID;

+            subFold.agentID = this.agentID;

+            this.SubFolders.Add(subFold.folderID, subFold);

+            return subFold;

+        }

+    }

+}

diff --git a/OpenSim/Region/Caches/UserProfileCache.cs b/OpenSim/Region/Caches/UserProfileCache.cs
new file mode 100644
index 0000000..0717e55
--- /dev/null
+++ b/OpenSim/Region/Caches/UserProfileCache.cs
@@ -0,0 +1,75 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using libsecondlife;

+using OpenSim.Framework.Data;

+

+namespace OpenSim.Region.Caches

+{

+    public class UserProfileCache

+    {

+        public Dictionary<LLUUID, CachedUserInfo> UserProfiles = new Dictionary<LLUUID, CachedUserInfo>();

+

+        public UserProfileCache()

+        {

+

+        }

+

+        /// <summary>

+        /// A new user has moved into a region in this instance

+        /// so get info from servers

+        /// </summary>

+        /// <param name="userID"></param>

+        public void AddNewUser(LLUUID userID)

+        {

+

+        }

+

+        /// <summary>

+        /// A user has left this instance 

+        /// so make sure servers have been updated

+        /// Then remove cached info

+        /// </summary>

+        /// <param name="userID"></param>

+        public void UserLogOut(LLUUID userID)

+        {

+

+        }

+

+        /// <summary>

+        /// Request the user profile from User server

+        /// </summary>

+        /// <param name="userID"></param>

+        private void RequestUserProfileForUser(LLUUID userID)

+        {

+

+        }

+

+        /// <summary>

+        /// Request Iventory Info from Inventory server

+        /// </summary>

+        /// <param name="userID"></param>

+        private void RequestInventoryForUser(LLUUID userID)

+        {

+

+        }

+

+        /// <summary>

+        /// Make sure UserProfile is updated on user server

+        /// </summary>

+        /// <param name="userID"></param>

+        private void UpdateUserProfileToServer(LLUUID userID)

+        {

+

+        }

+

+        /// <summary>

+        /// Update Inventory data to Inventory server

+        /// </summary>

+        /// <param name="userID"></param>

+        private void UpdateInventoryToServer(LLUUID userID)

+        {

+

+        }

+    }

+}

diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 048f4df..211ba8b 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.ClientStack
             // Keep track of when this packet was sent out

             Pack.TickCount = Environment.TickCount;

 

-            Console.WriteLine(CircuitCode + ":OUT: " + Pack.Type.ToString());

+          //  Console.WriteLine(CircuitCode + ":OUT: " + Pack.Type.ToString());

 

             if (!Pack.Header.Resent)

             {

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 66c1739..d32976f 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -24,6 +24,11 @@ namespace OpenSim.Region.Communications.OGS1
         public NetworkServersInfo serversInfo;

         public BaseHttpServer httpServer;

 

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="servers_info"></param>

+        /// <param name="httpServe"></param>

         public OGS1GridServices(NetworkServersInfo servers_info, BaseHttpServer httpServe)

         {

             serversInfo = servers_info;

@@ -32,6 +37,11 @@ namespace OpenSim.Region.Communications.OGS1
             this.StartRemoting();

         }

 

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionInfo"></param>

+        /// <returns></returns>

         public RegionCommsListener RegisterRegion(RegionInfo regionInfo)

         {

             if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))

@@ -40,8 +50,6 @@ namespace OpenSim.Region.Communications.OGS1
             }

 

             Hashtable GridParams = new Hashtable();

-

-

             // Login / Authentication

 

             GridParams["authkey"] = serversInfo.GridSendKey;

@@ -74,15 +82,6 @@ namespace OpenSim.Region.Communications.OGS1
                 return null;

             }

 

-            /* if (!this.listeners.ContainsKey(regionInfo.RegionHandle))

-             {

-                 MainLog.Instance.Verbose("OGS1 - Registering new HTTP listener on port " + regionInfo.InternalEndPoint.Port.ToString());

-                // initialised = true;

-                 httpListener = new BaseHttpServer( regionInfo.InternalEndPoint.Port );

-                 httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);

-                 httpListener.Start();

-             }*/

-

             // Initialise the background listeners

             RegionCommsListener regListener = new RegionCommsListener();

             if (this.listeners.ContainsKey(regionInfo.RegionHandle))

@@ -97,6 +96,11 @@ namespace OpenSim.Region.Communications.OGS1
             return regListener;

         }

 

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionInfo"></param>

+        /// <returns></returns>

         public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

         {

 

@@ -136,6 +140,11 @@ namespace OpenSim.Region.Communications.OGS1
             return neighbours;

         }

 

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionHandle"></param>

+        /// <returns></returns>

         public RegionInfo RequestNeighbourInfo(ulong regionHandle)

         {

             if (this.regions.ContainsKey(regionHandle))

@@ -179,6 +188,14 @@ namespace OpenSim.Region.Communications.OGS1
             return regionInfo;

         }

 

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="minX"></param>

+        /// <param name="minY"></param>

+        /// <param name="maxX"></param>

+        /// <param name="maxY"></param>

+        /// <returns></returns>

         public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)

         {

             Hashtable respData = MapBlockQuery(minX, minY, maxX, maxY);

@@ -232,6 +249,11 @@ namespace OpenSim.Region.Communications.OGS1
         }

 

         // Grid Request Processing

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="request"></param>

+        /// <returns></returns>

         public XmlRpcResponse ExpectUser(XmlRpcRequest request)

         {

             Console.WriteLine("Expecting User...");

@@ -269,6 +291,9 @@ namespace OpenSim.Region.Communications.OGS1
         }

 

         #region InterRegion Comms

+        /// <summary>

+        /// 

+        /// </summary>

         private void StartRemoting()

         {

             TcpChannel ch = new TcpChannel(this.serversInfo.RemotingListenerPort);

@@ -281,6 +306,12 @@ namespace OpenSim.Region.Communications.OGS1
         }

 

         #region Methods called by regions in this instance

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionHandle"></param>

+        /// <param name="agentData"></param>

+        /// <returns></returns>

         public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)

         {

             if (this.listeners.ContainsKey(regionHandle))

@@ -316,6 +347,13 @@ namespace OpenSim.Region.Communications.OGS1
             return false;

         }

 

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionHandle"></param>

+        /// <param name="agentID"></param>

+        /// <param name="position"></param>

+        /// <returns></returns>

         public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)

         {

             if (this.listeners.ContainsKey(regionHandle))

@@ -353,6 +391,12 @@ namespace OpenSim.Region.Communications.OGS1
         #endregion

 

         #region Methods triggered by calls from external instances

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionHandle"></param>

+        /// <param name="agentData"></param>

+        /// <returns></returns>

         public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)

         {

             if (this.listeners.ContainsKey(regionHandle))

@@ -363,6 +407,13 @@ namespace OpenSim.Region.Communications.OGS1
             return false;

         }

 

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionHandle"></param>

+        /// <param name="agentID"></param>

+        /// <param name="position"></param>

+        /// <returns></returns>

         public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position)

         {

             if (this.listeners.ContainsKey(regionHandle))

diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/InterpreterLogic.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Logic.cs
index 2a11afd..2a11afd 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/InterpreterLogic.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Logic.cs
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/InterpreterMethods.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Methods.cs
index 4d60559..4d60559 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/InterpreterMethods.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Methods.cs
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/InterpreterReturn.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Return.cs
index cbedb71..cbedb71 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/InterpreterReturn.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Return.cs