Merge branch 'master' into Avination-4.0

indra/newview/app_settings/settings_sh.xml

@@ -218,7 +218,7 @@
       <key>Value</key>
       <real>1</real>
     </map>
-	<key>SHAlphaMaskMaxRMSE</key>
+	<key>SHAutoMaskMaxRMSE</key>
     <map>
       <key>Comment</key>
       <string>Sets the maximum random mean square error cutoff used when detecting suitable textures for alphamasking. (SHUseRMSEAutoMask must be TRUE for this to have any effect)</string>

indra/newview/llface.cpp

@@ -1068,10 +1068,10 @@ bool LLFace::canRenderAsMask()
 	const LLTextureEntry* te = getTextureEntry();
 
 	static const LLCachedControl<bool> use_rmse_auto_mask("SHUseRMSEAutoMask",false);
-	static const LLCachedControl<F32> alpha_mas_max_rmse("SHAlphaMaskMaxRMSE",.09f);
+	static const LLCachedControl<F32> auto_mask_max_rmse("SHAutoMaskMaxRMSE",.09f);
 	if ((te->getColor().mV[3] == 1.0f) && // can't treat as mask if we have face alpha
 		(te->getGlow() == 0.f) && // glowing masks are hard to implement - don't mask
-		getTexture()->getIsAlphaMask(use_rmse_auto_mask ? alpha_mas_max_rmse : -1.f)) // texture actually qualifies for masking (lazily recalculated but expensive)
+		(!getViewerObject()->isAttachment() && getTexture()->getIsAlphaMask(use_rmse_auto_mask ? auto_mask_max_rmse : -1.f))) // texture actually qualifies for masking (lazily recalculated but expensive)
 	{
 		if (LLPipeline::sRenderDeferred)
 		{

indra/newview/llpaneldisplay.cpp

@@ -105,7 +105,7 @@ LLPanelDisplay::LLPanelDisplay()
 BOOL LLPanelDisplay::postBuild()
 {
 	// return to default values
-	childSetAction("Defaults", setHardwareDefaults, NULL);
+	getChild<LLButton>("Defaults")->setClickedCallback(boost::bind(&LLPanelDisplay::setHardwareDefaults));
 	
 	//============================================================================
 	// Resolution
@@ -113,8 +113,7 @@ BOOL LLPanelDisplay::postBuild()
 	// radio set for fullscreen size
 	
 	mCtrlWindowed = getChild<LLCheckBoxCtrl>( "windowed mode");
-	mCtrlWindowed->setCommitCallback(&LLPanelDisplay::onCommitWindowedMode);
-	mCtrlWindowed->setCallbackUserData(this);
+	mCtrlWindowed->setCommitCallback(boost::bind(&LLPanelDisplay::onCommitWindowedMode,this));
 
 	mAspectRatioLabel1 = getChild<LLTextBox>("AspectRatioLabel1");
 	mDisplayResLabel = getChild<LLTextBox>("DisplayResLabel");
@@ -194,25 +193,22 @@ BOOL LLPanelDisplay::postBuild()
 	}
 
 	mCtrlAspectRatio = getChild<LLComboBox>( "aspect_ratio");
-	mCtrlAspectRatio->setTextEntryCallback(onKeystrokeAspectRatio);
-	mCtrlAspectRatio->setCommitCallback(onSelectAspectRatio);
-	mCtrlAspectRatio->setCallbackUserData(this);
+	mCtrlAspectRatio->setTextEntryCallback(&LLPanelDisplay::onKeystrokeAspectRatio);
+	mCtrlAspectRatio->setCallbackUserData(this); 
+	mCtrlAspectRatio->setCommitCallback(boost::bind(&LLPanelDisplay::onSelectAspectRatio,this));
 	// add default aspect ratios
 	mCtrlAspectRatio->add(aspect_ratio_text, &mAspectRatio, ADD_TOP);
 	mCtrlAspectRatio->setCurrentByIndex(0);
 
 	mCtrlAutoDetectAspect = getChild<LLCheckBoxCtrl>( "aspect_auto_detect");
-	mCtrlAutoDetectAspect->setCommitCallback(onCommitAutoDetectAspect);
-	mCtrlAutoDetectAspect->setCallbackUserData(this);
+	mCtrlAutoDetectAspect->setCommitCallback(boost::bind(&LLPanelDisplay::onCommitAutoDetectAspect,this,_2));
 
 	// radio performance box
 	mCtrlSliderQuality = getChild<LLSliderCtrl>("QualityPerformanceSelection");
-	mCtrlSliderQuality->setSliderMouseUpCallback(boost::bind(&LLPanelDisplay::onChangeQuality,mCtrlSliderQuality,this));
-	mCtrlSliderQuality->setCallbackUserData(this);
+	mCtrlSliderQuality->setSliderMouseUpCallback(boost::bind(&LLPanelDisplay::onChangeQuality,this,_1));
 
 	mCtrlCustomSettings = getChild<LLCheckBoxCtrl>("CustomSettings");
-	mCtrlCustomSettings->setCommitCallback(onChangeCustom);
-	mCtrlCustomSettings->setCallbackUserData(this);
+	mCtrlCustomSettings->setCommitCallback(boost::bind(&LLPanelDisplay::onChangeCustom));
 
 	//mGraphicsBorder = getChild<LLViewBorder>("GraphicsBorder");
 
@@ -226,24 +222,19 @@ BOOL LLPanelDisplay::postBuild()
 	//----------------------------------------------------------------------------
 	// Enable Reflections
 	mCtrlReflectionDetail = getChild<LLComboBox>("ReflectionDetailCombo");
-	mCtrlReflectionDetail->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
-	mCtrlReflectionDetail->setCallbackUserData(this);
+	mCtrlReflectionDetail->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
 
 	// WindLight
 	mCtrlWindLight = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
-	mCtrlWindLight->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
-	mCtrlWindLight->setCallbackUserData(this);
+	mCtrlWindLight->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
 
 	// Deferred
 	mCtrlDeferred = getChild<LLCheckBoxCtrl>("RenderDeferred");
-	mCtrlDeferred->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
-	mCtrlDeferred->setCallbackUserData(this);
+	mCtrlDeferred->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
 	mCtrlDeferredDoF = getChild<LLCheckBoxCtrl>("RenderDepthOfField");
-	mCtrlDeferredDoF->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
-	mCtrlDeferredDoF->setCallbackUserData(this);
+	mCtrlDeferredDoF->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
 	mCtrlShadowDetail = getChild<LLComboBox>("ShadowDetailCombo");
-	mCtrlShadowDetail->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
-	mCtrlShadowDetail->setCallbackUserData(this);
+	mCtrlShadowDetail->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
 
 	//----------------------------------------------------------------------------
 	// Terrain Scale
@@ -252,15 +243,13 @@ BOOL LLPanelDisplay::postBuild()
 	//----------------------------------------------------------------------------
 	// Enable Avatar Shaders
 	mCtrlAvatarVP = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
-	mCtrlAvatarVP->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
-	mCtrlAvatarVP->setCallbackUserData(this);
+	mCtrlAvatarVP->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
 
 	//----------------------------------------------------------------------------
 	// Avatar Render Mode
 	mCtrlAvatarCloth = getChild<LLCheckBoxCtrl>("AvatarCloth");
 	mCtrlAvatarImpostors = getChild<LLCheckBoxCtrl>("AvatarImpostors");
-	mCtrlAvatarImpostors->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
-	mCtrlAvatarImpostors->setCallbackUserData(this);
+	mCtrlAvatarImpostors->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
 	mCtrlNonImpostors = getChild<LLSliderCtrl>("AvatarMaxVisible");
 
 	//----------------------------------------------------------------------------
@@ -278,8 +267,7 @@ BOOL LLPanelDisplay::postBuild()
 	//----------------------------------------------------------------------------
 	// Global Shader Enable
 	mCtrlShaderEnable = getChild<LLCheckBoxCtrl>("BasicShaders");
-	mCtrlShaderEnable->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
-	mCtrlShaderEnable->setCallbackUserData(this);
+	mCtrlShaderEnable->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
 	
 	//============================================================================
 
@@ -287,50 +275,42 @@ BOOL LLPanelDisplay::postBuild()
 	mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance");
 	mDrawDistanceMeterText1 = getChild<LLTextBox>("DrawDistanceMeterText1");
 	mDrawDistanceMeterText2 = getChild<LLTextBox>("DrawDistanceMeterText2");
-	mCtrlDrawDistance->setCommitCallback(&LLPanelDisplay::updateMeterText);
-	mCtrlDrawDistance->setCallbackUserData(this);
+	mCtrlDrawDistance->setCommitCallback(boost::bind(&LLPanelDisplay::updateMeterText, this));
 
 	// Object detail slider
 	mCtrlLODFactor = getChild<LLSliderCtrl>("ObjectMeshDetail");
 	mLODFactorText = getChild<LLTextBox>("ObjectMeshDetailText");
-	mCtrlLODFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
-	mCtrlLODFactor->setCallbackUserData(mLODFactorText);
+	mCtrlLODFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1,mLODFactorText));
 
 	// Flex object detail slider
 	mCtrlFlexFactor = getChild<LLSliderCtrl>("FlexibleMeshDetail");
 	mFlexFactorText = getChild<LLTextBox>("FlexibleMeshDetailText");
