Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes after RLVa plonk

Browse Source
This commit is contained in:
Siana Gearz
2010-11-07 21:33:31 +01:00
parent 18149fdfed
commit 21e10551b3
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llnotify.cpp
View File

@@ -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
{

9
indra/newview/llpanelpermissions.cpp
View File

@@ -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);