RLVa 1.1.2 to 1.1.3 upgrade. InvLinks + COF

This commit is contained in:
Siana Gearz
2010-11-25 23:47:11 +01:00
parent 074bec3ad1
commit f9dcb1bb09
88 changed files with 8710 additions and 4707 deletions

View File

@@ -251,7 +251,7 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) && (!chat.mRlvLocFiltered) && (CHAT_SOURCE_AGENT != chat.mSourceType) )
{
LLChat& rlvChat = const_cast<LLChat&>(chat);
gRlvHandler.filterLocation(rlvChat.mText);
RlvUtil::filterLocation(rlvChat.mText);
rlvChat.mRlvLocFiltered = TRUE;
}
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (!chat.mRlvNamesFiltered) )
@@ -261,7 +261,7 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
if (CHAT_SOURCE_AGENT != chat.mSourceType)
{
// Filter object and system chat (names are filtered elsewhere to save ourselves an gObjectList lookup)
gRlvHandler.filterNames(rlvChat.mText);
RlvUtil::filterNames(rlvChat.mText);
}
rlvChat.mRlvNamesFiltered = TRUE;
}
@@ -429,7 +429,7 @@ void LLFloaterChat::addChat(const LLChat& chat,
{
LLChat& rlvChat = const_cast<LLChat&>(chat);
if (!from_instant_message)
gRlvHandler.filterLocation(rlvChat.mText);
RlvUtil::filterLocation(rlvChat.mText);
rlvChat.mRlvLocFiltered = TRUE;
}
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (!chat.mRlvNamesFiltered) )
@@ -438,7 +438,7 @@ void LLFloaterChat::addChat(const LLChat& chat,
if ( (!from_instant_message) && (CHAT_SOURCE_AGENT != chat.mSourceType) )
{
// Filter object and system chat (names are filtered elsewhere to save ourselves an gObjectList lookup)
gRlvHandler.filterNames(rlvChat.mText);
RlvUtil::filterNames(rlvChat.mText);
}
rlvChat.mRlvNamesFiltered = TRUE;
}