-	mCtrlFlexFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
-	mCtrlFlexFactor->setCallbackUserData(mFlexFactorText);
+	mCtrlFlexFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText,_1, mFlexFactorText));
 
 	// Tree detail slider
 	mCtrlTreeFactor = getChild<LLSliderCtrl>("TreeMeshDetail");
 	mTreeFactorText = getChild<LLTextBox>("TreeMeshDetailText");
-	mCtrlTreeFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
-	mCtrlTreeFactor->setCallbackUserData(mTreeFactorText);
+	mCtrlTreeFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mTreeFactorText));
 
 	// Avatar detail slider
 	mCtrlAvatarFactor = getChild<LLSliderCtrl>("AvatarMeshDetail");
 	mAvatarFactorText = getChild<LLTextBox>("AvatarMeshDetailText");
-	mCtrlAvatarFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
-	mCtrlAvatarFactor->setCallbackUserData(mAvatarFactorText);
+	mCtrlAvatarFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mAvatarFactorText));
 
 	// Avatar physics detail slider
 	mCtrlAvatarPhysicsFactor = getChild<LLSliderCtrl>("AvatarPhysicsDetail");
 	mAvatarPhysicsFactorText = getChild<LLTextBox>("AvatarPhysicsDetailText");
-	mCtrlAvatarPhysicsFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
-	mCtrlAvatarPhysicsFactor->setCallbackUserData(mAvatarPhysicsFactorText);
+	mCtrlAvatarPhysicsFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mAvatarPhysicsFactorText));
 
 	// Terrain detail slider
 	mCtrlTerrainFactor = getChild<LLSliderCtrl>("TerrainMeshDetail");
 	mTerrainFactorText = getChild<LLTextBox>("TerrainMeshDetailText");
