diff options
Added a very very very basic Web front end for admin use - ready to be used in sandbox mode for adding new accounts.
Diffstat (limited to 'OpenSim.RegionServer/AgentAssetUpload.cs')
-rw-r--r-- | OpenSim.RegionServer/AgentAssetUpload.cs | 19 |
1 files changed, 17 insertions, 2 deletions
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 | |||
79 | 79 | ||
80 | 80 | ||
81 | } | 81 | } |
82 | /* for now we will only support uploading of textures | ||
83 | else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5) | 82 | else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5) |
84 | { | 83 | { |
85 | 84 | ||
@@ -92,7 +91,7 @@ namespace OpenSim | |||
92 | asset.Data = pack.AssetBlock.AssetData; | 91 | asset.Data = pack.AssetBlock.AssetData; |
93 | 92 | ||
94 | 93 | ||
95 | }*/ | 94 | } |
96 | 95 | ||
97 | if (asset != null) | 96 | if (asset != null) |
98 | { | 97 | { |
@@ -169,6 +168,22 @@ namespace OpenSim | |||
169 | 168 | ||
170 | #endregion | 169 | #endregion |
171 | 170 | ||
171 | public AssetBase AddUploadToAssetCache(LLUUID transactionID) | ||
172 | { | ||
173 | AssetBase asset = null; | ||
174 | if(this.transactions.ContainsKey(transactionID)) | ||
175 | { | ||
176 | AssetTransaction trans = this.transactions[transactionID]; | ||
177 | if (trans.UploadComplete) | ||
178 | { | ||
179 | OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); | ||
180 | asset = trans.Asset; | ||
181 | } | ||
182 | } | ||
183 | |||
184 | return asset; | ||
185 | } | ||
186 | |||
172 | public void CreateInventoryItem(CreateInventoryItemPacket packet) | 187 | public void CreateInventoryItem(CreateInventoryItemPacket packet) |
173 | { | 188 | { |
174 | if(this.transactions.ContainsKey(packet.InventoryBlock.TransactionID)) | 189 | if(this.transactions.ContainsKey(packet.InventoryBlock.TransactionID)) |