diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
commit | 038f250caea80e21192372019dca8fdcf269c0d9 (patch) | |
tree | 2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/newview/lltexturectrl.cpp | |
parent | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rwxr-xr-x | indra/newview/lltexturectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 9d1290b86d..c12753acb0 100755 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -242,7 +242,7 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id) LLUUID item_id = findItemID(mImageAssetID, FALSE); if (item_id.isNull()) { - mInventoryPanel->clearSelection(); + mInventoryPanel->getRootFolder()->clearSelection(); } else { |