Merge remote-tracking branch 'singu/master'

2013-01-13 18:01:48 +01:00
parent 3a414b21fa 94edef2c3f
commit dcc2e52c61
22 changed files with 409 additions and 202 deletions
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -760,6 +760,17 @@ Found in Advanced->Rendering->Info Displays</string>
      <key>Value</key>
      <integer>1</integer>
    </map>
+    <key>ShowLocalChatFloaterBar</key>
+    <map>
+      <key>Comment</key>
+	  <string>Whether or not local chat should have an input bar, requires a restart.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
    <key>OtherChatsTornOff</key>
    <map>
      <key>Comment</key>
@@ -780,6 +791,17 @@ Found in Advanced->Rendering->Info Displays</string>
      <key>Type</key>
      <string>Boolean</string>
      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>CommunicateSpecificShortcut</key>
+    <map>
+      <key>Comment</key>
+	  <string>When true, the keyboard shortcut for Communicate will not bring up the torn off Friends List.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
      <integer>0</integer>
    </map>
    <key>MarketImporterUpdateFreq</key>
@@ -6125,6 +6147,22 @@ This should be as low as possible, but too low may break functionality</string>
        <integer>0</integer>
      </array>
    </map>
+    <key>FloaterChatBarlessRect</key>
+    <map>
+      <key>Comment</key>
+	  <string>Rectangle for chat history without input bar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>172</integer>
+        <integer>500</integer>
+        <integer>0</integer>
+      </array>
+    </map>
    <key>FloaterClothingRect</key>
    <map>
      <key>Comment</key>
@@ -6189,6 +6227,22 @@ This should be as low as possible, but too low may break functionality</string>
        <integer>0</integer>
      </array>
    </map>
+    <key>FloaterDebugSettingsRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for the Debug Settings floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>300</integer>
+        <integer>245</integer>
+        <integer>0</integer>
+      </array>
+    </map>
    <key>FloaterEnvRect</key>
    <map>
      <key>Comment</key>
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -329,6 +329,7 @@ void LLPrefsAscentChat::refreshValues()
    mIMAnnounceIncoming             = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming");
    mHideTypingNotification         = gSavedSettings.getBOOL("AscentHideTypingNotification");
    mShowGroupNameInChatIM          = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM");
+    mShowLocalChatFloaterBar        = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
    mPlayTypingSound                = gSavedSettings.getBOOL("PlayTypingSound");
    mHideNotificationsInChat        = gSavedSettings.getBOOL("HideNotificationsInChat");
    mEnableMUPose                   = gSavedSettings.getBOOL("AscentAllowMUpose");
@@ -536,6 +537,7 @@ void LLPrefsAscentChat::cancel()
    gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming);
    gSavedSettings.setBOOL("AscentHideTypingNotification",         mHideTypingNotification);
    gSavedSettings.setBOOL("OptionShowGroupNameInChatIM",          mShowGroupNameInChatIM);
+    gSavedSettings.setBOOL("ShowLocalChatFloaterBar",              mShowLocalChatFloaterBar);
    gSavedSettings.setBOOL("PlayTypingSound",                      mPlayTypingSound);
    gSavedSettings.setBOOL("HideNotificationsInChat",              mHideNotificationsInChat);
    gSavedSettings.setBOOL("AscentAllowMUpose",                    mEnableMUPose);
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -66,6 +66,7 @@ protected:
    BOOL mIMAnnounceIncoming;
    BOOL mHideTypingNotification;
    BOOL mShowGroupNameInChatIM;
+    bool mShowLocalChatFloaterBar;
    BOOL mPlayTypingSound;
    BOOL mHideNotificationsInChat;
    BOOL mEnableMUPose;
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -161,7 +161,6 @@ LLAgentCamera::LLAgentCamera() :
 	mFocusObjectDist(0.f),
 	mFocusObjectOffset(),
 	mFocusDotRadius( 0.1f ),			// meters
-	mTrackFocusObject(TRUE),
 	mUIOffset(0.f),

 	mAtKey(0), // Either 1, 0, or -1... indicates that movement-key is pressed
@@ -225,7 +224,6 @@ void LLAgentCamera::init()
 	mCurrentCameraDistance = getCameraOffsetInitial().magVec() * gSavedSettings.getF32("CameraOffsetScale");
 	mTargetCameraDistance = mCurrentCameraDistance;
 	mCameraZoomFraction = 1.f;
-	mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject");

 	mInitialized = true;
 }
