diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-02 09:12:33 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-02 09:12:33 +0100 |
| commit | 2dc929b3863abfdce53aac4f737226a4d9bc25f8 (patch) | |
| tree | 9100025712ae9e4deda3d41bcccb8bc5e221e4d3 /indra/newview/lltexturectrl.cpp | |
| parent | ee7fce63fe706734b5931fb9d2bb351c0be71c83 (diff) | |
| parent | 4081f6f5844d4846162727682206440859fd4dc4 (diff) | |
merge from PE's viewer-release
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); |