aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelgroupinvite.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llpanelgroupinvite.cpp
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/newview/llpanelgroupinvite.cpp')
-rw-r--r--linden/indra/newview/llpanelgroupinvite.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelgroupinvite.cpp b/linden/indra/newview/llpanelgroupinvite.cpp
index 4078c6d..9bab774 100644
--- a/linden/indra/newview/llpanelgroupinvite.cpp
+++ b/linden/indra/newview/llpanelgroupinvite.cpp
@@ -1,6 +1,8 @@
1/** 1/**
2 * @file llpanelgroupinvite.cpp 2 * @file llpanelgroupinvite.cpp
3 * 3 *
4 * $LicenseInfo:firstyear=2006&license=viewergpl$
5 *
4 * Copyright (c) 2006-2007, Linden Research, Inc. 6 * Copyright (c) 2006-2007, Linden Research, Inc.
5 * 7 *
6 * Second Life Viewer Source Code 8 * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
23 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 25 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
24 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 26 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
25 * COMPLETENESS OR PERFORMANCE. 27 * COMPLETENESS OR PERFORMANCE.
28 * $/LicenseInfo$
26 */ 29 */
27 30
28#include "llviewerprecompiledheaders.h" 31#include "llviewerprecompiledheaders.h"
@@ -66,6 +69,7 @@ public:
66public: 69public:
67 LLUUID mGroupID; 70 LLUUID mGroupID;
68 71
72 LLString mLoadingText;
69 LLNameListCtrl *mInvitees; 73 LLNameListCtrl *mInvitees;
70 LLComboBox *mRoleNames; 74 LLComboBox *mRoleNames;
71 LLButton *mOKButton; 75 LLButton *mOKButton;
@@ -392,14 +396,14 @@ void LLPanelGroupInvite::update()
392 mPendingUpdate = FALSE; 396 mPendingUpdate = FALSE;
393 if (mImplementation->mGroupName) 397 if (mImplementation->mGroupName)
394 { 398 {
395 mImplementation->mGroupName->setText("(loading...)"); 399 mImplementation->mGroupName->setText(mImplementation->mLoadingText);
396 } 400 }
397 if ( mImplementation->mRoleNames ) 401 if ( mImplementation->mRoleNames )
398 { 402 {
399 mStoreSelected = mImplementation->mRoleNames->getCurrentID(); 403 mStoreSelected = mImplementation->mRoleNames->getCurrentID();
400 mImplementation->mRoleNames->clear(); 404 mImplementation->mRoleNames->clear();
401 mImplementation->mRoleNames->removeall(); 405 mImplementation->mRoleNames->removeall();
402 mImplementation->mRoleNames->add("(loading...)", LLUUID::null, ADD_BOTTOM); 406 mImplementation->mRoleNames->add(mImplementation->mLoadingText, LLUUID::null, ADD_BOTTOM);
403 mImplementation->mRoleNames->setCurrentByID(LLUUID::null); 407 mImplementation->mRoleNames->setCurrentByID(LLUUID::null);
404 } 408 }
405 409
@@ -470,6 +474,7 @@ BOOL LLPanelGroupInvite::postBuild()
470{ 474{
471 BOOL recurse = TRUE; 475 BOOL recurse = TRUE;
472 476
477 mImplementation->mLoadingText = childGetText("loading");
473 mImplementation->mRoleNames = (LLComboBox*) getChildByName("role_name", 478 mImplementation->mRoleNames = (LLComboBox*) getChildByName("role_name",
474 recurse); 479 recurse);
475 mImplementation->mGroupName = (LLTextBox*) getChildByName("group_name_text", recurse); 480 mImplementation->mGroupName = (LLTextBox*) getChildByName("group_name_text", recurse);