diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-12 18:40:51 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-12 18:40:51 +0300 |
| commit | ee6c66316e9c9a6c019232b5c773d2063328cdd3 (patch) | |
| tree | 61be2476631c8fb05b63d4cfe0df5c265b4fd1d8 /indra/newview/lltexturectrl.cpp | |
| parent | 8435d93653e4aa3e1c7602c5eaf34b4fed1c74f2 (diff) | |
| parent | 34cb8b7402a7e4727dd28ddc90d8d142dbbed3b6 (diff) | |
Merge with another head in branch
--HG--
branch : product-engine
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(); |