From b36dc363061ec5bf6b092c14193198e9a5eef816 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 9 Mar 2007 01:09:20 +0000
Subject: svn merge -r 58902:58986
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/lldrawable.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/lldrawable.cpp')

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 868d61942d..3418007d41 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -908,8 +908,8 @@ void LLDrawable::updateLightSet()
 		// mLightSet points to nearby lights
 		mLightSet.clear();
 		part->getLights(getPositionAgent(), getRadius(), mLightSet);
-		const S32 max_lights = 16;
-		if (mLightSet.size() > max_lights)
+		const drawable_set_t::size_type MAX_LIGHTS = 16;
+		if (mLightSet.size() > MAX_LIGHTS)
 		{
 			typedef std::set<std::pair<F32,LLPointer<LLDrawable> > > sorted_pair_set_t;
 			sorted_pair_set_t sorted_set;
-- 
cgit v1.3