From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llfloaterperformance.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterperformance.h') diff --git a/indra/newview/llfloaterperformance.h b/indra/newview/llfloaterperformance.h index 620dbac5bb..5fecd99825 100644 --- a/indra/newview/llfloaterperformance.h +++ b/indra/newview/llfloaterperformance.h @@ -38,7 +38,7 @@ public: LLFloaterPerformance(const LLSD& key); virtual ~LLFloaterPerformance(); - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); /*virtual*/ void draw(); void showSelectedPanel(LLPanel* selected_panel); -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llfloaterperformance.h | 208 +++++++++++++++++------------------ 1 file changed, 104 insertions(+), 104 deletions(-) (limited to 'indra/newview/llfloaterperformance.h') diff --git a/indra/newview/llfloaterperformance.h b/indra/newview/llfloaterperformance.h index ae653c25d9..089a508455 100644 --- a/indra/newview/llfloaterperformance.h +++ b/indra/newview/llfloaterperformance.h @@ -1,104 +1,104 @@ -/** - * @file llfloaterperformance.h - * - * $LicenseInfo:firstyear=2021&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2021, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLFLOATERPERFORMANCE_H -#define LL_LLFLOATERPERFORMANCE_H - -#include "llfloater.h" -#include "lllistcontextmenu.h" - -class LLCharacter; -class LLNameListCtrl; - -class LLFloaterPerformance : public LLFloater -{ -public: - LLFloaterPerformance(const LLSD& key); - virtual ~LLFloaterPerformance(); - - /*virtual*/ bool postBuild(); - /*virtual*/ void draw(); - - void showSelectedPanel(LLPanel* selected_panel); - void showMainPanel(); - void hidePanels(); - void showAutoadjustmentsPanel(); - - void detachItem(const LLUUID& item_id); - - void onAvatarListRightClick(LLUICtrl* ctrl, S32 x, S32 y); - - void onCustomAction (const LLSD& userdata, const LLUUID& av_id); - bool isActionChecked(const LLSD& userdata, const LLUUID& av_id); - -private: - void initBackBtn(LLPanel* panel); - void populateHUDList(); - void populateObjectList(); - void populateNearbyList(); - void setFPSText(); - - void onClickAdvanced(); - void onClickDefaults(); - void onChangeQuality(const LLSD& data); - void onClickHideAvatars(); - void onClickExceptions(); - void onClickShadows(); - void onClickAdvancedLighting(); - - void startAutotune(); - void stopAutotune(); - void updateAutotuneCtrls(bool autotune_enabled); - void enableAutotuneWarning(); - - void updateMaxRenderTime(); - - static void changeQualityLevel(const std::string& notif); - - LLPanel* mMainPanel; - LLPanel* mNearbyPanel; - LLPanel* mComplexityPanel; - LLPanel* mHUDsPanel; - LLPanel* mSettingsPanel; - LLPanel* mAutoadjustmentsPanel; - LLNameListCtrl* mHUDList; - LLNameListCtrl* mObjectList; - LLNameListCtrl* mNearbyList; - - LLButton* mStartAutotuneBtn; - LLButton* mStopAutotuneBtn; - - LLListContextMenu* mContextMenu; - - LLTimer* mUpdateTimer; - - // maximum GPU time of nearby avatars in ms according to LLWorld::getNearbyAvatarsAndMaxGPUTime - // -1.f if no profile has happened yet - F32 mNearbyMaxGPUTime = -1.f; - - boost::signals2::connection mMaxARTChangedSignal; -}; - -#endif // LL_LLFLOATERPERFORMANCE_H +/** + * @file llfloaterperformance.h + * + * $LicenseInfo:firstyear=2021&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2021, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLFLOATERPERFORMANCE_H +#define LL_LLFLOATERPERFORMANCE_H + +#include "llfloater.h" +#include "lllistcontextmenu.h" + +class LLCharacter; +class LLNameListCtrl; + +class LLFloaterPerformance : public LLFloater +{ +public: + LLFloaterPerformance(const LLSD& key); + virtual ~LLFloaterPerformance(); + + /*virtual*/ bool postBuild(); + /*virtual*/ void draw(); + + void showSelectedPanel(LLPanel* selected_panel); + void showMainPanel(); + void hidePanels(); + void showAutoadjustmentsPanel(); + + void detachItem(const LLUUID& item_id); + + void onAvatarListRightClick(LLUICtrl* ctrl, S32 x, S32 y); + + void onCustomAction (const LLSD& userdata, const LLUUID& av_id); + bool isActionChecked(const LLSD& userdata, const LLUUID& av_id); + +private: + void initBackBtn(LLPanel* panel); + void populateHUDList(); + void populateObjectList(); + void populateNearbyList(); + void setFPSText(); + + void onClickAdvanced(); + void onClickDefaults(); + void onChangeQuality(const LLSD& data); + void onClickHideAvatars(); + void onClickExceptions(); + void onClickShadows(); + void onClickAdvancedLighting(); + + void startAutotune(); + void stopAutotune(); + void updateAutotuneCtrls(bool autotune_enabled); + void enableAutotuneWarning(); + + void updateMaxRenderTime(); + + static void changeQualityLevel(const std::string& notif); + + LLPanel* mMainPanel; + LLPanel* mNearbyPanel; + LLPanel* mComplexityPanel; + LLPanel* mHUDsPanel; + LLPanel* mSettingsPanel; + LLPanel* mAutoadjustmentsPanel; + LLNameListCtrl* mHUDList; + LLNameListCtrl* mObjectList; + LLNameListCtrl* mNearbyList; + + LLButton* mStartAutotuneBtn; + LLButton* mStopAutotuneBtn; + + LLListContextMenu* mContextMenu; + + LLTimer* mUpdateTimer; + + // maximum GPU time of nearby avatars in ms according to LLWorld::getNearbyAvatarsAndMaxGPUTime + // -1.f if no profile has happened yet + F32 mNearbyMaxGPUTime = -1.f; + + boost::signals2::connection mMaxARTChangedSignal; +}; + +#endif // LL_LLFLOATERPERFORMANCE_H -- cgit v1.2.3 From 7e82c1de5242e7dacafe7d69abb753f6fe528e0f Mon Sep 17 00:00:00 2001 From: Rye Mutt Date: Wed, 24 Jul 2024 12:59:55 -0400 Subject: Fix performance floater getChild while drawing --- indra/newview/llfloaterperformance.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llfloaterperformance.h') diff --git a/indra/newview/llfloaterperformance.h b/indra/newview/llfloaterperformance.h index 089a508455..a7100eb350 100644 --- a/indra/newview/llfloaterperformance.h +++ b/indra/newview/llfloaterperformance.h @@ -30,7 +30,9 @@ #include "lllistcontextmenu.h" class LLCharacter; +class LLCheckBoxCtrl; class LLNameListCtrl; +class LLTextBox; class LLFloaterPerformance : public LLFloater { @@ -90,6 +92,13 @@ private: LLButton* mStartAutotuneBtn; LLButton* mStopAutotuneBtn; + LLTextBox* mTextWIPDesc = nullptr; + LLTextBox* mTextDisplayDesc = nullptr; + LLTextBox* mTextFPSLabel = nullptr; + LLTextBox* mTextFPSValue = nullptr; + + LLCheckBoxCtrl* mCheckTuneContinous = nullptr; + LLListContextMenu* mContextMenu; LLTimer* mUpdateTimer; -- cgit v1.2.3