@@ -1623,11 +1621,9 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal()
 		{
 			LLDrawable* drawablep = mFocusObject->mDrawable;
 			
-			if (mTrackFocusObject &&
-				drawablep && 
-				drawablep->isActive())
+			if (gSavedSettings.getBOOL("TrackFocusObject") && drawablep)
 			{
-				if (!mFocusObject->isAvatar())
+				if (drawablep->isActive() && !mFocusObject->isAvatar())
 				{
 					if (mFocusObject->isSelected())
 					{
--- a/indra/newview/llagentcamera.h
+++ b/indra/newview/llagentcamera.h
@@ -211,7 +211,6 @@ public:
 	void			setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id);
 	void			clearFocusObject();
 	void			setFocusObject(LLViewerObject* object);
-	void			setObjectTracking(BOOL track) 	{ mTrackFocusObject = track; }
 	const LLVector3d &getFocusGlobal() const		{ return mFocusGlobal; }
 	const LLVector3d &getFocusTargetGlobal() const	{ return mFocusTargetGlobal; }
 private:
@@ -224,7 +223,6 @@ private:
 	F32				mFocusObjectDist;
 	LLVector3		mFocusObjectOffset;
 	F32				mFocusDotRadius; 				// Meters
-	BOOL			mTrackFocusObject;

 	//--------------------------------------------------------------------
 	// Lookat / Pointat
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -108,7 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
 	mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL);
 	// do not automatically open singleton floaters (as result of getInstance())
 	BOOL no_open = FALSE;
-	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open);
+	bool show_bar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
+	LLUICtrlFactory::getInstance()->buildFloater(this, (show_bar ? "floater_chat_history.xml" : "floater_chat_history_barless.xml"), &getFactoryMap(), no_open);

 	childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
 	childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -31,117 +31,129 @@
 */

 #include "llviewerprecompiledheaders.h"
+
 #include "llfloatersettingsdebug.h"
-#include "llfloater.h"
-#include "lluictrlfactory.h"
-#include "llfirstuse.h"
-#include "llcombobox.h"
-#include "llspinctrl.h"
+
 #include "llcolorswatch.h"
+//#include "llfirstuse.h"
+#include "llfloater.h"
+#include "llscrolllistctrl.h"
+#include "llspinctrl.h"
+#include "lltexteditor.h"
+#include "lluictrlfactory.h"
 #include "llviewercontrol.h"
+#include "llwindow.h"

 // [RLVa:KB]
 #include "rlvhandler.h"
 #include "rlvextensions.h"
 // [/RLVa:KB]

-LLFloaterSettingsDebug* LLFloaterSettingsDebug::sInstance = NULL;
-
-LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater(std::string("Configuration Editor"))
+LLFloaterSettingsDebug::LLFloaterSettingsDebug()
+:	LLFloater(std::string("Configuration Editor"))
+,	mCurrentControlVariable(NULL)
+,	mOldControlVariable(NULL)
+,	mOldSearchTerm(std::string("---"))
 {
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_settings_debug.xml");
 }

 LLFloaterSettingsDebug::~LLFloaterSettingsDebug()
 {
-	sInstance = NULL;
+	if (mOldControlVariable)
+		mOldControlVariable->getCommitSignal()->disconnect(boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this));
 }

 BOOL LLFloaterSettingsDebug::postBuild()
 {
-	LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
+	mSettingsScrollList = getChild<LLScrollListCtrl>("settings_scroll_list");

 	struct f : public LLControlGroup::ApplyFunctor
 	{
-		LLComboBox* combo;
-		f(LLComboBox* c) : combo(c) {}
+		settings_map_t* map;
+		f(settings_map_t* m) : map(m) {}
 		virtual void apply(const std::string& name, LLControlVariable* control)
 		{
 			if (!control->isHiddenFromSettingsEditor())
 			{
-				combo->add(name, (void*)control);
+				(*map)[name]=control;
 			}
 		}
-	} func(settings_combo);
+	} func(&mSettingsMap);

 	gSavedSettings.applyToAll(&func);
 	gSavedPerAccountSettings.applyToAll(&func);
 	gColors.applyToAll(&func);

-	settings_combo->sortByName();
-	settings_combo->setCommitCallback(onSettingSelect);
-	settings_combo->setCallbackUserData(this);
-	settings_combo->updateSelection();
+	// Populate the list
+	{
+		for(settings_map_t::iterator it = mSettingsMap.begin(); it != mSettingsMap.end(); it++)
+		{
+			LLSD item;
+			item["columns"][0]["value"] = it->second->getName();
+			mSettingsScrollList->addElement(item, ADD_BOTTOM, it->second);
+		}
+	}
+	mSettingsScrollList->sortByColumnIndex(0, true);
+	mSettingsScrollList->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this));

-	childSetCommitCallback("val_spinner_1", onCommitSettings);
-	childSetUserData("val_spinner_1", this);
-	childSetCommitCallback("val_spinner_2", onCommitSettings);
-	childSetUserData("val_spinner_2", this);
-	childSetCommitCallback("val_spinner_3", onCommitSettings);
-	childSetUserData("val_spinner_3", this);
-	childSetCommitCallback("val_spinner_4", onCommitSettings);
-	childSetUserData("val_spinner_4", this);
-	childSetCommitCallback("val_text", onCommitSettings);
-	childSetUserData("val_text", this);
-	childSetCommitCallback("boolean_combo", onCommitSettings);
-	childSetUserData("boolean_combo", this);
-	childSetCommitCallback("color_swatch", onCommitSettings);
-	childSetUserData("color_swatch", this);
-	childSetAction("default_btn", onClickDefault, this);
+	llinfos << mSettingsScrollList->getItemCount() << " total debug settings displayed." << llendl;
+
+	getChild<LLUICtrl>("val_spinner_1")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
+	getChild<LLUICtrl>("val_spinner_2")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
+	getChild<LLUICtrl>("val_spinner_3")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
+	getChild<LLUICtrl>("val_spinner_4")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
+	getChild<LLUICtrl>("val_text")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
+	getChild<LLUICtrl>("boolean_combo")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
+	getChild<LLUICtrl>("color_swatch")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
+	getChild<LLUICtrl>("copy_btn")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onCopyToClipboard, this));
+	getChild<LLUICtrl>("default_btn")->setCommitCallback(boost::bind(&LLFloaterSettingsDebug::onClickDefault, this));
+	getChild<LLSearchEditor>("search_settings_input")->setSearchCallback(onUpdateFilter, this);
 	mComment = getChild<LLTextEditor>("comment_text");
 	return TRUE;
 }

 void LLFloaterSettingsDebug::draw()
 {
-	LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
-	LLControlVariable* controlp = static_cast<LLControlVariable*>(settings_combo->getCurrentUserdata());
-	updateControl(controlp ? controlp->getCOAActive() : NULL);
+	// check for changes in control visibility, like RLVa does
+	if(mCurrentControlVariable && mCurrentControlVariable->isHiddenFromSettingsEditor() != mOldVisibility)
+		updateControl();

 	LLFloater::draw();
 }

