Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer

# Conflicts: # indra/llui/llfolderviewitem.cpp # indra/llui/llui.h # indra/llxml/llcontrol.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfloateravatarpicker.cpp # indra/newview/llimprocessing.cpp # indra/newview/llnavigationbar.cpp # indra/newview/lltextureview.cpp # indra/newview/lltoolpie.cpp # indra/newview/llvieweraudio.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewerwindow.cpp
2023-09-22 20:47:05 +02:00 · 2023-09-22 20:47:05 +02:00 · 00464b15cd
parent 249d5c6c47 145a5ffe7f
commit 00464b15cd
64 changed files with 188 additions and 1087 deletions
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@ -115,7 +115,7 @@ const F32 FLEXIBLE_OBJECT_DEFAULT_LENGTH = 1.0f;
 const BOOL FLEXIBLE_OBJECT_DEFAULT_USING_COLLISION_SPHERE = FALSE;
 const BOOL FLEXIBLE_OBJECT_DEFAULT_RENDERING_COLLISION_SPHERE = FALSE;

-const char *SCULPT_DEFAULT_TEXTURE = "be293869-d0d9-0a69-5989-ad27f1946fd4"; // old inverted texture: "7595d345-a24c-e7ef-f0bd-78793792133e";
+const LLUUID SCULPT_DEFAULT_TEXTURE("be293869-d0d9-0a69-5989-ad27f1946fd4"); // old inverted texture: "7595d345-a24c-e7ef-f0bd-78793792133e";

 // Texture rotations are sent over the wire as a S16.  This is used to scale the actual float
 // value to a S16.   Don't use 7FFF as it introduces some odd rounding with 180 since it 
@ -1960,7 +1960,7 @@ bool LLFlexibleObjectData::fromLLSD(LLSD& sd)
 LLSculptParams::LLSculptParams()
 {
 	mType = PARAMS_SCULPT;
-	mSculptTexture.set(SCULPT_DEFAULT_TEXTURE);
+	mSculptTexture = SCULPT_DEFAULT_TEXTURE;
 	mSculptType = LL_SCULPT_TYPE_SPHERE;
 }

@ -2046,7 +2046,7 @@ void LLSculptParams::setSculptTexture(const LLUUID& texture_id, U8 sculpt_type)
 	U8 flags = sculpt_type & LL_SCULPT_FLAG_MASK;
 	if (sculpt_type != (type | flags) || type > LL_SCULPT_TYPE_MAX)
 	{
-		mSculptTexture.set(SCULPT_DEFAULT_TEXTURE);
+		mSculptTexture = SCULPT_DEFAULT_TEXTURE;
 		mSculptType = LL_SCULPT_TYPE_SPHERE;
 	}
 	else
--- a/indra/llprimitive/llprimitive.h
+++ b/indra/llprimitive/llprimitive.h
@ -97,7 +97,7 @@ extern const F32 OBJECT_REV_MIN;
 extern const F32 OBJECT_REV_MAX;
 extern const F32 OBJECT_REV_INC;

-extern const char *SCULPT_DEFAULT_TEXTURE;
+extern const LLUUID SCULPT_DEFAULT_TEXTURE;

 //============================================================================

--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@ -60,10 +60,11 @@ static LLDefaultChildRegistry::Register<LLButton> r("button");
 template class LLButton* LLView::getChild<class LLButton>(
 	const std::string& name, BOOL recurse) const;

-// globals loaded from settings.xml
-S32	LLBUTTON_H_PAD	= 0;
-S32 BTN_HEIGHT_SMALL= 0;
-S32 BTN_HEIGHT		= 0;
+// globals
+S32	LLBUTTON_H_PAD	= 4;
+S32 BTN_HEIGHT_SMALL= 23;
+S32 BTN_HEIGHT		= 23;
+S32 BTN_DROP_SHADOW = 2;

 LLButton::Params::Params()
 :	label_selected("label_selected"),				// requires is_toggle true
@ -93,8 +94,8 @@ LLButton::Params::Params()
 	image_overlay_disabled_color("image_overlay_disabled_color", LLColor4::white % 0.3f),
 	image_overlay_selected_color("image_overlay_selected_color", LLColor4::white),
 	flash_color("flash_color"),
-	pad_right("pad_right", LLUI::getInstance()->mSettingGroups["config"]->getS32("ButtonHPad")),
-	pad_left("pad_left", LLUI::getInstance()->mSettingGroups["config"]->getS32("ButtonHPad")),
+	pad_right("pad_right", LLBUTTON_H_PAD),
+	pad_left("pad_left", LLBUTTON_H_PAD),
 	pad_bottom("pad_bottom"),
 	click_callback("click_callback"),
 	mouse_down_callback("mouse_down_callback"),
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@ -43,10 +43,10 @@
 //

 // PLEASE please use these "constants" when building your own buttons.
-// They are loaded from settings.xml at run time.
 extern S32	LLBUTTON_H_PAD;
 extern S32	BTN_HEIGHT_SMALL;
 extern S32	BTN_HEIGHT;
