FIRE-15051: Show blacklisted agents as "Resident" instead of "Object" for Type on the Asset Blacklist floater

Wed, 03 Dec 2014 02:54:20 +0100

author
Northspring <pantera.polnocy@phoenixviewer.com>
date
Wed, 03 Dec 2014 02:54:20 +0100
changeset 43026
cfd6df2c8eec
parent 43025
7425b9978a0d
child 43027
a4d2f0febc13

FIRE-15051: Show blacklisted agents as "Resident" instead of "Object" for Type on the Asset Blacklist floater

indra/newview/fsfloaterwsassetblacklist.cpp file | annotate | diff | revisions
indra/newview/fswsassetblacklist.cpp file | annotate | diff | revisions
indra/newview/llavataractions.cpp file | annotate | diff | revisions
indra/newview/llviewermenu.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/floater_asset_blacklist.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pl/floater_asset_blacklist.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/fsfloaterwsassetblacklist.cpp	Tue Dec 02 23:49:53 2014 +0100
     1.2 +++ b/indra/newview/fsfloaterwsassetblacklist.cpp	Wed Dec 03 02:54:20 2014 +0100
     1.3 @@ -61,6 +61,9 @@
     1.4  		case 6:
     1.5  			return getString("asset_object");
     1.6  			break;
     1.7 +		case 45:
     1.8 +			return getString("asset_resident");
     1.9 +			break;
    1.10  		default:
    1.11  			return getString("asset_unknown");
    1.12  			break;
     2.1 --- a/indra/newview/fswsassetblacklist.cpp	Tue Dec 02 23:49:53 2014 +0100
     2.2 +++ b/indra/newview/fswsassetblacklist.cpp	Wed Dec 03 02:54:20 2014 +0100
     2.3 @@ -53,6 +53,9 @@
     2.4  		case 6:
     2.5  			type = LLAssetType::AT_OBJECT;
     2.6  			break;
     2.7 +		case 45:
     2.8 +			type = LLAssetType::AT_PERSON;
     2.9 +			break;
    2.10  		default:
    2.11  			type = LLAssetType::AT_NONE;
    2.12  	}
     3.1 --- a/indra/newview/llavataractions.cpp	Tue Dec 02 23:49:53 2014 +0100
     3.2 +++ b/indra/newview/llavataractions.cpp	Wed Dec 03 02:54:20 2014 +0100
     3.3 @@ -2150,7 +2150,7 @@
     3.4  {
     3.5  	if (permanent)
     3.6  	{
     3.7 -		FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(agent_id, av_name.getUserName(), "", LLAssetType::AT_OBJECT);
     3.8 +		FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(agent_id, av_name.getUserName(), "", LLAssetType::AT_PERSON);
     3.9  	}
    3.10  
    3.11  	LLViewerObject* av_obj = gObjectList.findObject(agent_id);
     4.1 --- a/indra/newview/llviewermenu.cpp	Tue Dec 02 23:49:53 2014 +0100
     4.2 +++ b/indra/newview/llviewermenu.cpp	Wed Dec 03 02:54:20 2014 +0100
     4.3 @@ -2793,12 +2793,14 @@
     4.4  			{
     4.5  				std::string entry_name = "";
     4.6  				std::string region_name;
     4.7 +				LLAssetType::EType asset_type;
     4.8  
     4.9  				if (objp->isAvatar())
    4.10  				{
    4.11  					LLNameValue* firstname = objp->getNVPair("FirstName");
    4.12  					LLNameValue* lastname = objp->getNVPair("LastName");
    4.13 -					entry_name = llformat("%s %s" ,firstname->getString(), lastname->getString());
    4.14 +					entry_name = llformat("%s %s", firstname->getString(), lastname->getString());
    4.15 +					asset_type = LLAssetType::AT_PERSON;
    4.16  				}
    4.17  				else
    4.18  				{
    4.19 @@ -2815,9 +2817,10 @@
    4.20  					{
    4.21  						region_name = region->getName();
    4.22  					}
    4.23 +					asset_type = LLAssetType::AT_OBJECT;
    4.24  				}
    4.25  			
    4.26 -				FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(objp->getID(), entry_name, region_name, LLAssetType::AT_OBJECT);
    4.27 +				FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(objp->getID(), entry_name, region_name, asset_type);
    4.28  			}
    4.29  
    4.30  			select_mgr->deselectObjectOnly(objp);
     5.1 --- a/indra/newview/skins/default/xui/en/floater_asset_blacklist.xml	Tue Dec 02 23:49:53 2014 +0100
     5.2 +++ b/indra/newview/skins/default/xui/en/floater_asset_blacklist.xml	Wed Dec 03 02:54:20 2014 +0100
     5.3 @@ -25,6 +25,10 @@
     5.4  Sound
     5.5  	</floater.string>
     5.6  	<floater.string
     5.7 +		name="asset_resident">
     5.8 +Resident
     5.9 +	</floater.string>
    5.10 +	<floater.string
    5.11  		name="asset_unknown">
    5.12  Unknown
    5.13  	</floater.string>
     6.1 --- a/indra/newview/skins/default/xui/pl/floater_asset_blacklist.xml	Tue Dec 02 23:49:53 2014 +0100
     6.2 +++ b/indra/newview/skins/default/xui/pl/floater_asset_blacklist.xml	Wed Dec 03 02:54:20 2014 +0100
     6.3 @@ -9,6 +9,9 @@
     6.4  	<floater.string name="asset_sound">
     6.5  		Dźwięk
     6.6  	</floater.string>
     6.7 +	<floater.string name="asset_resident">
     6.8 +		Rezydent
     6.9 +	</floater.string>
    6.10  	<floater.string name="asset_unknown">
    6.11  		Nieznany
    6.12  	</floater.string>

mercurial