From 324f12641ab410edcdfabb4c5c513bfdc866cb7c Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 6 Mar 2019 16:11:31 -0500
Subject: [PATCH] Remove redundant casts from c_str to string

Thanks Aru
---
 indra/llui/lluictrlfactory.cpp    | 2 +-
 indra/llwindow/llwindowmacosx.cpp | 2 +-
 indra/newview/llstartup.cpp       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 11605bafd..e41a8082a 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -496,7 +496,7 @@ void LLUICtrlFactory::rebuild()
 		panelp->setFocus(FALSE);
 		panelp->deleteAllChildren();
 
-		buildPanel(panelp, filename.c_str(), &panelp->getFactoryMap());
+		buildPanel(panelp, filename, &panelp->getFactoryMap());
 		panelp->setVisible(visible);
 	}
 
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 72c9f7628..8c11a05d3 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -80,7 +80,7 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card)
 			"You can try to run Second Life, but it will probably crash or run\n"
 			"very slowly.  Try anyway?",
 			bad_card);
-		S32 button = OSMessageBox(buffer.c_str(), "Unsupported video card", OSMB_YESNO);
+		S32 button = OSMessageBox(buffer, "Unsupported video card", OSMB_YESNO);
 		if (OSBTN_YES == button)
 		{
 			return FALSE;
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 96ef511e5..50d28db61 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -860,7 +860,7 @@ bool idle_startup()
 	{
 		LL_DEBUGS("AppInit") << "STATE_BROWSER_INIT" << LL_ENDL;
 		//std::string msg = LLTrans::getString("LoginInitializingBrowser");
-		//set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());
+		//set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD);
 		display_startup();
 		// LLViewerMedia::initBrowser();
 		LLStartUp::setStartupState( STATE_LOGIN_SHOW );
@@ -2683,15 +2683,15 @@ bool idle_startup()
 		update_texture_fetch();
 		display_startup();
 		set_startup_status(0.9f + 0.1f * wearables_time / MAX_WEARABLES_TIME,
-						 LLTrans::getString("LoginDownloadingClothing").c_str(),
-						 gAgent.mMOTD.c_str());
+						 LLTrans::getString("LoginDownloadingClothing"),
+						 gAgent.mMOTD);
 		display_startup();
 		return TRUE;
 	}
 
 	if (STATE_CLEANUP == LLStartUp::getStartupState())
 	{
-		set_startup_status(1.0, "", "");
+		set_startup_status(1.0, LLStringUtil::null, LLStringUtil::null);
 		display_startup();
 
 		// Let the map know about the inventory.