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

FIRE-31079 - remove references to unused LLPanelTopInfoBar

meow-7.2.2
Zi Ree 2021-08-21 19:51:24 +02:00
parent 70fd0be39a
commit b6c1e98b3e
7 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/CMakeLists.txt
View File

@ -612,7 +612,7 @@ set(viewer_SOURCE_FILES
llpanelteleporthistory.cpp
llpaneltiptoast.cpp
llpanelvoiceeffect.cpp
llpaneltopinfobar.cpp
#llpaneltopinfobar.cpp # <FS:Zi> unused
llpanelpulldown.cpp
llpanelvoicedevicesettings.cpp
llpanelvolume.cpp
@ -1378,7 +1378,7 @@ set(viewer_HEADER_FILES
llpanelpulldown.h
llpanelvoicedevicesettings.h
llpanelvoiceeffect.h
llpaneltopinfobar.h
#llpaneltopinfobar.h # <FS:Zi> unused
llpanelvolume.h
llpanelvolumepulldown.h
llpanelwearing.h

16
indra/newview/llagent.cpp
View File

@ -66,7 +66,8 @@
// </FS:Ansariel> [FS Communication UI]
#include "llspeakers.h"
#include "llnotificationsutil.h"
#include "llpaneltopinfobar.h"
// <FS:Zi> We don't use the mini location panel in Firestorm
// #include "llpaneltopinfobar.h"
#include "llparcel.h"
#include "llrendersphere.h"
#include "llscriptruntimeperms.h"
@ -2618,10 +2619,12 @@ void LLAgent::endAnimationUpdateUI()
LLNavigationBar::instance().getView()->setVisible(TRUE);
gStatusBar->setVisibleForMouselook(true);
if (gSavedSettings.getBOOL("ShowMiniLocationPanel"))
{
LLPanelTopInfoBar::getInstance()->setVisible(TRUE);
}
// <FS:Zi> We don't use the mini location panel in Firestorm
// if (gSavedSettings.getBOOL("ShowMiniLocationPanel"))
// {
// LLPanelTopInfoBar::getInstance()->setVisible(TRUE);
// }
// </FS:Zi>
LLChicletBar::getInstance()->setVisible(TRUE);
@ -2780,7 +2783,8 @@ void LLAgent::endAnimationUpdateUI()
LLNavigationBar::instance().getView()->setVisible(FALSE);
gStatusBar->setVisibleForMouselook(false);
LLPanelTopInfoBar::getInstance()->setVisible(FALSE);
// <FS:Zi> We don't use the mini location panel in Firestorm
// LLPanelTopInfoBar::getInstance()->setVisible(FALSE);
LLChicletBar::getInstance()->setVisible(FALSE);

7
indra/newview/llchicletbar.cpp
View File

@ -29,7 +29,8 @@
#include "llchiclet.h"
#include "lllayoutstack.h"
#include "llpaneltopinfobar.h"
// <FS:Zi> We don't use the mini location panel in Firestorm
// #include "llpaneltopinfobar.h"
#include "llsyswellwindow.h"
#include "llfloaternotificationstabbed.h"
@ -325,6 +326,8 @@ S32 LLChicletBar::getChicletPanelShrinkHeadroom() const
void LLChicletBar::fitWithTopInfoBar()
{
// <FS:Zi> We don't use the mini location panel in Firestorm
#if 0
LLPanelTopInfoBar& top_info_bar = LLPanelTopInfoBar::instance();
LLRect rect = getRect();
@ -351,6 +354,8 @@ void LLChicletBar::fitWithTopInfoBar()
setRect(rect);
LLPanel::reshape(width, rect.getHeight(), false);
#endif
// </FS:Zi>
}
// <FS:Ansariel> Option to hide IM/Group chat chiclets

6
indra/newview/llnavigationbar.cpp
View File

@ -42,7 +42,8 @@
#include "lllandmarkactions.h"
#include "lllocationhistory.h"
#include "lllocationinputctrl.h"
#include "llpaneltopinfobar.h"
// <FS:Zi> We don't use the mini location panel in Firestorm
// #include "llpaneltopinfobar.h"
#include "llteleporthistory.h"
#include "llresizebar.h"
#include "llsearchcombobox.h"
@ -842,7 +843,8 @@ void LLNavigationBar::onNavigationButtonHeldUp(LLButton* nav_button)
void LLNavigationBar::handleLoginComplete()
{
LLTeleportHistory::getInstance()->handleLoginComplete();
LLPanelTopInfoBar::instance().handleLoginComplete();
// <FS:Zi> We don't use the mini location panel in Firestorm
// LLPanelTopInfoBar::instance().handleLoginComplete();
gStatusBar->handleLoginComplete();
mCmbLocation->handleLoginComplete();
// <FS:Ansariel> Commented out because we don't have the LL viewer layout

3
indra/newview/llviewercontrol.cpp
View File

@ -74,7 +74,8 @@
//#include "llpanellogin.h"
#include "fspanellogin.h"
// </FS:Ansariel> [FS Login Panel]
#include "llpaneltopinfobar.h"
// <FS:Zi> We don't use the mini location panel in Firestorm
// #include "llpaneltopinfobar.h"
#include "llspellcheck.h"
#include "llslurl.h"
#include "llstartup.h"

6
indra/newview/llviewerwindow.cpp
View File

@ -142,7 +142,8 @@
#include "llmoveview.h"
#include "llnavigationbar.h"
#include "llnotificationhandler.h"
#include "llpaneltopinfobar.h"
// <FS:Zi> We don't use the mini location panel in Firestorm
// #include "llpaneltopinfobar.h"
#include "llpopupview.h"
#include "llpreviewtexture.h"
#include "llprogressview.h"
@ -7098,7 +7099,8 @@ void LLViewerWindow::setUIVisibility(bool visible)
// <FS:Zi> Is done inside XUI now, using visibility_control
//LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE);
// <FS:Zi> We don't use the mini location panel in Firestorm
// LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE);
mRootView->getChildView("status_bar_container")->setVisible(visible);
// <FS:Zi> hide utility bar if we are on a skin that uses it, e.g. Vintage

9
indra/newview/rlvui.cpp
View File

@ -23,7 +23,8 @@
#include "llmoveview.h" // Movement panel (contains "Stand" and "Stop Flying" buttons)
#include "llnavigationbar.h" // Navigation bar
#include "llparcel.h"
#include "llpaneltopinfobar.h"
// <FS:Zi> We don't use the mini location panel in Firestorm
// #include "llpaneltopinfobar.h"
#include "llteleporthistory.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
@ -114,8 +115,10 @@ void RlvUIEnabler::onToggleShowLoc()
if (LLNavigationBar::instanceExists())
LLNavigationBar::instance().refreshLocationCtrl();
if (LLPanelTopInfoBar::instanceExists())
LLPanelTopInfoBar::instance().update();
// <FS:Zi> We don't use the mini location panel in Firestorm
// if (LLPanelTopInfoBar::instanceExists())
// LLPanelTopInfoBar::instance().update();
// </FS:Zi> We don't use the mini location panel in Firestorm
if (!fEnable)
{