diff options
author | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
commit | 093fdcfcd3debd74dc773bf52faa07ea9f5f8b31 (patch) | |
tree | 9b3a0f7e37ef731cb9d35ef4e87c17a4c3c4b255 /indra/newview/lltexturectrl.cpp | |
parent | 187bc5211437718016a22e60c7b5ed29823c8510 (diff) | |
parent | 255fc0401ebde80cfde88995a18fc77a36e3479b (diff) |
merge changes for storm-1489
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r-- | indra/newview/lltexturectrl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 5b76537804..de22f2ae6b 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -420,7 +420,6 @@ BOOL LLFloaterTexturePicker::postBuild() mInventoryPanel->setFilterPermMask(mImmediateFilterPermMask); mInventoryPanel->setSelectCallback(boost::bind(&LLFloaterTexturePicker::onSelectionChange, this, _1, _2)); 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. |