-//static
-void LLFloaterSettingsDebug::show(void*)
+LLControlVariable* LLFloaterSettingsDebug::getControlVariable()
 {
-	if (sInstance == NULL)
-	{
-		sInstance = new LLFloaterSettingsDebug();
+	LLScrollListItem* item = mSettingsScrollList->getFirstSelected();
+	if (!item) return NULL;

-		LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_settings_debug.xml");
-	}
+	LLControlVariable* controlp = static_cast<LLControlVariable*>(item->getUserdata());

-	sInstance->open();		/* Flawfinder: ignore */
+	return controlp ? controlp->getCOAActive() : NULL;
 }

-//static 
-void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl, void* user_data)
+void LLFloaterSettingsDebug::onSettingSelect()
 {
-	LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
-	LLComboBox* combo_box = static_cast<LLComboBox*>(ctrl);
-	LLControlVariable* controlp = static_cast<LLControlVariable*>(combo_box->getCurrentUserdata());
+	mCurrentControlVariable = getControlVariable();

-	floaterp->updateControl(controlp ? controlp->getCOAActive() : NULL);
+	if (mOldControlVariable == mCurrentControlVariable) return;
+
+	// unbind change control signal from previously selected control
+	if(mOldControlVariable)
+		mOldControlVariable->getCommitSignal()->disconnect(boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this));
+
+	// bind change control signal, so we can see updates to the current control in realtime
+	if(mCurrentControlVariable)
+		mCurrentControlVariable->getCommitSignal()->connect(boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this));
+
+	mOldControlVariable = mCurrentControlVariable;
+
+	updateControl();
 }

-//static
-void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
+void LLFloaterSettingsDebug::onCommitSettings()
 {
-	LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
-
-	LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
-	LLControlVariable* controlp = static_cast<LLControlVariable*>(settings_combo->getCurrentUserdata());
-	controlp = controlp ? controlp->getCOAActive() : NULL;
-	if(!controlp)//Uh oh!
+	if (!mCurrentControlVariable)
 		return;

 	LLVector3 vector;
@@ -152,88 +164,89 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 	LLColor4U col4U;
 	LLColor4 color_with_alpha;

-	switch(controlp->type())
+	switch(mCurrentControlVariable->type())
 	{		
 	  case TYPE_U32:
-		controlp->set(floaterp->childGetValue("val_spinner_1"));
+		mCurrentControlVariable->set(getChild<LLUICtrl>("val_spinner_1")->getValue());
 		break;
 	  case TYPE_S32:
-		controlp->set(floaterp->childGetValue("val_spinner_1"));
+		mCurrentControlVariable->set(getChild<LLUICtrl>("val_spinner_1")->getValue());
 		break;
 	  case TYPE_F32:
-		controlp->set(LLSD(floaterp->childGetValue("val_spinner_1").asReal()));
+		mCurrentControlVariable->set(LLSD(getChild<LLUICtrl>("val_spinner_1")->getValue().asReal()));
 		break;
 	  case TYPE_BOOLEAN:
-		controlp->set(floaterp->childGetValue("boolean_combo"));
+		mCurrentControlVariable->set(getChild<LLUICtrl>("boolean_combo")->getValue());
 		break;
 	  case TYPE_STRING:
-		controlp->set(LLSD(floaterp->childGetValue("val_text").asString()));
+		mCurrentControlVariable->set(LLSD(getChild<LLUICtrl>("val_text")->getValue().asString()));
 		break;
 	  case TYPE_VEC3:
-		vector.mV[VX] = (F32)floaterp->childGetValue("val_spinner_1").asReal();
-		vector.mV[VY] = (F32)floaterp->childGetValue("val_spinner_2").asReal();
-		vector.mV[VZ] = (F32)floaterp->childGetValue("val_spinner_3").asReal();
-		controlp->set(vector.getValue());
+		vector.mV[VX] = (F32)getChild<LLUICtrl>("val_spinner_1")->getValue().asReal();
+		vector.mV[VY] = (F32)getChild<LLUICtrl>("val_spinner_2")->getValue().asReal();
+		vector.mV[VZ] = (F32)getChild<LLUICtrl>("val_spinner_3")->getValue().asReal();
+		mCurrentControlVariable->set(vector.getValue());
 		break;
 	  case TYPE_VEC3D:
-		vectord.mdV[VX] = floaterp->childGetValue("val_spinner_1").asReal();
-		vectord.mdV[VY] = floaterp->childGetValue("val_spinner_2").asReal();
-		vectord.mdV[VZ] = floaterp->childGetValue("val_spinner_3").asReal();
-		controlp->set(vectord.getValue());
+		vectord.mdV[VX] = getChild<LLUICtrl>("val_spinner_1")->getValue().asReal();
+		vectord.mdV[VY] = getChild<LLUICtrl>("val_spinner_2")->getValue().asReal();
+		vectord.mdV[VZ] = getChild<LLUICtrl>("val_spinner_3")->getValue().asReal();
+		mCurrentControlVariable->set(vectord.getValue());
 		break;
 	  case TYPE_RECT:
-		rect.mLeft = floaterp->childGetValue("val_spinner_1").asInteger();
-		rect.mRight = floaterp->childGetValue("val_spinner_2").asInteger();
-		rect.mBottom = floaterp->childGetValue("val_spinner_3").asInteger();
-		rect.mTop = floaterp->childGetValue("val_spinner_4").asInteger();
-		controlp->set(rect.getValue());
+		rect.mLeft = getChild<LLUICtrl>("val_spinner_1")->getValue().asInteger();
+		rect.mRight = getChild<LLUICtrl>("val_spinner_2")->getValue().asInteger();
+		rect.mBottom = getChild<LLUICtrl>("val_spinner_3")->getValue().asInteger();
+		rect.mTop = getChild<LLUICtrl>("val_spinner_4")->getValue().asInteger();
+		mCurrentControlVariable->set(rect.getValue());
 		break;
 	  case TYPE_COL4:
-		col3.setValue(floaterp->childGetValue("color_swatch"));
-		col4 = LLColor4(col3, (F32)floaterp->childGetValue("val_spinner_4").asReal());
-		controlp->set(col4.getValue());
+		col3.setValue(getChild<LLUICtrl>("val_color_swatch")->getValue());
+		col4 = LLColor4(col3, (F32)getChild<LLUICtrl>("val_spinner_4")->getValue().asReal());
+		mCurrentControlVariable->set(col4.getValue());
 		break;
 	  case TYPE_COL3:
-		controlp->set(floaterp->childGetValue("color_swatch"));
-		//col3.mV[VRED] = (F32)floaterp->childGetValue("val_spinner_1").asC();
-		//col3.mV[VGREEN] = (F32)floaterp->childGetValue("val_spinner_2").asReal();
-		//col3.mV[VBLUE] = (F32)floaterp->childGetValue("val_spinner_3").asReal();
-		//controlp->set(col3.getValue());
+		mCurrentControlVariable->set(getChild<LLUICtrl>("val_color_swatch")->getValue());
+		//col3.mV[VRED] = (F32)getChild<LLUICtrl>("val_spinner_1")->getValue().asC();
+		//col3.mV[VGREEN] = (F32)getChild<LLUICtrl>("val_spinner_2")->getValue().asReal();
+		//col3.mV[VBLUE] = (F32)getChild<LLUICtrl>("val_spinner_3")->getValue().asReal();
+		//mCurrentControlVariable->set(col3.getValue());
 		break;
 	  case TYPE_COL4U:
-		col3.setValue(floaterp->childGetValue("color_swatch"));
+		col3.setValue(getChild<LLUICtrl>("val_color_swatch")->getValue());
 		col4U.setVecScaleClamp(col3);
-		col4U.mV[VALPHA] = floaterp->childGetValue("val_spinner_4").asInteger();
-		controlp->set(col4U.getValue());
+		col4U.mV[VALPHA] = getChild<LLUICtrl>("val_spinner_4")->getValue().asInteger();
+		mCurrentControlVariable->set(col4U.getValue());
 		break;
 	  default:
 		break;
 	}
 }

