livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- internal : fix various RLVa merging issues

Kitty Barnett 2011-05-26 21:47:58 +02:00
parent 774a820426
commit a75110587d
4 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llappviewer.cpp
View File

@ -88,10 +88,6 @@
#include "rlvhandler.h"
// [/RLVa:KB]
// [RLVa:KB] - Checked: 2010-05-03 (RLVa-1.2.0g)
#include "rlvhandler.h"
// [/RLVa:KB]
#include "llweb.h"
#include "llsecondlifeurls.h"
#include "llupdaterservice.h"

2
indra/newview/llavatarlist.cpp
View File

@ -243,10 +243,10 @@ LLAvatarList::LLAvatarList(const Params& p)
, mIgnoreGlobalIcons(false)
// [RLVa:KB] - Checked: 2010-04-05 (RLVa-1.2.2a) | Added: RLVa-1.2.0d
, mRlvCheckShowNames(false)
// [/RLVa:KB]
, mShowAge(false)
, mShowPaymentStatus(false)
, mItemHeight(0)
// [/RLVa:KB]
// [Ansariel: Colorful radar]
, mUseRangeColors(false)
// [Ansariel: Colorful radar]

4
indra/newview/llfloaterworldmap.cpp
View File

@ -78,10 +78,6 @@
#include "rlvhandler.h"
// [/RLVa:KB]
// [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a)
#include "rlvhandler.h"
// [/RLVa:KB]
//---------------------------------------------------------------------------
// Constants
//---------------------------------------------------------------------------

19
indra/newview/llviewermessage.cpp
View File

@ -2807,25 +2807,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
return;
}
if (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM))
{
switch (pIMSession->mSessionType)
{
case LLIMModel::LLIMSession::GROUP_SESSION: // Group chat: allow if group is a sendim exception
if ( (from_id != gAgent.getID()) && (!gRlvHandler.isException(RLV_BHVR_RECVIM, session_id)) )
return;
break;
case LLIMModel::LLIMSession::ADHOC_SESSION: // Conference chat: allow if the sender is a sendim exception
if ( (from_id != gAgent.getID()) && (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id)) )
message = RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM);
break;
default:
RLV_ASSERT(false);
return;
}
}
// [/RLVa:KB]
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)) )
{
switch (pIMSession->mSessionType)