diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
| commit | 875606a04d656ef6e5600a3a7fb6e8b52feb1945 (patch) | |
| tree | 7189f1cd0a2b043446e6f145cb9c72b3a1f125aa /indra/newview/llpanelpermissions.cpp | |
| parent | 783e05058c5d74984ab554fdc60aa06839b9b5c9 (diff) | |
QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
| -rw-r--r-- | indra/newview/llpanelpermissions.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 7f9dae8a64..7110ea4f93 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -327,6 +327,7 @@ void LLPanelPermissions::refresh() // update group text field childSetEnabled("Group:",true); + childSetText("Group Name",LLString::null); LLUUID group_id; BOOL groups_identical = LLSelectMgr::getInstance()->selectGetGroup(group_id); if (groups_identical) @@ -337,6 +338,16 @@ void LLPanelPermissions::refresh() mLabelGroupName->setEnabled(TRUE); } } + else + { + if(mLabelGroupName) + { + mLabelGroupName->setNameID(LLUUID::null, TRUE); + mLabelGroupName->refresh(LLUUID::null, "", "", TRUE); + mLabelGroupName->setEnabled(FALSE); + } + } + childSetEnabled("button set group",owners_identical && (mOwnerID == gAgent.getID())); // figure out the contents of the name, description, & category @@ -854,7 +865,7 @@ void callback_deed_to_group(S32 option, void*) { LLUUID group_id; BOOL groups_identical = LLSelectMgr::getInstance()->selectGetGroup(group_id); - if(groups_identical && (gAgent.hasPowerInGroup(group_id, GP_OBJECT_DEED))) + if(group_id.notNull() && groups_identical && (gAgent.hasPowerInGroup(group_id, GP_OBJECT_DEED))) { LLSelectMgr::getInstance()->sendOwner(LLUUID::null, group_id, FALSE); // LLViewerStats::getInstance()->incStat(LLViewerStats::ST_RELEASE_COUNT); |