diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp index e62826582..7ab55de5d 100644 --- a/indra/newview/llfloaterinspect.cpp +++ b/indra/newview/llfloaterinspect.cpp @@ -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))); } // @@ -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))); } // @@ -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(); diff --git a/indra/newview/llfloaterinspect.h b/indra/newview/llfloaterinspect.h index 4874cf5d2..c60b116d7 100644 --- a/indra/newview/llfloaterinspect.h +++ b/indra/newview/llfloaterinspect.h @@ -38,6 +38,7 @@ #include "llavatarname.h" #include "llfloater.h" #include "llvoinventorylistener.h" +#include //class LLTool; class LLObjectSelection; @@ -84,9 +85,9 @@ private: std::map > mInventoryNums; // std::vector mQueue; // - std::map mOwnerNameCacheConnection; - std::map mLastOwnerNameCacheConnection; // - std::map mCreatorNameCacheConnection; + boost::container::map mOwnerNameCacheConnection; + boost::container::map mLastOwnerNameCacheConnection; // + boost::container::map mCreatorNameCacheConnection; }; #endif //LL_LLFLOATERINSPECT_H