From 0473ab08d81a7f5b87dfe02cbb95bd9863df1757 Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Wed, 2 Jun 2010 18:21:25 +0300 Subject: EXT-7034 FIX add initializationagent position at later state in case initialization at earlier state failed. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/480/ --HG-- branch : product-engine --- indra/newview/llnavigationbar.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llnavigationbar.cpp') diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 251c60b5bf..e5548007bd 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -713,6 +713,7 @@ void LLNavigationBar::onNavigationButtonHeldUp(LLButton* nav_button) void LLNavigationBar::handleLoginComplete() { + LLTeleportHistory::getInstance()->handleLoginComplete(); mCmbLocation->handleLoginComplete(); } -- cgit v1.2.3 From 5609f78f456a2919aa6eba76955a2438689c0689 Mon Sep 17 00:00:00 2001 From: Andrew Polunin Date: Thu, 3 Jun 2010 18:59:16 +0300 Subject: EXT-5808 FIXED Mini-Location panel was added below Navigation Bar - Implemented class LLPanelTopInfoBar (llpaneltopinfobar.h, llpaneltopinfobar.cpp, panel_topinfo_bar.xml). Most of it's implementation is borrowed from LLLocationInputCtrl class. - Mini-Location panel is turned off by default. - Added top bar context menu option \"Show Mini-Location Panel\". - Mini-Location panel displays the same context menu as top bar. - Added code to initialize LLPanelTopInfoBar in llviewerwindow.cpp. - Added declaration of the widget in main_view.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/464/ --HG-- branch : product-engine --- indra/newview/llnavigationbar.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llnavigationbar.cpp') diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index e5548007bd..fce666c9d4 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -48,6 +48,7 @@ #include "lllandmarkactions.h" #include "lllocationhistory.h" #include "lllocationinputctrl.h" +#include "llpaneltopinfobar.h" #include "llteleporthistory.h" #include "llsearchcombobox.h" #include "llsidetray.h" @@ -714,6 +715,7 @@ void LLNavigationBar::onNavigationButtonHeldUp(LLButton* nav_button) void LLNavigationBar::handleLoginComplete() { LLTeleportHistory::getInstance()->handleLoginComplete(); + LLPanelTopInfoBar::instance().handleLoginComplete(); mCmbLocation->handleLoginComplete(); } -- cgit v1.2.3