diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-15 14:26:11 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-15 14:26:11 -0400 |
commit | d4845c1d263c07aaa0b8c2c638cd2a214e166bdd (patch) | |
tree | fc056a7c16d03fc53a5efe0da0d055f6c606177a /indra/newview/lltexturectrl.cpp | |
parent | d5655c9bbfc2b498334e055da882055a8d99fff0 (diff) | |
parent | 08647d14c256cd6959a9853dc194614771a19501 (diff) |
merge
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r-- | indra/newview/lltexturectrl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index fcb9deb20b..0b02861b75 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -423,6 +423,10 @@ BOOL LLFloaterTexturePicker::postBuild() mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); mInventoryPanel->setAllowMultiSelect(FALSE); + // Disable auto selecting first filtered item because it takes away + // selection from the item set by LLTextureCtrl owning this floater. + mInventoryPanel->getRootFolder()->setAutoSelectOverride(TRUE); + // Commented out to scroll to currently selected texture. See EXT-5403. // // store this filter as the default one // mInventoryPanel->getRootFolder()->getFilter()->markDefault(); |