Merge
commit
97eefd13e4
|
|
@ -2193,20 +2193,6 @@ BOOL LLFloaterSnapshot::postBuild()
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
// <FS:Ansariel> 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();
|
||||
}
|
||||
// </FS:Ansariel>
|
||||
|
||||
void LLFloaterSnapshot::draw()
|
||||
{
|
||||
LLSnapshotLivePreview* previewp = impl.getPreviewView(this);
|
||||
|
|
|
|||
|
|
@ -53,11 +53,6 @@ public:
|
|||
/*virtual*/ void onClose(bool app_quitting);
|
||||
/*virtual*/ S32 notify(const LLSD& info);
|
||||
|
||||
// <FS:Ansariel> FIRE-1180: Move snapshot floater to back when losing focus
|
||||
/*virtual*/ void onFocusLost();
|
||||
/*virtual*/ void onFocusReceived();
|
||||
// </FS:Ansariel>
|
||||
|
||||
static void update();
|
||||
|
||||
// TODO: create a snapshot model instead
|
||||
|
|
|
|||
Loading…
Reference in New Issue