diff options
author | callum <none@none> | 2009-10-29 17:35:38 -0700 |
---|---|---|
committer | callum <none@none> | 2009-10-29 17:35:38 -0700 |
commit | 65b74c6a5e0da64e3c30abf18e875fa4191891d0 (patch) | |
tree | 01ffd01779af951f298753d5ec7ea08f3272d9d7 /indra/newview/llfloatergroupinvite.cpp | |
parent | b4bd34bd73b2be74afd08785c88b66b2fadd5bfc (diff) | |
parent | 07647fdc5e02f893905d40af00e9ad4ffbc4ae5a (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 |