merge

1 files changed, 3 insertions, 6 deletions

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 9cae6f0ebd..1287e14961 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1269,18 +1269,15 @@ void LLFloaterTools::getMediaState()
 // called when a user wants to add media to a prim or prim face
 void LLFloaterTools::onClickBtnAddMedia()
 {
-	// check for the edit tool and now many faces are selected
-	LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
-	if((tool != LLToolFace::getInstance()) || LLSelectMgr::getInstance()->getSelection()->isMultipleTESelected())
+	// check if multiple faces are selected
+	if(LLSelectMgr::getInstance()->getSelection()->isMultipleTESelected())
 	{
-		LLNotificationsUtil::add("MultipleFacesSelected",LLSD(), LLSD(), multipleFacesSelectedConfirm);
-		
+		LLNotificationsUtil::add("MultipleFacesSelected", LLSD(), LLSD(), multipleFacesSelectedConfirm);
 	}
 	else
 	{
 		onClickBtnEditMedia();
 	}
-
 }
 
 // static