From b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 13 Sep 2007 18:17:52 +0000 Subject: svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Merge patches made in the 1-18-3 RC iterations into the trunk. NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp) --- indra/llui/llspinctrl.cpp | 5 +++++ indra/llui/llspinctrl.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'indra/llui') diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp index 34363eb506..178400594a 100644 --- a/indra/llui/llspinctrl.cpp +++ b/indra/llui/llspinctrl.cpp @@ -527,3 +527,8 @@ LLView* LLSpinCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory * return spinner; } + +BOOL LLSpinCtrl::isDirty() const +{ + return( mValue != mInitialValue ); +} diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h index 4fe1a26f5d..981cf0def5 100644 --- a/indra/llui/llspinctrl.h +++ b/indra/llui/llspinctrl.h @@ -56,7 +56,7 @@ public: virtual void setValue(const LLSD& value ); virtual LLSD getValue() const; F32 get() { return (F32)getValue().asReal(); } - void set(F32 value) { setValue(value); } + void set(F32 value) { setValue(value); mInitialValue = value; } virtual void setMinValue(LLSD min_value) { setMinValue((F32)min_value.asReal()); } virtual void setMaxValue(LLSD max_value) { setMaxValue((F32)max_value.asReal()); } @@ -66,6 +66,8 @@ public: virtual void setEnabled( BOOL b ); virtual void setFocus( BOOL b ); virtual void clear(); + virtual BOOL isDirty() const; + virtual void setPrecision(S32 precision); virtual void setMinValue(F32 min) { mMinValue = min; } virtual void setMaxValue(F32 max) { mMaxValue = max; } -- cgit v1.3