diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:19:42 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:19:42 -0700 |
| commit | f232096bba9280dd78ef378612eeb65ae2814307 (patch) | |
| tree | 17da0d7b1bd17771691c461919bbba5f1780e905 /indra/newview/lltexturectrl.cpp | |
| parent | 4c225e3fc7b92e68a25efdb1ca8927e266e84ae5 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merge with 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 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) { |