-	mCtrlTerrainFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
-	mCtrlTerrainFactor->setCallbackUserData(mTerrainFactorText);
+	mCtrlTerrainFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mTerrainFactorText));
 
 	// Terrain detail slider
 	mCtrlSkyFactor = getChild<LLSliderCtrl>("SkyMeshDetail");
 	mSkyFactorText = getChild<LLTextBox>("SkyMeshDetailText");
-	mCtrlSkyFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
-	mCtrlSkyFactor->setCallbackUserData(mSkyFactorText);
+	mCtrlSkyFactor->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mSkyFactorText));
 
 	// Particle detail slider
 	mCtrlMaxParticle = getChild<LLSliderCtrl>("MaxParticleCount");
@@ -338,8 +318,7 @@ BOOL LLPanelDisplay::postBuild()
 	// Glow detail slider
 	mCtrlPostProcess = getChild<LLSliderCtrl>("RenderPostProcess");
 	mPostProcessText = getChild<LLTextBox>("PostProcessText");
-	mCtrlPostProcess->setCommitCallback(&LLPanelDisplay::updateSliderText);
-	mCtrlPostProcess->setCallbackUserData(mPostProcessText);
+	mCtrlPostProcess->setCommitCallback(boost::bind(&LLPanelDisplay::updateSliderText, _1, mPostProcessText));
 
 	// Text boxes (for enabling/disabling)
 	mShaderText = getChild<LLTextBox>("ShadersText");
