diff --git a/OpenMetaverse/InventoryManager.cs b/OpenMetaverse/InventoryManager.cs
index 97150fdc..57d85f48 100644
--- a/OpenMetaverse/InventoryManager.cs
+++ b/OpenMetaverse/InventoryManager.cs
@@ -917,13 +917,13 @@ namespace OpenMetaverse
         public delegate void TaskInventoryReplyCallback(UUID itemID, short serial, string assetFilename);
 
         /// <summary>
-        /// 
+        /// Reply received when uploading an invetnory asset
         /// </summary>
-        /// <param name="success"></param>
-        /// <param name="status"></param>
-        /// <param name="itemID"></param>
-        /// <param name="assetID"></param>
-        public delegate void NotecardUploadedAssetCallback(bool success, string status, UUID itemID, UUID assetID);
+        /// <param name="success">Has upload been successful</param>
+        /// <param name="status">Error message if upload failed</param>
+        /// <param name="itemID">Inventory asset UUID</param>
+        /// <param name="assetID">New gesture asset UUID</param>
+        public delegate void InventoryUploadedAssetCallback(bool success, string status, UUID itemID, UUID assetID);
 
         /// <summary>
         /// Fired when local inventory store needs to be updated. Generally at logout to update a local cache
@@ -2093,7 +2093,7 @@ namespace OpenMetaverse
         /// <param name="data"></param>
         /// <param name="notecardID"></param>
         /// <param name="callback"></param>
-        public void RequestUploadNotecardAsset(byte[] data, UUID notecardID, NotecardUploadedAssetCallback callback)
+        public void RequestUploadNotecardAsset(byte[] data, UUID notecardID, InventoryUploadedAssetCallback callback)
         {
             if (_Client.Network.CurrentSim == null || _Client.Network.CurrentSim.Caps == null)
                 throw new Exception("UpdateNotecardAgentInventory capability is not currently available");
@@ -2107,8 +2107,8 @@ namespace OpenMetaverse
 
                 // Make the request
                 CapsClient request = new CapsClient(url);
-                request.OnComplete += UploadNotecardAssetResponse;
-                request.UserData = new object[] { new KeyValuePair<NotecardUploadedAssetCallback, byte[]>(callback, data), notecardID };
+                request.OnComplete += UploadInventoryAssetResponse;
+                request.UserData = new object[] { new KeyValuePair<InventoryUploadedAssetCallback, byte[]>(callback, data), notecardID };
                 request.BeginGetResponse(query, OSDFormat.Xml, _Client.Settings.CAPS_TIMEOUT);
             }
             else
@@ -2117,6 +2117,36 @@ namespace OpenMetaverse
             }
         }
 
+        /// <summary>
+        /// Upload new gesture asset for an inventory gesture item
+        /// </summary>
+        /// <param name="data">Encoded gesture asset</param>
+        /// <param name="gestureID">Gesture inventory UUID</param>
+        /// <param name="callback">Callback whick will be called when upload is complete</param>
+        public void RequestUploadGestureAsset(byte[] data, UUID gestureID, InventoryUploadedAssetCallback callback)
+        {
+            if (_Client.Network.CurrentSim == null || _Client.Network.CurrentSim.Caps == null)
+                throw new Exception("UpdateGestureAgentInventory capability is not currently available");
+
+            Uri url = _Client.Network.CurrentSim.Caps.CapabilityURI("UpdateGestureAgentInventory");
+
+            if (url != null)
+            {
+                OSDMap query = new OSDMap();
+                query.Add("item_id", OSD.FromUUID(gestureID));
+
+                // Make the request
+                CapsClient request = new CapsClient(url);
+                request.OnComplete += UploadInventoryAssetResponse;
+                request.UserData = new object[] { new KeyValuePair<InventoryUploadedAssetCallback, byte[]>(callback, data), gestureID };
+                request.BeginGetResponse(query, OSDFormat.Xml, _Client.Settings.CAPS_TIMEOUT);
+            }
+            else
+            {
+                throw new Exception("UpdateGestureAgentInventory capability is not currently available");
+            }
+        }
+
         /// <summary>
         /// Update an existing script in an agents Inventory
         /// </summary>
@@ -3766,11 +3796,11 @@ namespace OpenMetaverse
             }
         }
 
-        private void UploadNotecardAssetResponse(CapsClient client, OSD result, Exception error)
+        private void UploadInventoryAssetResponse(CapsClient client, OSD result, Exception error)
         {
             OSDMap contents = result as OSDMap;
-            KeyValuePair<NotecardUploadedAssetCallback, byte[]> kvp = (KeyValuePair<NotecardUploadedAssetCallback, byte[]>)(((object[])client.UserData)[0]);
-            NotecardUploadedAssetCallback callback = kvp.Key;
+            KeyValuePair<InventoryUploadedAssetCallback, byte[]> kvp = (KeyValuePair<InventoryUploadedAssetCallback, byte[]>)(((object[])client.UserData)[0]);
+            InventoryUploadedAssetCallback callback = kvp.Key;
             byte[] itemData = (byte[])kvp.Value;
 
             if (error == null && contents != null)
@@ -3786,7 +3816,7 @@ namespace OpenMetaverse
                         // This makes the assumption that all uploads go to CurrentSim, to avoid
                         // the problem of HttpRequestState not knowing anything about simulators
                         CapsClient upload = new CapsClient(uploadURL);
-                        upload.OnComplete += UploadNotecardAssetResponse;
+                        upload.OnComplete += UploadInventoryAssetResponse;
                         upload.UserData = new object[2] { kvp, (UUID)(((object[])client.UserData)[1]) };
                         upload.BeginGetResponse(itemData, "application/octet-stream", _Client.Settings.CAPS_TIMEOUT);
                     }
