* Tleiades grid mode inventory (#444) - thanx Tleiades!

  * updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
 

3 files changed, 77 insertions, 14 deletions

diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 96f1933..1aa6498 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -14,8 +14,8 @@ namespace OpenSim.Region.Communications.OGS1
             m_gridService = gridInterComms;
             m_interRegion = gridInterComms;
 
-            m_inventoryService = new OGS1InventoryService();
             m_userService = new OGS1UserServices(this);
+            m_inventoryService = new OGS1InventoryService(serversInfo, m_userService);
         }
     }
 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 1b4b54c..0b78c83 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -5,6 +5,7 @@ using System.Net;
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
+using System.Runtime.Serialization.Formatters;
 using libsecondlife;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
@@ -302,8 +303,23 @@ namespace OpenSim.Region.Communications.OGS1
         /// </summary>
         private void StartRemoting()
         {
-            TcpChannel ch = new TcpChannel(this.serversInfo.RemotingListenerPort);
-            ChannelServices.RegisterChannel(ch, true);
+            // we only need to register the tcp channel once, and we don't know which other modules use remoting
+            if (ChannelServices.GetChannel("tcp") == null)
+            {
+                // Creating a custom formatter for a TcpChannel sink chain.
+                BinaryServerFormatterSinkProvider serverProvider = new BinaryServerFormatterSinkProvider();
+                serverProvider.TypeFilterLevel = TypeFilterLevel.Full;
+
+                BinaryClientFormatterSinkProvider clientProvider = new BinaryClientFormatterSinkProvider();
+
+                IDictionary props = new Hashtable();
+                props["port"] = this.serversInfo.RemotingListenerPort;
+                props["typeFilterLevel"] = TypeFilterLevel.Full;
+
+                TcpChannel ch = new TcpChannel(props, clientProvider, serverProvider);
+
+                ChannelServices.RegisterChannel(ch, true);
+            }
 
             WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry(typeof(OGS1InterRegionRemoting), "InterRegions", WellKnownObjectMode.Singleton);
             RemotingConfiguration.RegisterWellKnownServiceType(wellType);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 45188c1..2ec4d10 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -1,8 +1,15 @@
+using System;

+using System.Runtime.Remoting;

+using System.Runtime.Remoting.Channels;

+using System.Runtime.Remoting.Channels.Tcp;

+using System.Runtime.Serialization.Formatters;

+using System.Collections;

 using System.Collections.Generic;

+

 using libsecondlife;

 using OpenSim.Framework.Communications;

 using OpenSim.Framework.Data;

-using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;

+using OpenSim.Framework.Types;

 

 

 namespace OpenSim.Region.Communications.OGS1

@@ -10,43 +17,83 @@ namespace OpenSim.Region.Communications.OGS1
     public class OGS1InventoryService : IInventoryServices

     {

 

-        public OGS1InventoryService()

+        IUserServices _userServices;

+        IInventoryServices _inventoryServices;

+ 

+       public OGS1InventoryService(NetworkServersInfo networkConfig, IUserServices userServices) :

+            this(networkConfig.InventoryServerName, networkConfig.InventoryServerPort, userServices)

+         {

+        }

+ 

+        public OGS1InventoryService(string serverName, int serverPort, IUserServices userServices)

         {

+            _userServices = userServices;

+ 

+            // we only need to register the tcp channel once, and we don't know which other modules use remoting

+            if (ChannelServices.GetChannel("tcp") == null)

+            {

+                // Creating a custom formatter for a TcpChannel sink chain.

+               BinaryServerFormatterSinkProvider serverProvider = new BinaryServerFormatterSinkProvider();

+                serverProvider.TypeFilterLevel = TypeFilterLevel.Full;

+

+                BinaryClientFormatterSinkProvider clientProvider = new BinaryClientFormatterSinkProvider();

+

+                IDictionary props = new Hashtable();

+                props["typeFilterLevel"] = TypeFilterLevel.Full;

+

+                // Pass the properties for the port setting and the server provider in the server chain argument. (Client remains null here.)

+                TcpChannel chan = new TcpChannel(props, clientProvider, serverProvider);

+

+                ChannelServices.RegisterChannel(chan, true);

+            }

+

 

+

+            string remotingUrl = string.Format("tcp://{0}:{1}/Inventory", serverName, serverPort);

+            _inventoryServices = (IInventoryServices)Activator.GetObject(typeof(IInventoryServices), remotingUrl); 

         }

 

         #region IInventoryServices Members

        

         public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)

         {

-            

+            _inventoryServices.RequestInventoryForUser(userID, folderCallBack, itemCallBack);             

         }

 

-        public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)

+        public void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder)

         {

-            

+            _inventoryServices.AddNewInventoryFolder(userID, folder);

         }

 

         public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)

         {

-            

+            _inventoryServices.AddNewInventoryItem(userID, item);

         }

 

         public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)

         {

-            

+            _inventoryServices.DeleteInventoryItem(userID, item);

+        }

+

+        public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID folderID)

+        {

+            return _inventoryServices.RequestFirstLevelFolders(folderID);

         }

 

-        public void CreateNewUserInventory(LLUUID user)

+         public List<InventoryItemBase> RequestFolderItems(LLUUID folderID)

         {

-            

+            return _inventoryServices.RequestFolderItems(folderID);

         }

 

-        public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)

+        public void GetRootFoldersForUser(LLUUID user, out LLUUID libraryFolder, out LLUUID personalFolder)

         {

-            return new List<InventoryFolderBase>();

+            _inventoryServices.GetRootFoldersForUser(user, out libraryFolder, out personalFolder);

         }

 

+        public void CreateNewUserInventory(LLUUID libraryRootId, LLUUID user)

+        {

+            throw new Exception("method not implemented");

+        }

         #endregion

     }

 }