diff options
| author | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
| commit | a1041a6fa17368e13d610df9d5eb23e307654815 (patch) | |
| tree | 5f8c22e1bbdeb727600c31ff60f908b785c2faae /linden/indra/newview/llpanelpermissions.cpp | |
| parent | Moved "Show HUD Attachments" back to View, restored shortcut. (diff) | |
| parent | Fixed region names not showing up on regions with zero avatars (diff) | |
| download | meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.zip meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.gz meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.bz2 meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llpanelpermissions.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp index 24bbab6..42cb88c 100644 --- a/linden/indra/newview/llpanelpermissions.cpp +++ b/linden/indra/newview/llpanelpermissions.cpp | |||
| @@ -348,14 +348,19 @@ void LLPanelPermissions::refresh() | |||
| 348 | fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned())); | 348 | fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned())); |
| 349 | // [/RLVa:KB] | 349 | // [/RLVa:KB] |
| 350 | 350 | ||
| 351 | if (owner_name != last_owner_name) | 351 | //if (owner_name != last_owner_name) |
| 352 | // [RLVa:KB] | ||
| 353 | if ( (owner_name != last_owner_name) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) | ||
| 354 | // [/RLVa:KB] | ||
| 352 | { | 355 | { |
| 356 | childSetEnabled("Last Owner:", TRUE); | ||
| 353 | childSetText("Last Owner Name", last_owner_name); | 357 | childSetText("Last Owner Name", last_owner_name); |
| 354 | childSetEnabled("Last Owner Name", TRUE); | 358 | childSetEnabled("Last Owner Name", TRUE); |
| 355 | childSetEnabled("button last owner profile", TRUE); | 359 | childSetEnabled("button last owner profile", TRUE); |
| 356 | } | 360 | } |
| 357 | else | 361 | else |
| 358 | { | 362 | { |
| 363 | childSetEnabled("Last Owner:", FALSE); | ||
| 359 | childSetText("Last Owner Name", LLStringUtil::null); | 364 | childSetText("Last Owner Name", LLStringUtil::null); |
| 360 | childSetEnabled("Last Owner Name", FALSE); | 365 | childSetEnabled("Last Owner Name", FALSE); |
| 361 | childSetEnabled("button last owner profile", FALSE); | 366 | childSetEnabled("button last owner profile", FALSE); |