summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-07-13 17:16:36 -0700
committerMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-07-13 17:16:36 -0700
commit37fc4e42dd173d92abb31be83dbd04fa3b7b70fa (patch)
tree0355075f8fb41548989517abc44a129f73c4a545 /indra/newview/lltexturectrl.cpp
parenta884f5c0c794777f33012a5ca318fd98bab32667 (diff)
parent75c70884dab91490613ee0c9b866346a00bc9ad9 (diff)
Merge
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r--indra/newview/lltexturectrl.cpp4
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();