svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/lldebugmessagebox.cpp b/indra/newview/lldebugmessagebox.cpp
index 0ce745a373..938a6ebd11 100644
--- a/indra/newview/lldebugmessagebox.cpp
+++ b/indra/newview/lldebugmessagebox.cpp
@@ -205,21 +205,21 @@ void LLDebugVarMessageBox::draw()
 
 	if(mAnimate)
 	{
-		F32 animated_val = clamp_rescale(fmodf((F32)LLFrameTimer::getElapsedSeconds() / 5.f, 1.f), 0.f, 1.f, 0.f, mSlider1->getMaxValue());
 		if (mSlider1)
 		{
+			F32 animated_val = clamp_rescale(fmodf((F32)LLFrameTimer::getElapsedSeconds() / 5.f, 1.f), 0.f, 1.f, 0.f, mSlider1->getMaxValue());
 			mSlider1->setValue(animated_val);
 			slider_changed(mSlider1, this);
-		}
-		if (mSlider2)
-		{
-			mSlider2->setValue(animated_val);
-			slider_changed(mSlider2, this);
-		}
-		if (mSlider3)
-		{
-			mSlider3->setValue(animated_val);
-			slider_changed(mSlider3, this);
+			if (mSlider2)
+			{
+				mSlider2->setValue(animated_val);
+				slider_changed(mSlider2, this);
+			}
+			if (mSlider3)
+			{
+				mSlider3->setValue(animated_val);
+				slider_changed(mSlider3, this);
+			}
 		}
 	}
 	LLFloater::draw();