livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo changes to llstartup.cpp that slipped in as part of previous commit...

Ansariel 2015-02-17 10:58:27 +01:00
parent c72ef6f7ee
commit c2ef0bf500
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llstartup.cpp
View File

@ -1283,15 +1283,6 @@ bool idle_startup()
// Overwrite default user settings with user settings
LLAppViewer::instance()->loadSettingsFromDirectory("Account");
LLLayoutStack* chat_bar_stack = gToolBarView->findChild<LLLayoutStack>("chat_bar_stack");
if (chat_bar_stack)
{
LLSD persisted_sizes = //gSavedPerAccountSettings.getLLSD("layout_size_chat_bar_stack");
gSavedSettings.getLLSD("layout_size_chat_bar_stack");
LL_INFOS() << "ADBG: size = " << persisted_sizes.size() << LL_ENDL;
}
// Convert 'LogInstantMessages' into 'KeepConversationLogTranscripts' for backward compatibility (CHUI-743).
// <FS:CR> FIRE-11410 - Don't do this, handle it in settings restore and first run
//LLControlVariablePtr logInstantMessagesControl = gSavedPerAccountSettings.getControl("LogInstantMessages");