From c43681ca8f1619d2116c2d5caef4099c5a1eba04 Mon Sep 17 00:00:00 2001 From: Richard Linden <none@none> Date: Thu, 20 Oct 2011 12:05:03 -0700 Subject: [PATCH] EXP-1440 FIX Floaters can offset from call dialog and show offscreen for default positions --- indra/llui/llfloater.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index bd537bfb199..ddc90b03789 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -875,7 +875,8 @@ bool LLFloater::applyRectControl() { bool saved_rect = false; - if (LLFloaterReg::getLastFloaterInGroup(mInstanceName)) + LLFloater* last_in_group = LLFloaterReg::getLastFloaterInGroup(mInstanceName); + if (last_in_group && last_in_group != this) { // other floaters in our group, position ourselves relative to them and don't save the rect mRectControl.clear(); @@ -1589,6 +1590,7 @@ void LLFloater::setDocked(bool docked, bool pop_on_undock) if (mDocked) { setMinimized(FALSE); + mOpenPositioning = LLFloaterEnums::OPEN_POSITIONING_NONE; } updateTitleButtons(); -- GitLab