Hopefully fixed the texture uploading and the crashing when a prim with a uploaded texture on it is moved.

1 files changed, 2 insertions, 4 deletions

diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index 2b4d78f..5d40c88 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -20,7 +20,6 @@ namespace OpenSim
 

         public void AddUpload(LLUUID transactionID, AssetBase asset)

         {

-            Console.WriteLine("adding upload asset");

             AssetTransaction upload = new AssetTransaction();

             lock (this.transactions)

             {

@@ -40,7 +39,6 @@ namespace OpenSim
             }

             else

             {

-                Console.WriteLine(" no data in upload request so use xfer system");

                 upload.UploadComplete = false;

                 upload.XferID = Util.GetNextXferID();

                 RequestXferPacket xfer = new RequestXferPacket();

@@ -155,7 +153,7 @@ namespace OpenSim
                                 OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);

                             }

 

-                            Console.WriteLine(Helpers.FieldToString(trans.Asset.Data));

+                           

                         }

                         break;

                     }

@@ -183,7 +181,7 @@ namespace OpenSim
                 {

                     //already complete so we can add it to the inventory

                     OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset);

-                    OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset);

+                   Console.WriteLine( "ITem created is " +OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated());

                 }

                 else

                 {