From ff08d4d016c048d78cc6de86e62d8e94748bf968 Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 14 Aug 2007 14:57:52 +0000
Subject: More inventory work, should be able to now create new inventory
 folders and them be stored in database (so are there on next login). Again
 only works in standalone mode with Account/password authentication turned on.
 [Creating new inventory items should be working very soon.] The test is to
 make sure that it hasn't broke grid mode at all.

---
 .../Communications/Local/LocalInventoryService.cs  |  5 ++++
 .../Communications/OGS1/CommunicationsOGS1.cs      |  7 +++++-
 .../Communications/OGS1/OGS1InventoryService.cs    | 28 ++++++++++++++++++++++
 OpenSim/Region/Environment/Scenes/Scene.cs         |  4 ++--
 4 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 35c2c8c..6ba024a 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -47,5 +47,10 @@ namespace OpenSim.Region.Communications.Local
                 }
             }
         }
+
+        public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
+        {
+            this.AddFolder(folder);
+        }
     }
 }
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 47d3148..af239f7 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -8,12 +8,17 @@ namespace OpenSim.Region.Communications.OGS1
 {
     public class CommunicationsOGS1 : CommunicationsManager
     {
-        
+        public OGS1InventoryService InvenService;
+
         public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache)
         {
             OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
             GridServer = gridInterComms;
             InterRegion = gridInterComms;
+
+            InvenService = new OGS1InventoryService();
+            InventoryServer = InvenService;
+
             UserServer = new OGS1UserServices(this);
         }
     }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
new file mode 100644
index 0000000..e8355c6
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using libsecondlife;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Data;
+using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
+
+namespace OpenSim.Region.Communications.OGS1
+{
+    public class OGS1InventoryService : IInventoryServices
+    {
+
+        public OGS1InventoryService()
+        {
+
+        }
+
+        public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
+        {
+            
+        }
+
+        public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f24def2..5123048 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -564,7 +564,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_estateManager.sendRegionHandshake(client);
             CreateAndAddScenePresence(client);
             m_LandManager.sendParcelOverlay(client);
-            //commsManager.UserProfiles.AddNewUser(client.AgentId);
+            commsManager.UserProfiles.AddNewUser(client.AgentId);
         }
 
         protected virtual void SubscribeToClientEvents(IClientAPI client)
@@ -609,7 +609,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
             
            //client.OnCreateNewInventoryItem += CreateNewInventoryItem;
-            //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder;
+            client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder;
             client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents;
             client.OnRequestTaskInventory += RequestTaskInventory;
 
-- 
cgit v1.1