diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/llpanelgroupinvite.cpp | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/newview/llpanelgroupinvite.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupinvite.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp index 9bab774a46..229daf44ff 100644 --- a/indra/newview/llpanelgroupinvite.cpp +++ b/indra/newview/llpanelgroupinvite.cpp @@ -474,12 +474,12 @@ BOOL LLPanelGroupInvite::postBuild() { BOOL recurse = TRUE; - mImplementation->mLoadingText = childGetText("loading"); - mImplementation->mRoleNames = (LLComboBox*) getChildByName("role_name", + mImplementation->mLoadingText = getString("loading"); + mImplementation->mRoleNames = getChild<LLComboBox>("role_name", recurse); - mImplementation->mGroupName = (LLTextBox*) getChildByName("group_name_text", recurse); + mImplementation->mGroupName = getChild<LLTextBox>("group_name_text", recurse); mImplementation->mInvitees = - (LLNameListCtrl*) getChildByName("invitee_list", recurse); + getChild<LLNameListCtrl>("invitee_list", recurse); if ( mImplementation->mInvitees ) { mImplementation->mInvitees->setCallbackUserData(mImplementation); @@ -487,7 +487,7 @@ BOOL LLPanelGroupInvite::postBuild() mImplementation->mInvitees->setCommitCallback(impl::callbackSelect); } - LLButton* button = (LLButton*) getChildByName("add_button", recurse); + LLButton* button = getChild<LLButton>("add_button", recurse); if ( button ) { // default to opening avatarpicker automatically @@ -497,7 +497,7 @@ BOOL LLPanelGroupInvite::postBuild() } mImplementation->mRemoveButton = - (LLButton*) getChildByName("remove_button", recurse); + getChild<LLButton>("remove_button", recurse); if ( mImplementation->mRemoveButton ) { mImplementation->mRemoveButton-> @@ -507,7 +507,7 @@ BOOL LLPanelGroupInvite::postBuild() } mImplementation->mOKButton = - (LLButton*) getChildByName("ok_button", recurse); + getChild<LLButton>("ok_button", recurse); if ( mImplementation->mOKButton ) { mImplementation->mOKButton-> @@ -516,7 +516,7 @@ BOOL LLPanelGroupInvite::postBuild() mImplementation->mOKButton->setEnabled(FALSE); } - button = (LLButton*) getChildByName("cancel_button", recurse); + button = getChild<LLButton>("cancel_button", recurse); if ( button ) { button->setClickedCallback(impl::callbackClickCancel); |