diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-13 09:22:06 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-13 09:22:06 +0100 |
| commit | c8602b293517dfb4d5c6658ab235af9fe9932b7e (patch) | |
| tree | b5272175264fa52d235a78365205d817d363c320 /indra/newview/lltexturectrl.cpp | |
| parent | ef685e520967f41549519b8df14c7d585f3b644b (diff) | |
| parent | f790036002a49176066ec346e4068dc05aa88357 (diff) | |
merge from PE's viewer-release
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(); |