diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llcommunicationchannel.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llfloaterpathfindingobjects.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llpanelmaininventory.cpp | 2 | 
3 files changed, 3 insertions, 3 deletions
| diff --git a/indra/newview/llcommunicationchannel.cpp b/indra/newview/llcommunicationchannel.cpp index 627c9eb5c0..cf98b56b4c 100755 --- a/indra/newview/llcommunicationchannel.cpp +++ b/indra/newview/llcommunicationchannel.cpp @@ -108,6 +108,6 @@ void LLCommunicationChannel::onFilterFail(LLNotificationPtr pNotificationPtr)  		|| (notificationType == "notifytoast"))          && !pNotificationPtr->isCancelled())  	{ -		mHistory.insert(std::make_pair<LLDate, LLNotificationPtr>(pNotificationPtr->getDate(), pNotificationPtr)); +		mHistory.insert(history_list_t::value_type(pNotificationPtr->getDate(), pNotificationPtr));  	}  } 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));  	}  } diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index a7c9dbdf7b..a5063de0f4 100755 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -246,7 +246,7 @@ LLPanelMainInventory::~LLPanelMainInventory( void )  	llofstream filtersFile(filterSaveName.str());  	if(!LLSDSerialize::toPrettyXML(filterRoot, filtersFile))  	{ -		LL_WARNS() << "Could not write to filters save file " << filterSaveName << LL_ENDL; +		LL_WARNS() << "Could not write to filters save file " << filterSaveName.str() << LL_ENDL;  	}  	else  		filtersFile.close(); | 