-// static
-void LLFloaterSettingsDebug::onClickDefault(void* user_data)
+void LLFloaterSettingsDebug::onClickDefault()
 {
-	LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
-	LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
-	LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
-
-	if (controlp)
+	if (mCurrentControlVariable)
 	{
-		controlp = controlp->getCOAActive();
-		controlp->resetToDefault(true);
-		floaterp->updateControl(controlp);
+		mCurrentControlVariable->resetToDefault(true);
+		updateControl();
 	}
 }

-// we've switched controls, or doing per-frame update, so update spinners, etc.
-void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
+void LLFloaterSettingsDebug::onCopyToClipboard()
+{
+	if (mCurrentControlVariable)
+		getWindow()->copyTextToClipboard(utf8str_to_wstring(mCurrentControlVariable->getName()));
+}
+
+// we've switched controls, so update spinners, etc.
+void LLFloaterSettingsDebug::updateControl()
 {
 	LLSpinCtrl* spinner1 = getChild<LLSpinCtrl>("val_spinner_1");
 	LLSpinCtrl* spinner2 = getChild<LLSpinCtrl>("val_spinner_2");
 	LLSpinCtrl* spinner3 = getChild<LLSpinCtrl>("val_spinner_3");
 	LLSpinCtrl* spinner4 = getChild<LLSpinCtrl>("val_spinner_4");
-	LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("color_swatch");
+	LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("val_color_swatch");
+	LLUICtrl* bool_ctrl = getChild<LLUICtrl>("boolean_combo");

 	if (!spinner1 || !spinner2 || !spinner3 || !spinner4 || !color_swatch)
 	{
@@ -247,45 +260,33 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 	spinner3->setVisible(FALSE);
 	spinner4->setVisible(FALSE);
 	color_swatch->setVisible(FALSE);
-	childSetVisible("val_text", FALSE);
+	getChildView("val_text")->setVisible( FALSE);
 	mComment->setText(LLStringUtil::null);
+	childSetEnabled("copy_btn", false);
+	childSetEnabled("default_btn", false);
+	bool_ctrl->setVisible(false);

-	if (controlp)
+	if (mCurrentControlVariable)
 	{
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.1d
-		if (rlv_handler_t::isEnabled())
-		{
-			// Don't allow changing DBG_WRITE debug settings under @setdebug=n
-			bool fEnable = !( (gRlvHandler.hasBehaviour(RLV_BHVR_SETDEBUG)) && 
-				(RlvExtGetSet::getDebugSettingFlags(controlp->getName()) & RlvExtGetSet::DBG_WRITE) );
-			// Don't allow toggling "Basic Shaders" and/or "Atmopsheric Shaders" through the debug settings under @setenv=n
-			fEnable &= !((gRlvHandler.hasBehaviour(RLV_BHVR_SETENV)) && 
-				(("VertexShaderEnable" == controlp->getName()) || ("WindLightUseAtmosShaders" == controlp->getName())));
-			#ifdef RLV_EXTENSION_STARTLOCATION
-				// Don't allow toggling RLVaLoginLastLocation
-				fEnable &= !(RLV_SETTING_LOGINLASTLOCATION == controlp->getName());
-			#endif // RLV_EXTENSION_STARTLOCATION
-
-			// NOTE: this runs per-frame so there's no need to explictly handle onCommitSettings() or onClickDefault()
-			spinner1->setEnabled(fEnable);
-			spinner2->setEnabled(fEnable);
-			spinner3->setEnabled(fEnable);
-			spinner4->setEnabled(fEnable);
-			color_swatch->setEnabled(fEnable);
-			childSetEnabled("val_text", fEnable);
-			childSetEnabled("boolean_combo", fEnable);
-			childSetEnabled("default_btn", fEnable);
-		}
+// [RLVa:KB] - Checked: 2011-05-28 (RLVa-1.4.0a) | Modified: RLVa-1.4.0a
+		// If "HideFromEditor" was toggled while the floater is open then we need to manually disable access to the control
+		mOldVisibility = mCurrentControlVariable->isHiddenFromSettingsEditor();
+		spinner1->setEnabled(!mOldVisibility);
+		spinner2->setEnabled(!mOldVisibility);
+		spinner3->setEnabled(!mOldVisibility);
+		spinner4->setEnabled(!mOldVisibility);
+		color_swatch->setEnabled(!mOldVisibility);
+		childSetEnabled("val_text", !mOldVisibility);
+		bool_ctrl->setEnabled(!mOldVisibility);
+		childSetEnabled("default_btn", !mOldVisibility);
 // [/RLVa:KB]

-		controlp = controlp->getCOAActive();
-		eControlType type = controlp->type();
+		childSetEnabled("copy_btn", true);

-		//hide combo box only for non booleans, otherwise this will result in the combo box closing every frame
-		childSetVisible("boolean_combo", type == TYPE_BOOLEAN);
-		
+		eControlType type = mCurrentControlVariable->type();
+
+		mComment->setText(mCurrentControlVariable->getName() + std::string(": ") + mCurrentControlVariable->getComment());

-		mComment->setText(controlp->getComment());
 		spinner1->setMaxValue(F32_MAX);
 		spinner2->setMaxValue(F32_MAX);
 		spinner3->setMaxValue(F32_MAX);
@@ -311,7 +312,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			spinner4->setIncrement(0.1f);
 		}

-		LLSD sd = controlp->get();
+		LLSD sd = mCurrentControlVariable->get();
 		switch(type)
 		{
 		  case TYPE_U32:
@@ -348,23 +349,17 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			}
 			break;
 		  case TYPE_BOOLEAN:
-			if (!childHasFocus("boolean_combo"))
+			bool_ctrl->setVisible(true);
+			if (!bool_ctrl->hasFocus())
 			{
-				if (sd.asBoolean())
-				{
-					childSetValue("boolean_combo", LLSD("true"));
-				}
-				else
-				{
-					childSetValue("boolean_combo", LLSD(""));
-				}
+				bool_ctrl->setValue(sd.asInteger());
 			}
 			break;
 		  case TYPE_STRING:
-			childSetVisible("val_text", TRUE);
-			if (!childHasFocus("val_text"))
+			getChildView("val_text")->setVisible( TRUE);
+			if (!getChild<LLUICtrl>("val_text")->hasFocus())
 			{
-				childSetValue("val_text", sd);
+				getChild<LLUICtrl>("val_text")->setValue(sd);
 			}
 			break;
 		  case TYPE_VEC3:
@@ -530,3 +525,58 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 	}

 }