@@ -351,7 +330,11 @@ BOOL LLPanelDisplay::postBuild()
 	mTerrainScaleText = getChild<LLTextBox>("TerrainScaleText");
 
 	// Hardware tab
-	childSetCommitCallback("vbo", &LLPanelDisplay::onRenderVBOEnable, this);
+	mVBO = getChild<LLCheckBoxCtrl>("vbo");
+	mVBO->setCommitCallback(boost::bind(&LLPanelDisplay::onVertexShaderEnable));
+
+	mVBOStream = getChild<LLCheckBoxCtrl>("vbo_stream");
+
 
 	refresh();
 
@@ -598,13 +581,13 @@ void LLPanelDisplay::refreshEnabledState()
 	if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
 		!gGLManager.mHasVertexBufferObject)
 	{
-		childSetEnabled("vbo", false);
+		mVBO->setEnabled(false);
 		//Streaming VBOs -Shyotl
-		childSetEnabled("vbo_stream", false);
+		mVBOStream->setEnabled(false);
 	}
 	else
 	{
-		childSetEnabled("vbo_stream", LLVertexBuffer::sEnableVBOs);
+		mVBOStream->setEnabled(gSavedSettings.getBOOL("RenderVBOEnable"));
 	}
 
 	// if no windlight shaders, enable gamma, and fog distance
@@ -811,7 +794,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 	// hide one meter text if we're making things visible
 	if(!isHidden)
 	{
-		updateMeterText(mCtrlDrawDistance, this);
+		updateMeterText();
 	}
 
 	mMeshDetailText->setVisible(!isHidden);
@@ -900,12 +883,11 @@ void LLPanelDisplay::apply()
 	}
 }
 
-void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
+void LLPanelDisplay::onChangeQuality(LLUICtrl* caller)
 {
-	LLSliderCtrl* sldr = static_cast<LLSliderCtrl*>(ctrl);
-	LLPanelDisplay* cur_panel = static_cast<LLPanelDisplay*>(data);
+	LLSliderCtrl* sldr = static_cast<LLSliderCtrl*>(caller);
 
-	if(sldr == NULL || cur_panel == NULL)
+	if(sldr == NULL)
 	{
 		return;
 	}
@@ -914,19 +896,14 @@ void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
 	LLFeatureManager::getInstance()->setGraphicsLevel(set, true);
 	
 	LLFloaterPreference::refreshEnabledGraphics();
-	cur_panel->refresh();
+	refresh();
 }
 
-void LLPanelDisplay::onChangeCustom(LLUICtrl *ctrl, void *data)
+void LLPanelDisplay::onChangeCustom()
 {
 	LLFloaterPreference::refreshEnabledGraphics();
 }
 
-void LLPanelDisplay::onApplyResolution(LLUICtrl* src, void* user_data)
-{
-	((LLPanelDisplay*) src)->applyResolution();
-}
-
 void LLPanelDisplay::applyResolution()
 {
 
@@ -1018,20 +995,14 @@ void LLPanelDisplay::applyWindowSize()
 	}
 }
 
-//static 
-void LLPanelDisplay::onCommitWindowedMode(LLUICtrl* ctrl, void *data)
+void LLPanelDisplay::onCommitWindowedMode()
 {
-	LLPanelDisplay *panel = (LLPanelDisplay*)data;
-
-	panel->refresh();
+	refresh();
 }
 
-//static
-void LLPanelDisplay::onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data)
+void LLPanelDisplay::onCommitAutoDetectAspect(const LLSD& value)
 {
-	LLPanelDisplay *panel = (LLPanelDisplay*)data;
-
-	BOOL auto_detect = ((LLCheckBoxCtrl*)ctrl)->get();
+	BOOL auto_detect = value.asBoolean();
 	F32 ratio;
 
 	if (auto_detect)
@@ -1053,27 +1024,23 @@ void LLPanelDisplay::onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data)
 			aspect = llformat("%.3f", gViewerWindow->mWindow->getNativeAspectRatio());
 		}
 
