Merge with siana/future

2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions
--- a/indra/newview/llpaneldisplay.h
+++ b/indra/newview/llpaneldisplay.h
@@ -106,6 +106,7 @@ protected:
 	LLSliderCtrl	*mCtrlSkyFactor;				// LOD for terrain
 	LLSliderCtrl	*mCtrlMaxParticle;				// Max Particle
 	LLSliderCtrl	*mCtrlPostProcess;				// Max Particle
+	LLSliderCtrl	*mCtrlNonImpostors;				// Max non-impostors

 	LLCheckBoxCtrl	*mCtrlBumpShiny;
 	LLCheckBoxCtrl	*mCtrlWindLight;
@@ -162,6 +163,7 @@ protected:
 	S32 mShadowDetail;

 	BOOL mAvatarImpostors;
+	S32 mNonImpostors;
 	BOOL mAvatarCloth;
 	S32 mAvatarMode;
 	BOOL mLocalLights;