+
+void LLFloaterSettingsDebug::onUpdateFilter(const std::string& searchTerm, void*)
+{
+	LLFloaterSettingsDebug::getInstance()->updateFilter(searchTerm);
+}
+
+void LLFloaterSettingsDebug::updateFilter(std::string searchTerm)
+{
+	// make sure not to reselect the first item in the list on focus restore
+	if (searchTerm == mOldSearchTerm) return;
+
+	mOldSearchTerm = searchTerm;
+
+	LLStringUtil::toLower(searchTerm);
+
+	mSettingsScrollList->deleteAllItems();
+
+	for(settings_map_t::iterator it = mSettingsMap.begin(); it != mSettingsMap.end(); it++)
+	{
+		bool addItem = searchTerm.empty();
+		if (!addItem)
+		{
+			std::string itemValue = it->second->getName();
+
+			LLStringUtil::toLower(itemValue);
+
+			if (itemValue.find(searchTerm, 0) != std::string::npos)
+			{
+				addItem = true;
+			}
+			else // performance: broken out to save toLower calls on comments
+			{
+				std::string itemComment = it->second->getComment();
+				LLStringUtil::toLower(itemComment);
+				if (itemComment.find(searchTerm, 0) != std::string::npos)
+					addItem = true;
+			}
+		}
+
+		if (addItem)
+		{
+			LLSD item;
+			item["columns"][0]["value"] = it->second->getName();
+			mSettingsScrollList->addElement(item, ADD_BOTTOM, it->second);
+		}
+	}
+	mSettingsScrollList->sortByColumnIndex(0, true);
+
+	// if at least one match was found, highlight and select the topmost entry in the list
+	// but only if actually a search term was given
+	if (mSettingsScrollList->getItemCount() && !searchTerm.empty())
+		mSettingsScrollList->selectFirstItem();
+
+	onSettingSelect();
+}
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -35,9 +35,13 @@

 #include "llcontrol.h"
 #include "llfloater.h"
-#include "lltexteditor.h"

-class LLFloaterSettingsDebug : public LLFloater
+class LLScrollListCtrl;
+class LLTextEditor;
+
+class LLFloaterSettingsDebug
+:	public LLFloater
+,	public LLSingleton<LLFloaterSettingsDebug>
 {
 public:
 	LLFloaterSettingsDebug();
@@ -46,17 +50,33 @@ public:
 	virtual BOOL postBuild();
 	virtual void draw();

-	void updateControl(LLControlVariable* control);
+	void updateControl();

-	static void show(void*);
-	static void onSettingSelect(LLUICtrl* ctrl, void* user_data);
-	static void onCommitSettings(LLUICtrl* ctrl, void* user_data);
-	static void onClickDefault(void* user_data);
+	// updates control filter to display in the controls list on keystroke
+	static void onUpdateFilter(const std::string& searchTerm, void*);
+	void updateFilter(std::string searchTerm);
+
+	void onSettingSelect();
+	void onCommitSettings();
+	void onClickDefault();
+	void onCopyToClipboard();
+
+private:
+	// returns a pointer to the currently selected control variable, or NULL
+	LLControlVariable* getControlVariable();

 protected:
-	static LLFloaterSettingsDebug* sInstance;
+	typedef std::map<std::string,LLControlVariable*> settings_map_t;
+
+	settings_map_t mSettingsMap;
+
+	std::string mOldSearchTerm;
+	LLControlVariable* mCurrentControlVariable;
+	LLControlVariable* mOldControlVariable;
+	bool mOldVisibility;
+
+	LLScrollListCtrl* mSettingsScrollList;
 	LLTextEditor* mComment;
 };

 #endif //LLFLOATERDEBUGSETTINGS_H
