From 661e135778e9ca1aefb5a99825a985fbd3b08b74 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Thu, 7 Mar 2013 07:44:38 -0500 Subject: [PATCH] Restore DEV-12255 patch Refresh the snapshot when calling show after instance exists (IE: Via Keyboard shortcut) Should never have been removed in the first place, the purpose of 7faa19b29792b558a50b1da2bdfc483f6cc839dd was to have an explicit click to refresh, this patch requires an explicit click. This does NOT break keeping the same snapshot while switching settings --- indra/newview/llfloatersnapshot.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 8cea6087a..ef9c0c631 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -3075,6 +3075,14 @@ void LLFloaterSnapshot::show(void*) sInstance->impl.updateLayout(sInstance); } + else // just refresh the snapshot in the existing floater instance (DEV-12255) + { + LLSnapshotLivePreview* preview = LLFloaterSnapshot::Impl::getPreviewView(); + if(preview) + { + preview->updateSnapshot(TRUE); + } + } sInstance->open(); /* Flawfinder: ignore */ sInstance->focusFirstItem(FALSE);