summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorChristian Goetze (CG) <cg@lindenlab.com>2010-08-02 22:05:56 -0700
committerChristian Goetze (CG) <cg@lindenlab.com>2010-08-02 22:05:56 -0700
commitd10b9a7f37bec670342136eeea2c8c2604fdfeef (patch)
treea6380a0442d103faed76f1a1c7e5eb03d0f3f6ae /indra/newview/lltexturectrl.cpp
parenta39b31abf87d93fb41212e952cc3ad1d8c91b5ef (diff)
parentb3b8ef25e192f5713c9d5ca47289499b17ff07d1 (diff)
Pulled from "dessie/viewer-release"
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 d324cb1565..c0518b705b 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -426,6 +426,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();