From 21e10551b3855ad457655746ce9ad451f53b8c23 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sun, 7 Nov 2010 21:33:31 +0100 Subject: [PATCH] More fixes after RLVa plonk --- indra/newview/llnotify.cpp | 11 +++-------- indra/newview/llpanelpermissions.cpp | 9 ++------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/indra/newview/llnotify.cpp b/indra/newview/llnotify.cpp index fe2382f5f..5cad338fa 100644 --- a/indra/newview/llnotify.cpp +++ b/indra/newview/llnotify.cpp @@ -145,7 +145,6 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification, setIsChrome(TRUE); // class init - if (!sFont) { sFont = LLFontGL::getFontSansSerif(); sFontSmall = LLFontGL::getFontSansSerifSmall(); @@ -270,12 +269,6 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification, if (mIsTip) { - if (!gSavedSettings.getBOOL("HideNotificationsInChat")) { - // TODO: Make a separate archive for these. - LLChat chat(mMessage); - chat.mSourceType = CHAT_SOURCE_SYSTEM; - LLFloaterChat::getInstance(LLSD())->addChatHistory(chat); - } // TODO: Make a separate archive for these. LLChat chat(mMessage); chat.mSourceType = CHAT_SOURCE_SYSTEM; @@ -286,7 +279,9 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification, chat.mRlvLocFiltered = chat.mRlvNamesFiltered = TRUE; } // [/RLVa:KB] - LLFloaterChat::getInstance(LLSD())->addChatHistory(chat); + if (!gSavedSettings.getBOOL("HideNotificationsInChat")) { + LLFloaterChat::getInstance(LLSD())->addChatHistory(chat); + } } else { diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 626475cf8..258edd315 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -353,23 +353,18 @@ void LLPanelPermissions::refresh() } // [/RLVa:KB] + childSetText("Owner Name",owner_name); + childSetEnabled("Owner Name",TRUE); // childSetEnabled("button owner profile",owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned())); // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) childSetEnabled("button owner profile", fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned())); // [/RLVa:KB] - - - - childSetText("Last Owner Name",last_owner_name); childSetEnabled("Last Owner Name",TRUE); childSetEnabled("button last owner profile",owners_identical && mLastOwnerID.notNull()); - - - // update group text field childSetEnabled("Group:",true); childSetText("Group Name",LLStringUtil::null);