-
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1137,11 +1137,17 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
 		gFloaterView->addChild(floater); // reparent to floater view
 		LLFloater* focused_floater = gFloaterView->getFocusedFloater(); // obtain the focused floater
 		floater->open(); // make the new chat floater appear
+		static LLCachedControl<bool> minimize("OtherChatsTornOffAndMinimized");
 		if (focused_floater != NULL) // there was a focused floater
 		{
-			floater->setMinimized(true); // so minimize this one, for now
+			floater->setMinimized(minimize); // so minimize this one, for now, if desired
 			focused_floater->setFocus(true); // and work around focus being removed by focusing on the last
 		}
+		else if (minimize)
+		{
+			floater->setFocus(false); // work around focus being granted to new floater
+			floater->setMinimized(true);
+		}
 	}
 	mFloaters.insert(floater->getHandle());
 	return floater;
@@ -1179,11 +1185,12 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
 		static LLCachedControl<bool> minimize("OtherChatsTornOffAndMinimized");
 		if (focused_floater != NULL) // there was a focused floater
 		{
-			floater->setMinimized(true); // so minimize this one, for now
+			floater->setMinimized(minimize); // so minimize this one, for now, if desired
 			focused_floater->setFocus(true); // and work around focus being removed by focusing on the last
 		}
 		else if (minimize)
 		{
+			floater->setFocus(false); // work around focus being granted to new floater
 			floater->setMinimized(true);
 		}
 	}
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -500,7 +500,6 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
 		// Might have missed last update due to timing.
 		LLSelectMgr::getInstance()->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
 		LLSelectMgr::getInstance()->enableSilhouette(TRUE);
-		//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));

 		LLSelectMgr::getInstance()->updateSelectionCenter();
 		LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -385,7 +385,6 @@ BOOL LLManipScale::handleMouseUp(S32 x, S32 y, MASK mask)
 		// Might have missed last update due to UPDATE_DELAY timing
 		LLSelectMgr::getInstance()->sendMultipleUpdate( mLastUpdateFlags );
 		
-		//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
 		LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
 	}
 	return LLManip::handleMouseUp(x, y, mask);
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -1077,7 +1077,6 @@ BOOL LLManipTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
 		
 		mInSnapRegime = FALSE;
 		LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
-		//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
 	}

 	return LLManip::handleMouseUp(x, y, mask);
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -385,7 +385,7 @@ void LLPanelAvatarFirstLife::onClickImage(void* data)
 			S32 left, top;
 			gFloaterView->getNewFloaterPosition(&left, &top);
 			LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-			rect.translate( left - rect.mLeft, top - rect.mTop );
+			rect.translate( left - rect.mLeft, rect.mTop - top ); // Changed to avoid textures being sunken below the window border.
 			LLPreviewTexture* preview = new LLPreviewTexture("preview task texture",
 													 rect,
 													 std::string("Profile First Life Picture"),
@@ -433,7 +433,7 @@ void LLPanelAvatarSecondLife::onClickImage(void* data)
 				S32 left, top;
 				gFloaterView->getNewFloaterPosition(&left, &top);
 				LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-				rect.translate( left - rect.mLeft, top - rect.mTop );
+				rect.translate( left - rect.mLeft, rect.mTop - top ); // Changed to avoid textures being sunken below the window border.
 				LLPreviewTexture* preview = new LLPreviewTexture("preview task texture",
 														 rect,
 														 std::string("Profile Picture: ") +	name_text,
--- a/indra/newview/llprefschat.cpp
+++ b/indra/newview/llprefschat.cpp
@@ -66,6 +66,7 @@ private:
 	LLColor4 mHTMLLinkColor;
 	BOOL mChatFullWidth;
 	BOOL mCloseChatOnReturn;
+	bool mOnlyComm;
 	BOOL mArrowKeysMoveAvatar;
 	BOOL mShowTimestamps;
 	BOOL mPlayTypingAnim;
@@ -111,6 +112,7 @@ LLPrefsChatImpl::LLPrefsChatImpl()
 	childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
 	childSetValue("translate_language_combobox", 	gSavedSettings.getString("TranslateLanguage"));
 	childSetValue("translate_chat", 	gSavedSettings.getBOOL("TranslateChat"));
+	mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
 }

 void LLPrefsChatImpl::refreshValues()
@@ -139,6 +141,7 @@ void LLPrefsChatImpl::refreshValues()
 	mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
 	mTranslateLanguage = gSavedSettings.getString("TranslateLanguage");
 	mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
+	mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
 }

 void LLPrefsChatImpl::cancel()
@@ -166,6 +169,7 @@ void LLPrefsChatImpl::cancel()
 	gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);	
 	gSavedSettings.setString("TranslateLanguage", mTranslateLanguage);	
 	gSavedSettings.setBOOL("TranslateChat", mTranslateChat);
+	gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm);
 }

 void LLPrefsChatImpl::apply()
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -217,6 +217,7 @@ protected:
 	BOOL				mNoCopyTextureSelected;
 	F32					mContextConeOpacity;
 	LLSaveFolderState	mSavedFolderState;
+	BOOL				mSelectedItemPinned;
 	LLScrollListCtrl*   mLocalScrollCtrl; // tag: vaa emerald local_asset_browser
 };

@@ -249,7 +250,8 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	mSearchEdit(NULL),
 	mImmediateFilterPermMask(immediate_filter_perm_mask),
 	mNonImmediateFilterPermMask(non_immediate_filter_perm_mask),
