FIRE-15342: Avatar icons are shown in V3 chat history under RLVa ShowNames restriction

Wed, 07 Jan 2015 14:30:53 +0100

author
Ansariel
date
Wed, 07 Jan 2015 14:30:53 +0100
changeset 43110
938d814818ac
parent 43109
fa58f92af4c9
child 43111
09b047af2751

FIRE-15342: Avatar icons are shown in V3 chat history under RLVa ShowNames restriction

indra/newview/fschathistory.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/fschathistory.cpp	Wed Jan 07 14:13:03 2015 +0100
     1.2 +++ b/indra/newview/fschathistory.cpp	Wed Jan 07 14:30:53 2015 +0100
     1.3 @@ -506,7 +506,14 @@
     1.4  		switch (mSourceType)
     1.5  		{
     1.6  			case CHAT_SOURCE_AGENT:
     1.7 -				icon->setValue(chat.mFromID);
     1.8 +				if (!chat.mRlvNamesFiltered)
     1.9 +				{
    1.10 +					icon->setValue(chat.mFromID);
    1.11 +				}
    1.12 +				else
    1.13 +				{
    1.14 +					icon->setValue(LLSD("Unknown_Icon"));
    1.15 +				}
    1.16  				break;
    1.17  			case CHAT_SOURCE_OBJECT:
    1.18  				icon->setValue(LLSD("OBJECT_Icon"));
    1.19 @@ -516,7 +523,14 @@
    1.20  				// FS:LO FIRE-1439 - Clickable avatar names on local chat radar crossing reports
    1.21  				if(chat.mChatType == CHAT_TYPE_RADAR)
    1.22  				{
    1.23 -					icon->setValue(chat.mFromID);
    1.24 +					if (!chat.mRlvNamesFiltered)
    1.25 +					{
    1.26 +						icon->setValue(chat.mFromID);
    1.27 +					}
    1.28 +					else
    1.29 +					{
    1.30 +						icon->setValue(LLSD("Unknown_Icon"));
    1.31 +					}
    1.32  				}
    1.33  				else
    1.34  				{

mercurial