diff options
author | James Cook <james@lindenlab.com> | 2009-12-11 10:56:49 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-11 10:56:49 -0800 |
commit | ae9ca1be630e47e2314eabf9b8edb16eadda9828 (patch) | |
tree | 6e28ec62bad6390f7ac0aa8df3372daa8cf94844 /indra/llui/llfloater.cpp | |
parent | a87b99cd950de20dc55e1ae6ce7186863a554326 (diff) |
EXT-3313 Media Settings window has no background if viewer is too short
Code to set default floater position to top-left was causing incorrect
floater height computation when floater XML specified a bottom coordinate.
Reviewed with Callum.
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r-- | indra/llui/llfloater.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index fd7b64af02..e822b4843c 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2703,6 +2703,18 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o output_node, output_params, &default_params); } + // Default floater position to top-left corner of screen + // However, some legacy floaters have explicit top or bottom + // coordinates set, so respect their wishes. + if (!params.rect.top.isProvided() && !params.rect.bottom.isProvided()) + { + params.rect.top.set(0); + } + if (!params.rect.left.isProvided() && !params.rect.right.isProvided()) + { + params.rect.left.set(0); + } + setupParams(params, parent); initFromParams(params); |