diff options
author | Oz Linden <oz@lindenlab.com> | 2014-12-17 11:15:31 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-12-17 11:15:31 -0500 |
commit | f8ed44f8ec80916e684c2783da02f89474710de6 (patch) | |
tree | 2a4ca145439751e864beb6be91cde52a7901b036 /indra/newview/llfloaterpathfindingobjects.cpp | |
parent | 11ab03331f5028455a56245fc9121b82068565cc (diff) | |
parent | 0d71baba74e2009e88471e2c44e78863b34a5817 (diff) |
merge latest updates from nat and callum
Diffstat (limited to 'indra/newview/llfloaterpathfindingobjects.cpp')
-rwxr-xr-x | indra/newview/llfloaterpathfindingobjects.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp index d72ee073e1..f6ff83eaf4 100755 --- a/indra/newview/llfloaterpathfindingobjects.cpp +++ b/indra/newview/llfloaterpathfindingobjects.cpp @@ -406,7 +406,7 @@ void LLFloaterPathfindingObjects::addObjectToScrollList(const LLPathfindingObjec if (pObjectPtr->hasOwner() && !pObjectPtr->hasOwnerName()) { - mMissingNameObjectsScrollListItems.insert(std::make_pair<std::string, LLScrollListItem *>(pObjectPtr->getUUID().asString(), scrollListItem)); + mMissingNameObjectsScrollListItems.insert(scroll_list_item_map::value_type(pObjectPtr->getUUID().asString(), scrollListItem)); pObjectPtr->registerOwnerNameListener(boost::bind(&LLFloaterPathfindingObjects::handleObjectNameResponse, this, _1)); } } |