diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
| commit | e61a10ec5b6b84fcb5c27e8e308022d0094f8736 (patch) | |
| tree | bcf6152629edb1b2548af039bd89b6b573e1e514 /indra/newview/llpanelgrouproles.cpp | |
| parent | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff) | |
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
| -rw-r--r-- | indra/newview/llpanelgrouproles.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 30a86a40b2..faa278b667 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -152,13 +152,13 @@ BOOL LLPanelGroupRoles::postBuild() if (txt) { mDefaultNeedsApplyMesg = txt->getText(); - removeChild(txt); + removeChild(txt, TRUE); } txt = (LLTextBox*)getChildByName("want_apply_text"); if (txt) { mWantApplyMesg = txt->getText(); - removeChild(txt); + removeChild(txt, TRUE); } return LLPanelGroupTab::postBuild(); @@ -521,21 +521,21 @@ BOOL LLPanelGroupSubTab::postBuild() if (icon && icon->getImage().notNull()) { mActionIcons["folder"] = icon->getImage(); - removeChild(icon); + removeChild(icon, TRUE); } icon = (LLIconCtrl*) getChildByName("power_all_have_icon",no_recurse); if (icon && icon->getImage().notNull()) { mActionIcons["full"] = icon->getImage(); - removeChild(icon); + removeChild(icon, TRUE); } icon = (LLIconCtrl*) getChildByName("power_partial_icon",no_recurse); if (icon && icon->getImage().notNull()) { mActionIcons["partial"] = icon->getImage(); - removeChild(icon); + removeChild(icon, TRUE); } return LLPanelGroupTab::postBuild(); @@ -1805,7 +1805,7 @@ BOOL LLPanelGroupRolesSubTab::postBuildSubTab(LLView* root) if (txt) { mRemoveEveryoneTxt = txt->getText(); - parent->removeChild(txt); + parent->removeChild(txt, TRUE); } mCreateRoleButton = |