MAINT-8058 Simplification

1 files changed, 3 insertions, 14 deletions

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 9c3f0922b8..c9d664c7c4 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1334,18 +1334,12 @@ void LLFloaterTools::getMediaState()
 			{
 				// initial media title is the media URL (until we get the name)
 				media_title = media_data_get.getHomeURL();
-				navigateToTitleMedia(media_title);
-			}
-			else
-			{
-				// all faces might be empty. Make sure we will navigate next time.
-				navigateToTitleMedia(std::string());
 			}
+			// else all faces might be empty. 
 		}
 		else // there' re Different Medias' been set on on the faces.
 		{
 			media_title = multi_media_info_str;
-			navigateToTitleMedia(media_title);
 		}
 		
 		getChildView("media_tex")->setEnabled(bool_has_media && editable);
@@ -1362,7 +1356,6 @@ void LLFloaterTools::getMediaState()
 		if(LLFloaterMediaSettings::getInstance()->mMultipleValidMedia)
 		{
 			media_title = multi_media_info_str;
-			navigateToTitleMedia(media_title);
 		}
 		else
 		{
@@ -1371,12 +1364,6 @@ void LLFloaterTools::getMediaState()
 			{
 				// initial media title is the media URL (until we get the name)
 				media_title = media_data_get.getHomeURL();
-				navigateToTitleMedia(media_title);
-			}
-			else
-			{
-				// Make sure we will navigate next time.
-				navigateToTitleMedia(std::string());
 			}
 		}
 		
@@ -1385,6 +1372,8 @@ void LLFloaterTools::getMediaState()
 		getChildView("delete_media")->setEnabled(TRUE);
 		getChildView("add_media")->setEnabled(editable);
 	}
+
+	navigateToTitleMedia(media_title);
 	media_info->setText(media_title);
 	
 	// load values for media settings