-		panel->mCtrlAspectRatio->setLabel(aspect);
+		mCtrlAspectRatio->setLabel(aspect);
 
 		ratio = gViewerWindow->mWindow->getNativeAspectRatio();
 		gSavedSettings.setF32("FullScreenAspectRatio", ratio);
 	}
 }
 
-//static 
-void LLPanelDisplay::onKeystrokeAspectRatio(LLLineEditor* caller, void* user_data)
+void LLPanelDisplay::onKeystrokeAspectRatio(LLLineEditor* caller, void *user_data)
 {
-	LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
+	LLPanelDisplay* panel = (LLPanelDisplay*)user_data; 
 
 	panel->mCtrlAutoDetectAspect->set(FALSE);
 }
 
-//static
-void LLPanelDisplay::onSelectAspectRatio(LLUICtrl*, void* user_data)
+void LLPanelDisplay::onSelectAspectRatio()
 {
-	LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
-
-	panel->mCtrlAutoDetectAspect->set(FALSE);
+	mCtrlAutoDetectAspect->set(FALSE);
 }
 
 //static
@@ -1092,22 +1059,13 @@ void LLPanelDisplay::fractionFromDecimal(F32 decimal_val, S32& numerator, S32& d
 	}
 }
 
-//static
-void LLPanelDisplay::onVertexShaderEnable(LLUICtrl* self, void* data)
+void LLPanelDisplay::onVertexShaderEnable()
 {
 	LLFloaterPreference::refreshEnabledGraphics();
 }
 
 //static
-void LLPanelDisplay::onRenderVBOEnable(LLUICtrl* self, void* data)
-{
-	LLPanelDisplay* panel = (LLPanelDisplay*)data;
-	bool enable = panel->childGetValue("vbo").asBoolean();
-	panel->childSetEnabled("vbo_stream", enable);
-	if(!enable)	panel->childSetValue("vbo_stream", false);
-}
-
-void LLPanelDisplay::setHardwareDefaults(void* user_data)
+void LLPanelDisplay::setHardwareDefaults()
 {
 	LLFeatureManager::getInstance()->applyRecommendedSettings();
 	LLControlVariable* controlp = gSavedSettings.getControl("RenderAvatarMaxVisible");
@@ -1118,11 +1076,11 @@ void LLPanelDisplay::setHardwareDefaults(void* user_data)
 	LLFloaterPreference::refreshEnabledGraphics();
 }
 
-void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
+//static
+void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, LLTextBox* text_box)
 {
 	// get our UI widgets
-	LLTextBox* text_box = (LLTextBox*)user_data;
-	LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
+	LLSliderCtrl* slider = dynamic_cast<LLSliderCtrl*>(ctrl);
 	if(text_box == NULL || slider == NULL)
 	{
 		return;
@@ -1160,20 +1118,13 @@ void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
 	}
 }
 
-void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
+void LLPanelDisplay::updateMeterText()
 {
-	// get our UI widgets
-	LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
-	LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
-
-	LLTextBox* m1 = panel->getChild<LLTextBox>("DrawDistanceMeterText1");
-	LLTextBox* m2 = panel->getChild<LLTextBox>("DrawDistanceMeterText2");
-
 	// toggle the two text boxes based on whether we have 2 or 3 digits
-	F32 val = slider->getValueF32();
+	F32 val = mCtrlDrawDistance->getValueF32();
 	bool two_digits = val < 100;
-	m1->setVisible(two_digits);
-	m2->setVisible(!two_digits);
+	mDrawDistanceMeterText1->setVisible(two_digits);
+	mDrawDistanceMeterText2->setVisible(!two_digits);
 }
 
 

indra/newview/llpaneldisplay.h

@@ -146,6 +146,9 @@ protected:
 	LLTextBox		*mShadowDetailText;
 	LLTextBox		*mTerrainScaleText;
 
