From 2fe364dfafe0b68fec4f664312cd943beab1d110 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 21 Mar 2012 11:08:04 -0700
Subject: CHUI-61 FIX Relative floater positions not written to settings file
 if previous settings exist from old viewer

---
 indra/llui/llfloater.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 9c4bf0a5c2..1fb10faf1e 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -885,7 +885,6 @@ bool LLFloater::applyRectControl()
 			mPositioning = LLFloaterEnums::POSITIONING_RELATIVE;
 			LLRect screen_rect = calcScreenRect();
 			mPosition = LLCoordGL(screen_rect.getCenterX(), screen_rect.getCenterY()).convert();
-			storeRectControl();
 		}
 
 		LLControlVariablePtr x_control = getControlGroup()->getControl(mPosXControl);
@@ -902,6 +901,12 @@ bool LLFloater::applyRectControl()
 
 			saved_rect = true;
 		}
+
+		// remember updated position
+		if (mPositioning == LLFloaterEnums::POSITIONING_RELATIVE)
+		{
+			storeRectControl();
+		}
 	}
 
 	return saved_rect;
-- 
cgit v1.2.3