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

MAINT-3012 FIXED Don't show Destination Guide by default on first run.

meow-7.2.2
Mnikolenko ProductEngine 2013-08-15 12:37:24 +03:00
parent e7bc0e6e63
commit 22140012c2
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/app_settings/settings_per_account.xml
View File

@ -109,18 +109,7 @@
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>DisplayDestinationsOnInitialRun</key>
<map>
<key>Comment</key>
<string>Display the destinations guide when a user first launches Second Life.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
<key>LastInventoryInboxActivity</key>
<map>
<key>Comment</key>

19
indra/newview/lltoolbarview.cpp
View File

@ -51,8 +51,6 @@ LLToolBarView* gToolBarView = NULL;
static LLDefaultChildRegistry::Register<LLToolBarView> r("toolbar_view");
void handleLoginToolbarSetup();
bool isToolDragged()
{
return (LLToolDragAndDrop::getInstance()->getSource() == LLToolDragAndDrop::SOURCE_VIEWER);
@ -111,8 +109,6 @@ BOOL LLToolBarView::postBuild()
mToolbars[i]->setButtonAddCallback(boost::bind(LLToolBarView::onToolBarButtonAdded,_1));
mToolbars[i]->setButtonRemoveCallback(boost::bind(LLToolBarView::onToolBarButtonRemoved,_1));
}
LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&handleLoginToolbarSetup));
return TRUE;
}
@ -696,18 +692,3 @@ bool LLToolBarView::isModified() const
}
//
// HACK to bring up destinations guide at startup
//
void handleLoginToolbarSetup()
{
// Open the destinations guide by default on first login, per Rhett
if (gSavedPerAccountSettings.getBOOL("DisplayDestinationsOnInitialRun") || gAgent.isFirstLogin())
{
LLFloaterReg::showInstance("destinations");
gSavedPerAccountSettings.setBOOL("DisplayDestinationsOnInitialRun", FALSE);
}
}