diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-25 23:42:22 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-25 23:42:22 +0200 |
| commit | 3152f24dbdce572f6e8fe296ab9ede40e0b175da (patch) | |
| tree | 00fe8a5fe0dfdd821bc48c88c9087e0ca2667502 /indra/newview | |
| parent | dcf8487e4c4aee860bcebca6165ee0a83c1af56d (diff) | |
SL-12358 Preview picker for outfits shouldn't have 'apply now'
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lloutfitgallery.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index b2b6de94b3..12b46e9bb2 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -1364,6 +1364,7 @@ void LLOutfitGallery::onSelectPhoto(LLUUID selected_outfit_id) texture_floaterp->setOnFloaterCommitCallback(boost::bind(&LLOutfitGallery::onTexturePickerCommit, this, _1, _2)); texture_floaterp->setOnUpdateImageStatsCallback(boost::bind(&LLOutfitGallery::onTexturePickerUpdateImageStats, this, _1)); texture_floaterp->setLocalTextureEnabled(FALSE); + texture_floaterp->setCanApply(false, true); } floaterp->openFloater(); diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index 2380a23900..5d13c5a9b0 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -159,7 +159,7 @@ layout="topleft" left="8" name="preview_disabled" - top="266" + top="305" value="Preview Disabled" visible="false" width="120" /> |