diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:28:52 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:28:52 -0600 |
| commit | 01d06db0154e0cfc43c82664c6bf6129a3fa4883 (patch) | |
| tree | 3e842ddedf605d6883be7f04de55c173c38aa46b /indra/newview/llfloatergroupinvite.cpp | |
| parent | 801301c435414df1e22c321a685044b7cd43055e (diff) | |
| parent | 9abcf6684e86b0b8c2d343ccd4864b2e854be3d7 (diff) | |
sync to the tip.
Diffstat (limited to 'indra/newview/llfloatergroupinvite.cpp')
| -rw-r--r-- | indra/newview/llfloatergroupinvite.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloatergroupinvite.cpp b/indra/newview/llfloatergroupinvite.cpp index 3598479305..bf484c6343 100644 --- a/indra/newview/llfloatergroupinvite.cpp +++ b/indra/newview/llfloatergroupinvite.cpp @@ -81,7 +81,7 @@ void LLFloaterGroupInvite::impl::closeFloater(void* data) LLFloaterGroupInvite::LLFloaterGroupInvite(const LLUUID& group_id) : LLFloater(group_id) { - static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0); + S32 floater_header_size = getHeaderHeight(); LLRect contents; mImpl = new impl(group_id); @@ -114,7 +114,8 @@ LLFloaterGroupInvite::~LLFloaterGroupInvite() // static void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUUID> *agent_ids) { - static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0); + const LLFloater::Params& floater_params = LLFloater::getDefaultParams(); + S32 floater_header_size = floater_params.header_height; LLRect contents; // Make sure group_id isn't null |