* Started major restructusing of comms to prepare for better grid and region functionality

* Working towards one shared set of services
* Killed off two projects with very little functionality

3 files changed, 60 insertions, 41 deletions

diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index ca9c34b..96f1933 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -11,11 +11,11 @@ namespace OpenSim.Region.Communications.OGS1
         public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache)
         {
             OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
-            m_gridServer = gridInterComms;
+            m_gridService = gridInterComms;
             m_interRegion = gridInterComms;
 
-            m_inventoryServer = new OGS1InventoryService();
-            m_userServer = new OGS1UserServices(this);
+            m_inventoryService = new OGS1InventoryService();
+            m_userService = new OGS1UserServices(this);
         }
     }
 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 1428639..d5dbc46 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -1,38 +1,52 @@
-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)
-        {
-
-        }
-
-        public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
-        {
-
-        }
-
-        public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
-        {
-
-        }
-    }
-}
+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()

+        {

+

+        }

+

+        #region IInventoryServices Members

+

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

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        public void CreateNewUserInventory(LLUUID user)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)

+        {

+            throw new Exception("The method or operation is not implemented.");

+        }

+

+        #endregion

+    }

+}

diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 71b3752..d376d1c 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -101,5 +101,10 @@ namespace OpenSim.Region.Communications.OGS1
             UserProfileData profile = GetUserProfile(firstName, lastName);
             return profile;
         }
+
+        public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
     }
 }