+extern S32	BTN_DROP_SHADOW;

 //
 // Helpful functions
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@ -497,8 +497,6 @@ void LLComboBox::onFocusLost()

 void LLComboBox::setButtonVisible(BOOL visible)
 {
-	static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
-
 	mButton->setVisible(visible);
 	if (mTextEntry)
 	{
@ -506,7 +504,7 @@ void LLComboBox::setButtonVisible(BOOL visible)
 		if (visible)
 		{
 			S32 arrow_width = mArrowImage ? mArrowImage->getWidth() : 0;
-			text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * drop_shadow_button;
+			text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * BTN_DROP_SHADOW;
 		}
 		//mTextEntry->setRect(text_entry_rect);
 		mTextEntry->reshape(text_entry_rect.getWidth(), text_entry_rect.getHeight(), TRUE);
@ -545,19 +543,18 @@ void LLComboBox::setEnabledByValue(const LLSD& value, BOOL enabled)

 void LLComboBox::createLineEditor(const LLComboBox::Params& p)
 {
-	static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
 	LLRect rect = getLocalRect();
 	if (mAllowTextEntry)
 	{
 		S32 arrow_width = mArrowImage ? mArrowImage->getWidth() : 0;
-		S32 shadow_size = drop_shadow_button;
+		S32 shadow_size = BTN_DROP_SHADOW;
 		mButton->setRect(LLRect( getRect().getWidth() - llmax(8,arrow_width) - 2 * shadow_size,
 								rect.mTop, rect.mRight, rect.mBottom));
 		mButton->setTabStop(FALSE);
 		mButton->setHAlign(LLFontGL::HCENTER);

 		LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-		text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * drop_shadow_button;
+		text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * BTN_DROP_SHADOW;
 		// clear label on button
 		std::string cur_label = mButton->getLabelSelected();
 		LLLineEditor::Params params = p.combo_editor;
@ -1121,13 +1118,11 @@ void LLComboBox::onSetHighlight() const

 void LLComboBox::imageLoaded()
 {
-    static LLUICachedControl<S32> drop_shadow_button("DropShadowButton", 0);
-
    if (mAllowTextEntry)
    {
        LLRect rect = getLocalRect();
        S32 arrow_width = mArrowImage ? mArrowImage->getWidth() : 0;
-        S32 shadow_size = drop_shadow_button;
+        S32 shadow_size = BTN_DROP_SHADOW;
        mButton->setRect(LLRect(getRect().getWidth() - llmax(8, arrow_width) - 2 * shadow_size,
            rect.mTop, rect.mRight, rect.mBottom));
        if (mButton->getVisible())
@ -1136,7 +1131,7 @@ void LLComboBox::imageLoaded()
            if (mTextEntry)
            {
                LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-                text_entry_rect.mRight -= llmax(8, arrow_width) + 2 * drop_shadow_button;
+                text_entry_rect.mRight -= llmax(8, arrow_width) + 2 * BTN_DROP_SHADOW;
                mTextEntry->reshape(text_entry_rect.getWidth(), text_entry_rect.getHeight(), TRUE);
            }
        }
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@ -2094,10 +2094,9 @@ void	LLFloater::drawShadow(LLPanel* panel)
 	S32 right = panel->getRect().getWidth() - LLPANEL_BORDER_WIDTH;
 	S32 bottom = LLPANEL_BORDER_WIDTH;

-	static LLUICachedControl<S32> shadow_offset_S32 ("DropShadowFloater", 0);
 	static LLUIColor shadow_color_cached = LLUIColorTable::instance().getColor("ColorDropShadow");
 	LLColor4 shadow_color = shadow_color_cached;
-	F32 shadow_offset = (F32)shadow_offset_S32;
+	F32 shadow_offset = (F32)DROP_SHADOW_FLOATER;

 	if (!panel->isBackgroundOpaque())
 	{
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@ -61,6 +61,10 @@ const BOOL CLOSE_NO = FALSE;
 const BOOL ADJUST_VERTICAL_YES = TRUE;
 const BOOL ADJUST_VERTICAL_NO = FALSE;

+const F32 CONTEXT_CONE_IN_ALPHA = 0.f;
+const F32 CONTEXT_CONE_OUT_ALPHA = 1.f;
+const F32 CONTEXT_CONE_FADE_TIME = .08f;
+
 namespace LLFloaterEnums
 {
 	enum EOpenPositioning
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@ -631,12 +631,10 @@ void LLFolderView::setDragStart(S32 screen_x, S32 screen_y)

 bool LLFolderView::isOverDragThreshold(S32 screen_x, S32 screen_y)
 {
-	static LLCachedControl<S32> drag_and_drop_threshold(*LLUI::getInstance()->mSettingGroups["config"], "DragAndDropDistanceThreshold", 3);
-	
 	S32 dX = screen_x - mDragStartX;
 	S32 dY = screen_y - mDragStartY;
 	
-	return (dX * dX) + (dY * dY) > drag_and_drop_threshold * drag_and_drop_threshold;
+	return (dX * dX) + (dY * dY) > DRAG_N_DROP_DISTANCE_THRESHOLD * DRAG_N_DROP_DISTANCE_THRESHOLD;
 }
 // [/SL:KB]

--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@ -638,15 +638,13 @@ BOOL LLFolderViewItem::handleMouseDown( S32 x, S32 y, MASK mask )

 BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
 {
-	static LLCachedControl<S32> drag_and_drop_threshold(*LLUI::getInstance()->mSettingGroups["config"],"DragAndDropDistanceThreshold", 3);
-
 	mIsMouseOverTitle = (y > (getRect().getHeight() - mItemHeight));

 	if( hasMouseCapture() && isMovable() )
 	{
 			LLFolderView* root = getRoot();

-//		if( (x - mDragStartX) * (x - mDragStartX) + (y - mDragStartY) * (y - mDragStartY) > drag_and_drop_threshold() * drag_and_drop_threshold() 
+//		if( (x - mDragStartX) * (x - mDragStartX) + (y - mDragStartY) * (y - mDragStartY) > DRAG_N_DROP_DISTANCE_THRESHOLD * DRAG_N_DROP_DISTANCE_THRESHOLD
 //			&& root->getAllowDrag()
 //			&& root->getCurSelectedItem()
 //			&& root->startDrag())
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@ -67,8 +67,8 @@
 LLMenuHolderGL *LLMenuGL::sMenuContainer = NULL;
 view_listener_t::listener_map_t view_listener_t::sListeners;

-S32 MENU_BAR_HEIGHT = 0;
-S32 MENU_BAR_WIDTH = 0;
+S32 MENU_BAR_HEIGHT = 18;
+S32 MENU_BAR_WIDTH = 410;

 ///============================================================================
 /// Local function declarations, constants, enums, and typedefs
@ -3249,10 +3249,9 @@ void LLMenuGL::draw( void )
 	}
 	if (mDropShadowed && !mTornOff)
 	{
-		static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0);
 		static LLUIColor color_drop_shadow = LLUIColorTable::instance().getColor("ColorDropShadow");
 		gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0, 
-			color_drop_shadow, drop_shadow_floater );
+			color_drop_shadow, DROP_SHADOW_FLOATER);
 	}

 	if( mBgVisible )
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@ -284,10 +284,9 @@ BOOL LLModalDialog::handleKeyHere(KEY key, MASK mask )
 void LLModalDialog::draw()
 {
 	static LLUIColor shadow_color = LLUIColorTable::instance().getColor("ColorDropShadow");
-	static LLUICachedControl<S32> shadow_lines ("DropShadowFloater", 0);

 	gl_drop_shadow( 0, getRect().getHeight(), getRect().getWidth(), 0,
-		shadow_color, shadow_lines);
+		shadow_color, DROP_SHADOW_FLOATER);

 	LLFloater::draw();
 	
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@ -1342,8 +1342,7 @@ BOOL LLToolBarButton::handleHover(S32 x, S32 y, MASK mask)
 	BOOL handled = FALSE;
 		
 	S32 mouse_distance_squared = (x - mMouseDownX) * (x - mMouseDownX) + (y - mMouseDownY) * (y - mMouseDownY);
-	static LLCachedControl<S32> drag_threshold(*LLUI::getInstance()->mSettingGroups["config"], "DragAndDropDistanceThreshold", 3);
-	if (mouse_distance_squared > drag_threshold * drag_threshold
+	if (mouse_distance_squared > DRAG_N_DROP_DISTANCE_THRESHOLD * DRAG_N_DROP_DISTANCE_THRESHOLD
 		&& hasMouseCapture() && 
 		mStartDragItemCallback && mHandleDragItemCallback)
 	{
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@ -61,6 +61,7 @@ void make_ui_sound(const char* name, bool force_sound = false);
 //void make_ui_sound_deferred(const char * name);
 void make_ui_sound_deferred(const char* name, bool force_sound = false);

+const S32 DRAG_N_DROP_DISTANCE_THRESHOLD = 3;
 // this enum is used by the llview.h (viewer) and the llassetstorage.h (viewer and sim) 
 enum EDragAndDropType
 {
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@ -41,6 +41,7 @@

 const BOOL TAKE_FOCUS_YES = TRUE;
 const BOOL TAKE_FOCUS_NO  = FALSE;
+const S32 DROP_SHADOW_FLOATER = 5;

 class LLUICtrl
 	: public LLView, public boost::signals2::trackable
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@ -1613,8 +1613,6 @@ DECL_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
 LLSD test_llsd = LLSD()["testing1"] = LLSD()["testing2"];
 DECL_LLCC(LLSD, test_llsd);

-static LLCachedControl<std::string> test_BrowserHomePage("BrowserHomePage", "hahahahahha", "Not the real comment");
-
 void test_cached_control()
 {
 #define TEST_LLCC(T, V) if((T)mySetting_##T != V) LL_ERRS() << "Fail "#T << LL_ENDL
@ -1631,8 +1629,6 @@ void test_cached_control()
 	TEST_LLCC(LLColor3, LLColor3(1.0f, 0.f, 0.5f));
 	TEST_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
 //There's no LLSD comparsion for LLCC yet. TEST_LLCC(LLSD, test_llsd); 
-
-	if((std::string)test_BrowserHomePage != "http://www.firestormviewer.org") LL_ERRS() << "Fail BrowserHomePage" << LL_ENDL;
 }
 #endif // TEST_CACHED_CONTROL

--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
--- a/indra/newview/fsfloatercontactsetconfiguration.cpp
+++ b/indra/newview/fsfloatercontactsetconfiguration.cpp
@ -42,14 +42,11 @@
 FSFloaterContactSetConfiguration::FSFloaterContactSetConfiguration(const LLSD& target_set)
 :	LLFloater(target_set),
 	mContextConeOpacity(0.f),
-	mContextConeInAlpha(0.f),
-	mContextConeOutAlpha(0.f),
-	mContextConeFadeTime(0.f)
+	mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA),
+	mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA),
+	mContextConeFadeTime(CONTEXT_CONE_FADE_TIME)
 {
 	mContactSet = target_set.asString();
-	mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha");
-	mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha");
-	mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime");
 }

 BOOL FSFloaterContactSetConfiguration::postBuild()
--- a/indra/newview/lggbeamcolormapfloater.cpp
+++ b/indra/newview/lggbeamcolormapfloater.cpp
@ -40,13 +40,10 @@ S32 convertHueToX(F32 place)

 lggBeamColorMapFloater::lggBeamColorMapFloater(const LLSD& seed) : LLFloater(seed),
 	mContextConeOpacity(0.f),
-	mContextConeInAlpha(0.f),
-	mContextConeOutAlpha(0.f),
-	mContextConeFadeTime(0.f)
+	mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA),
+	mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA),
+	mContextConeFadeTime(CONTEXT_CONE_FADE_TIME)
 {
-	mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha");
-	mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha");
-	mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime");
 }

 lggBeamColorMapFloater::~lggBeamColorMapFloater()
--- a/indra/newview/lggbeammapfloater.cpp
+++ b/indra/newview/lggbeammapfloater.cpp
@ -25,13 +25,10 @@

 lggBeamMapFloater::lggBeamMapFloater(const LLSD& seed) : LLFloater(seed),
 	mContextConeOpacity(0.f),
-	mContextConeInAlpha(0.f),
-	mContextConeOutAlpha(0.f),
-	mContextConeFadeTime(0.f)
+	mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA),
+	mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA),
+	mContextConeFadeTime(CONTEXT_CONE_FADE_TIME)
 {
-	mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha");
-	mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha");
-	mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime");
 }

 lggBeamMapFloater::~lggBeamMapFloater()
--- a/indra/newview/llagentbenefits.cpp
+++ b/indra/newview/llagentbenefits.cpp
@ -122,20 +122,13 @@ S32 LLAgentBenefits::getAnimatedObjectLimit() const
 	else
 	{
 		S32 max_attach = 0;
-		if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits"))
+		if (gAgent.getRegion())
 		{
-			max_attach = getAttachmentLimit();
-		}
-		else
-		{
-			if (gAgent.getRegion())
+			LLSD features;
+			gAgent.getRegion()->getSimulatorFeatures(features);
+			if (features.has("AnimatedObjects"))
 			{
-				LLSD features;
-				gAgent.getRegion()->getSimulatorFeatures(features);
-				if (features.has("AnimatedObjects"))
-				{
-					max_attach = features["AnimatedObjects"]["MaxAgentAnimatedObjectAttachments"].asInteger();
-				}
+				max_attach = features["AnimatedObjects"]["MaxAgentAnimatedObjectAttachments"].asInteger();
 			}
 		}
 		return max_attach;
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@ -2034,7 +2034,8 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 					}
 					else
 					{
-						target_lag = vel * gSavedSettings.getF32("DynamicCameraStrength") / 30.f;
+                        LLCachedControl<F32> dynamic_camera_strength(gSavedSettings, "DynamicCameraStrength");
+						target_lag = vel * dynamic_camera_strength / 30.f;
 					}

 					mCameraLag = lerp(mCameraLag, target_lag, lag_interp);
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@ -600,13 +600,6 @@ bool	create_text_segment_icon_from_url_match(LLUrlMatch* match,LLTextBase* base)
 // or for things that are performance critical.  JC
 static void settings_to_globals()
 {
-	LLBUTTON_H_PAD		= gSavedSettings.getS32("ButtonHPad");
-	BTN_HEIGHT_SMALL	= gSavedSettings.getS32("ButtonHeightSmall");
-	BTN_HEIGHT			= gSavedSettings.getS32("ButtonHeight");
-
-	MENU_BAR_HEIGHT		= gSavedSettings.getS32("MenuBarHeight");
-	MENU_BAR_WIDTH		= gSavedSettings.getS32("MenuBarWidth");
-
 	LLSurface::setTextureSize(gSavedSettings.getU32("RegionTextureSize"));

 	LLRender::sGLCoreProfile = gSavedSettings.getBOOL("RenderGLContextCoreProfile");
@ -5114,7 +5107,8 @@ bool LLAppViewer::initCache()

    LLAppViewer::getTextureCache()->initCache(LL_PATH_CACHE, texture_cache_size, texture_cache_mismatch);

-	LLVOCache::getInstance()->initCache(LL_PATH_CACHE, gSavedSettings.getU32("CacheNumberOfRegionsForObjects"), getObjectCacheVersion());
+    const U32 CACHE_NUMBER_OF_REGIONS_FOR_OBJECTS = 128;
+	LLVOCache::getInstance()->initCache(LL_PATH_CACHE, CACHE_NUMBER_OF_REGIONS_FOR_OBJECTS, getObjectCacheVersion());

    return true;
 }
--- a/indra/newview/llchannelmanager.cpp
+++ b/indra/newview/llchannelmanager.cpp
@ -88,7 +88,7 @@ LLScreenChannel* LLChannelManager::createNotificationChannel()
 {
 	//  creating params for a channel
 	LLScreenChannelBase::Params p;
-	p.id = LLUUID(gSavedSettings.getString("NotificationChannelUUID"));
+	p.id = NOTIFICATION_CHANNEL_UUID;
 	p.channel_align = CA_RIGHT;
 	// <FS:Ansariel> Group notices, IMs and chiclets position
 	//p.toast_align = NA_TOP;
@ -119,7 +119,7 @@ void LLChannelManager::onLoginCompleted()
 		if (!channel) continue;

 		// don't calc notifications for Nearby Chat
-		if(channel->getChannelID() == LLUUID(gSavedSettings.getString("NearByChatChannelUUID")))
+		if(channel->getChannelID() == NEARBY_CHAT_CHANNEL_UUID)
 		{
 			continue;
 		}
@ -141,7 +141,7 @@ void LLChannelManager::onLoginCompleted()
 	{
 		// create a channel for the StartUp Toast
 		LLScreenChannelBase::Params p;
-		p.id = LLUUID(gSavedSettings.getString("StartUpChannelUUID"));
+		p.id = STARTUP_CHANNEL_UUID;
 		p.channel_align = CA_RIGHT;
 		mStartUpChannel = createChannel(p);

@ -185,7 +185,7 @@ void LLChannelManager::onStartUpToastClose()
 	{
 		mStartUpChannel->setVisible(FALSE);
 		mStartUpChannel->closeStartUpToast();
-		removeChannelByID(LLUUID(gSavedSettings.getString("StartUpChannelUUID")));
+		removeChannelByID(STARTUP_CHANNEL_UUID);
 		mStartUpChannel = NULL;
 	}

@ -279,12 +279,12 @@ LLNotificationsUI::LLScreenChannel* LLChannelManager::getNotificationScreenChann
 {
 	LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*>
 	(LLNotificationsUI::LLChannelManager::getInstance()->
-										findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
+										findChannelByID(NOTIFICATION_CHANNEL_UUID));

 	if (channel == NULL)
 	{
-		LL_WARNS() << "Can't find screen channel by NotificationChannelUUID" << LL_ENDL;
-		llassert(!"Can't find screen channel by NotificationChannelUUID");
+		LL_WARNS() << "Can't find screen channel by Notification Channel UUID" << LL_ENDL;
+		llassert(!"Can't find screen channel by Notification Channel UUID");
 	}

 	return channel;
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@ -101,21 +101,6 @@ LLVOAvatar *LLControlAvatar::getAttachedAvatar()

 void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_scale_fixup) const
 {
-
-    F32 max_legal_offset = MAX_LEGAL_OFFSET;
-    if (gSavedSettings.getControl("AnimatedObjectsMaxLegalOffset"))
-    {
-        max_legal_offset = gSavedSettings.getF32("AnimatedObjectsMaxLegalOffset");
-    }
-	max_legal_offset = llmax(max_legal_offset,0.f);
-
-    F32 max_legal_size = MAX_LEGAL_SIZE;
-    if (gSavedSettings.getControl("AnimatedObjectsMaxLegalSize"))
-    {
-        max_legal_size = gSavedSettings.getF32("AnimatedObjectsMaxLegalSize");
-    }
-	max_legal_size = llmax(max_legal_size, 1.f);
-    
    new_pos_fixup = LLVector3();
    new_scale_fixup = 1.0f;
 	LLVector3 vol_pos = mRootVolp->getRenderPosition();
@ -140,9 +125,9 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
 		{
 			LLVector3 pos_box_offset = point_to_box_offset(vol_pos, unshift_extents);
 			F32 offset_dist = pos_box_offset.length();
-			if (offset_dist > max_legal_offset && offset_dist > 0.f)
+			if (offset_dist > MAX_LEGAL_OFFSET && offset_dist > 0.f)
 			{
-				F32 target_dist = (offset_dist - max_legal_offset);
+				F32 target_dist = (offset_dist - MAX_LEGAL_OFFSET);
 				new_pos_fixup = (target_dist/offset_dist)*pos_box_offset;
 			}
 			if (new_pos_fixup != mPositionConstraintFixup)
@ -155,11 +140,11 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
 				
 			}
 		}
-        if (box_size/mScaleConstraintFixup > max_legal_size)
+        if (box_size/mScaleConstraintFixup > MAX_LEGAL_SIZE)
        {
-            new_scale_fixup = mScaleConstraintFixup*max_legal_size/box_size;
+            new_scale_fixup = mScaleConstraintFixup* MAX_LEGAL_SIZE /box_size;
            LL_DEBUGS("ConstraintFix") << getFullname() << " scale fix, box_size " << box_size << " fixup " 
-									   << mScaleConstraintFixup << " max legal " << max_legal_size 
+									   << mScaleConstraintFixup << " max legal " << MAX_LEGAL_SIZE
 									   << " -> new scale " << new_scale_fixup << LL_ENDL;
        }
    }
@ -204,8 +189,7 @@ void LLControlAvatar::matchVolumeTransform()
                mRoot->setWorldRotation(obj_rot * joint_rot);
                setRotation(mRoot->getRotation());

-				F32 global_scale = gSavedSettings.getF32("AnimatedObjectsGlobalScale");
-				setGlobalScale(global_scale * mScaleConstraintFixup);
+				setGlobalScale(mScaleConstraintFixup);
            }
            else
            {
@ -255,8 +239,7 @@ void LLControlAvatar::matchVolumeTransform()
            }
 			mRoot->setPosition(vol_pos + mPositionConstraintFixup);

-            F32 global_scale = gSavedSettings.getF32("AnimatedObjectsGlobalScale");
-            setGlobalScale(global_scale * mScaleConstraintFixup);
+            setGlobalScale(mScaleConstraintFixup);
        }
    }
 }
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@ -118,16 +118,12 @@ LLFloaterAvatarPicker::LLFloaterAvatarPicker(const LLSD& key)
 	mCloseOnSelect(FALSE),
    mExcludeAgentFromSearchResults(FALSE),
    mContextConeOpacity	(0.f),
