Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 151 insertions, 151 deletions

diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h
index 1541684567..35158b1bdd 100644
--- a/indra/newview/llfasttimerview.h
+++ b/indra/newview/llfasttimerview.h
@@ -1,151 +1,151 @@
-/** 
- * @file llfasttimerview.h
- * @brief LLFastTimerView class definition
- *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, 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_LLFASTTIMERVIEW_H
-#define LL_LLFASTTIMERVIEW_H
-
-#include "llfloater.h"
-#include "llfasttimer.h"
-#include "llunits.h"
-#include "lltracerecording.h"
-#include <deque>
-
-class LLScrollbar;
-
-class LLFastTimerView : public LLFloater
-{
-public:
-	LLFastTimerView(const LLSD&);
-	~LLFastTimerView();
-	bool postBuild();
-
-	static bool sAnalyzePerformance;
-
-	static void outputAllMetrics();
-	static void doAnalysis(std::string baseline, std::string target, std::string output);
-
-private:
-	static void doAnalysisDefault(std::string baseline, std::string target, std::string output) ;
-	static LLSD analyzePerformanceLogDefault(std::istream& is) ;
-	static void exportCharts(const std::string& base, const std::string& target);
-	void onPause();
-
-public:
-
-	virtual bool handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual bool handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask);
-	virtual bool handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual bool handleHover(S32 x, S32 y, MASK mask);
-	virtual bool handleToolTip(S32 x, S32 y, MASK mask);
-	virtual bool handleScrollWheel(S32 x, S32 y, S32 clicks);
-	virtual void draw();
-	virtual void onOpen(const LLSD& key);
-	virtual void onClose(bool app_quitting);
-	LLTrace::BlockTimerStatHandle* getLegendID(S32 y);
-
-private:	
-	void drawTicks();
-	void drawLineGraph();
-	void drawLegend();
-	void drawHelp(S32 y);
-	void drawBorders( S32 y, const S32 x_start, S32 barh, S32 dy);
-	void drawBars();
-
-	void printLineStats();
-	void generateUniqueColors();
-	void updateTotalTime();
-
-	struct TimerBar
-	{
-		TimerBar()
-		:	mTotalTime(0),
-			mSelfTime(0),
-			mStartFraction(0.f),
-			mEndFraction(1.f),
-			mFirstChild(false),
-			mLastChild(false)
-		{}
-		F32Seconds			mTotalTime,
-							mSelfTime,
-							mChildrenStart,
-							mChildrenEnd,
-							mSelfStart,
-							mSelfEnd;
-		LLTrace::BlockTimerStatHandle* mTimeBlock;
-		bool				mVisible,
-							mFirstChild,
-							mLastChild;
-		F32					mStartFraction,
-							mEndFraction;
-	};
-
-	struct TimerBarRow
-	{
-		TimerBarRow() 
-		:	mBottom(0),
-			mTop(0),
-			mBars(NULL)
-		{}
-		S32			mBottom,
-					mTop;
-		TimerBar*	mBars;
-	};
-
-	F32Seconds updateTimerBarWidths(LLTrace::BlockTimerStatHandle* time_block, TimerBarRow& row, S32 history_index, U32& bar_index);
-	S32 updateTimerBarOffsets(LLTrace::BlockTimerStatHandle* time_block, TimerBarRow& row, S32 timer_bar_index = 0);
-	S32 drawBar(LLRect bar_rect, TimerBarRow& row, S32 image_width, S32 image_height, bool hovered = false, bool visible = true, S32 bar_index = 0);
-	void setPauseState(bool pause_state);
-
-	std::deque<TimerBarRow> mTimerBarRows;
-	TimerBarRow				mAverageTimerRow;
-
-	enum EDisplayType
-	{
-		DISPLAY_TIME,
-		DISPLAY_CALLS,
-		DISPLAY_HZ
-	}								mDisplayType;
-	bool							mPauseHistory;
-	F64Seconds						mAllTimeMax,
-									mTotalTimeDisplay;
-	S32								mScrollIndex,
-									mHoverBarIndex,
-									mStatsIndex;
-	S32								mDisplayMode;
-	LLTrace::BlockTimerStatHandle*				mHoverID;
-	LLTrace::BlockTimerStatHandle*				mHoverTimer;
-	LLRect							mToolTipRect,
-									mGraphRect,
-									mBarRect,
-									mLegendRect;
-	LLFrameTimer					mHighlightTimer;
-	LLTrace::PeriodicRecording		mRecording;
-
-	LLScrollbar* 					mScrollBar;
-};
-
-#endif
+/**

+ * @file llfasttimerview.h

+ * @brief LLFastTimerView class definition

+ *

+ * $LicenseInfo:firstyear=2004&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, 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_LLFASTTIMERVIEW_H

+#define LL_LLFASTTIMERVIEW_H

+

+#include "llfloater.h"

+#include "llfasttimer.h"

+#include "llunits.h"

+#include "lltracerecording.h"

+#include <deque>

+

+class LLScrollbar;

+

+class LLFastTimerView : public LLFloater

+{

+public:

+    LLFastTimerView(const LLSD&);

+    ~LLFastTimerView();

+    bool postBuild();

+

+    static bool sAnalyzePerformance;

+

+    static void outputAllMetrics();

+    static void doAnalysis(std::string baseline, std::string target, std::string output);

+

+private:

+    static void doAnalysisDefault(std::string baseline, std::string target, std::string output) ;

+    static LLSD analyzePerformanceLogDefault(std::istream& is) ;

+    static void exportCharts(const std::string& base, const std::string& target);

+    void onPause();

+

+public:

+

+    virtual bool handleMouseDown(S32 x, S32 y, MASK mask);

+    virtual bool handleDoubleClick(S32 x, S32 y, MASK mask);

+    virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask);

+    virtual bool handleMouseUp(S32 x, S32 y, MASK mask);

+    virtual bool handleHover(S32 x, S32 y, MASK mask);

+    virtual bool handleToolTip(S32 x, S32 y, MASK mask);

+    virtual bool handleScrollWheel(S32 x, S32 y, S32 clicks);

+    virtual void draw();

+    virtual void onOpen(const LLSD& key);

+    virtual void onClose(bool app_quitting);

+    LLTrace::BlockTimerStatHandle* getLegendID(S32 y);

+

+private:

+    void drawTicks();

+    void drawLineGraph();

+    void drawLegend();

+    void drawHelp(S32 y);

+    void drawBorders( S32 y, const S32 x_start, S32 barh, S32 dy);

+    void drawBars();

+

+    void printLineStats();

+    void generateUniqueColors();

+    void updateTotalTime();

+

+    struct TimerBar

+    {

+        TimerBar()

+        :   mTotalTime(0),

+            mSelfTime(0),

+            mStartFraction(0.f),

+            mEndFraction(1.f),

+            mFirstChild(false),

+            mLastChild(false)

+        {}

+        F32Seconds          mTotalTime,

+                            mSelfTime,

+                            mChildrenStart,

+                            mChildrenEnd,

+                            mSelfStart,

+                            mSelfEnd;

+        LLTrace::BlockTimerStatHandle* mTimeBlock;

+        bool                mVisible,

+                            mFirstChild,

+                            mLastChild;

+        F32                 mStartFraction,

+                            mEndFraction;

+    };

+

+    struct TimerBarRow

+    {

+        TimerBarRow()

+        :   mBottom(0),

+            mTop(0),

+            mBars(NULL)

+        {}

+        S32         mBottom,

+                    mTop;

+        TimerBar*   mBars;

+    };

+

+    F32Seconds updateTimerBarWidths(LLTrace::BlockTimerStatHandle* time_block, TimerBarRow& row, S32 history_index, U32& bar_index);

+    S32 updateTimerBarOffsets(LLTrace::BlockTimerStatHandle* time_block, TimerBarRow& row, S32 timer_bar_index = 0);

+    S32 drawBar(LLRect bar_rect, TimerBarRow& row, S32 image_width, S32 image_height, bool hovered = false, bool visible = true, S32 bar_index = 0);

+    void setPauseState(bool pause_state);

+

+    std::deque<TimerBarRow> mTimerBarRows;

+    TimerBarRow             mAverageTimerRow;

+

+    enum EDisplayType

+    {

+        DISPLAY_TIME,

+        DISPLAY_CALLS,

+        DISPLAY_HZ

+    }                               mDisplayType;

+    bool                            mPauseHistory;

+    F64Seconds                      mAllTimeMax,

+                                    mTotalTimeDisplay;

+    S32                             mScrollIndex,

+                                    mHoverBarIndex,

+                                    mStatsIndex;

+    S32                             mDisplayMode;

+    LLTrace::BlockTimerStatHandle*              mHoverID;

+    LLTrace::BlockTimerStatHandle*              mHoverTimer;

+    LLRect                          mToolTipRect,

+                                    mGraphRect,

+                                    mBarRect,

+                                    mLegendRect;

+    LLFrameTimer                    mHighlightTimer;

+    LLTrace::PeriodicRecording      mRecording;

+

+    LLScrollbar*                    mScrollBar;

+};

+

+#endif