Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant casts from c_str to string

Browse Source 
Thanks Aru
This commit is contained in:
Lirusaito
2019-03-06 16:11:31 -05:00
parent cd02bbd1cb
commit 324f12641a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/lluictrlfactory.cpp
View File

@@ -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);
}

2
indra/llwindow/llwindowmacosx.cpp
View File

@@ -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;

8
indra/newview/llstartup.cpp
View File

@@ -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.