livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request !4 from phoenix-firestorm-testy master 

Fix so that when uploading content, the inventory won't switch away from the "Recent Items" tab.
meow-7.2.2
Ansariel Hiller 2020-02-24 21:22:12 +01:00
parent df24617e0c 0e2dc856e7
commit c33f949d43
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewerassetupload.cpp
View File

@ -822,7 +822,12 @@ void LLViewerAssetUpload::AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCorouti
sidepanel_inventory->showInventoryPanel();
}
// </FS:Ansariel>
LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, TRUE, TAKE_FOCUS_NO, (panel == NULL));
// <FS:Testy> FIRE-22943: Don't switch away from the "Recent Items" tab.
//LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, TRUE, TAKE_FOCUS_NO, (panel == NULL));
BOOL show_main_panel = (!panel || panel->getName() != "Recent Items");
LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, show_main_panel, TAKE_FOCUS_NO, (panel == NULL));
// </FS:Testy>
// restore keyboard focus
gFocusMgr.setKeyboardFocus(focus);