-    mContextConeInAlpha(0.f),
-    mContextConeOutAlpha(0.f),
-    mContextConeFadeTime(0.f),
+    mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA),
+    mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA),
+    mContextConeFadeTime(CONTEXT_CONE_FADE_TIME),
 	mFindUUIDAvatarNameCacheConnection() // <FS:Ansariel> Search by UUID
 {
 	mCommitCallbackRegistrar.add("Refresh.FriendList", boost::bind(&LLFloaterAvatarPicker::populateFriend, this));
-
-    mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha");
-    mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha");
-    mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime");
 }

 BOOL LLFloaterAvatarPicker::postBuild()
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@ -105,9 +105,9 @@ LLFloaterColorPicker::LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show
 	  mActive				( TRUE ),
 	  mCanApplyImmediately	( show_apply_immediate ),
 	  mContextConeOpacity	( 0.f ),
-      mContextConeInAlpha   ( 0.f ),
-      mContextConeOutAlpha   ( 0.f ),
-      mContextConeFadeTime   ( 0.f )
+      mContextConeInAlpha   (CONTEXT_CONE_IN_ALPHA),
+      mContextConeOutAlpha   (CONTEXT_CONE_OUT_ALPHA),
+      mContextConeFadeTime   (CONTEXT_CONE_FADE_TIME)
 {
 	buildFromFile ( "floater_color_picker.xml");

@ -119,10 +119,6 @@ LLFloaterColorPicker::LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show
 		mApplyImmediateCheck->setEnabled(FALSE);
 		mApplyImmediateCheck->set(FALSE);
 	}
