diff options
author | MW | 2007-03-26 16:51:50 +0000 |
---|---|---|
committer | MW | 2007-03-26 16:51:50 +0000 |
commit | 42ba0712765b93f652a8671269e39ca647b8d05e (patch) | |
tree | d76c780eb4ec1aff0b5485e19f9b3e49bf6b938c /OpenSim.RegionServer/SimClient.cs | |
parent | * Added Prebuild exe (just delete the old one) (diff) | |
download | opensim-SC-42ba0712765b93f652a8671269e39ca647b8d05e.zip opensim-SC-42ba0712765b93f652a8671269e39ca647b8d05e.tar.gz opensim-SC-42ba0712765b93f652a8671269e39ca647b8d05e.tar.bz2 opensim-SC-42ba0712765b93f652a8671269e39ca647b8d05e.tar.xz |
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 '')
-rw-r--r-- | OpenSim.RegionServer/SimClient.cs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index dea385c..811e8b8 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs | |||
@@ -287,7 +287,7 @@ namespace OpenSim | |||
287 | //this.UploadAssets.HandleUploadPacket(request, LLUUID.Random()); | 287 | //this.UploadAssets.HandleUploadPacket(request, LLUUID.Random()); |
288 | //} | 288 | //} |
289 | //else | 289 | //else |
290 | //{*/ | 290 | //{ |
291 | this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID)); | 291 | this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID)); |
292 | //} | 292 | //} |
293 | break; | 293 | break; |
@@ -318,13 +318,25 @@ namespace OpenSim | |||
318 | OpenSimRoot.Instance.InventoryCache.FetchInventoryDescendents(this, Fetch); | 318 | OpenSimRoot.Instance.InventoryCache.FetchInventoryDescendents(this, Fetch); |
319 | break; | 319 | break; |
320 | case PacketType.UpdateInventoryItem: | 320 | case PacketType.UpdateInventoryItem: |
321 | /* UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; | 321 | /* |
322 | UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; | ||
322 | for (int i = 0; i < update.InventoryData.Length; i++) | 323 | for (int i = 0; i < update.InventoryData.Length; i++) |
323 | { | 324 | { |
324 | if (update.InventoryData[i].TransactionID != LLUUID.Zero) | 325 | if (update.InventoryData[i].TransactionID != LLUUID.Zero) |
325 | { | 326 | { |
326 | AssetBase asset = OpenSimRoot.Instance.AssetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); | 327 | AssetBase asset = OpenSimRoot.Instance.AssetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); |
327 | OpenSimRoot.Instance.InventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); | 328 | if (asset != null) |
329 | { | ||
330 | OpenSimRoot.Instance.InventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); | ||
331 | } | ||
332 | else | ||
333 | { | ||
334 | asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); | ||
335 | if (asset != null) | ||
336 | { | ||
337 | OpenSimRoot.Instance.InventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); | ||
338 | } | ||
339 | } | ||
328 | } | 340 | } |
329 | }*/ | 341 | }*/ |
330 | break; | 342 | break; |