From 6323516a834b5f3dc8056b4107e216c341a42166 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 25 Mar 2009 20:15:46 +0000
Subject: * Appearance patches suite: These patches are applied to allow libomv
 bots to wear outfits in the future. This functionality will be upstreamed
 later. ** Fixed call of new AvatarAppearance without arguments, which caused
 bots look like clouds of gas ** Added a SendAvatarData in
 ScenePresence.SetAppearance, which is expected after SetAppearance is run **
 Fixed AssetXferUploader: CallbackID wasn't being passed on on multiple
 packets asset uploads ** Set VisualParams in AvatarAppearance to stop the
 alien looking bot from spawning and now looks a little better. *** TODO: Set
 better VisualParams value then 150 to everything

---
 .../Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs')

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 7803209..8bdf084 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -43,6 +43,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         private UUID InventFolder = UUID.Zero;
         private sbyte invType = 0;
         private bool m_createItem = false;
+        private uint m_createItemCallback = 0;
         private string m_description = String.Empty;
         private bool m_dumpAssetToFile;
         private bool m_finished = false;
@@ -148,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             m_finished = true;
             if (m_createItem)
             {
-                DoCreateItem(0);
+                DoCreateItem(m_createItemCallback);
             }
             else if (m_storeLocal)
             {
@@ -205,6 +206,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                 else
                 {
                     m_createItem = true; //set flag so the inventory item is created when upload is complete
+                    m_createItemCallback = callbackID;
                 }
             }
         }
-- 
cgit v1.1