From 42ba0712765b93f652a8671269e39ca647b8d05e Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 26 Mar 2007 16:51:50 +0000
Subject: Added a very very very basic Web front end for admin use - ready to
 be used in sandbox mode for adding new accounts.

---
 OpenSim.RegionServer/AgentAssetUpload.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'OpenSim.RegionServer/AgentAssetUpload.cs')

diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index 5d40c88..a482e80 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -79,7 +79,6 @@ namespace OpenSim
 
                 
             }
-            /* for now we will only support uploading of textures 
             else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5)
             {
                
@@ -92,7 +91,7 @@ namespace OpenSim
                     asset.Data = pack.AssetBlock.AssetData;
 
                
-            }*/
+            }
 
             if (asset != null)
             {
@@ -169,6 +168,22 @@ namespace OpenSim
 
         #endregion
 
+        public AssetBase AddUploadToAssetCache(LLUUID transactionID)
+        {
+            AssetBase asset = null;
+            if(this.transactions.ContainsKey(transactionID))
+            {
+                AssetTransaction trans = this.transactions[transactionID];
+                if (trans.UploadComplete)
+                {
+                    OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset);
+                    asset = trans.Asset;
+                }
+            }
+
+            return asset;
+        }
+
         public void CreateInventoryItem(CreateInventoryItemPacket packet)
         {
             if(this.transactions.ContainsKey(packet.InventoryBlock.TransactionID))
-- 
cgit v1.1