From c92c2651a06a77e190cad209e0f4fc7f633d0e75 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 4 Oct 2012 22:15:23 +0200 Subject: [PATCH] Backed out changeset: 7f3aea9e898c - Fix for FIRE-1180 causes FIRE-7853 and breaks controls on the snapshot floater --- indra/newview/llfloatersnapshot.cpp | 14 -------------- indra/newview/llfloatersnapshot.h | 5 ----- 2 files changed, 19 deletions(-) diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 1ba2325bdd..3b787448b5 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -2193,20 +2193,6 @@ BOOL LLFloaterSnapshot::postBuild() return TRUE; } -// FIRE-1180: Move snapshot floater to back when losing focus -void LLFloaterSnapshot::onFocusLost() -{ - getRootView()->getChildView("main_view")->sendChildToBack(gSnapshotFloaterView->getParent()); - LLFloater::onFocusLost(); -} - -void LLFloaterSnapshot::onFocusReceived() -{ - getRootView()->getChildView("main_view")->sendChildToFront(gSnapshotFloaterView->getParent()); - LLFloater::onFocusReceived(); -} -// - void LLFloaterSnapshot::draw() { LLSnapshotLivePreview* previewp = impl.getPreviewView(this); diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h index 99669fa671..ab61791279 100644 --- a/indra/newview/llfloatersnapshot.h +++ b/indra/newview/llfloatersnapshot.h @@ -53,11 +53,6 @@ public: /*virtual*/ void onClose(bool app_quitting); /*virtual*/ S32 notify(const LLSD& info); - // FIRE-1180: Move snapshot floater to back when losing focus - /*virtual*/ void onFocusLost(); - /*virtual*/ void onFocusReceived(); - // - static void update(); // TODO: create a snapshot model instead