diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 10:23:04 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 10:23:04 -0700 |
| commit | 17f71efce08ed4e677b497f4734d6f9f1fef56a3 (patch) | |
| tree | 8e27a7cb161f6e24439a772c5bcfdd4a3ee6f83a /indra/newview/llviewerassetupload.cpp | |
| parent | e914f3e4a11ff86b3e05089c9b3a6677ec623c9c (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' v6.5.1 into DRTVWR-528
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); |