diff --git a/OpenMetaverse/Messages/LindenMessages.cs b/OpenMetaverse/Messages/LindenMessages.cs
index dd5d2075..928a498d 100644
--- a/OpenMetaverse/Messages/LindenMessages.cs
+++ b/OpenMetaverse/Messages/LindenMessages.cs
@@ -1686,6 +1686,77 @@ namespace OpenMetaverse.Messages.Linden
         }
     }
 
+    /// <summary>
+    /// A message sent from the viewer to the simulator to request a temporary uploader capability
+    /// used to update a gesture contained in the agents inventory
+    /// </summary>
+    public class UpdateGestureAgentInventoryUpdateMessage : AssetUploaderBlock
+    {
+        /// <summary>
+        /// The Gesture AssetID to replace
+        /// </summary>
+        public UUID ItemID;
+
+        /// <summary>
+        /// Serialize the object
+        /// </summary>
+        /// <returns>An <see cref="OSDMap"/> containing the objects data</returns>
+        public override OSDMap Serialize()
+        {
+            OSDMap map = new OSDMap(1);
+            map["item_id"] = OSD.FromUUID(ItemID);
+
+            return map;
+        }
+
+        /// <summary>
+        /// Deserialize the message
+        /// </summary>
+        /// <param name="map">An <see cref="OSDMap"/> containing the data</param>
+        public override void Deserialize(OSDMap map)
+        {
+            ItemID = map["item_id"].AsUUID();
+        }
+    }
+
+    /// <summary>
+    /// A message containing the request/response used for updating a gesture
+    /// contained with an agents inventory
+    /// </summary>
+    public class UpdateGestureAgentInventoryMessage : IMessage
+    {
+        /// <summary>Object containing request or response</summary>
+        public AssetUploaderBlock Request;
+
+        /// <summary>
+        /// Serialize the object
+        /// </summary>
+        /// <returns>An <see cref="OSDMap"/> containing the objects data</returns>
+        public OSDMap Serialize()
+        {
+            return Request.Serialize();
+        }
+
+        /// <summary>
+        /// Deserialize the message
+        /// </summary>
+        /// <param name="map">An <see cref="OSDMap"/> containing the data</param>
+        public void Deserialize(OSDMap map)
+        {
+            if (map.ContainsKey("item_id"))
+                Request = new UpdateGestureAgentInventoryUpdateMessage();
+            else if (map.ContainsKey("state") && map["state"].AsString().Equals("upload"))
+                Request = new UploaderRequestUpload();
+            else if (map.ContainsKey("state") && map["state"].AsString().Equals("complete"))
+                Request = new UploaderRequestComplete();
+            else
+                Logger.Log("Unable to deserialize UpdateGestureAgentInventory: No message handler exists for state " + map["state"].AsString(), Helpers.LogLevel.Warning);
+
+            if (Request != null)
+                Request.Deserialize(map);
+        }
+    }
+
     /// <summary>
     /// A message request/response which is used to update a notecard contained within
     /// a tasks inventory
diff --git a/OpenMetaverse/Messages/MessageEventDecoder.cs b/OpenMetaverse/Messages/MessageEventDecoder.cs
index 850c7166..d0324c3a 100644
--- a/OpenMetaverse/Messages/MessageEventDecoder.cs
+++ b/OpenMetaverse/Messages/MessageEventDecoder.cs
@@ -69,6 +69,7 @@ namespace OpenMetaverse.Messages
                 case "UpdateScriptTask": message = new UpdateScriptTaskMessage(); break;
                 case "UpdateScriptAgent": message = new UpdateScriptAgentMessage(); break;
                 case "SendPostcard": message = new SendPostcardMessage(); break;
+                case "UpdateGestureAgentInventory": message = new UpdateGestureAgentInventoryMessage(); break;
                 case "UpdateNotecardAgentInventory": message = new UpdateNotecardAgentInventoryMessage(); break;
                 case "LandStatReply": message = new LandStatReplyMessage(); break;
                 case "ParcelVoiceInfoRequest": message = new ParcelVoiceInfoRequestMessage(); break;
@@ -101,7 +102,6 @@ namespace OpenMetaverse.Messages
                 // SendUserReportWithScreenshot
                 // ServerReleaseNotes
                 // StartGroupProposal
-                // UpdateGestureAgentInventory
                 // UpdateGestureTaskInventory
                 // UpdateNotecardTaskInventory
                 // ViewerStartAuction