-
-    mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha");
-    mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha");
-    mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime");
 }

 LLFloaterColorPicker::~LLFloaterColorPicker()
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@ -49,13 +49,14 @@

 const std::string LL_FCP_COMPLETE_NAME("complete_name");
 const std::string LL_FCP_ACCOUNT_NAME("user_name");
+const S32 CONVERSATION_HISTORY_PAGE_SIZE = 100;

 LLFloaterConversationPreview::LLFloaterConversationPreview(const LLSD& session_id)
 :	LLFloater(session_id),
 	mChatHistory(NULL),
 	mSessionID(session_id.asUUID()),
 	mCurrentPage(0),
-	mPageSize(gSavedSettings.getS32("ConversationHistoryPageSize")),
+	mPageSize(CONVERSATION_HISTORY_PAGE_SIZE),
 	mAccountName(session_id[LL_FCP_ACCOUNT_NAME]),
 	mCompleteName(session_id[LL_FCP_COMPLETE_NAME]),
 	mMutex(),
--- a/indra/newview/llfloaterenvironmentadjust.cpp
+++ b/indra/newview/llfloaterenvironmentadjust.cpp
@ -114,7 +114,7 @@ BOOL LLFloaterEnvironmentAdjust::postBuild()
    getChild<LLTextureCtrl>(FIELD_SKY_CLOUD_MAP)->setAllowNoTexture(TRUE);

    getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP)->setDefaultImageAssetID(LLSettingsWater::GetDefaultWaterNormalAssetId());
-    getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP)->setBlankImageAssetID(LLUUID(gSavedSettings.getString("DefaultBlankNormalTexture")));
+    getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP)->setBlankImageAssetID(DEFAULT_BLANK_NORMAL_TEXTURE);
    getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onWaterMapChanged(); });

    refresh();
--- a/indra/newview/llfloaterexperiencepicker.cpp
+++ b/indra/newview/llfloaterexperiencepicker.cpp
@ -88,13 +88,10 @@ LLFloaterExperiencePicker::LLFloaterExperiencePicker( const LLSD& key )
 	:LLFloater(key)
 	,mSearchPanel(NULL)
 	,mContextConeOpacity(0.f)
-	,mContextConeInAlpha(0.f)
-	,mContextConeOutAlpha(0.f)
-	,mContextConeFadeTime(0.f)
+	,mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA)
+	,mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA)
+	,mContextConeFadeTime(CONTEXT_CONE_FADE_TIME)
 {
-	mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha");
-	mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha");
-	mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime");
 }

 LLFloaterExperiencePicker::~LLFloaterExperiencePicker()
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@ -270,7 +270,8 @@ void LLFloaterIMNearbyChat::loadHistory()

 void LLFloaterIMNearbyChat::removeScreenChat()
 {
-	LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID")));
+	LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(
+        LLNotificationsUI::NEARBY_CHAT_CHANNEL_UUID);
 	if(chat_channel)
 	{
 		chat_channel->removeToastsFromChannel();
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@ -517,7 +517,7 @@ LLFloaterIMNearbyChatHandler::LLFloaterIMNearbyChatHandler()
 {
 	// Getting a Channel for our notifications
 	LLFloaterIMNearbyChatScreenChannel::Params p;
-	p.id = LLUUID(gSavedSettings.getString("NearByChatChannelUUID"));
+	p.id = NEARBY_CHAT_CHANNEL_UUID;
 	LLFloaterIMNearbyChatScreenChannel* channel = new LLFloaterIMNearbyChatScreenChannel(p);
 	
 	LLFloaterIMNearbyChatScreenChannel::create_toast_panel_callback_t callback = createToastPanel;
--- a/indra/newview/llfloaterimsession.cpp
+++ b/indra/newview/llfloaterimsession.cpp
@ -709,7 +709,7 @@ void LLFloaterIMSession::setDocked(bool docked, bool pop_on_undock)
 	// update notification channel state
 	LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*>
 		(LLNotificationsUI::LLChannelManager::getInstance()->
-											findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
+											findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));
 	
 	if(!isChatMultiTab())
 	{
@ -745,7 +745,7 @@ void LLFloaterIMSession::setVisible(BOOL visible)
 {
 	LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*>
 		(LLNotificationsUI::LLChannelManager::getInstance()->
-											findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
+											findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));

 	LLFloaterIMSessionTab::setVisible(visible);

@ -923,7 +923,7 @@ void LLFloaterIMSession::updateMessages()
 					// remove embedded notification from channel
 					LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*>
 							(LLNotificationsUI::LLChannelManager::getInstance()->
-																findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
+																findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));
 					if (getVisible())
 					{
 						// toast will be automatically closed since it is not storable toast
--- a/indra/newview/llfloaternotificationstabbed.cpp
+++ b/indra/newview/llfloaternotificationstabbed.cpp
@ -165,7 +165,7 @@ LLPanel * LLFloaterNotificationsTabbed::findItemByID(const LLUUID& id, std::stri
 void LLFloaterNotificationsTabbed::initChannel() 
 {
    LLNotificationsUI::LLScreenChannelBase* channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(
-        LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
+        LLNotificationsUI::NOTIFICATION_CHANNEL_UUID);
    mChannel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>(channel);
    if(NULL == mChannel)
    {
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@ -229,15 +229,9 @@ void inventory_offer_handler(LLOfferInfo* info)
    }


+    // <FS:Ansariel> Keep auto-accept option
    bool bAutoAccept(false);
    // Avoid the Accept/Discard dialog if the user so desires. JC
-    // <FS:Ansariel> Auto-accept any kind of inventory (FIRE-4128)
-    //if (gSavedSettings.getBOOL("AutoAcceptNewInventory")
-    //  && (info->mType == LLAssetType::AT_NOTECARD
-    //      || info->mType == LLAssetType::AT_LANDMARK
-    //      || info->mType == LLAssetType::AT_TEXTURE))
-//  if (gSavedSettings.getBOOL("AutoAcceptNewInventory"))
-    // </FS:Ansariel> Auto-accept any kind of inventory (FIRE-4128)
 // [RLVa:KB]
    // Don't auto-accept give-to-RLV inventory offers
    if ( (gSavedSettings.getBOOL("AutoAcceptNewInventory")) &&
@ -248,6 +242,7 @@ void inventory_offer_handler(LLOfferInfo* info)
        // and possibly open them on receipt depending upon "ShowNewInventory".
        bAutoAccept = true;
    }
+    // </FS:Ansariel>

    // Strip any SLURL from the message display. (DEV-2754)
    std::string msg = info->mDesc;
@ -317,7 +312,7 @@ void inventory_offer_handler(LLOfferInfo* info)
    LLNotification::Params p;

    // Object -> Agent Inventory Offer
-    if (info->mFromObject && !bAutoAccept)
+    if (info->mFromObject && !bAutoAccept) // <FS:Ansariel> Keep auto-accept option
    {
 // [RLVa:KB] - Checked: RLVa-1.2.2
        // Only filter if the object owner is a nearby agent
@ -402,6 +397,7 @@ void inventory_offer_handler(LLOfferInfo* info)
            send_do_not_disturb_message(gMessageSystem, info->mFromID);
        }

+        // <FS:Ansariel> Keep auto-accept option
        if (!bAutoAccept) // if we auto accept, do not pester the user
        {
            // Inform user that there is a script floater via toast system
@ -409,6 +405,7 @@ void inventory_offer_handler(LLOfferInfo* info)
            p.payload = payload;
            LLPostponedNotification::add<LLPostponedOfferNotification>(p, info->mFromID, false);
        }
+        // </FS:Ansariel>
        // <FS:Ansariel> FIRE-19540: Log auto-accepted inventory to nearby chat
        else if (gSavedSettings.getBOOL("FSLogAutoAcceptInventoryToChat"))
        {
--- a/indra/newview/llinspecttoast.cpp
+++ b/indra/newview/llinspecttoast.cpp
@ -60,8 +60,8 @@ private:
 LLInspectToast::LLInspectToast(const LLSD& notification_id) :
 	LLInspect(LLSD()), mPanel(NULL)
 {
-	LLScreenChannelBase* channel = LLChannelManager::getInstance()->findChannelByID(
-																LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
+    LLScreenChannelBase* channel = LLChannelManager::getInstance()->findChannelByID(
+        LLNotificationsUI::NOTIFICATION_CHANNEL_UUID);
 	mScreenChannel = dynamic_cast<LLScreenChannel*>(channel);
 	if(NULL == mScreenChannel)
 	{
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@ -243,10 +243,9 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)

 	// Can't access old mTextEntry fields as they are protected, so lets build new params
 	// That is C&P from LLComboBox::createLineEditor function
-	static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
 	S32 arrow_width = mArrowImage ? mArrowImage->getWidth() : 0;
 	LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-	text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * drop_shadow_button;
+	text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * BTN_DROP_SHADOW;

 	LLLineEditor::Params params = p.combo_editor;
 	params.rect(text_entry_rect);
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@ -432,10 +432,9 @@ void LLNavigationBar::fillSearchComboBox()
 // {
 // 	if (isBackgroundVisible())
 // 	{
-// 		static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0);
 // 		static LLUIColor color_drop_shadow = LLUIColorTable::instance().getColor("ColorDropShadow");
 // 		gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
-//                            color_drop_shadow, drop_shadow_floater );
+//                            color_drop_shadow, DROP_SHADOW_FLOATER);
 // 	}
 // 
 // 	LLPanel::draw();
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/indra/newview/llnotificationalerthandler.cpp
@ -50,7 +50,7 @@ LLAlertHandler::LLAlertHandler(const std::string& name, const std::string& notif
 	mIsModal(is_modal)
 {
 	LLScreenChannelBase::Params p;
-	p.id = LLUUID(gSavedSettings.getString("AlertChannelUUID"));
+	p.id = ALERT_CHANNEL_UUID;
 	p.display_toasts_always = true;
 	p.toast_align = NA_CENTRE;
 	p.channel_align = CA_CENTRE;
--- a/indra/newview/llpaneleditwater.cpp
+++ b/indra/newview/llpaneleditwater.cpp
@ -89,7 +89,7 @@ BOOL LLPanelSettingsWaterMainTab::postBuild()
    getChild<LLUICtrl>(FIELD_WATER_UNDERWATER_MOD)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onFogUnderWaterChanged(); });

    mTxtNormalMap->setDefaultImageAssetID(LLSettingsWater::GetDefaultWaterNormalAssetId());
-    mTxtNormalMap->setBlankImageAssetID(LLUUID( gSavedSettings.getString( "DefaultBlankNormalTexture" )));
+    mTxtNormalMap->setBlankImageAssetID(DEFAULT_BLANK_NORMAL_TEXTURE);
    mTxtNormalMap->setCommitCallback([this](LLUICtrl *, const LLSD &) { onNormalMapChanged(); });

    getChild<LLUICtrl>(FIELD_WATER_WAVE2_XY)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onSmallWaveChanged(); });
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@ -288,7 +288,7 @@ BOOL	LLPanelFace::postBuild()
 	mTextureCtrl = getChild<LLTextureCtrl>("texture control");
 	if(mTextureCtrl)
 	{
-		mTextureCtrl->setDefaultImageAssetID(LLUUID( gSavedSettings.getString( "DefaultObjectTexture" )));
+		mTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_TEXTURE);
 		mTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitTexture, this, _2) );
 		mTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelTexture, this, _2) );
 		mTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectTexture, this, _2) );
