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

Sound Explorer: Add correct name to blacklist

Ansariel 2014-03-20 12:40:23 +01:00
parent 3fc742382d
commit a5dcfd4647
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
indra/newview/NACLfloaterexploresounds.cpp
View File

@ -55,6 +55,14 @@ NACLFloaterExploreSounds::NACLFloaterExploreSounds(const LLSD& key)
NACLFloaterExploreSounds::~NACLFloaterExploreSounds()
{
for (blacklist_avatar_name_cache_connection_map_t::iterator it = mBlacklistAvatarNameCacheConnections.begin(); it != mBlacklistAvatarNameCacheConnections.end(); ++it)
{
if (it->second.connected())
{
it->second.disconnect();
}
}
mBlacklistAvatarNameCacheConnections.clear();
}
BOOL NACLFloaterExploreSounds::postBuild()
@ -393,18 +401,38 @@ void NACLFloaterExploreSounds::blacklistSound()
continue;
}
std::string entry_name;
std::string agent;
std::string region_name;
gCacheName->getFullName(item.mOwnerID, agent);
LLViewerRegion* cur_region = gAgent.getRegion();
if (cur_region)
{
region_name = cur_region->getName();
}
FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(item.mAssetID, agent, region_name, LLAssetType::AT_SOUND, true);
blacklist_avatar_name_cache_connection_map_t::iterator it = mBlacklistAvatarNameCacheConnections.find(item.mOwnerID);
if (it != mBlacklistAvatarNameCacheConnections.end())
{
if (it->second.connected())
{
it->second.disconnect();
}
mBlacklistAvatarNameCacheConnections.erase(it);
}
mBlacklistAvatarNameCacheConnections[item.mOwnerID] =
LLAvatarNameCache::get(item.mOwnerID, boost::bind(&NACLFloaterExploreSounds::onBlacklistAvatarNameCacheCallback, this, _1, _2, item.mAssetID, region_name));
}
}
void NACLFloaterExploreSounds::onBlacklistAvatarNameCacheCallback(const LLUUID& av_id, const LLAvatarName& av_name, const LLUUID& asset_id, const std::string& region_name)
{
blacklist_avatar_name_cache_connection_map_t::iterator it = mBlacklistAvatarNameCacheConnections.find(av_id);
if (it != mBlacklistAvatarNameCacheConnections.end())
{
if (it->second.connected())
{
it->second.disconnect();
}
mBlacklistAvatarNameCacheConnections.erase(it);
}
FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(asset_id, av_name.getCompleteName(), region_name, LLAssetType::AT_SOUND, true);
}

6
indra/newview/NACLfloaterexploresounds.h
View File

@ -8,6 +8,7 @@
#include "llfloater.h"
#include "lleventtimer.h"
#include "llaudioengine.h"
#include "llavatarnamecache.h"
class LLCheckBoxCtrl;
class LLScrollListCtrl;
@ -39,6 +40,11 @@ private:
LLCheckBoxCtrl* mPaused;
std::list<LLSoundHistoryItem> mLastHistory;
typedef std::map<LLUUID, boost::signals2::connection> blacklist_avatar_name_cache_connection_map_t;
blacklist_avatar_name_cache_connection_map_t mBlacklistAvatarNameCacheConnections;
void onBlacklistAvatarNameCacheCallback(const LLUUID& av_id, const LLAvatarName& av_name, const LLUUID& asset_id, const std::string& region_name);
};
#endif