From 3135d3a7c18aac855f81d10369076895c6b35836 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 29 Jan 2018 17:45:39 +0200 Subject: MAINT-8247 FIXED [maint-viewer] All Outfit images become unassigned if remove an outfit while selecting new image --- indra/newview/lloutfitgallery.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index c38d3ab140..dc3b153da2 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -1267,6 +1267,13 @@ LLUUID LLOutfitGallery::getDefaultPhoto() void LLOutfitGallery::onTexturePickerCommit(LLTextureCtrl::ETexturePickOp op, LLUUID id) { + LLUUID selected_outfit_id = getSelectedOutfitUUID(); + + if (selected_outfit_id.isNull()) + { + return; + } + LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get(); if (floaterp && op == LLTextureCtrl::TEXTURE_SELECT) @@ -1316,8 +1323,8 @@ void LLOutfitGallery::onTexturePickerCommit(LLTextureCtrl::ETexturePickOp op, LL return; } - checkRemovePhoto(getSelectedOutfitUUID()); - linkPhotoToOutfit(image_item_id, getSelectedOutfitUUID()); + checkRemovePhoto(selected_outfit_id); + linkPhotoToOutfit(image_item_id, selected_outfit_id); } } -- cgit v1.3