diff options
Diffstat (limited to 'indra/newview/llfloatergroupinvite.cpp')
| -rw-r--r-- | indra/newview/llfloatergroupinvite.cpp | 84 |
1 files changed, 43 insertions, 41 deletions
diff --git a/indra/newview/llfloatergroupinvite.cpp b/indra/newview/llfloatergroupinvite.cpp index a82e6e914e..49da4e64b3 100644 --- a/indra/newview/llfloatergroupinvite.cpp +++ b/indra/newview/llfloatergroupinvite.cpp @@ -2,30 +2,25 @@ * @file llfloatergroupinvite.cpp * @brief Floater to invite new members into a group. * - * $LicenseInfo:firstyear=2006&license=viewergpl$ - * - * Copyright (c) 2006-2007, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2006&license=viewerlgpl$ * Second Life Viewer Source Code - * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 - * ("GPL"), unless you have obtained a separate licensing agreement - * ("Other License"), formally executed by you and Linden Lab. Terms of - * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlife.com/developers/opensource/gplv2 + * Copyright (C) 2010, Linden Research, Inc. * - * There are special exceptions to the terms and conditions of the GPL as - * it is applied to this Source Code. View the full text of the exception - * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at http://secondlife.com/developers/opensource/flossexception + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * By copying, modifying or distributing this software, you acknowledge - * that you have read and understood your obligations described above, - * and agree to abide by those obligations. + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -33,9 +28,8 @@ #include "llfloatergroupinvite.h" #include "llpanelgroupinvite.h" - -const char FLOATER_TITLE[] = "Group Invitation"; -const LLRect FGI_RECT(0, 380, 210, 0); +#include "lltrans.h" +#include "lldraghandle.h" class LLFloaterGroupInvite::impl { @@ -57,9 +51,10 @@ public: // std::map<LLUUID, LLFloaterGroupInvite*> LLFloaterGroupInvite::impl::sInstances; -LLFloaterGroupInvite::impl::impl(const LLUUID& group_id) +LLFloaterGroupInvite::impl::impl(const LLUUID& group_id) : + mGroupID(group_id), + mInvitePanelp(NULL) { - mGroupID = group_id; } LLFloaterGroupInvite::impl::~impl() @@ -71,25 +66,26 @@ void LLFloaterGroupInvite::impl::closeFloater(void* data) { LLFloaterGroupInvite* floaterp = (LLFloaterGroupInvite*) data; - if ( floaterp ) floaterp->close(); + if ( floaterp ) floaterp->closeFloater(); } //----------------------------------------------------------------------------- // Implementation //----------------------------------------------------------------------------- -LLFloaterGroupInvite::LLFloaterGroupInvite(const std::string& name, - const LLRect &rect, - const std::string& title, - const LLUUID& group_id) -: LLFloater(name, rect, title) +LLFloaterGroupInvite::LLFloaterGroupInvite(const LLUUID& group_id) +: LLFloater(group_id) { - LLRect contents(getRect()); - contents.mTop -= LLFLOATER_HEADER_SIZE; + S32 floater_header_size = getHeaderHeight(); + LLRect contents; mImpl = new impl(group_id); - mImpl->mInvitePanelp = new LLPanelGroupInvite("Group Invite Panel", - group_id); + mImpl->mInvitePanelp = new LLPanelGroupInvite(group_id); + + contents = mImpl->mInvitePanelp->getRect(); + contents.mTop -= floater_header_size; + + setTitle (mImpl->mInvitePanelp->getString("GroupInvitation")); mImpl->mInvitePanelp->setCloseCallback(impl::closeFloater, this); @@ -110,8 +106,12 @@ LLFloaterGroupInvite::~LLFloaterGroupInvite() } // static -void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUUID> *agent_ids) +void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, uuid_vec_t *agent_ids) { + const LLFloater::Params& floater_params = LLFloater::getDefaultParams(); + S32 floater_header_size = floater_params.header_height; + LLRect contents; + // Make sure group_id isn't null if (group_id.isNull()) { @@ -125,10 +125,12 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU (LLFloaterGroupInvite*)NULL); if (!fgi) { - fgi = new LLFloaterGroupInvite("groupinfo", - FGI_RECT, - FLOATER_TITLE, - group_id); + fgi = new LLFloaterGroupInvite(group_id); + contents = fgi->mImpl->mInvitePanelp->getRect(); + contents.mTop += floater_header_size; + fgi->setRect(contents); + fgi->getDragHandle()->setRect(contents); + fgi->getDragHandle()->setTitle(fgi->mImpl->mInvitePanelp->getString("GroupInvitation")); impl::sInstances[group_id] = fgi; @@ -141,6 +143,6 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU } fgi->center(); - fgi->open(); /*Flawfinder: ignore*/ + fgi->openFloater(); fgi->mImpl->mInvitePanelp->update(); } |