@ -305,7 +305,7 @@ BOOL	LLPanelFace::postBuild()
 	mShinyTextureCtrl = getChild<LLTextureCtrl>("shinytexture control");
 	if(mShinyTextureCtrl)
 	{
-		mShinyTextureCtrl->setDefaultImageAssetID(LLUUID( gSavedSettings.getString( "DefaultObjectSpecularTexture" )));
+		mShinyTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_SPECULAR_TEXTURE);
 		mShinyTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitSpecularTexture, this, _2) );
 		mShinyTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelSpecularTexture, this, _2) );
 		mShinyTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectSpecularTexture, this, _2) );
@ -322,8 +322,8 @@ BOOL	LLPanelFace::postBuild()
 	mBumpyTextureCtrl = getChild<LLTextureCtrl>("bumpytexture control");
 	if(mBumpyTextureCtrl)
 	{
-		mBumpyTextureCtrl->setDefaultImageAssetID(LLUUID( gSavedSettings.getString( "DefaultObjectNormalTexture" )));
-		mBumpyTextureCtrl->setBlankImageAssetID(LLUUID( gSavedSettings.getString( "DefaultBlankNormalTexture" )));
+		mBumpyTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_NORMAL_TEXTURE);
+		mBumpyTextureCtrl->setBlankImageAssetID(DEFAULT_BLANK_NORMAL_TEXTURE);
 		mBumpyTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitNormalTexture, this, _2) );
 		mBumpyTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelNormalTexture, this, _2) );
 		mBumpyTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectNormalTexture, this, _2) );
@ -3979,7 +3979,7 @@ void LLPanelFace::onCopyTexture()
                        LLUUID id = mat_data["NormMap"].asUUID();
                        if (id.notNull() && !get_can_copy_texture(id))
                        {
-                            mat_data["NormMap"] = LLUUID(gSavedSettings.getString("DefaultObjectTexture"));
+                            mat_data["NormMap"] = DEFAULT_OBJECT_TEXTURE;
                            mat_data["NormMapNoCopy"] = true;
                        }

@ -3989,7 +3989,7 @@ void LLPanelFace::onCopyTexture()
                        LLUUID id = mat_data["SpecMap"].asUUID();
                        if (id.notNull() && !get_can_copy_texture(id))
                        {
-                            mat_data["SpecMap"] = LLUUID(gSavedSettings.getString("DefaultObjectTexture"));
+                            mat_data["SpecMap"] = DEFAULT_OBJECT_TEXTURE;
                            mat_data["SpecMapNoCopy"] = true;
                        }

--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@ -299,7 +299,7 @@ BOOL	LLPanelObject::postBuild()
 	mCtrlSculptTexture = getChild<LLTextureCtrl>("sculpt texture control");
 	if (mCtrlSculptTexture)
 	{
-		mCtrlSculptTexture->setDefaultImageAssetID(LLUUID(SCULPT_DEFAULT_TEXTURE));
+		mCtrlSculptTexture->setDefaultImageAssetID(SCULPT_DEFAULT_TEXTURE);
 		mCtrlSculptTexture->setCommitCallback( boost::bind(&LLPanelObject::onCommitSculpt, this, _2 ));
 		mCtrlSculptTexture->setOnCancelCallback( boost::bind(&LLPanelObject::onCancelSculpt, this, _2 ));
 		mCtrlSculptTexture->setOnSelectCallback( boost::bind(&LLPanelObject::onSelectSculpt, this, _2 ));
@ -2675,7 +2675,7 @@ void LLPanelObject::onCancelSculpt(const LLSD& data)

 	if(mSculptTextureRevert == LLUUID::null)
 	{
-		mSculptTextureRevert = LLUUID(SCULPT_DEFAULT_TEXTURE);
+		mSculptTextureRevert = SCULPT_DEFAULT_TEXTURE;
 	}
 	mTextureCtrl->setImageAssetID(mSculptTextureRevert);
 	
@ -2959,7 +2959,7 @@ void LLPanelObject::onCopyParams()
        }
        else
        {
-            mClipboardParams["sculpt"]["id"] = LLUUID(SCULPT_DEFAULT_TEXTURE);
+            mClipboardParams["sculpt"]["id"] = SCULPT_DEFAULT_TEXTURE;
        }

        mClipboardParams["sculpt"]["type"] = sculpt_params->getSculptType();
