SL-15039 Prune unused preferences #3

DebugInventoryFilters
DebugShowXUINames
DebugSlshareLogTag
DebugStat****
DefaultBlankNormalTexture
DefaultObjectNormalTexture
DefaultObjectSpecularTexture
DefaultUploadCost
DisplayAvatarAgentTarget
DisplayChat
DisplayDebug
DisplayDebugConsole
DisplayIM
DisplayLinden
DisplayRegion
DragAndDropToolTipDelay
DragAndDropDistanceThreshold
DropShadowButton
DropShadowFloater
DropShadowSlider
DropShadowTooltip
UIImgWhiteUUID
UseEnvironmentFromRegion
UseDayCycle
WaterPresetName
SkyPresetName
DayCycleName
DestinationGuideHintTimeout
SidePanelHintTimeout
DisablePrecacheDelayAfterTeleporting

10 files changed, 14 insertions, 23 deletions

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index fe9908a475..061c24db50 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -62,6 +62,7 @@ template class LLButton* LLView::getChild<class LLButton>(
 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
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index ccd31e90c0..ab64440c19 100644
--- 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
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 9ca05a16f3..7a925c0659 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -482,8 +482,6 @@ void LLComboBox::onFocusLost()
 
 void LLComboBox::setButtonVisible(BOOL visible)
 {
-	static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
-
 	mButton->setVisible(visible);
 	if (mTextEntry)
 	{
@@ -491,7 +489,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);
@@ -530,19 +528,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;
@@ -1081,13 +1078,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())
@@ -1096,7 +1091,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);
             }
         }
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 2303cd24b7..d08084cdf5 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1961,10 +1961,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())
 	{
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 5319af1b60..ed0e705fd5 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -596,15 +596,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())
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 32c5ceb20e..fe25ac1647 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3220,10 +3220,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 )
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index 3e5978eb59..22d98469ec 100644
--- 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();
 	
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 2707f7a15c..58ecf3e603 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -1134,8 +1134,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)
 	{
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 30dbd7248f..868e1d21a6 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -53,7 +53,7 @@ class LLWindow;
 class LLView;
 class LLHelp;
 
-
+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
 {
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 67dd24341c..424b4879ce 100644
--- 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