summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatergroupinvite.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-10-30 08:12:41 +0800
committerangela <angela@lindenlab.com>2009-10-30 08:12:41 +0800
commit8c7f5e902625173aada5377c5972b72a684bedf0 (patch)
tree188d9445f4e610b2a6e05b6af667ab47d38e65a2 /indra/newview/llfloatergroupinvite.cpp
parentc3b2f98012a32c0f241b814a27113e756961778c (diff)
parent5c4ec60c966bd1857fb195f73d2d09117b783f9a (diff)
branch merge
Diffstat (limited to 'indra/newview/llfloatergroupinvite.cpp')
-rw-r--r--indra/newview/llfloatergroupinvite.cpp5
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