Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Oops, that should use emplace, too bad we don't have C++11.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-01-20 17:44:22 -05:00
parent 18b7f6925a
commit 123ded50ef
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloaterinspect.cpp
View File

@@ -250,7 +250,7 @@ void LLFloaterInspect::refresh()
{
owner_name = LLTrans::getString("RetrievingData");
if (mOwnerNameCacheConnection.find(idOwner) == mOwnerNameCacheConnection.end())
mOwnerNameCacheConnection.insert(std::make_pair(idOwner, LLAvatarNameCache::get(idOwner, boost::bind(&LLFloaterInspect::onGetOwnerNameCallback, this, _1))));
mOwnerNameCacheConnection.emplace(idOwner, LLAvatarNameCache::get(idOwner, boost::bind(&LLFloaterInspect::onGetOwnerNameCallback, this, _1)));
}
// <edit>
@@ -268,7 +268,7 @@ void LLFloaterInspect::refresh()
{
last_owner_name = LLTrans::getString("RetrievingData");
if (mLastOwnerNameCacheConnection.find(idLastOwner) == mLastOwnerNameCacheConnection.end())
mLastOwnerNameCacheConnection.insert(std::make_pair(idLastOwner, LLAvatarNameCache::get(idLastOwner, boost::bind(&LLFloaterInspect::onGetLastOwnerNameCallback, this, _1))));
mLastOwnerNameCacheConnection.emplace(idLastOwner, LLAvatarNameCache::get(idLastOwner, boost::bind(&LLFloaterInspect::onGetLastOwnerNameCallback, this, _1)));
}
// </edit>
@@ -287,7 +287,7 @@ void LLFloaterInspect::refresh()
{
creator_name = LLTrans::getString("RetrievingData");
if (mCreatorNameCacheConnection.find(idCreator) == mCreatorNameCacheConnection.end())
mCreatorNameCacheConnection.insert(std::make_pair(idCreator, LLAvatarNameCache::get(idCreator, boost::bind(&LLFloaterInspect::onGetCreatorNameCallback, this, _1))));
mCreatorNameCacheConnection.emplace(idCreator, LLAvatarNameCache::get(idCreator, boost::bind(&LLFloaterInspect::onGetCreatorNameCallback, this, _1)));
}
row["id"] = obj->getObject()->getID();

7
indra/newview/llfloaterinspect.h
View File

@@ -38,6 +38,7 @@
#include "llavatarname.h"
#include "llfloater.h"
#include "llvoinventorylistener.h"
#include <boost/container/map.hpp>
//class LLTool;
class LLObjectSelection;
@@ -84,9 +85,9 @@ private:
std::map<LLUUID,std::pair<U32,U32> > mInventoryNums; //<scripts,total>
std::vector<LLUUID> mQueue;
// </edit>
std::map<const LLUUID, boost::signals2::scoped_connection> mOwnerNameCacheConnection;
std::map<const LLUUID, boost::signals2::scoped_connection> mLastOwnerNameCacheConnection; // <edit/>
std::map<const LLUUID, boost::signals2::scoped_connection> mCreatorNameCacheConnection;
boost::container::map<LLUUID, boost::signals2::scoped_connection> mOwnerNameCacheConnection;
boost::container::map<LLUUID, boost::signals2::scoped_connection> mLastOwnerNameCacheConnection; // <edit/>
boost::container::map<LLUUID, boost::signals2::scoped_connection> mCreatorNameCacheConnection;
};
#endif //LL_LLFLOATERINSPECT_H