diff options
author | Justin Clarke Casey | 2008-11-17 21:00:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-17 21:00:34 +0000 |
commit | c25a0ea7923aa390d30b8eebdbca4e599edf9b0d (patch) | |
tree | 775133790681153be9edc6d640162271750a1fd0 /OpenSim/Framework/Communications/Capabilities/Caps.cs | |
parent | * minor: add interface version to 'show version' command output (diff) | |
download | opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.zip opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.gz opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.bz2 opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.xz |
* Update libOMV to r2359. This is necessary for the progressive texture patch
* Update libopenjpeg as well for this patch.
* Appears to be okay on a very short sniff test
* Source code will be placed in opensim-libs shortly
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 28e56da..b4a0473 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -159,7 +159,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
159 | m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); | 159 | m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); |
160 | m_log.Warn("[SEED]: " + capsBase + m_requestPath); | 160 | m_log.Warn("[SEED]: " + capsBase + m_requestPath); |
161 | //m_capsHandlers["MapLayer"] = | 161 | //m_capsHandlers["MapLayer"] = |
162 | // new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", | 162 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", |
163 | // capsBase + m_mapLayerPath, | 163 | // capsBase + m_mapLayerPath, |
164 | // GetMapLayer); | 164 | // GetMapLayer); |
165 | m_capsHandlers["NewFileAgentInventory"] = | 165 | m_capsHandlers["NewFileAgentInventory"] = |
@@ -297,7 +297,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
297 | Hashtable inventoryhash = (Hashtable)foldersrequested[i]; | 297 | Hashtable inventoryhash = (Hashtable)foldersrequested[i]; |
298 | 298 | ||
299 | LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents(); | 299 | LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents(); |
300 | LLSDHelpers.DeserialiseLLSDMap(inventoryhash, llsdRequest); | 300 | LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest); |
301 | LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest); | 301 | LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest); |
302 | 302 | ||
303 | inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply); | 303 | inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply); |
@@ -431,7 +431,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
431 | { | 431 | { |
432 | m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName); | 432 | m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName); |
433 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); | 433 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); |
434 | mapResponse.LayerData.Array.Add(GetLLSDMapLayerResponse()); | 434 | mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); |
435 | return mapResponse; | 435 | return mapResponse; |
436 | } | 436 | } |
437 | 437 | ||
@@ -439,9 +439,9 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
439 | /// | 439 | /// |
440 | /// </summary> | 440 | /// </summary> |
441 | /// <returns></returns> | 441 | /// <returns></returns> |
442 | protected static LLSDMapLayer GetLLSDMapLayerResponse() | 442 | protected static OSDMapLayer GetOSDMapLayerResponse() |
443 | { | 443 | { |
444 | LLSDMapLayer mapLayer = new LLSDMapLayer(); | 444 | OSDMapLayer mapLayer = new OSDMapLayer(); |
445 | mapLayer.Right = 5000; | 445 | mapLayer.Right = 5000; |
446 | mapLayer.Top = 5000; | 446 | mapLayer.Top = 5000; |
447 | mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006"); | 447 | mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006"); |
@@ -545,7 +545,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
545 | 545 | ||
546 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); | 546 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); |
547 | LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); | 547 | LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); |
548 | LLSDHelpers.DeserialiseLLSDMap(hash, llsdUpdateRequest); | 548 | LLSDHelpers.DeserialiseOSDMap(hash, llsdUpdateRequest); |
549 | 549 | ||
550 | string capsBase = "/CAPS/" + m_capsObjectPath; | 550 | string capsBase = "/CAPS/" + m_capsObjectPath; |
551 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 551 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
@@ -600,10 +600,10 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
600 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 600 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
601 | { | 601 | { |
602 | m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); | 602 | m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); |
603 | //OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request)); | 603 | //OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request)); |
604 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); | 604 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); |
605 | LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); | 605 | LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); |
606 | LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); | 606 | LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest); |
607 | 607 | ||
608 | string capsBase = "/CAPS/" + m_capsObjectPath; | 608 | string capsBase = "/CAPS/" + m_capsObjectPath; |
609 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 609 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |