aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llassetuploadresponders.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llassetuploadresponders.cpp28
1 files changed, 27 insertions, 1 deletions
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index efe71e1..866fa34 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -2,7 +2,9 @@
2 * @file llassetuploadresponders.cpp 2 * @file llassetuploadresponders.cpp
3 * @brief Processes responses received for asset upload requests. 3 * @brief Processes responses received for asset upload requests.
4 * 4 *
5 * Copyright (c) 2007-2007, Linden Research, Inc. 5 * $LicenseInfo:firstyear=2007&license=viewergpl$
6 *
7 * Copyright (c) 2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
8 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#include "llviewerprecompiledheaders.h" 32#include "llviewerprecompiledheaders.h"
@@ -41,6 +44,8 @@
41#include "llpermissionsflags.h" 44#include "llpermissionsflags.h"
42#include "llpreviewnotecard.h" 45#include "llpreviewnotecard.h"
43#include "llpreviewscript.h" 46#include "llpreviewscript.h"
47#include "llpreviewgesture.h"
48#include "llgesturemgr.h"
44#include "llscrolllistctrl.h" 49#include "llscrolllistctrl.h"
45#include "lluploaddialog.h" 50#include "lluploaddialog.h"
46#include "llviewerobject.h" 51#include "llviewerobject.h"
@@ -381,6 +386,27 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content)
381 } 386 }
382 } 387 }
383 break; 388 break;
389
390 case LLInventoryType::IT_GESTURE:
391 {
392 // If this gesture is active, then we need to update the in-memory
393 // active map with the new pointer.
394 if (gGestureManager.isGestureActive(item_id))
395 {
396 LLUUID asset_id = new_item->getAssetUUID();
397 gGestureManager.replaceGesture(item_id, asset_id);
398 gInventory.notifyObservers();
399 }
400
401 //gesture will have a new asset_id
402 LLPreviewGesture* previewp = (LLPreviewGesture*)LLPreview::find(item_id);
403 if(previewp)
404 {
405 previewp->onUpdateSucceeded();
406 }
407
408 }
409 break;
384 case LLInventoryType::IT_WEARABLE: 410 case LLInventoryType::IT_WEARABLE:
385 default: 411 default:
386 break; 412 break;