From 2e3113863022a21d2145cc23992d6afab9c6fbcd Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 10 Jan 2013 20:19:26 -0800 Subject: CHUI-672 : Fixed : LLMultiFloater members need to be initialized in constructor. --- indra/llui/llmultifloater.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/llui') diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp index 59faabd482..179b251cdb 100644 --- a/indra/llui/llmultifloater.cpp +++ b/indra/llui/llmultifloater.cpp @@ -37,10 +37,12 @@ // LLMultiFloater::LLMultiFloater(const LLSD& key, const LLFloater::Params& params) - : LLFloater(key) - , mTabContainer(NULL) - , mTabPos(LLTabContainer::TOP) - , mAutoResize(TRUE) + : LLFloater(key), + mTabContainer(NULL), + mTabPos(LLTabContainer::TOP), + mAutoResize(TRUE), + mOrigMinWidth(params.min_width), + mOrigMinHeight(params.min_height) { } -- cgit v1.2.3 From 16082462a4d355509338ed28e396c8c81a20712a Mon Sep 17 00:00:00 2001 From: "maxim@mnikolenko" Date: Fri, 11 Jan 2013 15:32:05 +0200 Subject: CHUI-650 FIXED Set focus to floater when bringToFront() is called(even if it's already in front). --- indra/llui/llfloater.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llui') diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 8f9be5285d..e0e830f742 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2394,6 +2394,7 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus) { if (mFrontChild == child) { + child->setFocus(true); return; } -- cgit v1.2.3 From 88639dd862be6558f0777e99c571dcd807efa4ba Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 11 Jan 2013 17:28:43 -0800 Subject: CHUI-650 : Revert : revert the change as it creates infinite recursive calls --- indra/llui/llfloater.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/llui') diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index e0e830f742..8f9be5285d 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2394,7 +2394,6 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus) { if (mFrontChild == child) { - child->setFocus(true); return; } -- cgit v1.2.3