Skip to content
Snippets Groups Projects
Commit b65ad565 authored by Leslie Linden's avatar Leslie Linden
Browse files

* Changed destination guide to open by default in the top left on first login

* Made the avatar pickers and destinations guide properly stack and position
  themselves.

Reviewed by Richard.
parent 6998c5eb
No related branches found
No related tags found
No related merge requests found
......@@ -29,6 +29,7 @@
#include "lltoolbarview.h"
#include "llappviewer.h"
#include "lldir.h"
#include "llxmlnode.h"
#include "lltoolbar.h"
......@@ -36,12 +37,18 @@
#include "lltooldraganddrop.h"
#include "llclipboard.h"
#include "llagent.h" // HACK for destinations guide on startup
#include "llfloaterreg.h" // HACK for destinations guide on startup
#include "llviewercontrol.h" // HACK for destinations guide on startup
#include <boost/foreach.hpp>
LLToolBarView* gToolBarView = NULL;
static LLDefaultChildRegistry::Register<LLToolBarView> r("toolbar_view");
void handleLoginToolbarSetup();
bool isToolDragged()
{
return (LLToolDragAndDrop::getInstance()->getSource() == LLToolDragAndDrop::SOURCE_VIEWER);
......@@ -97,6 +104,8 @@ BOOL LLToolBarView::postBuild()
mToolbarBottom->setStartDragCallback(boost::bind(LLToolBarView::startDragTool,_1,_2,_3));
mToolbarBottom->setHandleDragCallback(boost::bind(LLToolBarView::handleDragTool,_1,_2,_3,_4));
mToolbarBottom->setHandleDropCallback(boost::bind(LLToolBarView::handleDropTool,_1,_2,_3,_4));
LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&handleLoginToolbarSetup));
return TRUE;
}
......@@ -466,3 +475,18 @@ bool LLToolBarView::isModified() const
return modified;
}
//
// HACK to bring up destinations guide at startup
//
void handleLoginToolbarSetup()
{
// Open the destinations guide by default on first login, per Rhett
if (gSavedSettings.getBOOL("FirstLoginThisInstall") || gAgent.isFirstLogin())
{
LLFloaterReg::showInstance("destinations");
}
}
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
open_positioning="cascading"
ignore_ui_scale="false"
legacy_header_height="225"
can_minimize="true"
can_close="true"
......@@ -12,6 +14,7 @@
single_instance="true"
help_topic="avatar"
save_rect="true"
save_visibility="true"
title="AVATAR PICKER"
width="635">
<web_browser
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
open_positioning="cascading"
ignore_ui_scale="false"
legacy_header_height="225"
can_minimize="true"
can_close="true"
......@@ -14,6 +15,7 @@
single_instance="true"
help_topic="destinations"
save_rect="true"
save_visibility="true"
title="DESTINATIONS"
width="840">
<web_browser
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment