aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorMW2007-07-27 12:21:52 +0000
committerMW2007-07-27 12:21:52 +0000
commitd143e7b074111c2a4796c6caf05ea5030412d44b (patch)
treefab873ac99db74c6db0badf677df8345586bd787 /OpenSim/Framework/Communications
parent* Removing some housekeeping tagged elements. (diff)
downloadopensim-SC-d143e7b074111c2a4796c6caf05ea5030412d44b.zip
opensim-SC-d143e7b074111c2a4796c6caf05ea5030412d44b.tar.gz
opensim-SC-d143e7b074111c2a4796c6caf05ea5030412d44b.tar.bz2
opensim-SC-d143e7b074111c2a4796c6caf05ea5030412d44b.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs5
2 files changed, 5 insertions, 2 deletions
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
23 InventoryFolder folderInfo = new InventoryFolder(); 23 InventoryFolder folderInfo = new InventoryFolder();
24 folderInfo.agentID = libOwner; 24 folderInfo.agentID = libOwner;
25 folderInfo.folderID = new LLUUID("00000112-000f-0000-0000-000100bba001"); 25 folderInfo.folderID = new LLUUID("00000112-000f-0000-0000-000100bba001");
26 folderInfo.name = "My Inventory"; 26 folderInfo.name = "Texture Library";
27 folderInfo.parentID = this.folderID; 27 folderInfo.parentID = this.folderID;
28 folderInfo.type = -1; 28 folderInfo.type = -1;
29 folderInfo.version = 1; 29 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
82 AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory); 82 AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
83 } 83 }
84 84
85 [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")] 85
86 //[Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
87 //Commented out the obsolete as at this time the first caps request can not use the new Caps method
88 //as the sent type is a array and not a map and the deserialising doesn't deal properly with arrays.
86 private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod) 89 private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)
87 { 90 {
88 string capsBase = "/CAPS/" + m_capsObjectPath; 91 string capsBase = "/CAPS/" + m_capsObjectPath;