diff options
author | Bennett Goble <signal@lindenlab.com> | 2021-12-11 10:28:35 -0800 |
---|---|---|
committer | Bennett Goble <signal@lindenlab.com> | 2021-12-11 10:29:37 -0800 |
commit | 0b95b9d008a0878b5d57262e529cef61fb29ea24 (patch) | |
tree | 6e12a7949c9a69a5e1ad170220b4e9a82a453142 /indra/newview/llviewerassetupload.cpp | |
parent | f729cfc33f258781c5fd85a3d8773bf6149d12db (diff) | |
parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) |
Merge branch 'master' into SL-15742
Diffstat (limited to 'indra/newview/llviewerassetupload.cpp')
-rw-r--r-- | indra/newview/llviewerassetupload.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index bc07821ccd..0df6811f6a 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -793,7 +793,7 @@ void LLViewerAssetUpload::AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCorouti // Show the preview panel for textures and sounds to let // user know that the image (or snapshot) arrived intact. LLInventoryPanel* panel = LLInventoryPanel::getActiveInventoryPanel(FALSE); - LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, TRUE, TAKE_FOCUS_NO, (panel == NULL)); + LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, FALSE, TAKE_FOCUS_NO, (panel == NULL)); // restore keyboard focus gFocusMgr.setKeyboardFocus(focus); |