+	LLCheckBoxCtrl	*mVBO;
+	LLCheckBoxCtrl	*mVBOStream;
+
 	BOOL mFSAutoDetectAspect;
 	F32 mAspectRatio;
 
@@ -192,31 +195,24 @@ protected:
 	S32 mVideoCardMem;
 	F32 mFogRatio;
 
-	static void setGraphicsSettings(LLControlGroup& group);
-	static void createGroup();
-
 	// if the quality radio buttons are changed
-	static void onChangeQuality(LLUICtrl *ctrl, void *data);
+	void onChangeQuality(LLUICtrl* caller);
 	
 	// if the custom settings box is clicked
-	static void onChangeCustom(LLUICtrl *ctrl, void *data);
+	static void onChangeCustom();
 	
-	static void onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data);
-	static void onKeystrokeAspectRatio(LLLineEditor* caller, void* user_data);
-	static void onSelectAspectRatio(LLUICtrl*, void*);
-	static void onCommitWindowedMode(LLUICtrl* ctrl, void *data);
-	static void onApplyResolution(LLUICtrl* ctrl, void* data);
-	static void updateSliderText(LLUICtrl* ctrl, void* user_data);
-	static void updateMeterText(LLUICtrl* ctrl, void* user_data);
+	void onCommitAutoDetectAspect(const LLSD& value);
+	static void onKeystrokeAspectRatio(LLLineEditor* caller, void *user_data);
+	void onSelectAspectRatio();
+	void onCommitWindowedMode();
+	static void updateSliderText(LLUICtrl* ctrl, LLTextBox* text_box);
+	void updateMeterText();
 
 	/// callback for defaults
-	static void setHardwareDefaults(void *data);
+	static void setHardwareDefaults();
 
 	// callback for when client turns on shaders
-	static void onVertexShaderEnable(LLUICtrl*, void*);
-
-	// callbacks for hardware tab
-	static void onRenderVBOEnable(LLUICtrl*, void*);
+	static void onVertexShaderEnable();
 
 	// helper function
 	static void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator);

indra/newview/llpreviewtexture.cpp

@@ -283,8 +283,8 @@ void LLPreviewTexture::draw()
 								mImage);
 
 			static const LLCachedControl<bool> use_rmse_auto_mask("SHUseRMSEAutoMask",false);
-			static const LLCachedControl<F32> alpha_mas_max_rmse("SHAlphaMaskMaxRMSE",.09f);
-			if (mAlphaMaskResult != mImage->getIsAlphaMask(use_rmse_auto_mask ? alpha_mas_max_rmse : -1.f))
+			static const LLCachedControl<F32> auto_mask_max_rmse("SHAutoMaskMaxRMSE",.09f);
+			if (mAlphaMaskResult != mImage->getIsAlphaMask(use_rmse_auto_mask ? auto_mask_max_rmse : -1.f))
 			{
 				mAlphaMaskResult = !mAlphaMaskResult;
 				if (!mAlphaMaskResult)

indra/newview/lltexturefetch.cpp

@@ -1339,7 +1339,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 				}
 				LLHTTPClient::request(mUrl, LLHTTPClient::HTTP_GET, NULL,
 					new HTTPGetResponder(mFetcher, mID, LLTimer::getTotalTime(), mRequestedSize, mRequestedOffset, true),
-					headers/*,*/ DEBUG_CURLIO_PARAM(false), keep_alive, no_does_authentication, allow_compressed_reply, NULL, 0, NULL);
+					headers/*,*/ DEBUG_CURLIO_PARAM(debug_off), keep_alive, no_does_authentication, allow_compressed_reply, NULL, 0, NULL);
 				res = true;
 			}
 			if (!res)

indra/newview/llviewercontrol.cpp

@@ -675,7 +675,7 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("RenderAutoMaskAlphaDeferred")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
 	gSavedSettings.getControl("RenderAutoMaskAlphaNonDeferred")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
 	gSavedSettings.getControl("SHUseRMSEAutoMask")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
