diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-08-15 12:37:24 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-08-15 12:37:24 +0300 |
| commit | 22140012c2b8f40081027bdcf2f5fbcd8a4527e9 (patch) | |
| tree | aac19b5d2c947e79e6afbff8d5b006ed600067dc /indra | |
| parent | e7bc0e6e6388481db1ef98407021f83870dc6351 (diff) | |
MAINT-3012 FIXED Don't show Destination Guide by default on first run.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/app_settings/settings_per_account.xml | 13 | ||||
| -rwxr-xr-x | indra/newview/lltoolbarview.cpp | 19 |
2 files changed, 1 insertions, 31 deletions
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 590f41283b..636caf5ef3 100755 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -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> diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index 4f2c99fba8..78a555d67d 100755 --- a/indra/newview/lltoolbarview.cpp +++ b/indra/newview/lltoolbarview.cpp @@ -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); - } -} - |