summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-03-21 11:08:04 -0700
committerRichard Linden <none@none>2012-03-21 11:08:04 -0700
commit2fe364dfafe0b68fec4f664312cd943beab1d110 (patch)
tree1fb96622c2fee59b338ffe02d3162159ac9add3b
parentb615a553955447cccf8f5b6af60410d4bb3c89a2 (diff)
CHUI-61 FIX Relative floater positions not written to settings file if previous settings exist from old viewer
-rw-r--r--indra/llui/llfloater.cpp7
1 files changed, 6 insertions, 1 deletions
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;