-	gSavedSettings.getControl("SHAlphaMaskMaxRMSE")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
+	gSavedSettings.getControl("SHAutoMaskMaxRMSE")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
 	gSavedSettings.getControl("RenderObjectBump")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
 	gSavedSettings.getControl("RenderMaxVBOSize")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
 	//See LL jira VWR-3258 comment section. Implemented by LL in 2.1 -Shyotl

indra/newview/llviewerparcelmedia.cpp

@@ -123,7 +123,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 			if(	! mediaUrl.empty() && gSavedSettings.getWarning("FirstStreamingVideo") )
 			{
 				LLNotificationsUtil::add("ParcelCanPlayMedia", LLSD(), LLSD(),
-					boost::bind(callback_play_media, _1, _2, parcel));
+					boost::bind(&callback_play_media, _1, _2, parcel));
 				return;
 
 			}
@@ -903,35 +903,43 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
 			LLViewerParcelMedia::playStreamingMusic(parcel, false);
 		}
 	}
-	else if (option == 1 || option == 2) // Deny or Blacklist
+	else 
 	{
-		LLViewerParcelMedia::sDeniedMedia.insert(domain);
-		if (ip != domain && domain.find('/') == std::string::npos)
-		{
-			LLViewerParcelMedia::sDeniedMedia.insert(ip);
-		}
 		if (type == 1)
 		{
 			LLViewerParcelMedia::stopStreamingMusic();
 		}
-		if (option == 1) // Deny
+		else
 		{
-			LLNotificationsUtil::add("MediaBlocked", args);
+			LLViewerParcelMedia::stopStreamingMusic();
 		}
-		else // Blacklist
+		if (option == 1 || option == 2) // Deny or Blacklist
 		{
-			LLSD newmedia;
-			newmedia["domain"] = domain;
-			newmedia["action"] = "deny";
-			LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+			LLViewerParcelMedia::sDeniedMedia.insert(domain);
 			if (ip != domain && domain.find('/') == std::string::npos)
 			{
-				newmedia["domain"] = ip;
-				LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+				LLViewerParcelMedia::sDeniedMedia.insert(ip);
+			}
+			
+			if (option == 1) // Deny
+			{
+				LLNotificationsUtil::add("MediaBlocked", args);
+			}
+			else // Blacklist
+			{
+				LLSD newmedia;
+				newmedia["domain"] = domain;
+				newmedia["action"] = "deny";
+				LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+				if (ip != domain && domain.find('/') == std::string::npos)
+				{
+					newmedia["domain"] = ip;
+					LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+				}
+				LLViewerParcelMedia::saveDomainFilterList();
+				args["LISTED"] = "blacklisted";
+				LLNotificationsUtil::add("MediaListed", args);
 			}
-			LLViewerParcelMedia::saveDomainFilterList();
-			args["LISTED"] = "blacklisted";
-			LLNotificationsUtil::add("MediaListed", args);
 		}
 	}
 

indra/newview/llviewerwindow.cpp

@@ -370,9 +370,9 @@ public:
 								}
 							}
 							static const LLCachedControl<bool> use_rmse_auto_mask("SHUseRMSEAutoMask",false);
-							static const LLCachedControl<F32> alpha_mas_max_rmse("SHAlphaMaskMaxRMSE",.09f);
-							addText(xpos, ypos, llformat("Mask: %s", imagep->getIsAlphaMask(use_rmse_auto_mask ? alpha_mas_max_rmse : -1.f) ? "TRUE":"FALSE")); ypos += y_inc;
-							addText(xpos, ypos, llformat("ID: %s", imagep->getID().asString().c_str())); ypos += y_inc;
+							static const LLCachedControl<F32> auto_mask_max_rmse("SHAutoMaskMaxRMSE",.09f);
+							addText(xpos, ypos, llformat("Mask: %s", imagep->getIsAlphaMask(use_rmse_auto_mask ? auto_mask_max_rmse : -1.f) ? "TRUE":"FALSE")); ypos += y_inc;
+							addText(xpos, ypos, llformat("ID: %s", imagep->getID().asString())); ypos += y_inc;
 						}
 					}
 				}