CHUI-61 FIX Relative floater positions not written to settings file if previous settings exist from old viewer

only write back floater positioning information generated from legacy saved rect after reading any new
floater positioning info

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 9c4bf0a5c2..84754d9c4d 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);
@@ -904,6 +903,13 @@ bool LLFloater::applyRectControl()
 		}
 	}
 
+	if (saved_rect)
+	{
+		// propagate any derived positioning data back to settings file
+		storeRectControl();
+	}
+
+
 	return saved_rect;
 }