diff options
| author | James Cook <james@lindenlab.com> | 2009-10-29 15:39:29 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-29 15:39:29 -0700 |
| commit | a1ec40c72beeb4ce80946b3050ac7f9ea8f40c9c (patch) | |
| tree | 3143a5e91c5d76889b106654fba8458c1b611ab9 /indra/newview/llfloatergroupinvite.cpp | |
| parent | b86d4b2299aa0b9321ddcbdb5246fe131aa4255c (diff) | |
| parent | 8f8718546a4d9d9a6d70d292814edea889e20e27 (diff) | |
merge
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 |