1 files changed, 33 insertions, 20 deletions

diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h
index c366fd65db..74a3ebde2f 100644
--- a/indra/llui/llstatbar.h
+++ b/indra/llui/llstatbar.h
@@ -52,9 +52,13 @@ public:
 		Optional<bool>			show_per_sec,
 								show_bar,
 								show_history,
-								show_mean;
+								show_mean,
+								scale_range;
 
+		Optional<S32>			num_frames,
+								max_height;
 		Optional<std::string>	stat;
+		Optional<EOrientation>	orientation;
 
 		Params()
 			: label("label"),
@@ -67,10 +71,14 @@ public:
 			  update_rate("update_rate", 5.0f),
 			  unit_scale("unit_scale", 1.f),
 			  show_per_sec("show_per_sec", true),
-			  show_bar("show_bar", TRUE),
+			  show_bar("show_bar", true),
 			  show_history("show_history", false),
 			  show_mean("show_mean", true),
-			  stat("stat")
+			  scale_range("scale_range", true),
+			  num_frames("num_frames", 300),
+			  max_height("max_height", 200),
+			  stat("stat"),
+			  orientation("orientation", VERTICAL)
 		{
 			changeDefault(follows.flags, FOLLOWS_TOP | FOLLOWS_LEFT);
 		}
@@ -88,27 +96,32 @@ public:
 	/*virtual*/ LLRect getRequiredRect();	// Return the height of this object, given the set options.
 
 private:
-	F32 mMinBar;
-	F32 mMaxBar;
-	F32 mTickSpacing;
-	F32 mLabelSpacing;
-	U32 mPrecision;
-	F32 mUpdatesPerSec;
-	F32 mUnitScale;
-	BOOL mPerSec;				// Use the per sec stats.
-	BOOL mDisplayBar;			// Display the bar graph.
-	BOOL mDisplayHistory;
-	BOOL mDisplayMean;			// If true, display mean, if false, display current value
-
-	LLTrace::TraceType<LLTrace::CountAccumulator<F64> >* mCountFloatp;
-	LLTrace::TraceType<LLTrace::CountAccumulator<S64> >* mCountIntp;
+	F32          mMinBar;
+	F32          mMaxBar;
+	F32			 mCurMaxBar;
+	F32          mTickSpacing;
+	F32          mLabelSpacing;
+	U32          mPrecision;
+	F32          mUpdatesPerSec;
+	F32          mUnitScale;
+	S32			 mNumFrames;
+	S32			 mMaxHeight;
+	bool         mPerSec;				// Use the per sec stats.
+	bool         mDisplayBar;			// Display the bar graph.
+	bool         mDisplayHistory;
+	bool         mDisplayMean;			// If true, display mean, if false, display current value
+	bool		 mScaleRange;
+	EOrientation mOrientation;
+
+	LLTrace::TraceType<LLTrace::CountAccumulator<F64> >*       mCountFloatp;
+	LLTrace::TraceType<LLTrace::CountAccumulator<S64> >*       mCountIntp;
 	LLTrace::TraceType<LLTrace::MeasurementAccumulator<F64> >* mMeasurementFloatp;
 	LLTrace::TraceType<LLTrace::MeasurementAccumulator<S64> >* mMeasurementIntp;
 
 	LLFrameTimer mUpdateTimer;
-	LLUIString mLabel;
-	std::string mUnitLabel;
-	F32 mValue;
+	LLUIString   mLabel;
+	std::string  mUnitLabel;
+	F32          mValue;
 };
 
 #endif