aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities
diff options
context:
space:
mode:
authorMike Mazur2009-02-04 00:01:36 +0000
committerMike Mazur2009-02-04 00:01:36 +0000
commit0c03a48fb2060eda4d288e2d2ca4e650ce000b4b (patch)
treea90465075960c92367b0a5e62db3121e4e3a139d /OpenSim/Framework/Communications/Capabilities
parent* Add another object to the existing save oar test (diff)
downloadopensim-SC_OLD-0c03a48fb2060eda4d288e2d2ca4e650ce000b4b.zip
opensim-SC_OLD-0c03a48fb2060eda4d288e2d2ca4e650ce000b4b.tar.gz
opensim-SC_OLD-0c03a48fb2060eda4d288e2d2ca4e650ce000b4b.tar.bz2
opensim-SC_OLD-0c03a48fb2060eda4d288e2d2ca4e650ce000b4b.tar.xz
- add OpenSim.Framework.AssetMetadata class. AssetBase is now composed of it
- trim trailing whitespace
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a6acd68..a370eea 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.DebugFormat( 160 m_log.DebugFormat(
161 "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_agentID); 161 "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_agentID);
162 162
163 //m_capsHandlers["MapLayer"] = 163 //m_capsHandlers["MapLayer"] =
164 // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", 164 // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",
165 // capsBase + m_mapLayerPath, 165 // capsBase + m_mapLayerPath,
@@ -247,9 +247,9 @@ namespace OpenSim.Framework.Communications.Capabilities
247 //m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); 247 //m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);
248 248
249 string result = LLSDHelpers.SerialiseLLSDReply(m_capsHandlers.CapsDetails); 249 string result = LLSDHelpers.SerialiseLLSDReply(m_capsHandlers.CapsDetails);
250 250
251 //m_log.DebugFormat("[CAPS] CapsRequest {0}", result); 251 //m_log.DebugFormat("[CAPS] CapsRequest {0}", result);
252 252
253 return result; 253 return result;
254 } 254 }
255 255
@@ -569,7 +569,7 @@ namespace OpenSim.Framework.Communications.Capabilities
569 569
570 m_httpListener.AddStreamHandler( 570 m_httpListener.AddStreamHandler(
571 new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps)); 571 new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
572 572
573 string protocol = "http://"; 573 string protocol = "http://";
574 574
575 if (m_httpListener.UseSSL) 575 if (m_httpListener.UseSSL)
@@ -648,7 +648,7 @@ namespace OpenSim.Framework.Communications.Capabilities
648 /// <returns></returns> 648 /// <returns></returns>
649 public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest) 649 public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest)
650 { 650 {
651 if (llsdRequest.asset_type == "texture" || 651 if (llsdRequest.asset_type == "texture" ||
652 llsdRequest.asset_type == "animation" || 652 llsdRequest.asset_type == "animation" ||
653 llsdRequest.asset_type == "sound") 653 llsdRequest.asset_type == "sound")
654 { 654 {
@@ -741,9 +741,9 @@ namespace OpenSim.Framework.Communications.Capabilities
741 741
742 AssetBase asset; 742 AssetBase asset;
743 asset = new AssetBase(); 743 asset = new AssetBase();
744 asset.FullID = assetID; 744 asset.Metadata.FullID = assetID;
745 asset.Type = assType; 745 asset.Metadata.Type = assType;
746 asset.Name = assetName; 746 asset.Metadata.Name = assetName;
747 asset.Data = data; 747 asset.Data = data;
748 m_assetCache.AddAsset(asset); 748 m_assetCache.AddAsset(asset);
749 749
@@ -751,7 +751,7 @@ namespace OpenSim.Framework.Communications.Capabilities
751 item.Owner = m_agentID; 751 item.Owner = m_agentID;
752 item.Creator = m_agentID; 752 item.Creator = m_agentID;
753 item.ID = inventoryItem; 753 item.ID = inventoryItem;
754 item.AssetID = asset.FullID; 754 item.AssetID = asset.Metadata.FullID;
755 item.Description = assetDescription; 755 item.Description = assetDescription;
756 item.Name = assetName; 756 item.Name = assetName;
757 item.AssetType = assType; 757 item.AssetType = assType;