-	mContextConeOpacity(0.f)
+	mContextConeOpacity(0.f),
+	mSelectedItemPinned(FALSE)
 {
 	mCanApplyImmediately = can_apply_immediately;
 	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_texture_ctrl.xml");
@@ -506,8 +508,13 @@ BOOL LLFloaterTexturePicker::postBuild()
 		mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
 		mInventoryPanel->setAllowMultiSelect(FALSE);

-		// store this filter as the default one
-		mInventoryPanel->getRootFolder()->getFilter()->markDefault();
+		// Disable auto selecting first filtered item because it takes away
+		// selection from the item set by LLTextureCtrl owning this floater.
+		mInventoryPanel->getRootFolder()->setAutoSelectOverride(TRUE);
+
+		// Commented out to scroll to currently selected texture. See EXT-5403.
+		// // store this filter as the default one
+		// mInventoryPanel->getRootFolder()->getFilter()->markDefault();

 		// Commented out to stop opening all folders with textures
 		// mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_TEXTURE);
@@ -675,6 +682,31 @@ void LLFloaterTexturePicker::draw()
 			// Draw X
 			gl_draw_x(interior, LLColor4::black );
 		}
+
+		if (mSelectedItemPinned) return;
+
+		LLFolderView* folder_view = mInventoryPanel->getRootFolder();
+		if (!folder_view) return;
+
+		LLInventoryFilter* filter = folder_view->getFilter();
+		if (!filter) return;
+
+		bool is_filter_active = folder_view->getCompletedFilterGeneration() < filter->getCurrentGeneration() &&
+				filter->isNotDefault();
+
+		// After inventory panel filter is applied we have to update
+		// constraint rect for the selected item because of folder view
+		// AutoSelectOverride set to TRUE. We force PinningSelectedItem
+		// flag to FALSE state and setting filter "dirty" to update
+		// scroll container to show selected item (see LLFolderView::doIdle()).
+		if (!is_filter_active && !mSelectedItemPinned)
+		{
+			folder_view->setPinningSelectedItem(mSelectedItemPinned);
+			folder_view->dirtyFilter();
+			folder_view->arrangeFromRoot();
+
+			mSelectedItemPinned = TRUE;
+		}
 	}
 }

--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -983,8 +983,6 @@ BOOL LLToolGrab::handleMouseUp(S32 x, S32 y, MASK mask)
 		gGrabTransientTool = NULL;
 	}

-	//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
-
 	return TRUE;
 } 

--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -880,7 +880,7 @@ void init_menus()
 	
 	menu = new LLMenuGL(CLIENT_MENU_NAME);
 	menu->setCanTearOff(FALSE);
-	menu->addChild(new LLMenuItemCallGL("Debug Settings...", LLFloaterSettingsDebug::show, NULL, NULL));
+	menu->addChild(new LLMenuItemCallGL("Debug Settings...", handle_singleton_toggle<LLFloaterSettingsDebug>, NULL, NULL));
 	gLoginMenuBarView->addChild(menu);
 	menu->updateParent(LLMenuGL::sMenuContainer);

@@ -1223,7 +1223,7 @@ void init_client_menu(LLMenuGL* menu)
 										&menu_check_control,
 										(void*)"SaveMinidump"));

