Automated merge with ssh://bitbucket.org/lindenlab/viewer-451

1 files changed, 10 insertions, 5 deletions

diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index 01b4fcfbe1..4f68c9a98e 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -760,17 +760,22 @@ void LLViewerAssetUpload::AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCorouti
         {
             success = true;
 
+            LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
+
             // Show the preview panel for textures and sounds to let
             // user know that the image (or snapshot) arrived intact.
-            LLInventoryPanel* panel = LLInventoryPanel::getActiveInventoryPanel();
+            LLInventoryPanel* panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
             if (panel)
             {
-                LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
                 panel->setSelection(serverInventoryItem, TAKE_FOCUS_NO);
-
-                // restore keyboard focus
-                gFocusMgr.setKeyboardFocus(focus);
             }
+            else
+            {
+                LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, TRUE, TAKE_FOCUS_NO, TRUE);
+            }
+
+            // restore keyboard focus
+            gFocusMgr.setKeyboardFocus(focus);
         }
         else
         {