From d143e7b074111c2a4796c6caf05ea5030412d44b Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 27 Jul 2007 12:21:52 +0000
Subject: A few changes so that the number of warnings is less but without
 deleting everything. Like, I removed the Obsolete from the old caps method as
 at this time not all caps calls can use the new Caps stream method as it
 doesn't properly deal with LLSD Arrays. Now down to 3 warnings on the events
 in IClientAPI and for now I think we have to live with them as I think most
 of those events will be used.

---
 OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 2 +-
 OpenSim/Framework/Communications/Capabilities/Caps.cs       | 5 ++++-
 OpenSim/Framework/General/Interfaces/IClientAPI.cs          | 1 -
 OpenSim/Framework/General/NullClientAPI.cs                  | 1 -
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index bcfce3f..f807b2b 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -23,7 +23,7 @@ namespace OpenSim.Framework.Communications.Caches
             InventoryFolder folderInfo = new InventoryFolder();
             folderInfo.agentID = libOwner;
             folderInfo.folderID = new LLUUID("00000112-000f-0000-0000-000100bba001");
-            folderInfo.name = "My Inventory";
+            folderInfo.name = "Texture Library";
             folderInfo.parentID = this.folderID;
             folderInfo.type = -1;
             folderInfo.version = 1;
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 3b1cc6a..5df66f4 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -82,7 +82,10 @@ namespace OpenSim.Region.Capabilities
             AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
         }
 
-        [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
+
+        //[Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
+        //Commented out the obsolete as at this time the first caps request can not use the new Caps method 
+        //as the sent type is a array and not a map and the deserialising doesn't deal properly with arrays.
         private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)
         {
             string capsBase = "/CAPS/" + m_capsObjectPath;
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 0bfd827..260da81 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -126,7 +126,6 @@ namespace OpenSim.Framework.Interfaces
         event UpdateVector OnUpdatePrimScale;
         event StatusChange OnChildAgentStatus;
         event GenericCall2 OnStopMovement;
-        event NewAvatar OnNewAvatar;
         event GenericCall6 OnRemoveAvatar;
 
         event CreateNewInventoryItem OnCreateNewInventoryItem;
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index aefb384..9815aca 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -49,7 +49,6 @@ namespace OpenSim.Framework
        public event UpdateVector OnUpdatePrimScale;
        public event StatusChange OnChildAgentStatus;
        public event GenericCall2 OnStopMovement;
-       public event NewAvatar OnNewAvatar;
        public event GenericCall6 OnRemoveAvatar;
 
        public event CreateNewInventoryItem OnCreateNewInventoryItem;
-- 
cgit v1.1