-	menu->addChild(new LLMenuItemCallGL("Debug Settings...", LLFloaterSettingsDebug::show, NULL, NULL));
+	menu->addChild(new LLMenuItemCallGL("Debug Settings...", handle_singleton_toggle<LLFloaterSettingsDebug>, NULL, NULL));
 	menu->addChild(new LLMenuItemCheckGL("View Admin Options", &handle_admin_override_toggle, NULL, &check_admin_override, NULL, 'V', MASK_CONTROL | MASK_ALT));

 	menu->addChild(new LLMenuItemCallGL("Request Admin Status", 
@@ -2062,7 +2062,8 @@ class LLViewCommunicate : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
+		static LLCachedControl<bool> only_comm("CommunicateSpecificShortcut");
+		if (!only_comm && LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
 		{
 			LLFloaterMyFriends::toggleInstance();
 		}
--- a/indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true" can_tear_off="true" enabled="true" height="275" left="15"
+     min_height="150" min_width="425" name="chat floater" rect_control="FloaterChatBarlessRect" title="Local Chat" width="435">
+	<string name="ringing">Connecting to in-world Voice Chat...</string>
+	<string name="connected">Connected</string>
+	<string name="unavailable">Voice not available at your current location</string>
+	<string name="hang_up">Disconnected from in-world Voice Chat</string>
+	<string name="voice_icon">icn_voice-localchat.tga</string>
+	<string name="IM_logging_string">-- Instant message logging enabled --</string>
+	<string name="IM_end_log_string">-- End of Log --</string>
+	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
+	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
+	<string name="ScriptTakeMoney">Take in-world money ([CURRENCY]) from you</string>
+	<string name="ActOnControlInputs">Act on your control inputs</string>
+	<string name="RemapControlInputs">Remap your control inputs</string>
+	<string name="AnimateYourAvatar">Animate your avatar</string>
+	<string name="AttachToYourAvatar">Attach to your avatar</string>
+	<string name="ReleaseOwnership">Release ownership and become public</string>
+	<string name="LinkAndDelink">Link and delink from other objects</string>
+	<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
+	<string name="ChangePermissions">Change its permissions</string>
+	<string name="TrackYourCamera">Track your camera</string>
+	<string name="TeleportYourAgent">Teleport you</string>
+	<string name="ControlYourCamera">Control your camera</string>
+	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels">
+		<layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305">
+			<combo_box follows="left|top" height="18" label="Gestures" left="6" name="Gesture" width="120">
+				<combo_item name="Gestures">Gestures</combo_item>
+			</combo_box>
+			<check_box bottom_delta="-2" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Show Muted Text" left_delta="124" name="show mutes" width="116"/>
+			<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
+			<button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/>
+			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/>
+			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="5" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="104" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
+			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="5" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="104" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
+			<panel bottom="0" left="0" name="chat_panel" height="0" width="0" visible="false">
+				<string name="gesture_label">Gestures</string>
+			</panel>
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
+	</layout_stack>
+</floater>
--- a/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="215" name="settings_debug"
-     title="Debug Settings" width="350">
-	<combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
-	     height="20" left="15" max_chars="255" name="settings_combo" />
-	<text_editor bottom_delta="-75" enabled="false" height="60" width="320" hide_scrollbar="true"
+     can_resize="true" height="220" name="settings_debug" min_height="220" min_width="285"
+     title="Debug Settings" width="300" rect_control="FloaterDebugSettingsRect">
+    <search_editor bottom="-40" follows="top|left|right" height="20" label="Search" left="10" right="-10" max_chars="255" name="search_settings_input" tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment."/>
+	<scroll_list height="20" bottom_delta="-24" follows="all" left="10" right="-10" name="settings_scroll_list" />
+	<text_editor follows="left|right" bottom_delta="-64" enabled="false" height="60" width="320" left="10" right="-10" hide_scrollbar="true"
 	     name="comment_text" word_wrap="true" />
-	<combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
+	<radio_group bottom_delta="-48" draw_border="false" follows="bottom|left|right" height="36"
 	     left="15" name="boolean_combo" visible="false">
-		<combo_item name="TRUE" value="true">
-			TRUE
-		</combo_item>
-		<combo_item name="FALSE" value="">
-			FALSE
-		</combo_item>
-	</combo_box>
-	<line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="300" />
+		<radio_item bottom="-18" height="15" name="TRUE" value="1">
+			True
+		</radio_item>
+		<radio_item bottom="-36" height="15" name="FALSE" value="0">
+			False
+		</radio_item>
+	</radio_group>
+	<line_editor follows="bottom|left|right" bottom="52" left="15" right="-15" height="20" name="val_text" visible="false" width="300" />
 	<color_swatch bottom="30" can_apply_immediately="true" height="55" label="Color"
-	     name="color_swatch" visible="true" width="37" />
-	<spinner bottom_delta="25" height="20" label="x" label_width="40" max_val="10000000"
+	     name="val_color_swatch" visible="false" width="37" />
+	<spinner bottom_delta="31" height="24" label="x" label_width="40" max_val="10000000"
 	     name="val_spinner_1" visible="false" width="120" />
-	<spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
+	<spinner bottom_delta="0" height="24" label="x" label_width="40" left_delta="135"
 	     max_val="10000000" name="val_spinner_2" visible="false" width="120" />
-	<spinner bottom_delta="-20" height="20" label="x" label_width="40" left="15"
+	<spinner bottom_delta="-23" height="24" label="x" label_width="40" left="15"
 	     max_val="10000000" name="val_spinner_3" visible="false" width="120" />
-	<spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
+	<spinner bottom_delta="0" height="24" label="x" label_width="40" left_delta="135"
 	     max_val="10000000" name="val_spinner_4" visible="false" width="120" />
-	<button bottom="5" height="20" label="Reset to default" left="15" name="default_btn"
-	     width="150" />
+	<button bottom="10" height="20" label="Copy Name" left="10" name="copy_btn" tool_tip="Copy the name of this setting."
+	     width="130" />
+	<button follows="right" bottom_delta="0" height="20" label="Reset to default" right="-10" name="default_btn"
+	     width="130" />
 </floater>
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -577,7 +577,7 @@
 			<on_enable function="World.EnableBuyLand" />
 		</menu_item_call>
 		<menu_item_call bottom="-308" enabled="true" height="19" label="Region/Estate..." left="0"
-		     mouse_opaque="true" name="Region/Estate..." width="185">
+		     mouse_opaque="true" name="Region/Estate..." shortcut="alt|R" width="185">
 			<on_click function="ShowFloater" userdata="about region" />
 		</menu_item_call>
 		<menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0"
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -22,6 +22,7 @@
        label="Do not echo/log notifications in chat" name="hide_notifications_in_chat_check"/>
      <check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
        label="Show group name in chat" tool_tip="The name of the group will also be displayed if the IM is from group chat." name="append_group_name_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="ShowLocalChatFloaterBar" label="Show local chat bar in floater (Needs restart)" tool_tip="Whether or not to display the input bar at the bottom of the local chat floater." name="show_local_chat_floater_bar"/>
      <check_box bottom="-120" left="10" control_name="AscentAllowMUpose" initial_value="false"
        label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
      <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -24,8 +24,9 @@
 	<text bottom_delta="6" follows="left|top" height="10" left="405" name="text_box5">(# lines)</text>
 	<slider bottom_delta="-25" control_name="ConsoleBackgroundOpacity" follows="top" height="12" increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1" min_val="0" name="console_opacity" value="0.4" width="200"/>
 	<check_box bottom_delta="-25" control_name="ChatFullWidth" follows="top" height="16" initial_value="false" label="Use full screen width (Requires restart)" name="chat_full_width_check"/>
-	<text bottom_delta="-22" height="10" left="12"	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
+	<text bottom_delta="-12" height="10" left="12"	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
 	<check_box bottom_delta="-8"  follows="top" height="16" initial_value="false" label="Close chat bar after hitting return" left="148" name="close_chat_on_return_check"/>
+	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Disallow communicate shortcut opening detached friends list" left="148" control_name="CommunicateSpecificShortcut" name="only_comm"/>
 	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Arrow keys always move avatar when chatting" name="arrow_keys_move_avatar_check"/>
 	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show timestamps in Local Chat" name="show_timestamps_check"/>
 	<check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" follows="top" height="16" initial_value="false" label="Show script errors and warnings as regular chat" name="script_errors_as_chat"/>