diff options
| author | simon <none@none> | 2013-11-25 11:12:57 -0800 |
|---|---|---|
| committer | simon <none@none> | 2013-11-25 11:12:57 -0800 |
| commit | 97b932c4057984856b0398ee98377e3b6d964424 (patch) | |
| tree | ff107afccc8317514e234143615bdea49a2d002c /indra/newview/lltexturectrl.cpp | |
| parent | 5756b7b3d05ce330e9877650ba6af04aaa4da49d (diff) | |
| parent | e28bd4612e2ce7760a13fde59580badb1cbaebd3 (diff) | |
Merge last changes for DRTVWR-345
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 4300cafb6b..ea837c9127 100755 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -820,7 +820,7 @@ void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem { mNoCopyTextureSelected = TRUE; } - mImageAssetID = itemp->getAssetUUID(); + setImageID(itemp->getAssetUUID()); mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here? if (user_action && mCanPreview) { |