diff options
author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
---|---|---|
committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
commit | 79e0e7d2980b28660716f43d0f0518a107117e83 (patch) | |
tree | a5d506aa55aa6970b46ff1e493b6d5f9cb410470 /indra/newview/lltexturectrl.cpp | |
parent | e6b20328c2e25223359dede17357682b5b4e7ea1 (diff) | |
parent | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (diff) |
Merge upstream
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 { |