diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-02 12:40:38 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-02 12:40:38 -0400 |
| commit | 695671d51e1bb7c1039fffa057d0477210aca308 (patch) | |
| tree | dcabd143ec6c27178b6616d9efaa98d108146056 /indra/newview/lltexturectrl.cpp | |
| parent | 655c3dbe1b711389c1f581f4ccae07dafb5cdefd (diff) | |
| parent | 1417bd3985f339915f259bf5971ef21e47e30163 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 0b86cefa1d..fcb9deb20b 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -423,8 +423,9 @@ BOOL LLFloaterTexturePicker::postBuild() mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); mInventoryPanel->setAllowMultiSelect(FALSE); - // store this filter as the default one - mInventoryPanel->getRootFolder()->getFilter()->markDefault(); + // Commented out to scroll to currently selected texture. See EXT-5403. + // // store this filter as the default one + // mInventoryPanel->getRootFolder()->getFilter()->markDefault(); // Commented out to stop opening all folders with textures // mInventoryPanel->openDefaultFolderForType(LLFolderType::FT_TEXTURE); |