livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience

master
Richard Linden 2012-03-20 10:55:15 -07:00
parent b615a55395 3033ca8474
commit 531e01be14
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/llfloater.cpp
View File

@ -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;
}