--- a/indra/newview/llpersistentnotificationstorage.cpp
+++ b/indra/newview/llpersistentnotificationstorage.cpp
@ -116,7 +116,7 @@ void LLPersistentNotificationStorage::loadNotifications()

 	using namespace LLNotificationsUI;
 	LLScreenChannel* notification_channel = dynamic_cast<LLScreenChannel*>(LLChannelManager::getInstance()->
-		findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
+		findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));

 	LLNotifications& instance = LLNotifications::instance();
 	startBulkUpdate(); // <FS:ND>
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@ -211,8 +211,12 @@ void LLScreenChannelBase::init(S32 channel_left, S32 channel_right)

 void	LLScreenChannelBase::updateRect()
 {
+    //const S32 CHANNEL_BOTTOM_PANEL_MARGIN = 35; // <FS:Ansariel> Keep custom bottom panel margin
 	S32 channel_top = getChannelRect().mTop;
+	// <FS:Ansariel> Keep custom bottom panel margin
+	//S32 channel_bottom = getChannelRect().mBottom + CHANNEL_BOTTOM_PANEL_MARGIN;
 	S32 channel_bottom = getChannelRect().mBottom + gSavedSettings.getS32("ChannelBottomPanelMargin");
+	// </FS:Ansariel>
 	S32 channel_left = getRect().mLeft;
 	S32 channel_right = getRect().mRight;
 	setRect(LLRect(channel_left, channel_top, channel_right, channel_bottom));
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@ -34,6 +34,10 @@

 namespace LLNotificationsUI
 {
+    const LLUUID ALERT_CHANNEL_UUID("F3E07BC8-A973-476D-8C7F-F3B7293975D1");
+    const LLUUID NOTIFICATION_CHANNEL_UUID("AEED3193-8709-4693-8558-7452CCA97AE5");
+    const LLUUID NEARBY_CHAT_CHANNEL_UUID("E1158BD6-661C-4981-9DAD-4DCBFF062502");
+    const LLUUID STARTUP_CHANNEL_UUID("B56AF90D-6684-48E4-B1E4-722D3DEB2CB6");

 typedef enum e_notification_toast_alignment
 {
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@ -425,7 +425,7 @@ void LLScriptFloater::hideToastsIfNeeded()

 	// find channel
 	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(LLChannelManager::getInstance()->findChannelByID(
-		LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
+        LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));
 	// update notification channel state
 	if(channel)
 	{
--- a/indra/newview/llsetkeybinddialog.cpp
+++ b/indra/newview/llsetkeybinddialog.cpp
@ -74,13 +74,10 @@ LLSetKeyBindDialog::LLSetKeyBindDialog(const LLSD& key)
    pUpdater(NULL),
    mLastMaskKey(0),
    mContextConeOpacity(0.f),
-    mContextConeInAlpha(0.f),
-    mContextConeOutAlpha(0.f),
-    mContextConeFadeTime(0.f)
+    mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA),
+    mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA),
+    mContextConeFadeTime(CONTEXT_CONE_FADE_TIME)
 {
-	mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha");
-	mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha");
-	mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime");
 }

 LLSetKeyBindDialog::~LLSetKeyBindDialog()
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@ -3037,7 +3037,7 @@ bool idle_startup()
 		static LLFrameTimer wearables_timer;

 		const F32 wearables_time = wearables_timer.getElapsedTimeF32();
-		static LLCachedControl<F32> max_wearables_time(gSavedSettings, "ClothingLoadingDelay");
+		const F32 MAX_WEARABLES_TIME = 10.f;

 		if (!gAgent.isOutfitChosen() && isAgentAvatarValid())
 		{
@ -3056,7 +3056,7 @@ bool idle_startup()
 		
 		display_startup();

-		if (gAgent.isOutfitChosen() && (wearables_time > max_wearables_time))
+		if (gAgent.isOutfitChosen() && (wearables_time > MAX_WEARABLES_TIME))
 		{
 			if (gInventory.isInventoryUsable())
 			{
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@ -168,8 +168,8 @@ void LLSysWellWindow::removeItemByID(const LLUUID& id)
 //---------------------------------------------------------------------------------
 void LLSysWellWindow::initChannel() 
 {
-	LLNotificationsUI::LLScreenChannelBase* channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(
-																LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
+    LLNotificationsUI::LLScreenChannelBase* channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(
+        LLNotificationsUI::NOTIFICATION_CHANNEL_UUID);
 	mChannel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>(channel);
 	if(NULL == mChannel)
 	{
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@ -87,10 +87,10 @@ static const S32 LOCAL_TRACKING_ID_COLUMN = 1;
 //static
 bool get_is_predefined_texture(LLUUID asset_id)
 {
-    if (asset_id == LLUUID(gSavedSettings.getString("DefaultObjectTexture"))
-        || asset_id == LLUUID(gSavedSettings.getString("UIImgWhiteUUID"))
-        || asset_id == LLUUID(gSavedSettings.getString("UIImgInvisibleUUID"))
-        || asset_id == LLUUID(SCULPT_DEFAULT_TEXTURE))
+    if (asset_id == DEFAULT_OBJECT_TEXTURE
+        || asset_id == UI_IMAGE_WHITE
+        || asset_id == UI_IMAGE_INVISIBLE
+        || asset_id == SCULPT_DEFAULT_TEXTURE)
    {
        return true;
    }
@ -1392,8 +1392,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
 	mCaptionHeight = p.show_caption ? BTN_HEIGHT_SMALL : 0;		// <FS:Zi> leave some room underneath the image for the caption
 	// Default of defaults is white image for diff tex
 	//
-	LLUUID whiteImage( gSavedSettings.getString( "UIImgWhiteUUID" ) );
-	setBlankImageAssetID( whiteImage );
+	setBlankImageAssetID(UI_IMAGE_WHITE);

 	setAllowNoTexture(p.allow_no_texture);
 	setCanApplyImmediately(p.can_apply_immediately);
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@ -65,6 +65,13 @@ bool get_is_predefined_texture(LLUUID asset_id);
 LLUUID get_copy_free_item_by_asset_id(LLUUID image_id, bool no_trans_perm = false);
 bool get_can_copy_texture(LLUUID image_id);

+const LLUUID DEFAULT_BLANK_NORMAL_TEXTURE("5b53359e-59dd-d8a2-04c3-9e65134da47a");
+const LLUUID DEFAULT_OBJECT_NORMAL_TEXTURE("85f28839-7a1c-b4e3-d71d-967792970a7b");
+const LLUUID DEFAULT_OBJECT_SPECULAR_TEXTURE("87e0e8f7-8729-1ea8-cfc9-8915773009db");
+const LLUUID DEFAULT_OBJECT_TEXTURE("89556747-24cb-43ed-920b-47caed15465f");
+const LLUUID UI_IMAGE_WHITE("5748decc-f629-461c-9a36-a35a221fe21f");
+const LLUUID UI_IMAGE_INVISIBLE("89556747-24cb-43ed-920b-47caed15465f");
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // LLTextureCtrl

--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@ -459,19 +459,16 @@ void LLAvatarTexBar::draw()
 		line_num++;
 	}
 	// <FS:Ansariel> Replace frequently called gSavedSettings
-	//const U32 texture_timeout = gSavedSettings.getU32("AvatarBakedTextureUploadTimeout");
 	//const U32 override_tex_discard_level = gSavedSettings.getU32("TextureDiscardLevel");
 	static LLCachedControl<U32> sAvatarBakedTextureUploadTimeout(gSavedSettings, "AvatarBakedTextureUploadTimeout");
 	static LLCachedControl<U32> sTextureDiscardLevel(gSavedSettings, "TextureDiscardLevel");
-	const U32 texture_timeout = sAvatarBakedTextureUploadTimeout();
 	const U32 override_tex_discard_level = sTextureDiscardLevel();
 	// </FS:Ansariel>
 	
 	LLColor4 header_color(1.f, 1.f, 1.f, 0.9f);

-	const std::string texture_timeout_str = texture_timeout ? llformat("%d",texture_timeout) : "Disabled";
 	const std::string override_tex_discard_level_str = override_tex_discard_level ? llformat("%d",override_tex_discard_level) : "Disabled";
-	std::string header_text = llformat("[ Timeout('AvatarBakedTextureUploadTimeout'):%s ] [ LOD_Override('TextureDiscardLevel'):%s ]", texture_timeout_str.c_str(), override_tex_discard_level_str.c_str());
+	std::string header_text = llformat("[ Timeout:60 ] [ LOD_Override('TextureDiscardLevel'):%s ]", override_tex_discard_level_str.c_str());
 	LLFontGL::getFontMonospace()->renderUTF8(header_text, 0, l_offset, v_offset + line_height*line_num,
 											 header_color, LLFontGL::LEFT, LLFontGL::TOP); //, LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT);
 	line_num++;
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@ -514,10 +514,9 @@ void LLToastAlertPanel::draw()
 	}

 	static LLUIColor shadow_color = LLUIColorTable::instance().getColor("ColorDropShadow");
-	static LLUICachedControl<S32> shadow_lines ("DropShadowFloater", 5);

 	gl_drop_shadow( 0, LLToastPanel::getRect().getHeight(), LLToastPanel::getRect().getWidth(), 0,
-		shadow_color, shadow_lines);
+		shadow_color, DROP_SHADOW_FLOATER);

 	LLToastPanel::draw();
 }
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@ -307,12 +307,10 @@ void LLToolDragAndDrop::setDragStart(S32 x, S32 y)

 BOOL LLToolDragAndDrop::isOverThreshold(S32 x,S32 y)
 {
-	static LLCachedControl<S32> drag_and_drop_threshold(gSavedSettings,"DragAndDropDistanceThreshold", 3);
-	
 	S32 mouse_delta_x = x - mDragStartX;
 	S32 mouse_delta_y = y - mDragStartY;
 	
-	return (mouse_delta_x * mouse_delta_x) + (mouse_delta_y * mouse_delta_y) > drag_and_drop_threshold * drag_and_drop_threshold;
+	return (mouse_delta_x * mouse_delta_x) + (mouse_delta_y * mouse_delta_y) > DRAG_N_DROP_DISTANCE_THRESHOLD * DRAG_N_DROP_DISTANCE_THRESHOLD;
 }

 void LLToolDragAndDrop::beginDrag(EDragAndDropType type,
@ -575,12 +573,13 @@ BOOL LLToolDragAndDrop::handleKey(KEY key, MASK mask)

 BOOL LLToolDragAndDrop::handleToolTip(S32 x, S32 y, MASK mask)
 {
+    const F32 DRAG_N_DROP_TOOLTIP_DELAY = 0.10000000149f;
 	if (!mToolTipMsg.empty())
 	{
 		LLToolTipMgr::instance().unblockToolTips();
 		LLToolTipMgr::instance().show(LLToolTip::Params()
 			.message(mToolTipMsg)
-			.delay_time(gSavedSettings.getF32( "DragAndDropToolTipDelay" )));
+			.delay_time(DRAG_N_DROP_TOOLTIP_DELAY));
 		return TRUE;
 	}
 	return FALSE;
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@ -95,8 +95,8 @@ LLToolPie::LLToolPie()
 	mMouseSteerX(-1),
 	mMouseSteerY(-1),
 	mClickAction(0),
-	mClickActionBuyEnabled( gSavedSettings.getBOOL("ClickActionBuyEnabled") ),
-	mClickActionPayEnabled( gSavedSettings.getBOOL("ClickActionPayEnabled") ),
+	mClickActionBuyEnabled( TRUE ),
+	mClickActionPayEnabled( TRUE ),
 	mDoubleClickTimer()
 {
 }
@ -882,8 +882,7 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
 	{
 		S32 delta_x = x - mMouseDownX;
 		S32 delta_y = y - mMouseDownY;
-		S32 threshold = gSavedSettings.getS32("DragAndDropDistanceThreshold");
-		if (delta_x * delta_x + delta_y * delta_y > threshold * threshold)
+		if (delta_x * delta_x + delta_y * delta_y > DRAG_N_DROP_DISTANCE_THRESHOLD * DRAG_N_DROP_DISTANCE_THRESHOLD)
 		{
 			startCameraSteering();
 			steerCameraWithMouse(x, y);
@ -1334,6 +1333,8 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
 			     ( (RlvActions::canInteract(hover_object, mHoverPick.mObjectOffset)) && (RlvActions::canShowName(RlvActions::SNC_DEFAULT, hover_object->getID())) ) )
 			{
 // [/RLVa:KB]
+                //const F32 INSPECTOR_TOOLTIP_DELAY = 0.35f; // <FS:Ansariel> Keep customizable tooltip delay
+
 				LLInspector::Params p;
 				p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
 				p.message(final_name);
@ -1347,6 +1348,8 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
 				p.click_callback(boost::bind(showAvatarInspector, hover_object->getID()));
 				p.visible_time_near(6.f);
 				p.visible_time_far(3.f);
+				// <FS:Ansariel> Keep customizable tooltip delay
+				//p.delay_time(INSPECTOR_TOOLTIP_DELAY);
 				p.delay_time(gSavedSettings.getF32("AvatarInspectorTooltipDelay"));
 				p.wrap(false);
 				
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@ -480,25 +480,19 @@ void audio_update_volume(bool force_update)

 		gAudiop->setMasterGain ( master_volume );

-		// <FS:Ansariel> Replace frequently called gSavedSettings
-		//gAudiop->setDopplerFactor(gSavedSettings.getF32("AudioLevelDoppler"));
+        const F32 AUDIO_LEVEL_DOPPLER = 1.f;
+		gAudiop->setDopplerFactor(AUDIO_LEVEL_DOPPLER);

-		//if(!LLViewerCamera::getInstance()->cameraUnderWater())
-		//gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
-		//else
-		//	gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelUnderwaterRolloff"));
-
-		static LLCachedControl<F32> sAudioLevelDoppler(gSavedSettings, "AudioLevelDoppler");
-		static LLCachedControl<F32> sAudioLevelRolloff(gSavedSettings, "AudioLevelRolloff");
-		static LLCachedControl<F32> sAudioLevelUnderwaterRolloff(gSavedSettings, "AudioLevelUnderwaterRolloff");
-
-		gAudiop->setDopplerFactor(sAudioLevelDoppler);
-
-		if(!LLViewerCamera::getInstance()->cameraUnderWater())
-		gAudiop->setRolloffFactor(sAudioLevelRolloff);
+        if(!LLViewerCamera::getInstance()->cameraUnderWater())
+        {
+            const F32 AUDIO_LEVEL_ROLLOFF = 1.f;
+            gAudiop->setRolloffFactor(AUDIO_LEVEL_ROLLOFF);
+        }
 		else
-			gAudiop->setRolloffFactor(sAudioLevelUnderwaterRolloff);
-		// </FS:Ansariel>
+        {
+            const F32 AUDIO_LEVEL_UNDERWATER_ROLLOFF = 5.f;
+            gAudiop->setRolloffFactor(AUDIO_LEVEL_UNDERWATER_ROLLOFF);
+        }

 		gAudiop->setMuted(mute_audio || progress_view_visible);
 		
@ -654,8 +648,8 @@ void audio_update_wind(bool force_update)
        // whereas steady-state avatar walk velocity is only 3.2 m/s.
        // Without this the world feels desolate on first login when you are
        // standing still.
-        static LLUICachedControl<F32> wind_level("AudioLevelWind", 0.5f);
-        LLVector3 scaled_wind_vec = gWindVec * wind_level;
+        const F32 WIND_LEVEL = 0.5f;
+        LLVector3 scaled_wind_vec = gWindVec * WIND_LEVEL;
        
        // Mix in the avatar's motion, subtract because when you walk north,
        // the apparent wind moves south.
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@ -481,6 +481,7 @@ static bool handleChatFontSizeChanged(const LLSD& newvalue)
 	return true;
 }

+// <FS:Ansariel> Keep custom chat persist time
 static bool handleChatPersistTimeChanged(const LLSD& newvalue)
 {
 	if(gConsole)
@ -489,6 +490,7 @@ static bool handleChatPersistTimeChanged(const LLSD& newvalue)
 	}
 	return true;
 }
+// </FS:Ansariel>

 static bool handleConsoleMaxLinesChanged(const LLSD& newvalue)
 {
@ -1276,7 +1278,7 @@ void settings_setup_listeners()
 	setting_setup_signal_listener(gSavedSettings, "RenderHiDPI", handleRenderHiDPIChanged);
    setting_setup_signal_listener(gSavedSettings, "TextureMemory", handleVideoMemoryChanged);
    setting_setup_signal_listener(gSavedSettings, "ChatConsoleFontSize", handleChatFontSizeChanged);
-    setting_setup_signal_listener(gSavedSettings, "ChatPersistTime", handleChatPersistTimeChanged);
+    setting_setup_signal_listener(gSavedSettings, "ChatPersistTime", handleChatPersistTimeChanged); // <FS:Ansariel> Keep custom chat persist time
    setting_setup_signal_listener(gSavedSettings, "ConsoleMaxLines", handleConsoleMaxLinesChanged);
    setting_setup_signal_listener(gSavedSettings, "UploadBakedTexOld", handleUploadBakedTexOldChanged);
    setting_setup_signal_listener(gSavedSettings, "UseOcclusion", handleUseOcclusionChanged);
@ -1287,9 +1289,6 @@ void settings_setup_listeners()
    setting_setup_signal_listener(gSavedSettings, "AudioLevelMusic", handleAudioVolumeChanged);
    setting_setup_signal_listener(gSavedSettings, "AudioLevelMedia", handleAudioVolumeChanged);
    setting_setup_signal_listener(gSavedSettings, "AudioLevelVoice", handleAudioVolumeChanged);
-    setting_setup_signal_listener(gSavedSettings, "AudioLevelDoppler", handleAudioVolumeChanged);
-    setting_setup_signal_listener(gSavedSettings, "AudioLevelRolloff", handleAudioVolumeChanged);
-    setting_setup_signal_listener(gSavedSettings, "AudioLevelUnderwaterRolloff", handleAudioVolumeChanged);
    setting_setup_signal_listener(gSavedSettings, "MuteAudio", handleAudioVolumeChanged);
    setting_setup_signal_listener(gSavedSettings, "MuteMusic", handleAudioVolumeChanged);
    setting_setup_signal_listener(gSavedSettings, "MuteMedia", handleAudioVolumeChanged);
@ -1509,8 +1508,6 @@ DECL_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
 LLSD test_llsd = LLSD()["testing1"] = LLSD()["testing2"];
 DECL_LLCC(LLSD, test_llsd);

-static LLCachedControl<std::string> test_BrowserHomePage("BrowserHomePage", "hahahahahha", "Not the real comment");
-
 void test_cached_control()
 {
 #define do { TEST_LLCC(T, V) if((T)mySetting_##T != V) LL_ERRS() << "Fail "#T << LL_ENDL; } while(0)
@ -1527,9 +1524,6 @@ void test_cached_control()
 	TEST_LLCC(LLColor3, LLColor3(1.0f, 0.f, 0.5f));
 	TEST_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
 //There's no LLSD comparsion for LLCC yet. TEST_LLCC(LLSD, test_llsd); 
-
-	// AO - Phoenixviewer doesn't want to send unecessary noise to secondlife.com
-	//if((std::string)test_BrowserHomePage != "http://www.secondlife.com") LL_ERRS() << "Fail BrowserHomePage" << LL_ENDL;
 }
 #endif // TEST_CACHED_CONTROL

--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@ -258,8 +258,8 @@ void display_stats()
 		LLMemory::logMemoryInfo(TRUE) ;
 		gRecentMemoryTime.reset();
 	}
-    F32 asset_storage_log_freq = gSavedSettings.getF32("AssetStorageLogFrequency");
-    if (asset_storage_log_freq > 0.f && gAssetStorageLogTime.getElapsedTimeF32() >= asset_storage_log_freq)
+    const F32 ASSET_STORAGE_LOG_FREQUENCY = 60.f;
+    if (gAssetStorageLogTime.getElapsedTimeF32() >= ASSET_STORAGE_LOG_FREQUENCY)
    {
 		LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("DS - Asset Storage");
        gAssetStorageLogTime.reset();
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@ -1784,8 +1784,9 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
 		const LLUUID& blocked_id;
 	};

-	LLNotificationsUI::LLChannelManager::getInstance()->killToastsFromChannel(LLUUID(
-			gSavedSettings.getString("NotificationChannelUUID")), OfferMatcher(blocked_id));
+    LLNotificationsUI::LLChannelManager::getInstance()->killToastsFromChannel(
+        LLNotificationsUI::NOTIFICATION_CHANNEL_UUID,
+        OfferMatcher(blocked_id));
 }


@ -7319,8 +7320,9 @@ void script_question_mute(const LLUUID& task_id, const std::string& object_name)
        const LLUUID& blocked_id;
    };

-    LLNotificationsUI::LLChannelManager::getInstance()->killToastsFromChannel(LLUUID(
-            gSavedSettings.getString("NotificationChannelUUID")), OfferMatcher(task_id));
+    LLNotificationsUI::LLChannelManager::getInstance()->killToastsFromChannel(
+        LLNotificationsUI::NOTIFICATION_CHANNEL_UUID,
+        OfferMatcher(task_id));
 }

 static LLNotificationFunctorRegistration script_question_cb_reg_1("ScriptQuestion", script_question_cb);
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@ -4019,20 +4019,13 @@ F32 LLViewerObject::recursiveGetEstTrianglesMax() const
 S32 LLViewerObject::getAnimatedObjectMaxTris() const
 {
    S32 max_tris = 0;
-    if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits")) 
+    if (gAgent.getRegion())
    {
-        max_tris = S32_MAX;
-    }
-    else
-    {
-        if (gAgent.getRegion())
+        LLSD features;
+        gAgent.getRegion()->getSimulatorFeatures(features);
+        if (features.has("AnimatedObjects"))
        {
-            LLSD features;
-            gAgent.getRegion()->getSimulatorFeatures(features);
-            if (features.has("AnimatedObjects"))
-            {
-                max_tris = features["AnimatedObjects"]["AnimatedObjectMaxTris"].asInteger();
-            }
+            max_tris = features["AnimatedObjects"]["AnimatedObjectMaxTris"].asInteger();
        }
    }
    return max_tris;
--- a/indra/newview/llviewertexlayer.cpp
+++ b/indra/newview/llviewertexlayer.cpp
@ -260,11 +260,11 @@ BOOL LLViewerTexLayerSetBuffer::isReadyToUpdate() const

 	// Update if we've hit a timeout.  Unlike for uploads, we can make this timeout fairly small
 	// since render unnecessarily doesn't cost much.
-	const U32 texture_timeout = gSavedSettings.getU32("AvatarBakedLocalTextureUpdateTimeout");
-	if (texture_timeout != 0)
+	const U32 TEXTURE_TIMEOUT = 10;
+	if (TEXTURE_TIMEOUT != 0)
 	{
 		// If we hit our timeout and have textures available at even lower resolution, then update.
-		const BOOL is_update_textures_timeout = mNeedsUpdateTimer.getElapsedTimeF32() >= texture_timeout;
+		const BOOL is_update_textures_timeout = mNeedsUpdateTimer.getElapsedTimeF32() >= TEXTURE_TIMEOUT;
 		const BOOL has_lower_lod = getViewerTexLayerSet()->isLocalTextureDataAvailable();
 		if (has_lower_lod && is_update_textures_timeout) return TRUE; 
 	}
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@ -3857,11 +3857,13 @@ void LLViewerWindow::updateUI()
 	// <FS:Ansariel> We don't show the hints anyway, so needless to check here
 	//if (gLoggedInTime.getStarted())
 	//{
-	//	if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("DestinationGuideHintTimeout"))
+    //    const F32 DESTINATION_GUIDE_HINT_TIMEOUT = 1200.f;
+    //    const F32 SIDE_PANEL_HINT_TIMEOUT = 300.f;
+	//	if (gLoggedInTime.getElapsedTimeF32() > DESTINATION_GUIDE_HINT_TIMEOUT)
 	//	{
 	//		LLFirstUse::notUsingDestinationGuide();
 	//	}
-	//	if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("SidePanelHintTimeout"))
+	//	if (gLoggedInTime.getElapsedTimeF32() > SIDE_PANEL_HINT_TIMEOUT)
 	//	{
 	//		LLFirstUse::notUsingSidePanel();
 	//	}
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@ -1471,8 +1471,8 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
 {
    LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;

-    static LLCachedControl<S32> box_detail_cache(gSavedSettings, "AvatarBoundingBoxComplexity");
-    S32 box_detail = box_detail_cache;
+    const S32 BOX_DETAIL_DEFAULT = 3;
+    S32 box_detail = BOX_DETAIL_DEFAULT;
    if (getOverallAppearance() != AOA_NORMAL)
    {
        if (isControlAvatar())
@ -4889,10 +4889,10 @@ void LLVOAvatar::updateOrientation(LLAgent& agent, F32 speed, F32 delta_time)

 			LLVector3 pelvisDir( mRoot->getWorldMatrix().getFwdRow4().mV );

-			static LLCachedControl<F32> s_pelvis_rot_threshold_slow(gSavedSettings, "AvatarRotateThresholdSlow", 60.0);
-			static LLCachedControl<F32> s_pelvis_rot_threshold_fast(gSavedSettings, "AvatarRotateThresholdFast", 2.0);
+			const F32 AVATAR_PELVIS_ROTATE_THRESHOLD_SLOW = 60.0f;
+			const F32 AVATAR_PELVIS_ROTATE_THRESHOLD_FAST = 2.0f;

-			F32 pelvis_rot_threshold = clamp_rescale(speed, 0.1f, 1.0f, s_pelvis_rot_threshold_slow, s_pelvis_rot_threshold_fast);
+			F32 pelvis_rot_threshold = clamp_rescale(speed, 0.1f, 1.0f, AVATAR_PELVIS_ROTATE_THRESHOLD_SLOW, AVATAR_PELVIS_ROTATE_THRESHOLD_FAST);
 						
 			if (self_in_mouselook)
 			{
@ -10275,9 +10275,7 @@ void LLVOAvatar::parseAppearanceMessage(LLMessageSystem* mesgsys, LLAppearanceMe
 	
 	// Parse visual params, if any.
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_VisualParam);
-    static LLCachedControl<bool> block_some_avatars(gSavedSettings, "BlockSomeAvatarAppearanceVisualParams");
-	bool drop_visual_params_debug = block_some_avatars && (ll_rand(2) == 0); // pretend that ~12% of AvatarAppearance messages arrived without a VisualParam block, for testing
-	if( num_blocks > 1 && !drop_visual_params_debug)
+	if( num_blocks > 1)
 	{
 		//LL_DEBUGS("Avatar") << avString() << " handle visual params, num_blocks " << num_blocks << LL_ENDL;
 		
@ -10322,14 +10320,7 @@ void LLVOAvatar::parseAppearanceMessage(LLMessageSystem* mesgsys, LLAppearanceMe
 	}
 	else
 	{
-		if (drop_visual_params_debug)
-		{
-			LL_INFOS() << "Debug-faked lack of parameters on AvatarAppearance for object: "  << getID() << LL_ENDL;
-		}
-		else
-		{
-			LL_DEBUGS("Avatar") << "AvatarAppearance msg received without any parameters, object: " << getID() << LL_ENDL;
-		}
+        LL_DEBUGS("Avatar") << "AvatarAppearance msg received without any parameters, object: " << getID() << LL_ENDL;
 	}

 	LLVisualParam* appearance_version_param = getVisualParam(11000);
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@ -6111,7 +6111,7 @@ void LLPipeline::setupAvatarLights(bool for_edit)
 		light->setSpotExponent(0.f);
 		light->setSpotCutoff(180.f);
 	}
-	else if (gAvatarBacklight) // Always true (unless overridden in a devs .ini)
+	else if (gAvatarBacklight)
 	{
        LLVector3 light_dir = sun_up ? LLVector3(mSunDir) : LLVector3(mMoonDir);
 		LLVector3 opposite_pos = -light_dir;
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@ -226,22 +226,12 @@ for possible steps to resolve this issue.
              <button.commit_callback
                function="MediaBrowser.OpenWebBrowser" />
            </button>
-            <check_box
-             control_name="UseExternalBrowser"
-             follows="bottom|left"
-             height="20"
-             label="Always open in my web browser"
-             layout="topleft"
-             left_pad="5"
-             name="open_always"
-             top_delta="0"
-             width="200" />
            <button
             follows="bottom|right"
             height="20"
             label="Close"
             layout="topleft"
-             left_pad="80"
+             left_pad="285"
             name="close"
             top_delta="0"
             width="70">