Mergeup to 3.7.9 viewer-release

1 files changed, 12 insertions, 7 deletions

diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 88400e4ef2..343f2b413f 100755
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -264,7 +264,7 @@ void LLLandmarksPanel::onShowOnMap()
 {
 	if (NULL == mCurrentSelectedList)
 	{
-		llwarns << "There are no selected list. No actions are performed." << llendl;
+		LL_WARNS() << "There are no selected list. No actions are performed." << LL_ENDL;
 		return;
 	}
 
@@ -421,7 +421,7 @@ bool LLLandmarksPanel::isReceivedFolderSelected() const
 
 	// *TODO: it should be filled with logic when EXT-976 is done.
 
-	llwarns << "Not implemented yet until EXT-976 is done." << llendl;
+	LL_WARNS() << "Not implemented yet until EXT-976 is done." << LL_ENDL;
 
 	return false;
 }
@@ -529,7 +529,7 @@ void LLLandmarksPanel::setParcelID(const LLUUID& parcel_id)
 // virtual
 void LLLandmarksPanel::setErrorStatus(U32 status, const std::string& reason)
 {
-	llwarns << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl;
+	LL_WARNS() << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<LL_ENDL;
 }
 
 
@@ -716,6 +716,11 @@ void LLLandmarksPanel::updateListCommands()
 	mListCommands->getChildView(TRASH_BUTTON_NAME)->setEnabled(trash_enabled);
 }
 
+void LLLandmarksPanel::updateMenuVisibility(LLUICtrl* menu)
+{
+	onMenuVisibilityChange(menu, LLSD().with("visibility", true));
+}
+
 void LLLandmarksPanel::onActionsButtonClick()
 {
 	LLToggleableMenu* menu = mGearFolderMenu;
@@ -1042,7 +1047,7 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
 	}
 	else
 	{
-		llwarns << "Unprocessed command has come: " << command_name << llendl;
+		LL_WARNS() << "Unprocessed command has come: " << command_name << LL_ENDL;
 	}
 
 	return true;
@@ -1201,7 +1206,7 @@ bool LLLandmarksPanel::canItemBeModified(const std::string& command_name, LLFold
 		}
 		else
 		{
-			llwarns << "Unprocessed command has come: " << command_name << llendl;
+			LL_WARNS() << "Unprocessed command has come: " << command_name << LL_ENDL;
 		}
 	}
 
@@ -1359,9 +1364,9 @@ void LLLandmarksPanel::doCreatePick(LLLandmark* landmark)
 	}
 	else
 	{
-		llwarns << "Can't create pick for landmark for region" << region_id
+		LL_WARNS() << "Can't create pick for landmark for region" << region_id
 				<< ". Region: "	<< region->getName()
-				<< " does not support RemoteParcelRequest" << llendl;
+				<< " does not support RemoteParcelRequest" << LL_ENDL;
 	}
 }