From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 08:04:56 +0000
Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
 ignore-dead-branch

---
 indra/newview/lllocationinputctrl.cpp | 513 ++++++++++++++++++++++++++++++++++
 1 file changed, 513 insertions(+)
 create mode 100644 indra/newview/lllocationinputctrl.cpp

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
new file mode 100644
index 0000000000..4aaa7ca6cb
--- /dev/null
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -0,0 +1,513 @@
+/**
+ * @file lllocationinputctrl.cpp
+ * @brief Combobox-like location input control
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+// file includes
+#include "lllocationinputctrl.h"
+
+// common includes
+#include "llbutton.h"
+#include "llfloaterreg.h"
+#include "llfocusmgr.h"
+#include "llkeyboard.h"
+#include "llstring.h"
+#include "lluictrlfactory.h"
+#include "v2math.h"
+
+// newview includes
+#include "llagent.h"
+#include "llfloaterland.h"
+#include "llinventorymodel.h"
+#include "lllandmarklist.h"
+#include "lllocationhistory.h"
+#include "llpanelplaces.h"
+#include "llsidetray.h"
+#include "llviewerinventory.h"
+#include "llviewerparcelmgr.h"
+
+//============================================================================
+/*
+ * "ADD LANDMARK" BUTTON UPDATING LOGIC
+ * 
+ * If the current parcel has been landmarked, we should draw
+ * a special image on the button.
+ * 
+ * To avoid determining the appropriate image on every draw() we do that
+ * only in the following cases:
+ * 1) Navbar is shown for the first time after login.
+ * 2) Agent moves to another parcel.
+ * 3) A landmark is created or removed.
+ * 
+ * The first case is handled by the handleLoginComplete() method.
+ * 
+ * The second case is handled by setting the "agent parcel changed" callback
+ * on LLViewerParcelMgr.
+ * 
+ * The third case is the most complex one. We have two inventory observers for that:
+ * one is designated to handle adding landmarks, the other handles removal.
+ * Let's see how the former works.
+ * 
+ * When we get notified about landmark addition, the landmark position is unknown yet. What we can
+ * do at that point is initiate loading the landmark data by LLLandmarkList and set the
+ * "loading finished" callback on it. Finally, when the callback is triggered,
+ * we can determine whether the landmark refers to a point within the current parcel
+ * and choose the appropriate image for the "Add landmark" button.
+ */
+
+// Returns true if the given inventory item is a landmark pointing to the current parcel.
+// Used to filter inventory items.
+class LLIsAgentParcelLandmark : public LLInventoryCollectFunctor
+{
+public:
+	/*virtual*/ bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+	{
+		if (!item || item->getType() != LLAssetType::AT_LANDMARK)
+			return false;
+
+		LLLandmark* landmark = gLandmarkList.getAsset(item->getAssetUUID());
+		if (!landmark) // the landmark not been loaded yet
+			return false;
+
+		LLVector3d landmark_global_pos;
+		if (!landmark->getGlobalPos(landmark_global_pos))
+			return false;
+
+		return LLViewerParcelMgr::getInstance()->inAgentParcel(landmark_global_pos);
+	}
+};
+
+/**
+ * Initiates loading the landmarks that have been just added.
+ *
+ * Once the loading is complete we'll be notified
+ * with the callback we set for LLLandmarkList.
+ */
+class LLAddLandmarkObserver : public LLInventoryAddedObserver
+{
+public:
+	LLAddLandmarkObserver(LLLocationInputCtrl* input) : mInput(input) {}
+
+private:
+	/*virtual*/ void done()
+	{
+		std::vector<LLUUID>::const_iterator it = mAdded.begin(), end = mAdded.end();
+		for(; it != end; ++it)
+		{
+			LLInventoryItem* item = gInventory.getItem(*it);
+			if (!item || item->getType() != LLAssetType::AT_LANDMARK)
+				continue;
+
+			// Start loading the landmark.
+			LLLandmark* lm = gLandmarkList.getAsset(
+					item->getAssetUUID(),
+					boost::bind(&LLLocationInputCtrl::onLandmarkLoaded, mInput, _1));
+			if (lm)
+			{
+				// Already loaded? Great, handle it immediately (the callback won't be called).
+				mInput->onLandmarkLoaded(lm);
+			}
+		}
+
+		mAdded.clear();
+	}
+
+	LLLocationInputCtrl* mInput;
+};
+
+/**
+ * Updates the "Add landmark" button once a landmark gets removed.
+ */
+class LLRemoveLandmarkObserver : public LLInventoryObserver
+{
+public:
+	LLRemoveLandmarkObserver(LLLocationInputCtrl* input) : mInput(input) {}
+
+private:
+	/*virtual*/ void changed(U32 mask)
+	{
+		if (mask & (~(LLInventoryObserver::LABEL|LLInventoryObserver::INTERNAL|LLInventoryObserver::ADD)))
+		{
+			mInput->updateAddLandmarkButton();
+		}
+	}
+
+	LLLocationInputCtrl* mInput;
+};
+
+//============================================================================
+
+
+static LLDefaultWidgetRegistry::Register<LLLocationInputCtrl> r("location_input");
+
+LLLocationInputCtrl::Params::Params()
+:	add_landmark_image_enabled("add_landmark_image_enabled"),
+	add_landmark_image_disabled("add_landmark_image_disabled"),
+	add_landmark_button("add_landmark_button"),
+	add_landmark_hpad("add_landmark_hpad", 0),
+	info_button("info_button"),
+	background("background")
+{
+}
+
+LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
+:	LLComboBox(p),
+	mAddLandmarkHPad(p.add_landmark_hpad),
+	mInfoBtn(NULL),
+	mAddLandmarkBtn(NULL)
+{
+	// Background image.
+	LLButton::Params bg_params = p.background;
+	mBackground = LLUICtrlFactory::create<LLButton>(bg_params);
+	addChildInBack(mBackground);
+
+	// "Place information" button.
+	LLButton::Params info_params = p.info_button;
+	mInfoBtn = LLUICtrlFactory::create<LLButton>(info_params);
+	mInfoBtn->setClickedCallback(boost::bind(&LLLocationInputCtrl::onInfoButtonClicked, this));
+	addChild(mInfoBtn);
+	
+	// "Add landmark" button.
+	LLButton::Params al_params = p.add_landmark_button;
+	if (p.add_landmark_image_enabled())
+	{
+		al_params.image_unselected = p.add_landmark_image_enabled;
+		al_params.image_selected = p.add_landmark_image_enabled;
+	}
+	if (p.add_landmark_image_disabled())
+	{
+		al_params.image_disabled = p.add_landmark_image_disabled;
+		al_params.image_disabled_selected = p.add_landmark_image_disabled;
+	}
+	al_params.click_callback.function(boost::bind(&LLLocationInputCtrl::onAddLandmarkButtonClicked, this));
+	mAddLandmarkBtn = LLUICtrlFactory::create<LLButton>(al_params);
+	enableAddLandmarkButton(true);
+	addChild(mAddLandmarkBtn);
+	
+	setFocusReceivedCallback(boost::bind(&LLLocationInputCtrl::onFocusReceived, this));
+	setFocusLostCallback(boost::bind(&LLLocationInputCtrl::onFocusLost, this));
+	setPrearrangeCallback(boost::bind(&LLLocationInputCtrl::onLocationPrearrange, this, _2));
+
+	updateWidgetlayout();
+
+	// - Make the "Add landmark" button updated when either current parcel gets changed
+	//   or a landmark gets created or removed from the inventory.
+	// - Update the location string on parcel change.
+	LLViewerParcelMgr::getInstance()->setAgentParcelChangedCallback(
+		boost::bind(&LLLocationInputCtrl::onAgentParcelChange, this));
+
+	LLLocationHistory::getInstance()->setLoadedCallback(
+			boost::bind(&LLLocationInputCtrl::onLocationHistoryLoaded, this));
+
+	mRemoveLandmarkObserver	= new LLRemoveLandmarkObserver(this);
+	mAddLandmarkObserver	= new LLAddLandmarkObserver(this);
+	gInventory.addObserver(mRemoveLandmarkObserver);
+	gInventory.addObserver(mAddLandmarkObserver);
+}
+
+LLLocationInputCtrl::~LLLocationInputCtrl()
+{
+	gInventory.removeObserver(mRemoveLandmarkObserver);
+	gInventory.removeObserver(mAddLandmarkObserver);
+	delete mRemoveLandmarkObserver;
+	delete mAddLandmarkObserver;
+}
+
+void LLLocationInputCtrl::setEnabled(BOOL enabled)
+{
+	LLComboBox::setEnabled(enabled);
+	mAddLandmarkBtn->setEnabled(enabled);
+}
+
+void LLLocationInputCtrl::hideList()
+{
+	LLComboBox::hideList();
+	if (mTextEntry && hasFocus())
+		focusTextEntry();
+}
+
+BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
+{
+	// Let the buttons show their tooltips.
+	if (LLUICtrl::handleToolTip(x, y, msg, sticky_rect_screen) && !msg.empty())
+	{
+		return TRUE;
+	}
+
+	// Cursor is above the text entry.
+	msg = LLUI::sShowXUINames ? getShowNamesToolTip() : gAgent.getSLURL();
+	if (mTextEntry && sticky_rect_screen)
+	{
+		*sticky_rect_screen = mTextEntry->calcScreenRect();
+	}
+
+	return TRUE;
+}
+
+BOOL LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask)
+{
+	BOOL result = LLComboBox::handleKeyHere(key, mask);
+
+	if (key == KEY_DOWN && hasFocus() && mList->getItemCount() != 0)
+	{
+		showList();
+	}
+
+	return result;
+}
+
+void LLLocationInputCtrl::onTextEntry(LLLineEditor* line_editor)
+{
+	KEY key = gKeyboard->currentKey();
+
+	if (line_editor->getText().empty())
+	{
+		prearrangeList(); // resets filter
+		hideList();
+	}
+	// Typing? (moving cursor should not affect showing the list)
+	else if (key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END)
+	{
+		prearrangeList(line_editor->getText());
+		if (mList->getItemCount() != 0)
+		{
+			showList();
+			focusTextEntry();
+		}
+		else
+		{
+			// Hide the list if it's empty.
+			hideList();
+		}
+	}
+	
+	LLComboBox::onTextEntry(line_editor);
+}
+
+/**
+ * Useful if we want to just set the text entry value, no matter what the list contains.
+ *
+ * This is faster than setTextEntry().
+ */
+void LLLocationInputCtrl::setText(const LLStringExplicit& text)
+{
+	if (mTextEntry)
+	{
+		mTextEntry->setText(text);
+		mHasAutocompletedText = FALSE;
+	}
+}
+
+void LLLocationInputCtrl::setFocus(BOOL b)
+{
+	LLComboBox::setFocus(b);
+
+	if (mTextEntry && b && !mList->getVisible())
+		mTextEntry->setFocus(TRUE);
+}
+
+void LLLocationInputCtrl::handleLoginComplete()
+{
+	// An agent parcel update hasn't occurred yet, so we have to
+	// manually set location and the appropriate "Add landmark" icon.
+	refresh();
+}
+
+//== private methods =========================================================
+
+void LLLocationInputCtrl::onFocusReceived()
+{
+	prearrangeList();
+	setText(gAgent.getSLURL());
+	if (mTextEntry)
+		mTextEntry->endSelection(); // we don't want handleMouseUp() to "finish" the selection
+}
+
+void LLLocationInputCtrl::onFocusLost()
+{
+	refreshLocation();
+}
+
+void LLLocationInputCtrl::onInfoButtonClicked()
+{
+	LLSD key;
+	key["type"] = LLPanelPlaces::AGENT;
+
+	LLSideTray::getInstance()->showPanel("panel_places", key);
+}
+
+void LLLocationInputCtrl::onAddLandmarkButtonClicked()
+{
+	LLFloaterReg::showInstance("add_landmark");
+}
+
+void LLLocationInputCtrl::onAgentParcelChange()
+{
+	refresh();
+}
+
+void LLLocationInputCtrl::onLandmarkLoaded(LLLandmark* lm)
+{
+	(void) lm;
+	updateAddLandmarkButton();
+}
+
+void LLLocationInputCtrl::onLocationHistoryLoaded()
+{
+	rebuildLocationHistory();
+}
+
+void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data)
+{
+	std::string filter = data.asString();
+	rebuildLocationHistory(filter);
+	mList->mouseOverHighlightNthItem(-1); // Clear highlight on the last selected item.
+}
+
+void LLLocationInputCtrl::refresh()
+{
+	refreshLocation();			// update location string
+	updateAddLandmarkButton();	// indicate whether current parcel has been landmarked 
+}
+
+void LLLocationInputCtrl::refreshLocation()
+{
+	// Is one of our children focused?
+	if (LLUICtrl::hasFocus() || mButton->hasFocus() || mList->hasFocus() ||
+		(mTextEntry && mTextEntry->hasFocus()) || (mAddLandmarkBtn->hasFocus()))
+
+	{
+		llwarns << "Location input should not be refreshed when having focus" << llendl;
+		return;
+	}
+
+	// Update location field.
+	std::string location_name;
+
+	if (!gAgent.buildLocationString(location_name, LLAgent::LOCATION_FORMAT_NORMAL))
+		location_name = "Unknown";
+
+	setText(location_name);
+}
+
+void LLLocationInputCtrl::rebuildLocationHistory(std::string filter)
+{
+	LLLocationHistory::location_list_t filtered_items;
+	const LLLocationHistory::location_list_t* itemsp = NULL;
+	LLLocationHistory* lh = LLLocationHistory::getInstance();
+	
+	if (filter.empty())
+		itemsp = &lh->getItems();
+	else
+	{
+		lh->getMatchingItems(filter, filtered_items);
+		itemsp = &filtered_items;
+	}
+	
+	removeall();
+	for (LLLocationHistory::location_list_t::const_reverse_iterator it = itemsp->rbegin(); it != itemsp->rend(); it++)
+		add(*it);
+}
+
+void LLLocationInputCtrl::focusTextEntry()
+{
+	// We can't use "mTextEntry->setFocus(TRUE)" instead because
+	// if the "select_on_focus" parameter is true it places the cursor
+	// at the beginning (after selecting text), thus screwing up updateSelection().
+	if (mTextEntry)
+		gFocusMgr.setKeyboardFocus(mTextEntry);
+}
+
+void LLLocationInputCtrl::enableAddLandmarkButton(bool val)
+{
+	// Enable/disable the button.
+	mAddLandmarkBtn->setEnabled(val);
+}
+
+// Change the "Add landmark" button image
+// depending on whether current parcel has been landmarked.
+void LLLocationInputCtrl::updateAddLandmarkButton()
+{
+	bool cur_parcel_landmarked = false;
+
+	// Determine whether there are landmarks pointing to the current parcel.
+	LLInventoryModel::cat_array_t cats;
+	LLInventoryModel::item_array_t items;
+	LLIsAgentParcelLandmark is_current_parcel_landmark;
+	gInventory.collectDescendentsIf(gAgent.getInventoryRootID(),
+		cats,
+		items,
+		LLInventoryModel::EXCLUDE_TRASH,
+		is_current_parcel_landmark);
+	cur_parcel_landmarked = !items.empty();
+
+	enableAddLandmarkButton(!cur_parcel_landmarked);
+}
+
+void LLLocationInputCtrl::updateWidgetlayout()
+{
+	const LLRect&	rect			= getLocalRect();
+	const LLRect&	hist_btn_rect	= mButton->getRect();
+	LLRect			info_btn_rect	= mButton->getRect();
+
+	// info button
+	info_btn_rect.setOriginAndSize(
+		0, (rect.getHeight() - info_btn_rect.getHeight()) / 2,
+		info_btn_rect.getWidth(), info_btn_rect.getHeight());
+	mInfoBtn->setRect(info_btn_rect);
+
+	// background
+	mBackground->setRect(LLRect(info_btn_rect.getWidth(), rect.mTop,
+		rect.mRight - hist_btn_rect.getWidth(), rect.mBottom));
+
+	// history button
+	mButton->setRightHPad(0);
+
+	// "Add Landmark" button
+	{
+		LLRect al_btn_rect = mAddLandmarkBtn->getRect();
+		al_btn_rect.translate(
+			hist_btn_rect.mLeft - mAddLandmarkHPad - al_btn_rect.getWidth(),
+			(rect.getHeight() - al_btn_rect.getHeight()) / 2);
+		mAddLandmarkBtn->setRect(al_btn_rect);
+	}
+
+	// text entry
+	if (mTextEntry)
+	{
+		LLRect text_entry_rect(rect);
+		text_entry_rect.mLeft = info_btn_rect.getWidth();
+		text_entry_rect.mRight = mAddLandmarkBtn->getRect().mLeft;
+		text_entry_rect.stretch(0, -1); // make space for border
+		mTextEntry->setRect(text_entry_rect);
+	}
+}
-- 
cgit v1.3


From ade6bbb06c6a842f39a3fe32decf7c66682df092 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 17:16:27 +0000
Subject: merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3

---
 indra/llmath/llrect.h                              |   8 +-
 indra/llmath/v3dmath.h                             |   8 +-
 indra/llmath/v3math.cpp                            |   6 -
 indra/llmath/v3math.h                              |   4 +-
 indra/llmath/v4color.h                             |  10 +-
 indra/llmath/v4coloru.h                            |   8 +-
 indra/llui/llbutton.cpp                            |   2 +-
 indra/llui/llcheckboxctrl.h                        |   2 +-
 indra/llui/llcombobox.cpp                          |   8 +-
 indra/llui/llfloater.cpp                           |   7 +
 indra/llui/llfloater.h                             |   5 +-
 indra/llui/llflyoutbutton.cpp                      |   2 +-
 indra/llui/lliconctrl.h                            |   2 +-
 indra/llui/lllineeditor.h                          |   2 +-
 indra/llui/llmenugl.h                              |   2 +-
 indra/llui/llmultifloater.h                        |   2 +-
 indra/llui/llnotifications.h                       |   4 +-
 indra/llui/llpanel.cpp                             |  18 +-
 indra/llui/llpanel.h                               |   6 +-
 indra/llui/llradiogroup.h                          |   4 +-
 indra/llui/llscrolllistcolumn.cpp                  |  10 +
 indra/llui/llscrolllistcolumn.h                    |  14 +-
 indra/llui/llscrolllistctrl.cpp                    |   4 +-
 indra/llui/llscrolllistctrl.h                      |   2 +-
 indra/llui/llscrolllistitem.h                      |   6 +-
 indra/llui/llsearcheditor.cpp                      |   2 +-
 indra/llui/lltextbox.h                             |   2 +-
 indra/llui/lltexteditor.h                          |   2 +-
 indra/llui/llui.cpp                                |   8 +
 indra/llui/llui.h                                  |   4 +-
 indra/llui/lluicolortable.h                        |   4 +-
 indra/llui/lluictrl.cpp                            |   7 +
 indra/llui/lluictrl.h                              |  13 +-
 indra/llui/lluictrlfactory.h                       |  24 +-
 indra/llui/llview.cpp                              |  22 +-
 indra/llui/llview.h                                |  24 +-
 indra/llxml/llcontrol.cpp                          |   6 +-
 indra/newview/CMakeLists.txt                       |   2 -
 indra/newview/llappviewer.cpp                      |   2 +-
 indra/newview/llfavoritesbar.cpp                   |   2 +-
 indra/newview/llfloaterauction.cpp                 |   9 +-
 indra/newview/llfloaterauction.h                   |   2 +-
 indra/newview/llfloaterbuildoptions.cpp            |   2 +-
 indra/newview/llfloaterbuildoptions.h              |   2 +-
 indra/newview/llfloaterbump.cpp                    |   2 +-
 indra/newview/llfloaterbump.h                      |   5 +-
 indra/newview/llfloatercamera.cpp                  |  15 +-
 indra/newview/llfloatercamera.h                    |   2 +-
 indra/newview/llfloaterlagmeter.cpp                |  90 ++--
 indra/newview/llfloaterlagmeter.h                  |   7 +-
 indra/newview/llfloaterland.cpp                    |   7 +-
 indra/newview/llfloaternotificationsconsole.cpp    |  12 +-
 indra/newview/llfloaternotificationsconsole.h      |   2 +-
 indra/newview/llfloaterpreference.cpp              | 587 +++++++++++++++++++--
 indra/newview/llfloaterpreference.h                |  36 +-
 indra/newview/llfloaterreporter.cpp                |   2 +-
 indra/newview/llfloatersettingsdebug.cpp           |  73 ++-
 indra/newview/llfloatersettingsdebug.h             |   6 +-
 indra/newview/llfloatertools.cpp                   |   3 +-
 indra/newview/llfolderview.cpp                     |  49 +-
 indra/newview/llfolderview.h                       |   3 +
 indra/newview/lllocationinputctrl.cpp              |   4 +
 indra/newview/llnamelistctrl.h                     |   4 +-
 indra/newview/llpanelprofileview.cpp               |   4 +-
 indra/newview/llpanelprofileview.h                 |   2 +-
 indra/newview/llpanelteleporthistory.cpp           |  11 +-
 indra/newview/llstatusbar.cpp                      |   2 +-
 indra/newview/llviewerfloaterreg.cpp               |  15 +-
 indra/newview/llviewermenu.cpp                     |  14 +-
 indra/newview/llviewermessage.cpp                  |   4 +-
 indra/newview/llviewerwindow.cpp                   |  91 ++--
 .../skins/default/xui/en/floater_auction.xml       |  11 +-
 .../skins/default/xui/en/floater_avatar_picker.xml |  10 +-
 .../skins/default/xui/en/floater_lagmeter.xml      |  11 +-
 .../xui/en/floater_notifications_console.xml       |   5 +-
 .../skins/default/xui/en/floater_preferences.xml   |   1 +
 .../default/xui/en/floater_settings_debug.xml      |  43 +-
 .../default/xui/en/panel_preferences_graphics1.xml |   8 +-
 78 files changed, 1058 insertions(+), 368 deletions(-)

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llmath/llrect.h b/indra/llmath/llrect.h
index 98aceb0597..16bfdde658 100644
--- a/indra/llmath/llrect.h
+++ b/indra/llmath/llrect.h
@@ -64,17 +64,11 @@ public:
 	mLeft(left), mTop(top), mRight(right), mBottom(bottom)
 	{}
 
-	LLRectBase(const LLSD& sd)
+	explicit LLRectBase(const LLSD& sd)
 	{
 		setValue(sd);
 	}
 
-	const LLRectBase& operator=(const LLSD& sd)
-	{
-		setValue(sd);
-		return *this;
-	}
-
 	void setValue(const LLSD& sd)
 	{
 		mLeft = sd[0].asInteger(); 
diff --git a/indra/llmath/v3dmath.h b/indra/llmath/v3dmath.h
index a99bf5b4a6..6ab31e8a41 100644
--- a/indra/llmath/v3dmath.h
+++ b/indra/llmath/v3dmath.h
@@ -53,7 +53,7 @@ class LLVector3d
 		inline LLVector3d(const F64 x, const F64 y, const F64 z);			// Initializes LLVector3d to (x. y, z)
 		inline explicit LLVector3d(const F64 *vec);				// Initializes LLVector3d to (vec[0]. vec[1], vec[2])
 		inline explicit LLVector3d(const LLVector3 &vec);
-		LLVector3d(const LLSD& sd)
+		explicit LLVector3d(const LLSD& sd)
 		{
 			setValue(sd);
 		}
@@ -65,12 +65,6 @@ class LLVector3d
 			mdV[2] = sd[2].asReal();
 		}
 
-		const LLVector3d& operator=(const LLSD& sd)
-		{
-			setValue(sd);
-			return *this;
-		}
-
 		LLSD getValue() const
 		{
 			LLSD ret;
diff --git a/indra/llmath/v3math.cpp b/indra/llmath/v3math.cpp
index 101e9d075a..f392ac448b 100644
--- a/indra/llmath/v3math.cpp
+++ b/indra/llmath/v3math.cpp
@@ -314,12 +314,6 @@ void LLVector3::setValue(const LLSD& sd)
 	mV[2] = (F32) sd[2].asReal();
 }
 
-const LLVector3& LLVector3::operator=(const LLSD& sd)
-{
-	setValue(sd);
-	return *this;
-}
-
 const LLVector3& operator*=(LLVector3 &a, const LLQuaternion &rot)
 {
     const F32 rw = - rot.mQ[VX] * a.mV[VX] - rot.mQ[VY] * a.mV[VY] - rot.mQ[VZ] * a.mV[VZ];
diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h
index 7f96800e21..805d7e6384 100644
--- a/indra/llmath/v3math.h
+++ b/indra/llmath/v3math.h
@@ -67,14 +67,12 @@ class LLVector3
 		explicit LLVector3(const LLVector2 &vec);				// Initializes LLVector3 to (vec[0]. vec[1], 0)
 		explicit LLVector3(const LLVector3d &vec);				// Initializes LLVector3 to (vec[0]. vec[1], vec[2])
 		explicit LLVector3(const LLVector4 &vec);				// Initializes LLVector4 to (vec[0]. vec[1], vec[2])
-		LLVector3(const LLSD& sd);
+		explicit LLVector3(const LLSD& sd);
 
 		LLSD getValue() const;
 
 		void setValue(const LLSD& sd);
 
-		const LLVector3& operator=(const LLSD& sd);
-
 		inline BOOL isFinite() const;									// checks to see if all values of LLVector3 are finite
 		BOOL		clamp(F32 min, F32 max);		// Clamps all values to (min,max), returns TRUE if data changed
 		BOOL		clampLength( F32 length_limit );					// Scales vector to limit length to a value
diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h
index 7414c38847..d6fbdec61e 100644
--- a/indra/llmath/v4color.h
+++ b/indra/llmath/v4color.h
@@ -58,7 +58,7 @@ class LLColor4
 		LLColor4(U32 clr);							// Initializes LLColor4 to (r=clr>>24, etc))
 		LLColor4(const F32 *vec);			// Initializes LLColor4 to (vec[0]. vec[1], vec[2], 1)
 		LLColor4(const LLColor3 &vec, F32 a = 1.f);	// Initializes LLColor4 to (vec, a)
-		LLColor4(const LLSD& sd);
+		explicit LLColor4(const LLSD& sd);
 		explicit LLColor4(const LLColor4U& color4u);  // "explicit" to avoid automatic conversion
 		explicit LLColor4(const LLVector4& vector4);  // "explicit" to avoid automatic conversion
 
@@ -113,7 +113,6 @@ class LLColor4
 		F32 &operator[](int idx) { return mV[idx]; }
 	
 	    const LLColor4& operator=(const LLColor3 &a);	// Assigns vec3 to vec4 and returns vec4
-		const LLColor4& operator=(const LLSD& sd);
 		
 		friend std::ostream&	 operator<<(std::ostream& s, const LLColor4 &a);		// Print a
 		friend LLColor4 operator+(const LLColor4 &a, const LLColor4 &b);	// Return vector a + b
@@ -634,12 +633,5 @@ void LLColor4::clamp()
 	}
 }
 
-inline const LLColor4& LLColor4::operator=(const LLSD& sd)
-{
-	setValue(sd);
-
-	return *this;
-}
-
 #endif
 
diff --git a/indra/llmath/v4coloru.h b/indra/llmath/v4coloru.h
index c0390fa0b2..4ec5a345eb 100644
--- a/indra/llmath/v4coloru.h
+++ b/indra/llmath/v4coloru.h
@@ -66,7 +66,7 @@ public:
 	LLColor4U(U8 r, U8 g, U8 b);		// Initializes LLColor4U to (r, g, b, 1)
 	LLColor4U(U8 r, U8 g, U8 b, U8 a);		// Initializes LLColor4U to (r. g, b, a)
 	LLColor4U(const U8 *vec);			// Initializes LLColor4U to (vec[0]. vec[1], vec[2], 1)
-	LLColor4U(const LLSD& sd)
+	explicit LLColor4U(const LLSD& sd)
 	{
 		setValue(sd);
 	}
@@ -79,12 +79,6 @@ public:
 		mV[3] = sd[3].asInteger();
 	}
 
-	const LLColor4U& operator=(const LLSD& sd)
-	{
-		setValue(sd);
-		return *this;
-	}
-
 	LLSD getValue() const
 	{
 		LLSD ret;
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 110ad82763..4d340b3ddd 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -146,7 +146,7 @@ LLButton::LLButton(const LLButton::Params& p)
 	mFadeWhenDisabled(FALSE)
 {
 	static LLUICachedControl<S32> llbutton_orig_h_pad ("UIButtonOrigHPad", 0);
-	static LLButton::Params default_params(LLUICtrlFactory::getDefaultParams<LLButton::Params>());
+	static Params default_params(LLUICtrlFactory::getDefaultParams<Params>());
 
 	//if we aren't a picture_style button set label as name if not provided
 	if (!p.picture_style.isProvided() || !p.picture_style)
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index fe719e3b6a..2f8f088a3e 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -65,7 +65,7 @@ public:
 		Optional<LLTextBox::Params> label_text;
 		Optional<LLButton::Params> check_button;
 
-		Deprecated	radio_style;
+		Ignored					radio_style;
 
 		Params();
 	};
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 2197d5432b..51ab3326fe 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -640,15 +640,17 @@ void LLComboBox::onButtonDown()
 {
 	if (!mList->getVisible())
 	{
+		// this might change selection, so do it first
+		prearrangeList();
+
+		// highlight the last selected item from the original selection before potentially selecting a new item
+		// as visual cue to original value of combo box
 		LLScrollListItem* last_selected_item = mList->getLastSelectedItem();
 		if (last_selected_item)
 		{
-			// highlight the original selection before potentially selecting a new item
 			mList->mouseOverHighlightNthItem(mList->getItemIndex(last_selected_item));
 		}
 
-		prearrangeList();
-
 		if (mList->getItemCount() != 0)
 		{
 			showList();
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index a14b99eeb7..8932a7ccf2 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -188,6 +188,13 @@ bool LLFloater::KeyCompare::equate(const LLSD& a, const LLSD& b)
 
 //************************************
 
+//static 
+const LLFloater::Params& LLFloater::getDefaultParams()
+{
+	return LLUICtrlFactory::getDefaultParams<LLFloater::Params>();
+}
+
+
 LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
 	:	LLPanel(),
 		mDragHandle(NULL),
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 421b7f3ec1..3e80f1b284 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -141,7 +141,10 @@ public:
 		}
 	};
 	
-	LLFloater(const LLSD& key = LLSD(), const LLFloater::Params& params = LLFloater::Params());
+	// use this to avoid creating your own default LLFloater::Param instance
+	static const Params& getDefaultParams();
+
+	LLFloater(const LLSD& key = LLSD(), const Params& params = getDefaultParams());
 
 	virtual ~LLFloater();
 
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp
index 62a321dc02..8846f2a8c4 100644
--- a/indra/llui/llflyoutbutton.cpp
+++ b/indra/llui/llflyoutbutton.cpp
@@ -35,7 +35,7 @@
 // file includes
 #include "llflyoutbutton.h"
 
-static LLDefaultWidgetRegistry::Register<LLFlyoutButton> r2("flyout_button");
+//static LLDefaultWidgetRegistry::Register<LLFlyoutButton> r2("flyout_button");
 
 const S32 FLYOUT_BUTTON_ARROW_WIDTH = 24;
 
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index ad0f6f563f..a6cab0e9ee 100644
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -55,7 +55,7 @@ public:
 	{
 		Optional<LLUIImage*>	image;
 		Optional<LLUIColor>		color;
-		Deprecated				scale_image;
+		Ignored					scale_image;
 		Params();
 	};
 protected:
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index 78df791334..eb021bace9 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -103,7 +103,7 @@ public:
 		Optional<S32>					text_pad_left,
 										text_pad_right;
 
-		Deprecated						is_unicode,
+		Ignored							is_unicode,
 										drop_shadow_visible,	
 										border_drop_shadow_visible,
 										bg_visible;
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 7d889c291c..0d7d1ae746 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -63,7 +63,7 @@ public:
 		Optional<KEY>			jump_key;
 		Optional<bool>			use_mac_ctrl;
 
-		Deprecated				rect,
+		Ignored					rect,
 								left,
 								top,
 								right,
diff --git a/indra/llui/llmultifloater.h b/indra/llui/llmultifloater.h
index ea8a9841e3..7f4c1c040a 100644
--- a/indra/llui/llmultifloater.h
+++ b/indra/llui/llmultifloater.h
@@ -44,7 +44,7 @@
 class LLMultiFloater : public LLFloater
 {
 public:
-	LLMultiFloater(const LLFloater::Params& params = LLFloater::Params());
+	LLMultiFloater(const LLFloater::Params& params = LLFloater::getDefaultParams());
 	virtual ~LLMultiFloater() {};
 	
 	void buildTabContainer();
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 5c8d146e0c..b749724b4e 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -299,8 +299,8 @@ public:
 
 		struct Functor : public LLInitParam::Choice<Functor>
 		{
-			Option<std::string>										name;
-			Option<LLNotificationFunctorRegistry::ResponseFunctor>	function;
+			Alternative<std::string>										name;
+			Alternative<LLNotificationFunctorRegistry::ResponseFunctor>	function;
 
 			Functor()
 			:	name("functor_name"),
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index ad5cdca5cc..0136a41d61 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -58,6 +58,11 @@
 
 static LLDefaultWidgetRegistry::Register<LLPanel> r1("panel", &LLPanel::fromXML);
 
+const LLPanel::Params& LLPanel::getDefaultParams() 
+{ 
+	return LLUICtrlFactory::getDefaultParams<LLPanel::Params>(); 
+}
+
 LLPanel::Params::Params()
 :	has_border("border", false),
 	bg_opaque_color("bg_opaque_color"),
@@ -114,6 +119,14 @@ void LLPanel::addBorder(LLViewBorder::Params p)
 	addChild( mBorder );
 }
 
+void LLPanel::addBorder() 
+{  
+	LLViewBorder::Params p; 
+	p.border_thickness(LLPANEL_BORDER_WIDTH); 
+	addBorder(p); 
+}
+
+
 void LLPanel::removeBorder()
 {
 	if (mBorder)
@@ -885,10 +898,11 @@ LLView* LLPanel::getChildView(const std::string& name, BOOL recurse, BOOL create
 	}
 	if (!view && create_if_missing)
 	{
-		view = getDummyWidget<LLView>(name);
+		view = getDefaultWidget<LLView>(name);
 		if (!view)
 		{
-			view = LLUICtrlFactory::createDummyWidget<LLView>(name);
+			// create LLViews explicitly, as they are not registered widget types
+			view = LLUICtrlFactory::createDefaultWidget<LLView>(name);
 		}
 	}
 	return view;
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
index b3ccdd0f00..fc40cd77eb 100644
--- a/indra/llui/llpanel.h
+++ b/indra/llui/llpanel.h
@@ -96,10 +96,10 @@ public:
 protected:
 	friend class LLUICtrlFactory;
 	// RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8
-	static const Params& defaultParams() { return LLUICtrlFactory::getDefaultParams<LLPanel::Params>(); }
+	static const LLPanel::Params& getDefaultParams();
 
 	// Panels can get constructed directly
-	LLPanel(const Params& params = defaultParams());
+	LLPanel(const LLPanel::Params& params = getDefaultParams());
 	
 public:
 // 	LLPanel(const std::string& name, const LLRect& rect = LLRect(), BOOL bordered = TRUE);
@@ -122,7 +122,7 @@ public:
 
 	// Border controls
 	void addBorder( LLViewBorder::Params p);
-	void addBorder() {  LLViewBorder::Params p; p.border_thickness(LLPANEL_BORDER_WIDTH); addBorder(p); }
+	void addBorder();
 	void			removeBorder();
 	BOOL			hasBorder() const { return mBorder != NULL; }
 	void			setBorderVisible( BOOL b );
diff --git a/indra/llui/llradiogroup.h b/indra/llui/llradiogroup.h
index d3cb8a628e..850d896e29 100644
--- a/indra/llui/llradiogroup.h
+++ b/indra/llui/llradiogroup.h
@@ -48,8 +48,8 @@ class LLRadioCtrl : public LLCheckBoxCtrl
 public:
 	struct Params : public LLInitParam::Block<Params, LLCheckBoxCtrl::Params>
 	{
-		Deprecated length;
-		Deprecated type;
+		Ignored		length;
+		Ignored		type;
 
 		Params() 
 		:	length("length"),
diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp
index 48fddbfb71..02f09bd9b4 100644
--- a/indra/llui/llscrolllistcolumn.cpp
+++ b/indra/llui/llscrolllistcolumn.cpp
@@ -285,6 +285,16 @@ void LLScrollListColumn::SortNames::declareValues()
 	declare("descending", LLScrollListColumn::DESCENDING);
 }
 
+//
+// LLScrollListColumn
+//
+//static 
+const LLScrollListColumn::Params& LLScrollListColumn::getDefaultParams()
+{
+	return LLUICtrlFactory::getDefaultParams<LLScrollListColumn::Params>();
+}
+
+
 LLScrollListColumn::LLScrollListColumn(const Params& p, LLScrollListCtrl* parent)
 :	mWidth(0),
 	mIndex (-1),
diff --git a/indra/llui/llscrolllistcolumn.h b/indra/llui/llscrolllistcolumn.h
index c1bb86577f..712ea56454 100644
--- a/indra/llui/llscrolllistcolumn.h
+++ b/indra/llui/llscrolllistcolumn.h
@@ -116,9 +116,9 @@ public:
 
 		struct Width : public LLInitParam::Choice<Width>
 		{
-			Option<bool>	dynamic_width;
-			Option<S32>		pixel_width;
-			Option<F32>		relative_width;
+			Alternative<bool>	dynamic_width;
+			Alternative<S32>		pixel_width;
+			Alternative<F32>		relative_width;
 
 			Width()
 			:	dynamic_width("dynamicwidth", false),
@@ -133,8 +133,8 @@ public:
 		// either an image or label is used in column header
 		struct Header : public LLInitParam::Choice<Header>
 		{
-			Option<std::string>			label;
-			Option<LLUIImage*>			image;
+			Alternative<std::string>			label;
+			Alternative<LLUIImage*>			image;
 
 			Header()
 			:	label("label"),
@@ -160,8 +160,10 @@ public:
 		}
 	};
 
+	static const Params& getDefaultParams();
+
 	//NOTE: this is default constructible so we can store it in a map.
-	LLScrollListColumn(const Params& p = Params(), LLScrollListCtrl* = NULL);
+	LLScrollListColumn(const Params& p = getDefaultParams(), LLScrollListCtrl* = NULL);
 
 	void setWidth(S32 width);
 	S32 getWidth() const { return mWidth; }
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 42c7c892c8..6d91c784f7 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1246,14 +1246,14 @@ const std::string LLScrollListCtrl::getSelectedItemLabel(S32 column) const
 // "StringUUID" interface: use this when you're creating a list that contains non-unique strings each of which
 // has an associated, unique UUID, and only one of which can be selected at a time.
 
-LLScrollListItem* LLScrollListCtrl::addStringUUIDItem(const std::string& item_text, const LLUUID& id, EAddPosition pos, BOOL enabled, S32 column_width)
+LLScrollListItem* LLScrollListCtrl::addStringUUIDItem(const std::string& item_text, const LLUUID& id, EAddPosition pos, BOOL enabled)
 {
 	if (getItemCount() < mMaxItemCount)
 	{
 		LLScrollListItem::Params item_p;
 		item_p.enabled(enabled);
 		item_p.value(id);
-		item_p.cells.add().value(item_text).width(column_width).type("text");
+		item_p.cells.add().value(item_text).type("text");
 
 		return addRow( item_p, pos );
 	}
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 461df6760f..8d200fb73f 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -222,7 +222,7 @@ public:
 	// DEPRECATED: Use LLSD versions of setCommentText() and getSelectedValue().
 	// "StringUUID" interface: use this when you're creating a list that contains non-unique strings each of which
 	// has an associated, unique UUID, and only one of which can be selected at a time.
-	LLScrollListItem*	addStringUUIDItem(const std::string& item_text, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE, S32 column_width = 0);
+	LLScrollListItem*	addStringUUIDItem(const std::string& item_text, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
 	LLUUID				getStringUUIDSelectedItem() const;
 
 	LLScrollListItem*	getFirstSelected() const;
diff --git a/indra/llui/llscrolllistitem.h b/indra/llui/llscrolllistitem.h
index 8d87137c3a..4237d5b304 100644
--- a/indra/llui/llscrolllistitem.h
+++ b/indra/llui/llscrolllistitem.h
@@ -64,9 +64,9 @@ public:
 		Optional<void*>		userdata;
 		Optional<LLSD>		value;
 		
-		Deprecated			name; // use for localization tools
-		Deprecated			type; 
-		Deprecated			length; 
+		Ignored				name; // use for localization tools
+		Ignored				type; 
+		Ignored				length; 
 
 		Multiple<LLScrollListCell::Params> cells;
 
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
index 3171f96fcf..9522d32a8b 100644
--- a/indra/llui/llsearcheditor.cpp
+++ b/indra/llui/llsearcheditor.cpp
@@ -36,7 +36,7 @@
  
 #include "llsearcheditor.h"
 
-static LLDefaultWidgetRegistry::Register<LLSearchEditor> r2("search_editor");
+//static LLDefaultWidgetRegistry::Register<LLSearchEditor> r2("search_editor");
 
 LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p)
 :	LLUICtrl(p)
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index aae538a221..dca906decc 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -60,7 +60,7 @@ public:
 
 		Optional<LLFontGL::ShadowType>	font_shadow;
 
-		Deprecated			drop_shadow_visible,
+		Ignored				drop_shadow_visible,
 							type,
 							length;
 
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index efedb30f47..f64353555e 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -82,7 +82,7 @@ public:
 
 		Optional<LLViewBorder::Params> border;
 
-		Deprecated				type,
+		Ignored					type,
 								length,
 								is_unicode;
 
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 3c9759695d..1d3e5d7a15 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -58,6 +58,10 @@
 #include "llmenugl.h"
 #include "llwindow.h"
 
+// for registration
+#include "llsearcheditor.h"
+#include "llflyoutbutton.h"
+
 // for XUIParse
 #include "llquaternion.h"
 #include <boost/tokenizer.hpp>
@@ -85,6 +89,10 @@ std::list<std::string> gUntranslated;
 
 /*static*/ std::vector<std::string> LLUI::sXUIPaths;
 
+// register searcheditor here
+static LLDefaultWidgetRegistry::Register<LLSearchEditor> register_search_editor("search_editor");
+static LLDefaultWidgetRegistry::Register<LLFlyoutButton> register_flyout_button("flyout_button");
+
 
 //
 // Functions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 35c0bb478e..dbd295d4e8 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -665,8 +665,8 @@ template <typename T> LLRegisterWith<LLDestroyClassList> LLDestroyClass<T>::sReg
 // useful parameter blocks
 struct TimeIntervalParam : public LLInitParam::Choice<TimeIntervalParam>
 {
-	Option<F32>		seconds;
-	Option<S32>		frames;
+	Alternative<F32>		seconds;
+	Alternative<S32>		frames;
 	TimeIntervalParam()
 	:	seconds("seconds"),
 		frames("frames")
diff --git a/indra/llui/lluicolortable.h b/indra/llui/lluicolortable.h
index 8900875813..dcbb1ee5cb 100644
--- a/indra/llui/lluicolortable.h
+++ b/indra/llui/lluicolortable.h
@@ -22,8 +22,8 @@ class LLUIColorTable : public LLSingleton<LLUIColorTable>
 public:
 	struct ColorParams : LLInitParam::Choice<ColorParams>
 	{
-		Option<LLColor4>    value;
-		Option<std::string> reference;
+		Alternative<LLColor4>    value;
+		Alternative<std::string> reference;
 
 		ColorParams();
 	};
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 80ef7ebdf1..8aba122e39 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -111,6 +111,13 @@ void LLFocusableElement::setFocus(BOOL b)
 {
 }
 
+//static 
+const LLUICtrl::Params& LLUICtrl::getDefaultParams()
+{
+	return LLUICtrlFactory::getDefaultParams<LLUICtrl::Params>();
+}
+
+
 LLUICtrl::LLUICtrl(const LLUICtrl::Params& p, const LLViewModelPtr& viewmodel) 
 :	LLView(p),
 	mTentative(FALSE),
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 71f0a47f45..686f1e966d 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -87,7 +87,7 @@ public:
 	
 	struct CallbackParam : public LLInitParam::Block<CallbackParam>
 	{
-		Deprecated				name;
+		Ignored					name;
 
 		Optional<std::string>	function_name;
 		Optional<LLSD>			parameter;
@@ -116,8 +116,8 @@ public:
 	
 	struct EnableControls : public LLInitParam::Choice<EnableControls>
 	{
-		Option<std::string> enabled;
-		Option<std::string> disabled;
+		Alternative<std::string> enabled;
+		Alternative<std::string> disabled;
 		
 		EnableControls()
 		: enabled("enabled_control"),
@@ -126,8 +126,8 @@ public:
 	};	
 	struct ControlVisibility : public LLInitParam::Choice<ControlVisibility>
 	{
-		Option<std::string> visible;
-		Option<std::string> invisible;
+		Alternative<std::string> visible;
+		Alternative<std::string> invisible;
 
 		ControlVisibility()
 			: visible("make_visible_control"),
@@ -160,7 +160,8 @@ public:
 	void initFromParams(const Params& p);
 protected:
 	friend class LLUICtrlFactory;
-	LLUICtrl(const Params& p = LLUICtrl::Params(),
+	static const Params& getDefaultParams();
+	LLUICtrl(const Params& p = getDefaultParams(),
              const LLViewModelPtr& viewmodel=LLViewModelPtr(new LLViewModel));
 	
 	void initCommitCallback(const CommitCallbackParam& cb, commit_signal_t& sig);
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 4045022c8e..b9c61b1fed 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -154,9 +154,15 @@ struct LLCompareTypeID
 
 class LLWidgetTemplateRegistry 
 :	public LLRegistrySingleton<const std::type_info*, std::string, LLWidgetTemplateRegistry, LLCompareTypeID>
-{
+{};
 
-};
+// function used to create new default widgets via LLView::getChild<T>
+typedef LLView* (*dummy_widget_creator_func_t)(const std::string&);
+
+// used to register factory functions for default widget instances
+class LLDummyWidgetRegistry
+:	public LLRegistrySingleton<const std::type_info*, dummy_widget_creator_func_t, LLDummyWidgetRegistry, LLCompareTypeID>
+{};
 
 extern LLFastTimer::DeclareTimer FTM_WIDGET_SETUP;
 extern LLFastTimer::DeclareTimer FTM_WIDGET_CONSTRUCTION;
@@ -295,10 +301,16 @@ fail:
 		return widget;
 	}
 
+	template<class T>
+	static T* getDefaultWidget(const std::string& name)
+	{
+		dummy_widget_creator_func_t* dummy_func = LLDummyWidgetRegistry::instance().getValue(&typeid(T));
+		return dynamic_cast<T*>((*dummy_func)(name));
+	}
+
 	template <class T> 
-	static T* createDummyWidget(const std::string& name) 
+	static LLView* createDefaultWidget(const std::string& name) 
 	{
-		//#pragma message("Generating LLUICtrlFactory::createDummyWidget")
 		typename T::Params params;
 		params.name(name);
 		
@@ -389,8 +401,10 @@ template<typename T, typename PARAM_BLOCK>
 LLWidgetRegistry<DERIVED>::Register<T, PARAM_BLOCK>::Register(const char* tag, LLWidgetCreatorFunc func)
 :	LLWidgetRegistry<DERIVED>::StaticRegistrar(tag, func.empty() ? (LLWidgetCreatorFunc)&LLUICtrlFactory::defaultBuilder<T, PARAM_BLOCK> : func)
 {
-	//FIXME: inventory_panel will register itself with LLPanel::Params but it does have its own params...:(
+	// associate parameter block type with template .xml file
 	LLWidgetTemplateRegistry::instance().defaultRegistrar().add(&typeid(PARAM_BLOCK), tag);
+	// associate widget type with factory function
+	LLDummyWidgetRegistry::instance().defaultRegistrar().add(&typeid(T), &LLUICtrlFactory::createDefaultWidget<T>);
 }
 
 
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 2e2ef4d79f..d225ad2767 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -124,7 +124,7 @@ LLView::LLView(const LLView::Params& p)
 	mDefaultTabGroup(p.default_tab_group),
 	mLastTabGroup(0),
 	mToolTipMsg((LLStringExplicit)p.tool_tip()),
-	mDummyWidgets(NULL)
+	mDefaultWidgets(NULL)
 {
 	// create rect first, as this will supply initial follows flags
 	setShape(p.rect);
@@ -157,12 +157,12 @@ LLView::~LLView()
 		mParentView->removeChild(this);
 	}
 
-	if (mDummyWidgets)
+	if (mDefaultWidgets)
 	{
-		std::for_each(mDummyWidgets->begin(), mDummyWidgets->end(),
+		std::for_each(mDefaultWidgets->begin(), mDefaultWidgets->end(),
 					  DeletePairedPointer());
-		delete mDummyWidgets;
-		mDummyWidgets = NULL;
+		delete mDefaultWidgets;
+		mDefaultWidgets = NULL;
 	}
 }
 
@@ -1710,10 +1710,10 @@ LLView* LLView::getChildView(const std::string& name, BOOL recurse, BOOL create_
 
 	if (create_if_missing)
 	{
-		LLView* view = getDummyWidget<LLView>(name);
+		LLView* view = getDefaultWidget<LLView>(name);
 		if (!view)
 		{
-			 view = LLUICtrlFactory::createDummyWidget<LLView>(name);
+			 view = LLUICtrlFactory::createDefaultWidget<LLView>(name);
 		}
 		return view;
 	}
@@ -2750,11 +2750,11 @@ LLView::tree_iterator_t LLView::endTree()
 
 // only create maps on demand, as they incur heap allocation/deallocation cost
 // when a view is constructed/deconstructed
-LLView::dummy_widget_map_t& LLView::getDummyWidgetMap() const
+LLView::default_widget_map_t& LLView::getDefaultWidgetMap() const
 {
-	if (!mDummyWidgets)
+	if (!mDefaultWidgets)
 	{
-		mDummyWidgets = new dummy_widget_map_t();
+		mDefaultWidgets = new default_widget_map_t();
 	}
-	return *mDummyWidgets;
+	return *mDefaultWidgets;
 }
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 458d02d001..422f62f602 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -143,8 +143,8 @@ class LLView : public LLMouseHandler, public LLMortician
 public:
 	struct Follows : public LLInitParam::Choice<Follows>
 	{
-		Option<std::string>	string;
-		Option<U32>			flags;
+		Alternative<std::string>	string;
+		Alternative<U32>			flags;
 
         Follows()
 		:   string(""),
@@ -190,7 +190,7 @@ public:
 
 		// these are nested attributes for LLLayoutPanel
 		//FIXME: get parent context involved in parsing traversal
-		Deprecated					user_resize,
+		Ignored						user_resize,
 									auto_resize,
 									needs_translate;
 
@@ -486,10 +486,10 @@ public:
 
 	virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
 
-	template <class T> T* getDummyWidget(const std::string& name) const
+	template <class T> T* getDefaultWidget(const std::string& name) const
 	{
-		dummy_widget_map_t::const_iterator found_it = getDummyWidgetMap().find(name);
-		if (found_it == getDummyWidgetMap().end())
+		default_widget_map_t::const_iterator found_it = getDefaultWidgetMap().find(name);
+		if (found_it == getDefaultWidgetMap().end())
 		{
 			return NULL;
 		}
@@ -592,11 +592,11 @@ private:
 
 	static LLWindow* sWindow;	// All root views must know about their window.
 
-	typedef std::map<std::string, LLView*> dummy_widget_map_t;
+	typedef std::map<std::string, LLView*> default_widget_map_t;
 	// allocate this map no demand, as it is rarely needed
-	mutable dummy_widget_map_t* mDummyWidgets;
+	mutable default_widget_map_t* mDefaultWidgets;
 
-	dummy_widget_map_t& getDummyWidgetMap() const;
+	default_widget_map_t& getDefaultWidgetMap() const;
 
 public:
 	static BOOL	sDebugRects;	// Draw debug rects behind everything.
@@ -640,10 +640,10 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse, BO
 		}
 		if (create_if_missing)
 		{
-			result = getDummyWidget<T>(name);
+			result = getDefaultWidget<T>(name);
 			if (!result)
 			{
-				result = LLUICtrlFactory::createDummyWidget<T>(name);
+				result = LLUICtrlFactory::getDefaultWidget<T>(name);
 
 				if (result)
 				{
@@ -655,7 +655,7 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse, BO
 					return NULL;
 				}
 
-				getDummyWidgetMap()[name] = result;
+				getDefaultWidgetMap()[name] = result;
 			}
 		}
 	}
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index 2271c02cd0..9d0cdacb1d 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -1176,7 +1176,7 @@ template<>
 LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const std::string& control_name)
 {
 	if (type == TYPE_VEC3)
-		return sd;
+		return (LLVector3)sd;
 	else
 	{
 		CONTROL_ERRS << "Invalid LLVector3 value" << llendl;
@@ -1188,7 +1188,7 @@ template<>
 LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, const std::string& control_name)
 {
 	if (type == TYPE_VEC3D)
-		return sd;
+		return (LLVector3d)sd;
 	else
 	{
 		CONTROL_ERRS << "Invalid LLVector3d value" << llendl;
@@ -1200,7 +1200,7 @@ template<>
 LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::string& control_name)
 {
 	if (type == TYPE_RECT)
-		return sd;
+		return LLRect(sd);
 	else
 	{
 		CONTROL_ERRS << "Invalid rect value" << llendl;
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0cbacd5b2e..f96c8fdca0 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -278,7 +278,6 @@ set(viewer_SOURCE_FILES
     llpaneldirland.cpp
     llpaneldirpeople.cpp
     llpaneldirplaces.cpp
-    llpaneldisplay.cpp
     llpanelevent.cpp
     llpanelface.cpp
     llpanelgroup.cpp
@@ -694,7 +693,6 @@ set(viewer_HEADER_FILES
     llpaneldirland.h
     llpaneldirpeople.h
     llpaneldirplaces.h
-    llpaneldisplay.h
     llpanelevent.h
     llpanelface.h
     llpanelgroup.h
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index ce66bb6180..d0d6a118b3 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1715,7 +1715,7 @@ void LLAppViewer::loadColorSettings()
 			if(control->isType(TYPE_COL4))
 			{
 				LLUIColorTable::ColorParams color;
-				color.value = control->getValue();
+				color.value = (LLColor4)control->getValue();
 
 				LLUIColorTable::ColorEntryParams color_entry;
 				color_entry.name = name;
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 7719af2bd7..0e5b943dd3 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -367,7 +367,7 @@ BOOL LLFavoritesBarCtrl::postBuild()
 	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_favorites.xml", gMenuHolder);
 	if (!menu)
 	{
-		menu = LLUICtrlFactory::createDummyWidget<LLMenuGL>("inventory_menu");
+		menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu");
 	}
 	menu->setBackgroundColor(gSavedSkinSettings.getColor("MenuPopupBgColor"));
 	mInventoryItemsPopupMenuHandle = menu->getHandle();
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index e1974bba84..8ad5a19d02 100644
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -75,7 +75,9 @@ LLFloaterAuction::LLFloaterAuction(const LLSD& key)
   : LLFloater(),
 	mParcelID(-1)
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml");
+//	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml");
+	mCommitCallbackRegistrar.add("ClickSnapshot",	boost::bind(&LLFloaterAuction::onClickSnapshot, this));
+	mCommitCallbackRegistrar.add("ClickOK",		boost::bind(&LLFloaterAuction::onClickOK, this));
 }
 
 // Destroys the object
@@ -85,11 +87,6 @@ LLFloaterAuction::~LLFloaterAuction()
 
 BOOL LLFloaterAuction::postBuild()
 {
-	childSetValue("fence_check", LLSD( gSavedSettings.getBOOL("AuctionShowFence") ) );
-	getChild<LLUICtrl>("fence_check")->setCommitCallback(boost::bind(LLSavedSettingsGlue::setBOOL, _1, "AuctionShowFence"));
-
-	childSetAction("snapshot_btn", onClickSnapshot, this);
-	childSetAction("ok_btn", onClickOK, this);
 	return TRUE;
 }
 
diff --git a/indra/newview/llfloaterauction.h b/indra/newview/llfloaterauction.h
index d71fd3c653..b018316c64 100644
--- a/indra/newview/llfloaterauction.h
+++ b/indra/newview/llfloaterauction.h
@@ -55,9 +55,9 @@ public:
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void draw();
 	
-private:
 	LLFloaterAuction(const LLSD& key);
 	~LLFloaterAuction();
+private:
 	void initialize();
 
 	static void onClickSnapshot(void* data);
diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp
index 2507a72caa..9dbd1db38e 100644
--- a/indra/newview/llfloaterbuildoptions.cpp
+++ b/indra/newview/llfloaterbuildoptions.cpp
@@ -46,7 +46,7 @@
 LLFloaterBuildOptions::LLFloaterBuildOptions(const LLSD& key)
   : LLFloater()
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_build_options.xml");
+	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_build_options.xml");
 }
 
 LLFloaterBuildOptions::~LLFloaterBuildOptions()
diff --git a/indra/newview/llfloaterbuildoptions.h b/indra/newview/llfloaterbuildoptions.h
index da72520486..61db303ba2 100644
--- a/indra/newview/llfloaterbuildoptions.h
+++ b/indra/newview/llfloaterbuildoptions.h
@@ -45,7 +45,7 @@ class LLFloaterBuildOptions
 	:	public LLFloater, public LLFloaterSingleton<LLFloaterBuildOptions>
 {
 	friend class LLUISingleton<LLFloaterBuildOptions, VisibilityPolicy<LLFloater> >;
-protected:
+public:
 	LLFloaterBuildOptions(const LLSD& key);
 	~LLFloaterBuildOptions();
 };
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
index 5cf4d90ece..e4e1c7efa2 100644
--- a/indra/newview/llfloaterbump.cpp
+++ b/indra/newview/llfloaterbump.cpp
@@ -50,7 +50,7 @@
 LLFloaterBump::LLFloaterBump(const LLSD& key) 
 :	LLFloater()
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_bumps.xml");
+	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_bumps.xml");
 }
 
 
diff --git a/indra/newview/llfloaterbump.h b/indra/newview/llfloaterbump.h
index f55a9e6bc5..b56817436c 100644
--- a/indra/newview/llfloaterbump.h
+++ b/indra/newview/llfloaterbump.h
@@ -44,13 +44,12 @@ class LLFloaterBump
 {
 	friend class LLUISingleton<LLFloaterBump, VisibilityPolicy<LLFloater> >;
 protected:
-	LLFloaterBump(const LLSD& key);
-	virtual ~LLFloaterBump();
-	
 	void add(LLScrollListCtrl* list, LLMeanCollisionData *mcd);
 
 public:
 	/*virtual*/ void onOpen(const LLSD& key);
+	LLFloaterBump(const LLSD& key);
+	virtual ~LLFloaterBump();
 };
 
 #endif
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 6ca8944a19..e79142513b 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -47,20 +47,24 @@ const F32 CAMERA_BUTTON_DELAY = 0.0f;
 //
 // Member functions
 //
-
-
 LLFloaterCamera::LLFloaterCamera(const LLSD& val)
 :	LLFloater()
 {
-	setIsChrome(TRUE);
-	
 	// For now, only used for size and tooltip strings
 	const BOOL DONT_OPEN = FALSE;
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_camera.xml", DONT_OPEN);
-	
+}
+
+// virtual
+BOOL LLFloaterCamera::postBuild()
+{
+	setIsChrome(TRUE);
+
 	mRotate = getChild<LLJoystickCameraRotate>("cam_rotate_stick");
 	mZoom = getChild<LLJoystickCameraZoom>("zoom");
 	mTrack = getChild<LLJoystickCameraTrack>("cam_track_stick");
+
+	return TRUE;
 }
 
 // virtual
@@ -79,3 +83,4 @@ void LLFloaterCamera::onClose(bool app_quitting)
 		gSavedSettings.setBOOL("ShowCameraControls", FALSE);
 	}
 }
+
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index 871e5c8ed1..f954e329eb 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -51,7 +51,7 @@ private:
 	
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void onClose(bool app_quitting);
-	
+	/*virtual*/ BOOL postBuild();
 public:
 	LLJoystickCameraRotate* mRotate;
 	LLJoystickCameraZoom*	mZoom;
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp
index a97b270c44..82deaef4a9 100644
--- a/indra/newview/llfloaterlagmeter.cpp
+++ b/indra/newview/llfloaterlagmeter.cpp
@@ -53,21 +53,22 @@ const std::string LAG_GOOD_IMAGE_NAME     = "lag_status_good.tga";
 LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
 	:	LLFloater()
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_lagmeter.xml");
+//	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_lagmeter.xml");
+	mCommitCallbackRegistrar.add("LagMeter.ClickShrink",  boost::bind(&LLFloaterLagMeter::onClickShrink, this));	
+}
 
+BOOL LLFloaterLagMeter::postBuild()
+{
 	// Don't let this window take keyboard focus -- it's confusing to
 	// lose arrow-key driving when testing lag.
 	setIsChrome(TRUE);
-
+	
 	// were we shrunk last time?
 	if (gSavedSettings.getBOOL("LagMeterShrunk"))
 	{
-		onClickShrink(this);
+		onClickShrink();
 	}
-}
-
-BOOL LLFloaterLagMeter::postBuild()
-{
+	
 	mClientButton = getChild<LLButton>("client_lagmeter");
 	mClientText = getChild<LLTextBox>("client_text");
 	mClientCause = getChild<LLTextBox>("client_lag_cause");
@@ -102,7 +103,7 @@ BOOL LLFloaterLagMeter::postBuild()
 	config_string = getString("server_single_process_max_time_ms", mStringArgs);
 	mServerSingleProcessMaxTime = (float)atof( config_string.c_str() );
 
-	mShrunk = false;
+//	mShrunk = false;
 	config_string = getString("max_width_px", mStringArgs);
 	mMaxWidth = atoi( config_string.c_str() );
 	config_string = getString("min_width_px", mStringArgs);
@@ -120,18 +121,18 @@ BOOL LLFloaterLagMeter::postBuild()
 	mStringArgs["[SERVER_FRAME_RATE_CRITICAL]"] = getString("server_frame_rate_critical_fps");
 	mStringArgs["[SERVER_FRAME_RATE_WARNING]"] = getString("server_frame_rate_warning_fps");
 
-	childSetAction("minimize", onClickShrink, this);
+//	childSetAction("minimize", onClickShrink, this);
 
 	return TRUE;
 }
 LLFloaterLagMeter::~LLFloaterLagMeter()
 {
 	// save shrunk status for next time
-	gSavedSettings.setBOOL("LagMeterShrunk", mShrunk);
+//	gSavedSettings.setBOOL("LagMeterShrunk", mShrunk);
 	// expand so we save the large window rectangle
-	if (mShrunk)
+	if (gSavedSettings.getBOOL("LagMeterShrunk"))
 	{
-		onClickShrink(this);
+		onClickShrink();
 	}
 }
 
@@ -311,58 +312,61 @@ void LLFloaterLagMeter::determineServer()
 	}
 }
 
-//static
-void LLFloaterLagMeter::onClickShrink(void * data)
+
+void LLFloaterLagMeter::onClickShrink()  // toggle "LagMeterShrunk"
 {
-	LLFloaterLagMeter * self = (LLFloaterLagMeter*)data;
+//	LLFloaterLagMeter * self = (LLFloaterLagMeter*)data;
+
+	LLButton * button = getChild<LLButton>("minimize");
+	S32 delta_width = mMaxWidth -mMinWidth;
+	LLRect r = getRect();
+	bool shrunk = gSavedSettings.getBOOL("LagMeterShrunk");
 
-	LLButton * button = self->getChild<LLButton>("minimize");
-	S32 delta_width = self->mMaxWidth - self->mMinWidth;
-	LLRect r = self->getRect();
-	if(self->mShrunk)
+	if(shrunk)
 	{
-		self->setTitle( self->getString("max_title_msg", self->mStringArgs) );
+		setTitle(getString("max_title_msg", mStringArgs) );
 		// make left edge appear to expand
 		r.translate(-delta_width, 0);
-		self->setRect(r);
-		self->reshape(self->mMaxWidth, self->getRect().getHeight());
+		setRect(r);
+		reshape(mMaxWidth, getRect().getHeight());
 		
-		self->childSetText("client", self->getString("client_text_msg", self->mStringArgs) + ":");
-		self->childSetText("network", self->getString("network_text_msg", self->mStringArgs) + ":");
-		self->childSetText("server", self->getString("server_text_msg", self->mStringArgs) + ":");
+		childSetText("client", getString("client_text_msg", mStringArgs) + ":");
+		childSetText("network", getString("network_text_msg",mStringArgs) + ":");
+		childSetText("server", getString("server_text_msg", mStringArgs) + ":");
 
 		// usually "<<"
-		button->setLabel( self->getString("smaller_label", self->mStringArgs) );
+		button->setLabel( getString("smaller_label", mStringArgs) );
 	}
 	else
 	{
-		self->setTitle( self->getString("min_title_msg", self->mStringArgs) );
+		setTitle( getString("min_title_msg", mStringArgs) );
 		// make left edge appear to collapse
 		r.translate(delta_width, 0);
-		self->setRect(r);
-		self->reshape(self->mMinWidth, self->getRect().getHeight());
+		setRect(r);
+		reshape(mMinWidth, getRect().getHeight());
 		
-		self->childSetText("client", self->getString("client_text_msg", self->mStringArgs) );
-		self->childSetText("network", self->getString("network_text_msg", self->mStringArgs) );
-		self->childSetText("server", self->getString("server_text_msg", self->mStringArgs) );
+		childSetText("client", getString("client_text_msg", mStringArgs) );
+		childSetText("network",getString("network_text_msg",mStringArgs) );
+		childSetText("server", getString("server_text_msg", mStringArgs) );
 
 		// usually ">>"
-		button->setLabel( self->getString("bigger_label", self->mStringArgs) );
+		button->setLabel( getString("bigger_label", mStringArgs) );
 	}
 	// Don't put keyboard focus on the button
 	button->setFocus(FALSE);
 
-	self->mClientText->setVisible(self->mShrunk);
-	self->mClientCause->setVisible(self->mShrunk);
-	self->childSetVisible("client_help", self->mShrunk);
+//	self->mClientText->setVisible(self->mShrunk);
+//	self->mClientCause->setVisible(self->mShrunk);
+//	self->childSetVisible("client_help", self->mShrunk);
 
-	self->mNetworkText->setVisible(self->mShrunk);
-	self->mNetworkCause->setVisible(self->mShrunk);
-	self->childSetVisible("network_help", self->mShrunk);
+//	self->mNetworkText->setVisible(self->mShrunk);
+//	self->mNetworkCause->setVisible(self->mShrunk);
+//	self->childSetVisible("network_help", self->mShrunk);
 
-	self->mServerText->setVisible(self->mShrunk);
-	self->mServerCause->setVisible(self->mShrunk);
-	self->childSetVisible("server_help", self->mShrunk);
+//	self->mServerText->setVisible(self->mShrunk);
+//	self->mServerCause->setVisible(self->mShrunk);
+//	self->childSetVisible("server_help", self->mShrunk);
 
-	self->mShrunk = !self->mShrunk;
+//	self->mShrunk = !self->mShrunk;
+	gSavedSettings.setBOOL("LagMeterShrunk", !gSavedSettings.getBOOL("LagMeterShrunk"));
 }
diff --git a/indra/newview/llfloaterlagmeter.h b/indra/newview/llfloaterlagmeter.h
index e8af68ac7a..6d2086839e 100644
--- a/indra/newview/llfloaterlagmeter.h
+++ b/indra/newview/llfloaterlagmeter.h
@@ -42,17 +42,18 @@ class LLFloaterLagMeter : public LLFloater, public LLFloaterSingleton<LLFloaterL
 	friend class LLUISingleton<LLFloaterLagMeter, VisibilityPolicy<LLFloater> >;
 	
 public:
+	LLFloaterLagMeter(const LLSD& key);
+	/*virtual*/ ~LLFloaterLagMeter();
+
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL postBuild();	
 private:
-	LLFloaterLagMeter(const LLSD& key);
-	/*virtual*/ ~LLFloaterLagMeter();
 
 	void determineClient();
 	void determineNetwork();
 	void determineServer();
 
-	static void onClickShrink(void * data);
+	void onClickShrink();
 
 	bool mShrunk;
 	S32 mMaxWidth, mMinWidth;
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 6f5bd5f27b..f3275913e4 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -44,11 +44,11 @@
 #include "lluserauth.h"
 
 #include "llagent.h"
-#include "llfloateravatarpicker.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
-#include "llradiogroup.h"
 #include "llcombobox.h"
+#include "llfloaterreg.h"
+#include "llfloateravatarpicker.h"
 #include "llfloaterauction.h"
 #include "llfloatergroups.h"
 #include "llfloatergroupinfo.h"
@@ -889,7 +889,8 @@ void LLPanelLandGeneral::onClickStartAuction(void* data)
 		}
 		else
 		{
-			LLFloaterAuction::showInstance();
+			//LLFloaterAuction::showInstance();
+			LLFloaterReg::showInstance("auction");
 		}
 	}
 }
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index 11842b8b0e..3d5d2b733f 100644
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -163,7 +163,9 @@ bool LLNotificationChannelPanel::update(const LLSD& payload, bool passed_filter)
 LLFloaterNotificationConsole::LLFloaterNotificationConsole(const LLSD& key)
 : LLFloater()
 {
-	LLUICtrlFactory::instance().buildFloater(this, "floater_notifications_console.xml");
+	mCommitCallbackRegistrar.add("ClickAdd",     boost::bind(&LLFloaterNotificationConsole::onClickAdd, this));	
+
+	//LLUICtrlFactory::instance().buildFloater(this, "floater_notifications_console.xml");
 }
 
 void LLFloaterNotificationConsole::onClose(bool app_quitting)
@@ -187,7 +189,7 @@ BOOL LLFloaterNotificationConsole::postBuild()
 	addChannel("Notifications");
 	addChannel("NotificationTips");
 
-	getChild<LLButton>("add_notification")->setClickedCallback(onClickAdd, this);
+//	getChild<LLButton>("add_notification")->setClickedCallback(onClickAdd, this);
 
 	LLComboBox* notifications = getChild<LLComboBox>("notification_types");
 	LLNotifications::TemplateNames names = LLNotifications::instance().getTemplateNames();
@@ -236,11 +238,9 @@ void LLFloaterNotificationConsole::updateResizeLimits()
 	setResizeLimits(getMinWidth(), floater_header_size + HEADER_PADDING + ((NOTIFICATION_PANEL_HEADER_HEIGHT + 3) * stack.getNumPanels()));
 }
 
-void LLFloaterNotificationConsole::onClickAdd(void* user_data)
+void LLFloaterNotificationConsole::onClickAdd()
 {
-	LLFloaterNotificationConsole* floater = (LLFloaterNotificationConsole*)user_data;
-
-	std::string message_name = floater->getChild<LLComboBox>("notification_types")->getValue().asString();
+	std::string message_name = getChild<LLComboBox>("notification_types")->getValue().asString();
 	if (!message_name.empty())
 	{
 		LLNotifications::instance().add(message_name, LLSD());
diff --git a/indra/newview/llfloaternotificationsconsole.h b/indra/newview/llfloaternotificationsconsole.h
index 0372553182..b85437c3c5 100644
--- a/indra/newview/llfloaternotificationsconsole.h
+++ b/indra/newview/llfloaternotificationsconsole.h
@@ -55,7 +55,7 @@ public:
 	void updateResizeLimits();
 
 private:
-	static void onClickAdd(void* user_data);
+	void onClickAdd();
 };
 
 
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d0df2617b3..15d57ebbcc 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -57,18 +57,61 @@
 #include "llfloatervoicedevicesettings.h"
 #include "llkeyboard.h"
 #include "llmodaldialog.h"
-#include "llpaneldisplay.h"
 #include "llpanellogin.h"
 #include "llradiogroup.h"
+#include "llsky.h"
 #include "llstylemap.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
 #include "llsliderctrl.h"
 #include "lltabcontainer.h"
+#include "lltrans.h"
 #include "lltexteditor.h"
 #include "llviewercontrol.h"
 #include "llviewercamera.h"
 #include "llviewerwindow.h"
+#include "llviewermessage.h"
+#include "llviewershadermgr.h"
+#include "llvotree.h"
+#include "llvosky.h"
+
+// linden library includes
+#include "llerror.h"
+#include "llfontgl.h"
+#include "llrect.h"
+#include "llstring.h"
+
+// project includes
+
+#include "llbutton.h"
+#include "llflexibleobject.h"
+#include "lllineeditor.h"
+#include "llresmgr.h"
+#include "llspinctrl.h"
+#include "llstartup.h"
+#include "lltextbox.h"
+
+#include "llui.h"
+
+#include "llviewerimage.h"
+#include "llviewerimagelist.h"
+#include "llviewerobjectlist.h"
+
+#include "llvoavatar.h"
+#include "llvovolume.h"
+#include "llwindow.h"
+#include "llworld.h"
+#include "pipeline.h"
+#include "lluictrlfactory.h"
+#include "llboost.h"
+
+
+//RN temporary includes for resolution switching
+#include "llglheaders.h"
+const F32 MAX_USER_FAR_CLIP = 512.f;
+const F32 MIN_USER_FAR_CLIP = 64.f;
+
+const S32 ASPECT_RATIO_STR_LEN = 100;
 
 class LLVoiceSetKeyDialog : public LLModalDialog
 	{
@@ -136,6 +179,9 @@ bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response
 bool callback_skip_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater);
 bool callback_reset_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater);
 
+bool extractWindowSizeFromString(const std::string& instr, U32 &width, U32 &height);
+void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator);
+
 LLMediaBase *get_web_media()
 {
 	LLMediaBase *media_source;
@@ -223,8 +269,41 @@ bool callback_reset_dialogs(const LLSD& notification, const LLSD& response, LLFl
 	return false;
 }
 
+
+// Extract from strings of the form "<width> x <height>", e.g. "640 x 480".
+bool extractWindowSizeFromString(const std::string& instr, U32 &width, U32 &height)
+{
+	using namespace boost;
+	cmatch what;
+	const regex expression("([0-9]+) x ([0-9]+)");
+	if (regex_match(instr.c_str(), what, expression))
+	{
+		width = atoi(what[1].first);
+		height = atoi(what[2].first);
+		return true;
+	}
+	
+	width = height = 0;
+	return false;
+}
+
+void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator)
+{
+	numerator = 0;
+	denominator = 0;
+	for (F32 test_denominator = 1.f; test_denominator < 30.f; test_denominator += 1.f)
+	{
+		if (fmodf((decimal_val * test_denominator) + 0.01f, 1.f) < 0.02f)
+		{
+			numerator = llround(decimal_val * test_denominator);
+			denominator = llround(test_denominator);
+			break;
+		}
+	}
+}
 // static
 std::string LLFloaterPreference::sSkin = "";
+F32 LLFloaterPreference::sAspectRatio = 0.0;
 //////////////////////////////////////////////
 // LLFloaterPreference
 
@@ -235,9 +314,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 {
 	//Build Floater is now Called from 	LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
           
-	mFactoryMap["display"]		= LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPanelDisplay>);               /// done fixing the callbacks
-
-
 	mCommitCallbackRegistrar.add("Pref.Apply",				boost::bind(&LLFloaterPreference::onBtnApply, this));
 	mCommitCallbackRegistrar.add("Pref.Cancel",				boost::bind(&LLFloaterPreference::onBtnCancel, this));
 	mCommitCallbackRegistrar.add("Pref.OK",					boost::bind(&LLFloaterPreference::onBtnOK, this));
@@ -261,9 +337,14 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.HardwareSettings",       boost::bind(&LLFloaterPreference::onOpenHardwareSettings, this));	
 	mCommitCallbackRegistrar.add("Pref.HardwareDefaults",       boost::bind(&LLFloaterPreference::setHardwareDefaults, this));	
 	mCommitCallbackRegistrar.add("Pref.VertexShaderEnable",     boost::bind(&LLFloaterPreference::onVertexShaderEnable, this));	
-	gSavedSkinSettings.getControl("HTMLLinkColor")->getCommitSignal()->connect(boost::bind(&handleHTMLLinkColorChanged,  _2));
-	//gSavedSettings.getControl("UseExternalBrowser")->getCommitSignal()->connect(boost::bind(&LLPanelPreference::handleUseExternalBrowserChanged, this));
+	mCommitCallbackRegistrar.add("Pref.WindowedMod",            boost::bind(&LLFloaterPreference::onCommitWindowedMode, this));	
+	mCommitCallbackRegistrar.add("Pref.UpdateSliderText",       boost::bind(&LLFloaterPreference::onUpdateSliderText,this, _1,_2));	
+	mCommitCallbackRegistrar.add("Pref.AutoDetectAspect",       boost::bind(&LLFloaterPreference::onCommitAutoDetectAspect, this));	
+	mCommitCallbackRegistrar.add("Pref.onSelectAspectRatio",    boost::bind(&LLFloaterPreference::onKeystrokeAspectRatio, this));	
+	mCommitCallbackRegistrar.add("Pref.QualityPerformance",     boost::bind(&LLFloaterPreference::onChangeQuality, this, _2));	
 	
+	gSavedSkinSettings.getControl("HTMLLinkColor")->getCommitSignal()->connect(boost::bind(&handleHTMLLinkColorChanged,  _2));
+
 }
 
 BOOL LLFloaterPreference::postBuild()
@@ -271,20 +352,27 @@ BOOL LLFloaterPreference::postBuild()
 	LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
 	if (!tabcontainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
 		tabcontainer->selectFirstTab();
-	
-	
 	return TRUE;
 }
 
 LLFloaterPreference::~LLFloaterPreference()
 {
+	// clean up user data
+	LLComboBox* ctrl_aspect_ratio = getChild<LLComboBox>( "aspect_ratio");
+	LLComboBox* ctrl_window_size = getChild<LLComboBox>("windowsize combo");
+	for (S32 i = 0; i < ctrl_aspect_ratio->getItemCount(); i++)
+	{
+		ctrl_aspect_ratio->setCurrentByIndex(i);
+	}
+	for (S32 i = 0; i < ctrl_window_size->getItemCount(); i++)
+	{
+		ctrl_window_size->setCurrentByIndex(i);
+	}
 }
 void LLFloaterPreference::draw()
 {
 	BOOL has_first_selected = (getChildRef<LLScrollListCtrl>("disabled_popups").getFirstSelected()!=NULL);
 	gSavedSettings.setBOOL("FirstSelectedDisabledPopups", has_first_selected);
-	
-	
 	LLFloater::draw();
 }
 
@@ -368,6 +456,14 @@ void LLFloaterPreference::apply()
 		}
 	}
 
+	applyResolution();
+	
+	// Only set window size if we're not in fullscreen mode
+	if(gSavedSettings.getBOOL("NotFullScreen"))
+	{
+		applyWindowSize();
+	}
+	
 }
 
 void LLFloaterPreference::cancel()
@@ -396,7 +492,11 @@ void LLFloaterPreference::cancel()
 	{
 		voice_device_settings ->cancel();
 	}
+	
 	LLFloaterReg::hideInstance("pref_voicedevicesettings");
+	
+	gSavedSettings.setF32("FullScreenAspectRatio", sAspectRatio);
+
 }
 
 void LLFloaterPreference::onOpen(const LLSD& key)
@@ -517,32 +617,17 @@ void LLFloaterPreference::onChangeCustom()
 
 	refreshEnabledGraphics();
 }
-//////////////////////////////////////////////////////////////////////////
-// static     Note:(angela) NOT touching LLPanelDisplay for this milestone (skinning-11)
+
 void LLFloaterPreference::refreshEnabledGraphics()
 {
 	LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
 	if(instance)
 	{
 		LLFloaterHardwareSettings::instance()->refreshEnabledState();
-		
-		LLTabContainer* tabcontainer = instance->getChild<LLTabContainer>("pref core");
-		for (child_list_t::const_iterator iter = tabcontainer->getChildList()->begin();
-			 iter != tabcontainer->getChildList()->end(); ++iter)
-		{
-			LLView* view = *iter;
-			if(!view)
-				return;
-			if(view->getName()=="display")
-			{
-				LLPanelDisplay* display_panel = dynamic_cast<LLPanelDisplay*>(view);
-				if(!display_panel)
-					return;
-				display_panel->refreshEnabledState();
-			}	
-		}
+		instance->refreshEnabledState();
 	}
 }
+
 void LLFloaterPreference::updateMeterText(LLUICtrl* ctrl)
 {
 	// get our UI widgets
@@ -693,6 +778,208 @@ void LLFloaterPreference::buildLists(void* data)
 	}
 }
 
+void LLFloaterPreference::refreshEnabledState()
+{
+	
+	// disable graphics settings and exit if it's not set to custom
+	if(!gSavedSettings.getBOOL("RenderCustomSettings"))
+	{
+		return;
+	}
+	
+	LLCheckBoxCtrl* ctrl_reflections = getChild<LLCheckBoxCtrl>("Reflections");
+	LLRadioGroup* radio_reflection_detail = getChild<LLRadioGroup>("ReflectionDetailRadio");
+	
+	// Reflections
+	BOOL reflections = gSavedSettings.getBOOL("VertexShaderEnable") 
+		&& gGLManager.mHasCubeMap
+		&& LLCubeMap::sUseCubeMaps;
+	ctrl_reflections->setEnabled(reflections);
+	
+	// Bump & Shiny	
+	bool bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
+	getChild<LLCheckBoxCtrl>("BumpShiny")->setEnabled(bumpshiny ? TRUE : FALSE);
+	
+	for (S32 i = 0; i < radio_reflection_detail->getItemCount(); ++i)
+	{
+		radio_reflection_detail->setIndexEnabled(i, ctrl_reflections->get() && reflections);
+	}
+	
+	// Avatar Mode
+	// Enable Avatar Shaders
+	LLCheckBoxCtrl* ctrl_avatar_vp = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
+	// Avatar Render Mode
+	LLCheckBoxCtrl* ctrl_avatar_cloth = getChild<LLCheckBoxCtrl>("AvatarCloth");
+
+	S32 max_avatar_shader = LLViewerShaderMgr::instance()->mMaxAvatarShaderLevel;
+	ctrl_avatar_vp->setEnabled((max_avatar_shader > 0) ? TRUE : FALSE);
+	
+	if (gSavedSettings.getBOOL("VertexShaderEnable") == FALSE || 
+		gSavedSettings.getBOOL("RenderAvatarVP") == FALSE)
+	{
+		ctrl_avatar_cloth->setEnabled(false);
+	} 
+	else
+	{
+		ctrl_avatar_cloth->setEnabled(true);
+	}
+	
+	// Vertex Shaders
+	// Global Shader Enable
+	LLCheckBoxCtrl* ctrl_shader_enable   = getChild<LLCheckBoxCtrl>("BasicShaders");
+	// radio set for terrain detail mode
+	LLRadioGroup*   mRadioTerrainDetail = getChild<LLRadioGroup>("TerrainDetailRadio");   // can be linked with control var
+
+	ctrl_shader_enable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"));
+	
+	BOOL shaders = ctrl_shader_enable->get();
+	if (shaders)
+	{
+		mRadioTerrainDetail->setValue(1);
+		mRadioTerrainDetail->setEnabled(FALSE);
+	}
+	else
+	{
+		mRadioTerrainDetail->setEnabled(TRUE);
+	}
+	
+	// WindLight
+	LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
+	
+	// *HACK just checks to see if we can use shaders... 
+	// maybe some cards that use shaders, but don't support windlight
+	ctrl_wind_light->setEnabled(ctrl_shader_enable->getEnabled() && shaders);
+	// now turn off any features that are unavailable
+	disableUnavailableSettings();
+}
+
+void LLFloaterPreference::disableUnavailableSettings()
+{	
+	LLCheckBoxCtrl* ctrl_reflections   = getChild<LLCheckBoxCtrl>("Reflections");
+	LLCheckBoxCtrl* ctrl_avatar_vp     = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
+	LLCheckBoxCtrl* ctrl_avatar_cloth  = getChild<LLCheckBoxCtrl>("AvatarCloth");
+	LLCheckBoxCtrl* ctrl_shader_enable = getChild<LLCheckBoxCtrl>("BasicShaders");
+	LLCheckBoxCtrl* ctrl_wind_light    = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
+	LLCheckBoxCtrl* ctrl_avatar_impostors = getChild<LLCheckBoxCtrl>("AvatarImpostors");
+
+	// if vertex shaders off, disable all shader related products
+	if(!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"))
+	{
+		ctrl_shader_enable->setEnabled(FALSE);
+		ctrl_shader_enable->setValue(FALSE);
+		
+		ctrl_wind_light->setEnabled(FALSE);
+		ctrl_wind_light->setValue(FALSE);
+		
+		ctrl_reflections->setEnabled(FALSE);
+		ctrl_reflections->setValue(FALSE);
+		
+		ctrl_avatar_vp->setEnabled(FALSE);
+		ctrl_avatar_vp->setValue(FALSE);
+		
+		ctrl_avatar_cloth->setEnabled(FALSE);
+		ctrl_avatar_cloth->setValue(FALSE);
+	}
+	
+	// disabled windlight
+	if(!LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders"))
+	{
+		ctrl_wind_light->setEnabled(FALSE);
+		ctrl_wind_light->setValue(FALSE);
+	}
+	
+	// disabled reflections
+	if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderWaterReflections"))
+	{
+		ctrl_reflections->setEnabled(FALSE);
+		ctrl_reflections->setValue(FALSE);
+	}
+	
+	// disabled av
+	if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderAvatarVP"))
+	{
+		ctrl_avatar_vp->setEnabled(FALSE);
+		ctrl_avatar_vp->setValue(FALSE);
+		
+		ctrl_avatar_cloth->setEnabled(FALSE);
+		ctrl_avatar_cloth->setValue(FALSE);
+	}
+	// disabled cloth
+	if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderAvatarCloth"))
+	{
+		ctrl_avatar_cloth->setEnabled(FALSE);
+		ctrl_avatar_cloth->setValue(FALSE);
+	}
+	// disabled impostors
+	if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderUseImpostors"))
+	{
+		ctrl_avatar_impostors->setEnabled(FALSE);
+		ctrl_avatar_impostors->setValue(FALSE);
+	}
+}
+
+void LLFloaterPreference::onCommitAutoDetectAspect()
+{
+	BOOL auto_detect = getChild<LLCheckBoxCtrl>("aspect_auto_detect")->get();
+	F32 ratio;
+	
+	if (auto_detect)
+	{
+		S32 numerator = 0;
+		S32 denominator = 0;
+		
+		// clear any aspect ratio override
+		gViewerWindow->mWindow->setNativeAspectRatio(0.f);
+		fractionFromDecimal(gViewerWindow->mWindow->getNativeAspectRatio(), numerator, denominator);
+		
+		std::string aspect;
+		if (numerator != 0)
+		{
+			aspect = llformat("%d:%d", numerator, denominator);
+		}
+		else
+		{
+			aspect = llformat("%.3f", gViewerWindow->mWindow->getNativeAspectRatio());
+		}
+		
+		getChild<LLComboBox>( "aspect_ratio")->setLabel(aspect);
+		
+		ratio = gViewerWindow->mWindow->getNativeAspectRatio();
+		gSavedSettings.setF32("FullScreenAspectRatio", ratio);
+	}
+}
+
+void LLFloaterPreference::refresh()
+{
+	LLPanel::refresh();
+
+	// sliders and their text boxes
+	//	mPostProcess = gSavedSettings.getS32("RenderGlowResolutionPow");
+	// slider text boxes
+	updateSliderText(getChild<LLSliderCtrl>("ObjectMeshDetail"), getChild<LLTextBox>("ObjectMeshDetailText"));
+	updateSliderText(getChild<LLSliderCtrl>("FlexibleMeshDetail"), getChild<LLTextBox>("FlexibleMeshDetailText"));
+	updateSliderText(getChild<LLSliderCtrl>("TreeMeshDetail"), getChild<LLTextBox>("TreeMeshDetailText"));
+	updateSliderText(getChild<LLSliderCtrl>("AvatarMeshDetail"), getChild<LLTextBox>("AvatarMeshDetailText"));
+	updateSliderText(getChild<LLSliderCtrl>("TerrainMeshDetail"), getChild<LLTextBox>("TerrainMeshDetailText"));
+	updateSliderText(getChild<LLSliderCtrl>("RenderPostProcess"), getChild<LLTextBox>("PostProcessText"));
+	updateSliderText(getChild<LLSliderCtrl>("SkyMeshDetail"), getChild<LLTextBox>("SkyMeshDetailText"));
+	
+	refreshEnabledState();
+}
+
+void LLFloaterPreference::onCommitWindowedMode()
+{
+	refresh();
+}
+
+void LLFloaterPreference::onChangeQuality(const LLSD& data)
+{
+	U32 level = (U32)(data.asReal());
+	LLFeatureManager::getInstance()->setGraphicsLevel(level, true);
+	refreshEnabledGraphics();
+	refresh();
+}
+
 // static
 // DEV-24146 -  needs to be removed at a later date. jan-2009
 void LLFloaterPreference::cleanupBadSetting()
@@ -790,9 +1077,9 @@ void LLFloaterPreference::onCommitLogging()
 {
 	enableHistory();
 }
+
 void LLFloaterPreference::enableHistory()
 {
-	
 	if (childGetValue("log_instant_messages").asBoolean() || childGetValue("log_chat").asBoolean())
 	{
 		childEnable("log_show_history");
@@ -850,6 +1137,158 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
 
 }
 
+void LLFloaterPreference::onUpdateSliderText(LLUICtrl* ctrl, const LLSD& name)
+{
+	if(name.asString() =="" || !hasChild("name"))
+		return;
+	
+	LLTextBox* text_box = getChild<LLTextBox>(name.asString());
+	LLSliderCtrl* slider = dynamic_cast<LLSliderCtrl*>(ctrl);
+	updateSliderText(slider, text_box);
+}
+
+void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box)
+{
+	if(text_box == NULL || ctrl== NULL)
+		return;
+	
+	// get range and points when text should change
+	F32 value = (F32)ctrl->getValue().asReal();
+	F32 min = ctrl->getMinValue();
+	F32 max = ctrl->getMaxValue();
+	F32 range = max - min;
+	llassert(range > 0);
+	F32 midPoint = min + range / 3.0f;
+	F32 highPoint = min + (2.0f * range / 3.0f);
+	
+	// choose the right text
+	if(value < midPoint)
+	{
+		text_box->setText(LLTrans::getString("GraphicsQualityLow"));
+	} 
+	else if (value < highPoint)
+	{
+		text_box->setText(LLTrans::getString("GraphicsQualityMid"));
+	}
+	else
+	{
+		text_box->setText(LLTrans::getString("GraphicsQualityHigh"));
+	}
+}
+
+void LLFloaterPreference::onKeystrokeAspectRatio()
+{
+	getChild<LLCheckBoxCtrl>("aspect_auto_detect")->set(FALSE);
+}
+
+void LLFloaterPreference::applyWindowSize()
+{
+	LLComboBox* ctrl_windowSize = getChild<LLComboBox>("windowsize combo");
+	if (ctrl_windowSize->getVisible() && (ctrl_windowSize->getCurrentIndex() != -1))
+	{
+		U32 width = 0;
+		U32 height = 0;
+		if (extractWindowSizeFromString(ctrl_windowSize->getValue().asString().c_str(), width,height))
+		{
+			LLViewerWindow::movieSize(width, height);
+		}
+	}
+}
+
+void LLFloaterPreference::applyResolution()
+{
+	LLComboBox* ctrl_aspect_ratio = getChild<LLComboBox>( "aspect_ratio");
+	gGL.flush();
+	char aspect_ratio_text[ASPECT_RATIO_STR_LEN];		/*Flawfinder: ignore*/
+	if (ctrl_aspect_ratio->getCurrentIndex() == -1)
+	{
+		// *Can't pass const char* from c_str() into strtok
+		strncpy(aspect_ratio_text, ctrl_aspect_ratio->getSimple().c_str(), sizeof(aspect_ratio_text) -1);	/*Flawfinder: ignore*/
+		aspect_ratio_text[sizeof(aspect_ratio_text) -1] = '\0';
+		char *element = strtok(aspect_ratio_text, ":/\\");
+		if (!element)
+		{
+			sAspectRatio = 0.f; // will be clamped later
+		}
+		else
+		{
+			LLLocale locale(LLLocale::USER_LOCALE);
+			sAspectRatio = (F32)atof(element);
+		}
+		
+		// look for denominator
+		element = strtok(NULL, ":/\\");
+		if (element)
+		{
+			LLLocale locale(LLLocale::USER_LOCALE);
+			
+			F32 denominator = (F32)atof(element);
+			if (denominator != 0.f)
+			{
+				sAspectRatio /= denominator;
+			}
+		}
+	}
+	else
+	{
+		sAspectRatio = (F32)ctrl_aspect_ratio->getValue().asReal();
+	}
+	
+	// presumably, user entered a non-numeric value if aspect_ratio == 0.f
+	if (sAspectRatio != 0.f)
+	{
+		sAspectRatio = llclamp(sAspectRatio, 0.2f, 5.f);
+		gSavedSettings.setF32("FullScreenAspectRatio", sAspectRatio);
+	}
+	
+	// Screen resolution
+	S32 num_resolutions;
+	LLWindow::LLWindowResolution* supported_resolutions = 
+	gViewerWindow->getWindow()->getSupportedResolutions(num_resolutions);
+	U32 resIndex = getChild<LLComboBox>("fullscreen combo")->getCurrentIndex();
+	gSavedSettings.setS32("FullScreenWidth", supported_resolutions[resIndex].mWidth);
+	gSavedSettings.setS32("FullScreenHeight", supported_resolutions[resIndex].mHeight);
+	
+	gViewerWindow->requestResolutionUpdate(!gSavedSettings.getBOOL("NotFullScreen"));
+	
+	send_agent_update(TRUE);
+	
+	// Update enable/disable
+	refresh();
+}
+
+void LLFloaterPreference::initWindowSizeControls(LLPanel* panelp)
+{
+	// Window size
+	//	mWindowSizeLabel = getChild<LLTextBox>("WindowSizeLabel");
+	LLComboBox* ctrl_window_size = panelp->getChild<LLComboBox>("windowsize combo");
+	
+	// Look to see if current window size matches existing window sizes, if so then
+	// just set the selection value...
+	const U32 height = gViewerWindow->getWindowDisplayHeight();
+	const U32 width = gViewerWindow->getWindowDisplayWidth();
+	for (S32 i=0; i < ctrl_window_size->getItemCount(); i++)
+	{
+		U32 height_test = 0;
+		U32 width_test = 0;
+		ctrl_window_size->setCurrentByIndex(i);
+		if (extractWindowSizeFromString(ctrl_window_size->getValue().asString(), width_test, height_test))
+		{
+			if ((height_test == height) && (width_test == width))
+			{
+				return;
+			}
+		}
+	}
+	// ...otherwise, add a new entry with the current window height/width.
+	LLUIString resolution_label = panelp->getString("resolution_format");
+	resolution_label.setArg("[RES_X]", llformat("%d", width));
+	resolution_label.setArg("[RES_Y]", llformat("%d", height));
+	ctrl_window_size->add(resolution_label, ADD_TOP);
+	ctrl_window_size->setCurrentByIndex(0);
+}
+
+
 
 //----------------------------------------------------------------------------
 static LLRegisterPanelClassWrapper<LLPanelPreference> t_places("panel_preference");
@@ -858,14 +1297,12 @@ LLPanelPreference::LLPanelPreference()
 {
 	//
 	mCommitCallbackRegistrar.add("setControlFalse",		boost::bind(&LLPanelPreference::setControlFalse,this, _2));
-	
 }
 //virtual
 BOOL LLPanelPreference::postBuild()
 {
 	if (hasChild("maturity_desired_combobox"))
 	{
-
 		/////////////////////////// From LLPanelGeneral //////////////////////////
 		// if we have no agent, we can't let them choose anything
 		// if we have an agent, then we only let them choose if they have a choice
@@ -935,6 +1372,94 @@ BOOL LLPanelPreference::postBuild()
 		childSetText("busy_response", getString("log_in_to_change"));
 		
 	}
+
+
+	if(hasChild("fullscreen combo"))
+	{
+		//============================================================================
+		// Resolution
+
+		S32 num_resolutions = 0;
+		LLWindow::LLWindowResolution* supported_resolutions = gViewerWindow->getWindow()->getSupportedResolutions(num_resolutions);
+		
+		S32 fullscreen_mode = num_resolutions - 1;
+		
+		LLComboBox*ctrl_full_screen = getChild<LLComboBox>( "fullscreen combo");
+		LLUIString resolution_label = getString("resolution_format");
+		
+		for (S32 i = 0; i < num_resolutions; i++)
+		{
+			resolution_label.setArg("[RES_X]", llformat("%d", supported_resolutions[i].mWidth));
+			resolution_label.setArg("[RES_Y]", llformat("%d", supported_resolutions[i].mHeight));
+			ctrl_full_screen->add( resolution_label, ADD_BOTTOM );
+		}
+		
+		{
+			BOOL targetFullscreen;
+			S32 targetWidth;
+			S32 targetHeight;
+			
+			gViewerWindow->getTargetWindow(targetFullscreen, targetWidth, targetHeight);
+			
+			if (targetFullscreen)
+			{
+				fullscreen_mode = 0; // default to 800x600
+				for (S32 i = 0; i < num_resolutions; i++)
+				{
+					if (targetWidth == supported_resolutions[i].mWidth
+						&&  targetHeight == supported_resolutions[i].mHeight)
+					{
+						fullscreen_mode = i;
+					}
+				}
+				ctrl_full_screen->setCurrentByIndex(fullscreen_mode);
+			}
+			else
+			{
+				// set to windowed mode
+				//fullscreen_mode = mCtrlFullScreen->getItemCount() - 1;
+				ctrl_full_screen->setCurrentByIndex(0);
+			}
+		}
+		
+		LLFloaterPreference::initWindowSizeControls(this);
+		
+		if (gSavedSettings.getBOOL("FullScreenAutoDetectAspectRatio"))
+		{
+			LLFloaterPreference::sAspectRatio = gViewerWindow->getDisplayAspectRatio();
+		}
+		else
+		{
+			LLFloaterPreference::sAspectRatio = gSavedSettings.getF32("FullScreenAspectRatio");
+		}
+
+		getChild<LLComboBox>("aspect_ratio")->setTextEntryCallback(boost::bind(&LLPanelPreference::setControlFalse, this, LLSD("FullScreenAutoDetectAspectRatio") ));	
+		
+
+		S32 numerator = 0;
+		S32 denominator = 0;
+		fractionFromDecimal(LLFloaterPreference::sAspectRatio, numerator, denominator);		
+		
+		LLUIString aspect_ratio_text = getString("aspect_ratio_text");
+		if (numerator != 0)
+		{
+			aspect_ratio_text.setArg("[NUM]", llformat("%d",  numerator));
+			aspect_ratio_text.setArg("[DEN]", llformat("%d",  denominator));
+		}	
+		else
+		{
+			aspect_ratio_text = llformat("%.3f", LLFloaterPreference::sAspectRatio);
+		}
+		
+		LLComboBox* ctrl_aspect_ratio = getChild<LLComboBox>( "aspect_ratio");
+		//mCtrlAspectRatio->setCommitCallback(onSelectAspectRatio, this);
+		// add default aspect ratios
+		ctrl_aspect_ratio->add(aspect_ratio_text, &LLFloaterPreference::sAspectRatio, ADD_TOP);
+		ctrl_aspect_ratio->setCurrentByIndex(0);
+		
+		refresh();
+	}
+	
 	apply();
 	return true;
 }
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 000bff4dea..afff610c69 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -43,12 +43,22 @@
 
 class LLPanelPreference;
 class LLPanelLCD;
-class LLPanelDisplay;
 class LLPanelDebug;
 class LLMessageSystem;
 class LLScrollListCtrl;
-
+class LLSliderCtrl;
 class LLSD;
+class LLTextBox;
+
+typedef enum
+	{
+		GS_LOW_GRAPHICS,
+		GS_MID_GRAPHICS,
+		GS_HIGH_GRAPHICS,
+		GS_ULTRA_GRAPHICS
+		
+	} EGraphicsSettings;
+
 
 // Floater to control preferences (display, audio, bandwidth, general.
 class LLFloaterPreference : public LLFloater
@@ -88,6 +98,8 @@ protected:
 	void setHardwareDefaults();
 	// callback for when client turns on shaders
 	void onVertexShaderEnable();
+	
+
 public:
 
 	void onClickSetCache();
@@ -106,11 +118,29 @@ public:
 	void enableHistory();
 	void onCommitLogging();
 	void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
+	void refreshEnabledState();
+	void disableUnavailableSettings();
+	void onCommitWindowedMode();
+	void refresh();	// Refresh enable/disable
+	// if the quality radio buttons are changed
+	void onChangeQuality(const LLSD& data);
+	
+	void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
+	void onUpdateSliderText(LLUICtrl* ctrl, const LLSD& name);
+	void onKeystrokeAspectRatio();
+//	void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator);
+//	bool extractWindowSizeFromString(const std::string& instr, U32 &width, U32 &height);
+
+	void onCommitAutoDetectAspect();
+	void applyResolution();
+	void applyWindowSize();
+
+	static void initWindowSizeControls(LLPanel* panelp);
 	
 	static void buildLists(void* data);
 	static void refreshSkin(void* data);
 	static void cleanupBadSetting();
-	
+	static F32 sAspectRatio;	
 private:
 	static std::string sSkin;
 	bool mGotPersonalInfo;
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 8ddc929019..4b175cdc27 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -188,7 +188,7 @@ BOOL LLFloaterReporter::postBuild()
 	LLLineEditor* le = getChild<LLLineEditor>("abuser_name_edit");
 	le->setEnabled( FALSE );
 
-	setPosBox(mPosition.getValue());
+	setPosBox((LLVector3d)mPosition.getValue());
 	LLButton* pick_btn = getChild<LLButton>("pick_btn");
 	pick_btn->setImages(std::string("tool_face.tga"),
 						std::string("tool_face_active.tga") );
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 339b90a0f5..8b6102c67f 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -44,7 +44,11 @@
 LLFloaterSettingsDebug::LLFloaterSettingsDebug(const LLSD& key) 
 :	LLFloater(key)
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_settings_debug.xml");
+	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_settings_debug.xml");
+	mCommitCallbackRegistrar.add("SettingSelect",	boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this,_1));
+	mCommitCallbackRegistrar.add("CommitSettings",	boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
+	mCommitCallbackRegistrar.add("ClickDefault",	boost::bind(&LLFloaterSettingsDebug::onClickDefault, this));
+
 }
 
 LLFloaterSettingsDebug::~LLFloaterSettingsDebug()
@@ -82,17 +86,7 @@ BOOL LLFloaterSettingsDebug::postBuild()
 	}
 
 	settings_combo->sortByName();
-	settings_combo->setCommitCallback(onSettingSelect, this);
 	settings_combo->updateSelection();
-
-	childSetCommitCallback("val_spinner_1", onCommitSettings, this);
-	childSetCommitCallback("val_spinner_2", onCommitSettings, this);
-	childSetCommitCallback("val_spinner_3", onCommitSettings, this);
-	childSetCommitCallback("val_spinner_4", onCommitSettings, this);
-	childSetCommitCallback("val_text", onCommitSettings, this);
-	childSetCommitCallback("boolean_combo", onCommitSettings, this);
-	childSetCommitCallback("color_swatch", onCommitSettings, this);
-	childSetAction("default_btn", onClickDefault, this);
 	mComment = getChild<LLTextEditor>("comment_text");
 	return TRUE;
 }
@@ -107,21 +101,17 @@ void LLFloaterSettingsDebug::draw()
 }
 
 //static 
-void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl, void* user_data)
+void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl)
 {
-	LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
 	LLComboBox* combo_box = (LLComboBox*)ctrl;
 	LLControlVariable* controlp = (LLControlVariable*)combo_box->getCurrentUserdata();
 
-	floaterp->updateControl(controlp);
+	updateControl(controlp);
 }
 
-//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");
+	LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
 	LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
 
 	LLVector3 vector;
@@ -135,46 +125,46 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 	switch(controlp->type())
 	{		
 	  case TYPE_U32:
-		controlp->set(floaterp->childGetValue("val_spinner_1"));
+		controlp->set(childGetValue("val_spinner_1"));
 		break;
 	  case TYPE_S32:
-		controlp->set(floaterp->childGetValue("val_spinner_1"));
+		controlp->set(childGetValue("val_spinner_1"));
 		break;
 	  case TYPE_F32:
-		controlp->set(LLSD(floaterp->childGetValue("val_spinner_1").asReal()));
+		controlp->set(LLSD(childGetValue("val_spinner_1").asReal()));
 		break;
 	  case TYPE_BOOLEAN:
-		controlp->set(floaterp->childGetValue("boolean_combo"));
+		controlp->set(childGetValue("boolean_combo"));
 		break;
 	  case TYPE_STRING:
-		controlp->set(LLSD(floaterp->childGetValue("val_text").asString()));
+		controlp->set(LLSD(childGetValue("val_text").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();
+		vector.mV[VX] = (F32)childGetValue("val_spinner_1").asReal();
+		vector.mV[VY] = (F32)childGetValue("val_spinner_2").asReal();
+		vector.mV[VZ] = (F32)childGetValue("val_spinner_3").asReal();
 		controlp->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();
+		vectord.mdV[VX] = childGetValue("val_spinner_1").asReal();
+		vectord.mdV[VY] = childGetValue("val_spinner_2").asReal();
+		vectord.mdV[VZ] = childGetValue("val_spinner_3").asReal();
 		controlp->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();
+		rect.mLeft = childGetValue("val_spinner_1").asInteger();
+		rect.mRight = childGetValue("val_spinner_2").asInteger();
+		rect.mBottom = childGetValue("val_spinner_3").asInteger();
+		rect.mTop = childGetValue("val_spinner_4").asInteger();
 		controlp->set(rect.getValue());
 		break;
 	  case TYPE_COL4:
-		col3.setValue(floaterp->childGetValue("color_swatch"));
-		col4 = LLColor4(col3, (F32)floaterp->childGetValue("val_spinner_4").asReal());
+		col3.setValue(childGetValue("val_color_swatch"));
+		col4 = LLColor4(col3, (F32)childGetValue("val_spinner_4").asReal());
 		controlp->set(col4.getValue());
 		break;
 	  case TYPE_COL3:
-		controlp->set(floaterp->childGetValue("color_swatch"));
+		controlp->set(childGetValue("val_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();
@@ -186,16 +176,15 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 }
 
 // static
-void LLFloaterSettingsDebug::onClickDefault(void* user_data)
+void LLFloaterSettingsDebug::onClickDefault()
 {
-	LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
-	LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
+	LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
 	LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
 
 	if (controlp)
 	{
 		controlp->resetToDefault();
-		floaterp->updateControl(controlp);
+		updateControl(controlp);
 	}
 }
 
@@ -206,7 +195,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 	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");
 
 	if (!spinner1 || !spinner2 || !spinner3 || !spinner4 || !color_swatch)
 	{
diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
index 0a98021c79..87833793af 100644
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -52,9 +52,9 @@ public:
 
 	void updateControl(LLControlVariable* control);
 
-	static void onSettingSelect(LLUICtrl* ctrl, void* user_data);
-	static void onCommitSettings(LLUICtrl* ctrl, void* user_data);
-	static void onClickDefault(void* user_data);
+	void onSettingSelect(LLUICtrl* ctrl);
+	void onCommitSettings();
+	void onClickDefault();
 
 protected:
 	LLTextEditor* mComment;
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 62a8c0d27e..4bcf470317 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -45,6 +45,7 @@
 #include "lldraghandle.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloateropenobject.h"
+#include "llfloaterreg.h"
 #include "llfocusmgr.h"
 #include "llmenugl.h"
 #include "llpanelcontents.h"
@@ -952,7 +953,7 @@ void LLFloaterTools::setObjectType( LLPCode pcode )
 void LLFloaterTools::onClickGridOptions(void* data)
 {
 	//LLFloaterTools* floaterp = (LLFloaterTools*)data;
-	LLFloaterBuildOptions::showInstance();
+	LLFloaterReg::showInstance("build_options");
 	// RN: this makes grid options dependent on build tools window
 	//floaterp->addDependentFloater(LLFloaterBuildOptions::getInstance(), FALSE);
 }
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 5b17c98ef0..fd8c22b8e5 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -82,7 +82,7 @@ const S32 ICON_WIDTH = 16;
 const S32 TEXT_PAD = 1;
 const S32 ARROW_SIZE = 12;
 const S32 RENAME_WIDTH_PAD = 4;
-const S32 RENAME_HEIGHT_PAD = 6;
+const S32 RENAME_HEIGHT_PAD = 2;
 const S32 AUTO_OPEN_STACK_DEPTH = 16;
 const S32 MIN_ITEM_WIDTH_VISIBLE = ICON_WIDTH + ICON_PAD + ARROW_SIZE + TEXT_PAD + /*first few characters*/ 40;
 const S32 MINIMUM_RENAMER_WIDTH = 80;
@@ -2560,7 +2560,7 @@ LLFolderView::LLFolderView(const Params& p)
 	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_inventory.xml", gMenuHolder);
 	if (!menu)
 	{
-		menu = LLUICtrlFactory::createDummyWidget<LLMenuGL>("inventory_menu");
+		menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu");
 	}
 	menu->setBackgroundColor(gSavedSkinSettings.getColor("MenuPopupBgColor"));
 	mPopupMenuHandle = menu->getHandle();
@@ -2772,6 +2772,9 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen
 		reshape( llmax(min_width, total_width), running_height );
 	}
 
+	// move item renamer text field to item's new position
+	updateRenamerPosition();
+
 	mTargetHeight = (F32)target_height;
 	return llround(mTargetHeight);
 }
@@ -3620,23 +3623,8 @@ void LLFolderView::startRenamingSelectedItem( void )
 	{
 		mRenameItem = item;
 
-		S32 x = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD - 1 + item->getIndentation();
-		S32 y = llfloor(item->getRect().getHeight()-sFont->getLineHeight()-2);
-		item->localPointToScreen( x, y, &x, &y );
-		screenPointToLocal( x, y, &x, &y );
-		mRenamer->setOrigin( x, y );
-
-		S32 scroller_height = 0;
-		S32 scroller_width = gViewerWindow->getWindowWidth();
-		BOOL dummy_bool;
-		if (mScrollContainer)
-		{
-			mScrollContainer->calcVisibleSize( &scroller_width, &scroller_height, &dummy_bool, &dummy_bool);
-		}
+		updateRenamerPosition();
 
-		S32 width = llmax(llmin(item->getRect().getWidth() - x, scroller_width - x - getRect().mLeft), MINIMUM_RENAMER_WIDTH);
-		S32 height = llfloor(sFont->getLineHeight() + RENAME_HEIGHT_PAD);
-		mRenamer->reshape( width, height, TRUE );
 
 		mRenamer->setText(item->getName());
 		mRenamer->selectAll();
@@ -4386,6 +4374,31 @@ void LLFolderView::dumpSelectionInformation()
 	llinfos << "****************************************" << llendl;
 }
 
+void LLFolderView::updateRenamerPosition()
+{
+	if(mRenameItem)
+	{
+		S32 x = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD - 1 + mRenameItem->getIndentation();
+		S32 y = llfloor(mRenameItem->getRect().getHeight()-sFont->getLineHeight()-2);
+		mRenameItem->localPointToScreen( x, y, &x, &y );
+		screenPointToLocal( x, y, &x, &y );
+		mRenamer->setOrigin( x, y );
+
+		S32 scroller_height = 0;
+		S32 scroller_width = gViewerWindow->getWindowWidth();
+		BOOL dummy_bool;
+		if (mScrollContainer)
+		{
+			mScrollContainer->calcVisibleSize( &scroller_width, &scroller_height, &dummy_bool, &dummy_bool);
+		}
+
+		S32 width = llmax(llmin(mRenameItem->getRect().getWidth() - x, scroller_width - x - getRect().mLeft), MINIMUM_RENAMER_WIDTH);
+		S32 height = llfloor(sFont->getLineHeight() + RENAME_HEIGHT_PAD);
+		mRenamer->reshape( width, height, TRUE );
+	}
+}
+
+
 ///----------------------------------------------------------------------------
 /// Local function definitions
 ///----------------------------------------------------------------------------
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 2393aa627c..848d289bb9 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -915,6 +915,9 @@ public:
 	// DEBUG only
 	void dumpSelectionInformation();
 
+private:
+	void updateRenamerPosition();
+
 protected:
 	LLScrollContainer* mScrollContainer;  // NULL if this is not a child of a scroll container.
 
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 4aaa7ca6cb..fac0de0f33 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -426,7 +426,9 @@ void LLLocationInputCtrl::rebuildLocationHistory(std::string filter)
 	LLLocationHistory* lh = LLLocationHistory::getInstance();
 	
 	if (filter.empty())
+	{
 		itemsp = &lh->getItems();
+	}
 	else
 	{
 		lh->getMatchingItems(filter, filtered_items);
@@ -435,7 +437,9 @@ void LLLocationInputCtrl::rebuildLocationHistory(std::string filter)
 	
 	removeall();
 	for (LLLocationHistory::location_list_t::const_reverse_iterator it = itemsp->rbegin(); it != itemsp->rend(); it++)
+	{
 		add(*it);
+	}
 }
 
 void LLLocationInputCtrl::focusTextEntry()
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 379cd48a6a..6f64aa68ad 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -68,8 +68,8 @@ public:
 
 	struct NameColumn : public LLInitParam::Choice<NameColumn>
 	{
-		Option<S32>				column_index;
-		Option<std::string>		column_name;
+		Alternative<S32>				column_index;
+		Alternative<std::string>		column_name;
 		NameColumn()
 		:	column_name("name_column"),
 			column_index("name_column_index", 0)
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 457397a379..0d25272f88 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -45,8 +45,8 @@ static std::string PANEL_PROFILE = "panel_profile";
 static std::string PANEL_PICKS = "panel_picks";
 static std::string PANEL_NOTES = "panel_notes";
 
-LLPanelProfileView::LLPanelProfileView(const LLPanel::Params& p)
-: LLPanel(p)
+LLPanelProfileView::LLPanelProfileView()
+: LLPanel()
 {
 }
 
diff --git a/indra/newview/llpanelprofileview.h b/indra/newview/llpanelprofileview.h
index 4d81704522..2d89f15fe4 100644
--- a/indra/newview/llpanelprofileview.h
+++ b/indra/newview/llpanelprofileview.h
@@ -44,7 +44,7 @@ class LLPanelProfileView : public LLPanel
 	friend class LLUICtrlFactory;
 
 public:
-	LLPanelProfileView(const LLPanel::Params& p = defaultParams());
+	LLPanelProfileView();
 
 	~LLPanelProfileView(void);
 
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 22e8ada2ea..eb35834dc0 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -92,15 +92,8 @@ void LLTeleportHistoryPanel::onShowOnMap()
 
 	S32 index = itemp->getColumn(LIST_INDEX)->getValue().asInteger();
 
-	const LLTeleportHistory::slurl_list_t& hist_items = mTeleportHistory->getItems();
-
-	LLVector3d global_pos = hist_items[index].mGlobalPos;
-	
-	if (!global_pos.isExactlyZero())
-	{
-		LLFloaterWorldMap::getInstance()->trackLocation(global_pos);
-		LLFloaterReg::showInstance("world_map", "center");
-	}
+	// teleport to existing item in history, so we don't add it again
+	mTeleportHistory->goToItem(index);
 }
 
 // virtual
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 981a843d94..8c2372ee74 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -732,7 +732,7 @@ void LLStatusBar::onClickSearch(void* data)
 // static
 void LLStatusBar::onClickStatGraph(void* data)
 {
-	LLFloaterLagMeter::showInstance();
+	LLFloaterReg::showInstance("lagmeter");
 }
 
 BOOL can_afford_transaction(S32 cost)
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 950d5ba20c..03c4915e66 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -39,20 +39,26 @@
 
 #include "llcompilequeue.h"
 #include "llfloaterabout.h"
+#include "llfloaterauction.h"
 #include "llfloateraddlandmark.h"
 #include "llfloateravatarinfo.h"
+#include "llfloaterbuildoptions.h"
+#include "llfloaterbump.h"
 #include "llfloaterchat.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterdirectory.h"
 #include "llfloaterjoystick.h"
-#include "llfloatervoicedevicesettings.h"
+#include "llfloaternotificationsconsole.h"
+#include "llfloaterlagmeter.h"
 #include "llfloatermap.h"
 #include "llfloatermemleak.h"
 #include "llfloatermute.h"
 #include "llfloaterpreference.h"
 #include "llfloatersnapshot.h"
+#include "llfloatersettingsdebug.h"
 #include "llfloatertools.h"
 #include "llfloateruipreview.h"
+#include "llfloatervoicedevicesettings.h"
 #include "llfloaterworldmap.h"
 #include "llinventoryview.h"
 #include "llnearbychathistory.h"
@@ -80,6 +86,13 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("add_landmark", "floater_add_landmark.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAddLandmark>);
 	LLFloaterReg::add("mute", "floater_mute.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMute>);
 	
+	LLFloaterReg::add("auction", "floater_auction.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAuction>);
+	LLFloaterReg::add("build_options", "floater_build_options.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBuildOptions>);
+	LLFloaterReg::add("bumps", "floater_bumps.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBump>);
+	LLFloaterReg::add("notifications_console", "floater_notifications_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationConsole>);
+	LLFloaterReg::add("settings_debug", "floater_settings_debug.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSettingsDebug>);
+	LLFloaterReg::add("lagmeter", "floater_lagmeter.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLagMeter>);
+
 	LLFloaterReg::add("ui_preview", "floater_ui_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterUIPreview>);
 	LLFloaterReg::add("test_widgets", "floater_test_widgets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater>);
 	
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index bdc86a3a69..826aca5e64 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -121,6 +121,7 @@
 #include "llfloaterperms.h"
 #include "llfloaterpostprocess.h"
 #include "llfloaterpreference.h"
+#include "llfloaterreg.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterreporter.h"
 #include "llfloaterscriptdebug.h"
@@ -613,7 +614,8 @@ class LLAdvancedToggleConsole : public view_listener_t
 #endif
 		else if ("notifications" == console_type)
 		{
-			LLFloaterNotificationConsole::showInstance();
+			//LLFloaterNotificationConsole::showInstance();
+			LLFloaterReg::showInstance("notifications_console");
 		}
 		return true;
 	}
@@ -2145,7 +2147,8 @@ class LLAdvancedShowDebugSettings : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		LLFloaterSettingsDebug::showInstance(userdata);
+	//	LLFloaterSettingsDebug::showInstance(userdata);
+		LLFloaterReg::showInstance("settings_debug",userdata);
 		return true;
 	}
 };
@@ -5649,7 +5652,7 @@ class LLShowFloater : public view_listener_t
 		}
 		else if (floater_name == "grid options")
 		{
-			LLFloaterBuildOptions::showInstance();
+			LLFloaterReg::showInstance("build_options");
 		}
 		else if (floater_name == "script errors")
 		{
@@ -5673,12 +5676,13 @@ class LLShowFloater : public view_listener_t
 		{
 			if (!gNoRender)
 			{
-				LLFloaterBump::showInstance();
+				//LLFloaterBump::showInstance();
+				LLFloaterReg::showInstance("bumps");
 			}
 		}
 		else if (floater_name == "lag meter")
 		{
-			LLFloaterLagMeter::showInstance();
+			LLFloaterReg::showInstance("lagmeter");
 		}
 		else if (floater_name == "buy currency")
 		{
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a62e59bc10..a05bd30600 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4395,8 +4395,8 @@ void handle_show_mean_events(void *)
 	{
 		return;
 	}
-
-	LLFloaterBump::showInstance();
+	LLFloaterReg::showInstance("bumps");
+	//LLFloaterBump::showInstance();
 }
 
 void mean_name_callback(const LLUUID &id, const std::string& first, const std::string& last, BOOL always_false)
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index cb2a8771fa..46aa284258 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2131,7 +2131,8 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 	    && (MASK_CONTROL & mask)
 	    && ('5' == key))
 	{
-		LLFloaterNotificationConsole::showInstance();
+		//LLFloaterNotificationConsole::showInstance();
+		LLFloaterReg::showInstance("notifications_console");
 		return TRUE;
 	}
 
@@ -2428,51 +2429,59 @@ void LLViewerWindow::updateUI()
 		root_view = mRootView;
 	}
 
-	// walk UI tree in depth-first order
-	LLView::tree_iterator_t end_it;
-	for (LLView::tree_iterator_t it = root_view->beginTree();
-		it != end_it;
-		++it)
-	{
-		LLView* viewp = *it;
-		// calculating the screen rect involves traversing the parent, so this is less than optimal
-		if (!viewp->getVisible()
-			|| !viewp->calcScreenBoundingRect().pointInRect(x, y))
-		{
-			// skip this view and all of its children
-			it.skipDescendants();
-			continue;
-		}
+	// aggregate visible views that contain mouse cursor in display order
 
-		// if this view is mouse opaque, nothing behind it should be in mouse_hover_set
-		if (viewp->getMouseOpaque())
+	// while the top_ctrl contains the mouse cursor, only it and its descendants will receive onMouseEnter events
+	if (top_ctrl && top_ctrl->calcScreenBoundingRect().pointInRect(x, y))
+	{
+		// iterator over contents of top_ctrl, and throw into mouse_hover_set
+		for (LLView::tree_iterator_t it = top_ctrl->beginTree();
+			it != top_ctrl->endTree();
+			++it)
 		{
-			// constrain further iteration to children of this widget
-			it = viewp->beginTree();
+			LLView* viewp = *it;
+			if (viewp->getVisible()
+				&& viewp->calcScreenBoundingRect().pointInRect(x, y))
+			{
+				// we have a view that contains the mouse, add it to the set
+				mouse_hover_set.insert(viewp->getHandle());
+			}
+			else
+			{
+				// skip this view and all of its children
+				it.skipDescendants();
+			}
 		}
-
-		// we have a view that contains the mouse, add it to the set
-		mouse_hover_set.insert(viewp->getHandle());
 	}
-
-	// now do the same aggregation for the "top" ctrl, whose parent does not necessarily contain the mouse
-	if (top_ctrl)
+	else
 	{
-		for (LLView::tree_iterator_t it = top_ctrl->beginTree();
-			it != root_view->endTree();
+		// walk UI tree in depth-first order
+		LLView::tree_iterator_t end_it;
+		for (LLView::tree_iterator_t it = root_view->beginTree();
+			it != end_it;
 			++it)
 		{
 			LLView* viewp = *it;
-			if (!viewp->getVisible()
-				|| !viewp->calcScreenBoundingRect().pointInRect(x, y))
+			// calculating the screen rect involves traversing the parent, so this is less than optimal
+			if (viewp->getVisible()
+				&& viewp->calcScreenBoundingRect().pointInRect(x, y))
+			{
+
+				// if this view is mouse opaque, nothing behind it should be in mouse_hover_set
+				if (viewp->getMouseOpaque())
+				{
+					// constrain further iteration to children of this widget
+					it = viewp->beginTree();
+				}
+	
+				// we have a view that contains the mouse, add it to the set
+				mouse_hover_set.insert(viewp->getHandle());
+			}
+			else
 			{
 				// skip this view and all of its children
 				it.skipDescendants();
-				continue;
 			}
-
-			// we have a view that contains the mouse, add it to the set
-			mouse_hover_set.insert(viewp->getHandle());
 		}
 	}
 
@@ -2898,11 +2907,25 @@ void LLViewerWindow::updateWorldViewRect()
 	if (!LLSideTray::instanceCreated()) return;
 
 	LLRect new_world_rect = mWindowRect;
+
+	// pull in right side of world view based on sidetray
 	LLSideTray* sidetray = LLSideTray::getInstance();
 	if (sidetray->getVisible())
 	{
 		new_world_rect.mRight -= llround((F32)sidetray->getTrayWidth() * mDisplayScale.mV[VX]);
 	}
+
+	// push top of world view below nav bar
+	if (LLNavigationBar::getInstance()->getVisible())
+	{
+		LLNavigationBar* barp = LLNavigationBar::getInstance();
+		LLRect nav_bar_rect;
+		if(barp->localRectToOtherView(barp->getLocalRect(), &nav_bar_rect, mRootView))
+		{
+			new_world_rect.mTop = llround((F32)LLNavigationBar::getInstance()->getRect().mBottom * mDisplayScale.mV[VY]);
+		}
+	}
+
 	if (mWorldViewRect != new_world_rect)
 	{
 		mWorldViewRect = new_world_rect;
diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml
index 21d060fdda..076332e062 100644
--- a/indra/newview/skins/default/xui/en/floater_auction.xml
+++ b/indra/newview/skins/default/xui/en/floater_auction.xml
@@ -29,6 +29,7 @@
      top_pad="12"
      width="400" />
     <check_box
+     control_name="AuctionShowFence" 
      follows="left|bottom"
      height="16"
      initial_value="true"
@@ -47,7 +48,10 @@
      left_delta="0"
      name="snapshot_btn"
      top_pad="4"
-     width="96" />
+     width="96" >
+      <button.commit_callback
+         function="ClickSnapshot" />
+    </button>
     <button
      follows="left|bottom"
      height="20"
@@ -57,5 +61,8 @@
      left_pad="4"
      name="ok_btn"
      top_delta="0"
-     width="48" />
+     width="48">
+      <button.commit_callback
+          function="ClickOK" />
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 0e29046500..0012294160 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -64,17 +64,17 @@
              left_delta="0"
              name="Edit"
              top_pad="4"
-             width="132" />
+             width="50" />
             <button
              follows="top|right"
              height="20"
              label="Find"
              label_selected="Find"
              layout="topleft"
-             left_pad="30"
+             left_pad="5"
              name="Find"
              top_delta="-1"
-             width="95" />
+             width="62" />
             <scroll_list
              follows="left|top|right|bottom"
              height="90"
@@ -196,12 +196,12 @@
      top="324"
      width="95" />
     <button
-     follows="left|bottom"
+     follows="right|bottom"
      height="20"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
-     left_pad="70"
+     right="-10" 
      name="Cancel"
      top_delta="0"
      width="95" />
diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
index ebe8df9f5e..8af4f74aa3 100644
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
@@ -201,6 +201,7 @@
         Client:
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"
      type="string"
      length="1"
      bottom="40"
@@ -214,6 +215,7 @@
         Normal
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"	
      bottom="56"
      follows="left|top"
      height="16"
@@ -248,6 +250,7 @@
         Network:
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"
      type="string"
      length="1"
      bottom="80"
@@ -261,6 +264,7 @@
         Normal
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"	
      bottom="96"
      follows="left|top"
      height="16"
@@ -295,6 +299,7 @@
         Server:
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"
      type="string"
      length="1"
      bottom="120"
@@ -308,6 +313,7 @@
         Normal
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"
      bottom="136"
      follows="left|top"
      height="16"
@@ -333,5 +339,8 @@
      left_delta="-317"
      name="minimize"
      top_delta="-2"
-     width="25" />
+     width="25">
+        <button.commit_callback
+         function="LagMeter.ClickShrink" />
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
index 92ecb5908e..14aa12aed7 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
@@ -24,7 +24,10 @@
      left_pad="3"
      name="add_notification"
      top_delta="0"
-     width="50" />
+     width="50" >
+        <button.commit_callback
+         function="ClickAdd" />
+    </button>
     <layout_stack
      bottom="495"
      follows="left|right|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index ba28016d8e..1760d5b818 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -109,6 +109,7 @@
          layout="topleft"
          name="web" />
         <panel
+		 class="panel_preference"
          filename="panel_preferences_graphics1.xml"
          label="Graphics"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
index 108d0b97e8..9a73ffb1a2 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
@@ -15,7 +15,10 @@
      max_chars="255"
      name="settings_combo"
      top="30"
-     width="200" />
+     width="200">
+      <combo_box.commit_callback
+       function="SettingSelect" />
+    </combo_box>
     <text_editor
      enabled="false"
      height="60"
@@ -41,6 +44,8 @@
         <combo_box.item
          label="FALSE"
          value="" />
+         <combo_box.commit_callback
+           function="CommitSettings" />
     </combo_box>
     <line_editor
      height="20"
@@ -49,14 +54,21 @@
      name="val_text"
      top_delta="0"
      visible="false"
-     width="300" />
+     width="300" >
+      <line_editor.commit_callback
+       function="CommitSettings" />
+    </line_editor>
     <color_swatch
      bottom="185"
      can_apply_immediately="true"
      height="55"
+     name="val_color_swatch" 
      label="Color"
      layout="topleft"
-     width="37" />
+     width="37" >
+      <color_swatch.commit_callback
+       function="CommitSettings" />
+    </color_swatch>
     <spinner
      height="20"
      label="x"
@@ -66,7 +78,10 @@
      name="val_spinner_1"
      top_delta="10"
      visible="false"
-     width="120" />
+     width="120" >
+      <spinner.commit_callback
+       function="CommitSettings" />
+    </spinner>
     <spinner
      height="20"
      label="x"
@@ -76,7 +91,10 @@
      name="val_spinner_2"
      top_delta="0"
      visible="false"
-     width="120" />
+     width="120">
+      <spinner.commit_callback
+       function="CommitSettings" />
+    </spinner>
     <spinner
      height="20"
      label="x"
@@ -86,7 +104,10 @@
      name="val_spinner_3"
      top="160"
      visible="false"
-     width="120" />
+     width="120">
+      <spinner.commit_callback
+       function="CommitSettings" />
+    </spinner>
     <spinner
      height="20"
      label="x"
@@ -96,7 +117,10 @@
      name="val_spinner_4"
      top_delta="0"
      visible="false"
-     width="120" />
+     width="120" >
+      <spinner.commit_callback
+       function="CommitSettings" />
+    </spinner>
     <button
      height="20"
      label="Reset to default"
@@ -104,5 +128,8 @@
      left="15"
      name="default_btn"
      top="190"
-     width="150" />
+     width="150" >
+      <button.commit_callback
+       function="ClickDefault" />
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 929f857e90..8db8c8f31d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -165,6 +165,9 @@
          enabled="true"
          label="16:9 (Widescreen)"
          value="1.7777777" />
+		 <combo_box.commit_callback
+         function="setControlFalse"
+		 parameter="FullScreenAutoDetectAspectRatio" />
     </combo_box>
     <check_box
 	 make_invisible_control="NotFullScreen"
@@ -336,7 +339,10 @@
      name="QualityPerformanceSelection"
      show_text="false"
      top_delta="-1"
-     width="150" />
+     width="150">
+	 <slider.commit_callback
+			function="Pref.QualityPerformance"/>
+	</slider>		
     <check_box
      control_name="RenderCustomSettings"
      height="16"
-- 
cgit v1.3


From d6101558a171dbd2390792ac1e78d09fc2c27711 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 6 Jul 2009 21:58:04 +0000
Subject: Merge xui-army-5 to viewer-2, includes layout, art, and color
 changes, also UI color refactoring and new FreeType font library on Linux.
 svn merge -r126038:126164
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5

---
 indra/cmake/00-Common.cmake                        |    1 -
 indra/llui/CMakeLists.txt                          |    2 +
 indra/llui/llcombobox.cpp                          |   22 +-
 indra/llui/llcombobox.h                            |    3 +-
 indra/llui/llconsole.cpp                           |    4 +-
 indra/llui/lldraghandle.h                          |    4 +-
 indra/llui/llfloater.cpp                           |   19 +-
 indra/llui/llflyoutbutton.cpp                      |    7 +-
 indra/llui/llflyoutbutton.h                        |    8 +-
 indra/llui/llfocusmgr.cpp                          |    2 +-
 indra/llui/lllineeditor.cpp                        |   11 +-
 indra/llui/llmenugl.cpp                            |   26 +-
 indra/llui/llmenugl.h                              |    2 +-
 indra/llui/llmodaldialog.cpp                       |    2 +-
 indra/llui/llpanel.cpp                             |    4 -
 indra/llui/llresizehandle.cpp                      |    2 +-
 indra/llui/llspinctrl.cpp                          |    8 +-
 indra/llui/llstatgraph.cpp                         |    4 +-
 indra/llui/llstyle.h                               |    2 +-
 indra/llui/lltextbox.cpp                           |    2 +-
 indra/llui/lltexteditor.cpp                        |    6 +-
 indra/llui/lltexteditor.h                          |    2 +-
 indra/llui/llui.cpp                                |   10 +-
 indra/llui/llui.h                                  |   12 +-
 indra/llui/lluicolortable.cpp                      |  169 ++-
 indra/llui/lluicolortable.h                        |   33 +-
 indra/llui/lluictrl.cpp                            |    8 -
 indra/llui/lluictrlfactory.cpp                     |    8 +-
 indra/llui/lluictrlfactory.h                       |    2 +-
 indra/llui/lluiimage.cpp                           |    2 +-
 indra/llui/lluiimage.h                             |    4 +-
 indra/llui/llview.cpp                              |   16 +-
 indra/llvfs/lldir_mac.cpp                          |   21 +-
 indra/llwindow/CMakeLists.txt                      |    4 +-
 indra/newview/app_settings/settings.xml            |   89 +-
 indra/newview/llagent.cpp                          |    4 +-
 indra/newview/llagent.h                            |    3 +-
 indra/newview/llappviewer.cpp                      |   57 +-
 indra/newview/llbottomtray.cpp                     |    6 +-
 indra/newview/llcallingcard.cpp                    |    2 +-
 indra/newview/llchiclet.cpp                        |   10 +-
 indra/newview/llfavoritesbar.cpp                   |    2 +-
 indra/newview/llfeaturemanager.cpp                 |    1 -
 indra/newview/llfloaterabout.cpp                   |   10 +-
 indra/newview/llfloaterchat.cpp                    |   18 +-
 indra/newview/llfloatercolorpicker.cpp             |    4 +-
 indra/newview/llfloaterpreference.cpp              |  116 +-
 indra/newview/llfloaterpreference.h                |    3 +
 indra/newview/llfloatersettingsdebug.cpp           |    4 -
 indra/newview/llfloatersnapshot.cpp                |    2 +-
 indra/newview/llfloatervoicedevicesettings.cpp     |    2 +-
 indra/newview/llfloaterworldmap.cpp                |    4 +-
 indra/newview/llfolderview.cpp                     |   18 +-
 indra/newview/llhudmanager.cpp                     |    5 +-
 indra/newview/llhudtext.cpp                        |    2 +-
 indra/newview/llimpanel.cpp                        |    8 +-
 indra/newview/llimview.cpp                         |   10 +-
 indra/newview/lllocationinputctrl.cpp              |   33 +-
 indra/newview/lllocationinputctrl.h                |    8 +-
 indra/newview/llmanip.cpp                          |    6 +-
 indra/newview/llmaniprotate.cpp                    |   10 +-
 indra/newview/llmanipscale.cpp                     |    8 +-
 indra/newview/llmaniptranslate.cpp                 |   14 +-
 indra/newview/llmemoryview.cpp                     |    2 +-
 indra/newview/llnetmap.cpp                         |   12 +-
 indra/newview/lloutputmonitorctrl.cpp              |    8 +-
 indra/newview/llselectmgr.cpp                      |   12 +-
 indra/newview/llsidetray.cpp                       |    4 +-
 indra/newview/llstartup.cpp                        |   25 +-
 indra/newview/llstatusbar.cpp                      |    2 +-
 indra/newview/llstylemap.cpp                       |    6 +-
 indra/newview/lltoolfocus.cpp                      |    6 +-
 indra/newview/lltoolgrab.cpp                       |   16 +-
 indra/newview/lltoolgun.cpp                        |    4 +-
 indra/newview/lltoolmgr.cpp                        |    2 +
 indra/newview/lltracker.cpp                        |    4 +-
 indra/newview/lluploaddialog.cpp                   |    2 +-
 indra/newview/llviewercontrol.cpp                  |   65 +-
 indra/newview/llviewercontrol.h                    |    5 +-
 indra/newview/llviewermenu.cpp                     |    9 +-
 indra/newview/llviewerobjectlist.cpp               |   12 +-
 indra/newview/llviewerparceloverlay.cpp            |   22 +-
 indra/newview/llviewerwindow.cpp                   |   41 +-
 indra/newview/llvoavatar.cpp                       |    4 +-
 indra/newview/llvosky.cpp                          |    2 +-
 indra/newview/llworldmapview.cpp                   |    6 +-
 indra/newview/pipeline.cpp                         |    4 +-
 indra/newview/skins/default/colors.xml             |  207 ++-
 .../containers/Accordion_ArrowClosed_Off.png       |  Bin 0 -> 175 bytes
 .../containers/Accordion_ArrowClosed_Over.png      |  Bin 0 -> 170 bytes
 .../containers/Accordion_ArrowClosed_Press.png     |  Bin 0 -> 175 bytes
 .../containers/Accordion_ArrowOpened_Over.png      |  Bin 0 -> 162 bytes
 .../containers/Accordion_ArrowOpened_Press.png     |  Bin 0 -> 169 bytes
 .../default/textures/containers/Accordion_Off.png  |  Bin 0 -> 239 bytes
 .../default/textures/containers/Accordion_Over.png |  Bin 0 -> 206 bytes
 .../textures/containers/Accordion_Press.png        |  Bin 0 -> 200 bytes
 .../default/textures/containers/Container.png      |  Bin 0 -> 673 bytes
 .../textures/containers/TabTop_Left_Off.png        |  Bin 0 -> 339 bytes
 .../textures/containers/TabTop_Left_Over.png       |  Bin 0 -> 337 bytes
 .../textures/containers/TabTop_Left_Selected.png   |  Bin 0 -> 458 bytes
 .../textures/containers/TabTop_Middle_Off.png      |  Bin 0 -> 258 bytes
 .../textures/containers/TabTop_Middle_Over.png     |  Bin 0 -> 285 bytes
 .../textures/containers/TabTop_Middle_Selected.png |  Bin 0 -> 367 bytes
 .../textures/containers/TabTop_Right_Off.png       |  Bin 0 -> 357 bytes
 .../textures/containers/TabTop_Right_Over.png      |  Bin 0 -> 362 bytes
 .../textures/containers/TabTop_Right_Selected.png  |  Bin 0 -> 474 bytes
 .../textures/containers/Toolbar_Left_Off.png       |  Bin 0 -> 306 bytes
 .../textures/containers/Toolbar_Left_Over.png      |  Bin 0 -> 310 bytes
 .../textures/containers/Toolbar_Left_Selected.png  |  Bin 0 -> 380 bytes
 .../textures/containers/Toolbar_Middle_Off.png     |  Bin 0 -> 224 bytes
 .../textures/containers/Toolbar_Middle_Over.png    |  Bin 0 -> 228 bytes
 .../containers/Toolbar_Middle_Selected.png         |  Bin 0 -> 296 bytes
 .../textures/containers/Toolbar_Right_Off.png      |  Bin 0 -> 302 bytes
 .../textures/containers/Toolbar_Right_Over.png     |  Bin 0 -> 297 bytes
 .../textures/containers/Toolbar_Right_Selected.png |  Bin 0 -> 377 bytes
 .../default/textures/navbar/Arrow_Left_Off.png     |  Bin 0 -> 382 bytes
 .../default/textures/navbar/Arrow_Left_Over.png    |  Bin 0 -> 381 bytes
 .../default/textures/navbar/Arrow_Right_Off.png    |  Bin 0 -> 380 bytes
 .../default/textures/navbar/Arrow_Right_Over.png   |  Bin 0 -> 379 bytes
 .../textures/navbar/Favorite_Star_Active.png       |  Bin 0 -> 641 bytes
 .../default/textures/navbar/Favorite_Star_Off.png  |  Bin 0 -> 573 bytes
 .../default/textures/navbar/Favorite_Star_Over.png |  Bin 0 -> 579 bytes
 .../textures/navbar/Favorite_Star_Press.png        |  Bin 0 -> 551 bytes
 .../default/textures/navbar/FileMenu_Divider.png   |  Bin 0 -> 116 bytes
 .../skins/default/textures/navbar/Help_Over.png    |  Bin 0 -> 348 bytes
 .../skins/default/textures/navbar/Help_Press.png   |  Bin 0 -> 384 bytes
 .../skins/default/textures/navbar/Home_Off.png     |  Bin 0 -> 379 bytes
 .../skins/default/textures/navbar/Home_Over.png    |  Bin 0 -> 330 bytes
 .../skins/default/textures/navbar/Info_Off.png     |  Bin 0 -> 608 bytes
 .../skins/default/textures/navbar/Info_Over.png    |  Bin 0 -> 622 bytes
 .../skins/default/textures/navbar/Info_Press.png   |  Bin 0 -> 605 bytes
 .../skins/default/textures/navbar/NavBar_BG.png    |  Bin 0 -> 210 bytes
 .../default/textures/navbar/Row_Selection.png      |  Bin 0 -> 231 bytes
 .../skins/default/textures/navbar/Search.png       |  Bin 0 -> 467 bytes
 .../textures/taskpanel/TaskPanel_Tab_Off.png       |  Bin 0 -> 219 bytes
 .../textures/taskpanel/TaskPanel_Tab_Selected.png  |  Bin 0 -> 325 bytes
 indra/newview/skins/default/textures/textures.xml  |  229 ++--
 .../default/textures/widgets/Checkbox_Disabled.png |  Bin 0 -> 306 bytes
 .../default/textures/widgets/Checkbox_Off.png      |  Bin 0 -> 322 bytes
 .../skins/default/textures/widgets/Checkbox_On.png |  Bin 0 -> 577 bytes
 .../textures/widgets/Checkbox_On_Disabled.png      |  Bin 0 -> 558 bytes
 .../default/textures/widgets/Checkbox_On_Over.png  |  Bin 0 -> 547 bytes
 .../default/textures/widgets/Checkbox_On_Press.png |  Bin 0 -> 612 bytes
 .../default/textures/widgets/Checkbox_Over.png     |  Bin 0 -> 318 bytes
 .../default/textures/widgets/Checkbox_Press.png    |  Bin 0 -> 373 bytes
 .../textures/widgets/ComboButton_Disabled.png      |  Bin 0 -> 450 bytes
 .../default/textures/widgets/ComboButton_Off.png   |  Bin 0 -> 470 bytes
 .../default/textures/widgets/ComboButton_On.png    |  Bin 0 -> 486 bytes
 .../textures/widgets/ComboButton_Selected.png      |  Bin 0 -> 539 bytes
 .../default/textures/widgets/DropDown_Disabled.png |  Bin 0 -> 600 bytes
 .../default/textures/widgets/DropDown_Off.png      |  Bin 0 -> 603 bytes
 .../skins/default/textures/widgets/DropDown_On.png |  Bin 0 -> 638 bytes
 .../default/textures/widgets/DropDown_Press.png    |  Bin 0 -> 679 bytes
 .../skins/default/textures/widgets/ProgressBar.png |  Bin 0 -> 220 bytes
 .../default/textures/widgets/ProgressTrack.png     |  Bin 0 -> 192 bytes
 .../textures/widgets/PushButton_Disabled.png       |  Bin 0 -> 461 bytes
 .../default/textures/widgets/PushButton_Off.png    |  Bin 0 -> 464 bytes
 .../default/textures/widgets/PushButton_On.png     |  Bin 0 -> 490 bytes
 .../textures/widgets/PushButton_On_Over.png        |  Bin 0 -> 498 bytes
 .../textures/widgets/PushButton_On_Selected.png    |  Bin 0 -> 572 bytes
 .../default/textures/widgets/PushButton_Over.png   |  Bin 0 -> 457 bytes
 .../default/textures/widgets/PushButton_Press.png  |  Bin 0 -> 520 bytes
 .../textures/widgets/PushButton_Selected.png       |  Bin 0 -> 520 bytes
 .../widgets/PushButton_Selected_Disabled.png       |  Bin 0 -> 490 bytes
 .../textures/widgets/PushButton_Selected_Over.png  |  Bin 0 -> 498 bytes
 .../textures/widgets/PushButton_Selected_Press.png |  Bin 0 -> 572 bytes
 .../textures/widgets/RadioButton_Disabled.png      |  Bin 0 -> 541 bytes
 .../default/textures/widgets/RadioButton_Off.png   |  Bin 0 -> 563 bytes
 .../default/textures/widgets/RadioButton_On.png    |  Bin 0 -> 627 bytes
 .../textures/widgets/RadioButton_On_Disabled.png   |  Bin 0 -> 605 bytes
 .../textures/widgets/RadioButton_On_Over.png       |  Bin 0 -> 635 bytes
 .../textures/widgets/RadioButton_On_Press.png      |  Bin 0 -> 641 bytes
 .../default/textures/widgets/RadioButton_Over.png  |  Bin 0 -> 575 bytes
 .../default/textures/widgets/RadioButton_Press.png |  Bin 0 -> 589 bytes
 .../default/textures/widgets/ScrollArrow_Down.png  |  Bin 0 -> 239 bytes
 .../textures/widgets/ScrollArrow_Down_Over.png     |  Bin 0 -> 257 bytes
 .../default/textures/widgets/ScrollArrow_Left.png  |  Bin 0 -> 271 bytes
 .../textures/widgets/ScrollArrow_Left_Over.png     |  Bin 0 -> 295 bytes
 .../default/textures/widgets/ScrollArrow_Right.png |  Bin 0 -> 260 bytes
 .../textures/widgets/ScrollArrow_Right_Over.png    |  Bin 0 -> 283 bytes
 .../default/textures/widgets/ScrollArrow_Up.png    |  Bin 0 -> 262 bytes
 .../textures/widgets/ScrollArrow_Up_Over.png       |  Bin 0 -> 276 bytes
 .../default/textures/widgets/ScrollThumb_Horiz.png |  Bin 0 -> 364 bytes
 .../textures/widgets/ScrollThumb_Horiz_Over.png    |  Bin 0 -> 311 bytes
 .../default/textures/widgets/ScrollThumb_Vert.png  |  Bin 0 -> 323 bytes
 .../textures/widgets/ScrollThumb_Vert_Over.png     |  Bin 0 -> 311 bytes
 .../default/textures/widgets/ScrollTrack_Horiz.png |  Bin 0 -> 153 bytes
 .../default/textures/widgets/ScrollTrack_Vert.png  |  Bin 0 -> 150 bytes
 .../widgets/SegmentedBtn_Left_Disabled.png         |  Bin 0 -> 378 bytes
 .../textures/widgets/SegmentedBtn_Left_Off.png     |  Bin 0 -> 386 bytes
 .../textures/widgets/SegmentedBtn_Left_On.png      |  Bin 0 -> 404 bytes
 .../widgets/SegmentedBtn_Left_On_Disabled.png      |  Bin 0 -> 404 bytes
 .../textures/widgets/SegmentedBtn_Left_On_Over.png |  Bin 0 -> 394 bytes
 .../widgets/SegmentedBtn_Left_On_Selected.png      |  Bin 0 -> 495 bytes
 .../textures/widgets/SegmentedBtn_Left_Over.png    |  Bin 0 -> 384 bytes
 .../textures/widgets/SegmentedBtn_Left_Press.png   |  Bin 0 -> 455 bytes
 .../widgets/SegmentedBtn_Left_Selected.png         |  Bin 0 -> 455 bytes
 .../SegmentedBtn_Left_Selected_Disabled.png        |  Bin 0 -> 404 bytes
 .../widgets/SegmentedBtn_Left_Selected_Over.png    |  Bin 0 -> 394 bytes
 .../widgets/SegmentedBtn_Left_Selected_Press.png   |  Bin 0 -> 495 bytes
 .../widgets/SegmentedBtn_Middle_Disabled.png       |  Bin 0 -> 277 bytes
 .../textures/widgets/SegmentedBtn_Middle_On.png    |  Bin 0 -> 308 bytes
 .../widgets/SegmentedBtn_Middle_On_Over.png        |  Bin 0 -> 300 bytes
 .../widgets/SegmentedBtn_Middle_On_Press.png       |  Bin 0 -> 393 bytes
 .../textures/widgets/SegmentedBtn_Middle_Over.png  |  Bin 0 -> 286 bytes
 .../widgets/SegmentedBtn_Middle_Selected.png       |  Bin 0 -> 359 bytes
 .../SegmentedBtn_Middle_Selected_Disabled.png      |  Bin 0 -> 308 bytes
 .../widgets/SegmentedBtn_Middle_Selected_Over.png  |  Bin 0 -> 300 bytes
 .../widgets/SegmentedBtn_Middle_Selected_Press.png |  Bin 0 -> 393 bytes
 .../widgets/SegmentedBtn_Right_Disabled.png        |  Bin 0 -> 380 bytes
 .../textures/widgets/SegmentedBtn_Right_Off.png    |  Bin 0 -> 391 bytes
 .../textures/widgets/SegmentedBtn_Right_On.png     |  Bin 0 -> 420 bytes
 .../widgets/SegmentedBtn_Right_On_Over.png         |  Bin 0 -> 416 bytes
 .../widgets/SegmentedBtn_Right_On_Selected.png     |  Bin 0 -> 502 bytes
 .../textures/widgets/SegmentedBtn_Right_Over.png   |  Bin 0 -> 398 bytes
 .../textures/widgets/SegmentedBtn_Right_Press.png  |  Bin 0 -> 459 bytes
 .../widgets/SegmentedBtn_Right_Selected.png        |  Bin 0 -> 459 bytes
 .../SegmentedBtn_Right_Selected_Disabled.png       |  Bin 0 -> 420 bytes
 .../widgets/SegmentedBtn_Right_Selected_Over.png   |  Bin 0 -> 416 bytes
 .../widgets/SegmentedBtn_Right_Selected_Press.png  |  Bin 0 -> 502 bytes
 .../textures/widgets/SliderThumb_Disabled.png      |  Bin 0 -> 475 bytes
 .../default/textures/widgets/SliderThumb_Off.png   |  Bin 0 -> 475 bytes
 .../default/textures/widgets/SliderThumb_Over.png  |  Bin 0 -> 482 bytes
 .../default/textures/widgets/SliderThumb_Press.png |  Bin 0 -> 470 bytes
 .../default/textures/widgets/SliderTrack_Horiz.png |  Bin 0 -> 225 bytes
 .../default/textures/widgets/SliderTrack_Vert.png  |  Bin 0 -> 232 bytes
 .../default/textures/widgets/TextField_Active.png  |  Bin 0 -> 225 bytes
 .../textures/widgets/TextField_Disabled.png        |  Bin 0 -> 225 bytes
 .../default/textures/widgets/TextField_Off.png     |  Bin 0 -> 224 bytes
 .../textures/widgets/TextField_Search_Active.png   |  Bin 0 -> 923 bytes
 .../textures/widgets/TextField_Search_Disabled.png |  Bin 0 -> 943 bytes
 .../textures/widgets/TextField_Search_Off.png      |  Bin 0 -> 958 bytes
 .../skins/default/textures/windows/Flyout.png      |  Bin 0 -> 820 bytes
 .../default/textures/windows/Flyout_Pointer.png    |  Bin 0 -> 236 bytes
 .../textures/windows/Icon_Close_Foreground.png     |  Bin 0 -> 226 bytes
 .../default/textures/windows/Icon_Close_Press.png  |  Bin 0 -> 217 bytes
 .../default/textures/windows/Icon_Close_Toast.png  |  Bin 0 -> 460 bytes
 .../textures/windows/Icon_Dock_Foreground.png      |  Bin 0 -> 240 bytes
 .../default/textures/windows/Icon_Dock_Press.png   |  Bin 0 -> 241 bytes
 .../textures/windows/Icon_Gear_Background.png      |  Bin 0 -> 373 bytes
 .../textures/windows/Icon_Gear_Foreground.png      |  Bin 0 -> 373 bytes
 .../default/textures/windows/Icon_Gear_Over.png    |  Bin 0 -> 279 bytes
 .../default/textures/windows/Icon_Gear_Press.png   |  Bin 0 -> 396 bytes
 .../textures/windows/Icon_Undock_Foreground.png    |  Bin 0 -> 238 bytes
 .../default/textures/windows/Icon_Undock_Press.png |  Bin 0 -> 260 bytes
 .../default/textures/windows/Resize_Corner.png     |  Bin 0 -> 137 bytes
 .../default/textures/windows/Toast_CloseBtn.png    |  Bin 0 -> 471 bytes
 .../skins/default/textures/windows/Toast_Over.png  |  Bin 0 -> 400 bytes
 .../default/textures/windows/Window_Background.png |  Bin 0 -> 950 bytes
 .../default/textures/windows/Window_Foreground.png |  Bin 0 -> 959 bytes
 .../newview/skins/default/xui/de/floater_tools.xml |  632 ++++++++-
 .../skins/default/xui/de/panel_group_general.xml   |   85 ++
 .../default/xui/de/panel_group_land_money.xml      |   86 ++
 .../skins/default/xui/de/panel_group_notices.xml   |   80 ++
 .../skins/default/xui/de/panel_group_roles.xml     |  163 ++-
 .../default/xui/en/floater_animation_preview.xml   |   14 +-
 .../skins/default/xui/en/floater_bulk_perms.xml    |   22 +-
 .../skins/default/xui/en/floater_buy_contents.xml  |    6 +-
 .../skins/default/xui/en/floater_buy_object.xml    |   14 +-
 .../skins/default/xui/en/floater_gesture.xml       |   23 +-
 indra/newview/skins/default/xui/en/floater_im.xml  |    2 +-
 .../xui/en/floater_inventory_view_finder.xml       |    2 +-
 .../skins/default/xui/en/floater_land_holdings.xml |   52 +-
 .../skins/default/xui/en/floater_mute_object.xml   |    4 +-
 .../skins/default/xui/en/floater_preferences.xml   |  131 +-
 .../default/xui/en/floater_preview_animation.xml   |   10 +-
 .../default/xui/en/floater_preview_gesture.xml     |   90 +-
 .../skins/default/xui/en/floater_preview_sound.xml |   11 +-
 .../skins/default/xui/en/floater_region_info.xml   |    2 +-
 .../skins/default/xui/en/floater_sell_land.xml     |   65 +-
 .../skins/default/xui/en/floater_telehub.xml       |    2 +-
 .../skins/default/xui/en/floater_test_checkbox.xml |   11 -
 .../default/xui/en/floater_test_navigation_bar.xml |   17 +
 .../newview/skins/default/xui/en/floater_tools.xml | 1361 ++++++++++----------
 .../skins/default/xui/en/floater_url_entry.xml     |   20 +-
 indra/newview/skins/default/xui/en/fonts.xml       |   16 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |   13 +-
 .../newview/skins/default/xui/en/notifications.xml |   36 +-
 .../skins/default/xui/en/panel_bottomtray.xml      |    2 +-
 .../skins/default/xui/en/panel_group_general.xml   |  119 +-
 .../default/xui/en/panel_group_land_money.xml      |  143 +-
 .../skins/default/xui/en/panel_group_notices.xml   |  160 ++-
 .../skins/default/xui/en/panel_group_roles.xml     |  176 +--
 .../skins/default/xui/en/panel_navigation_bar.xml  |  129 +-
 .../newview/skins/default/xui/en/panel_people.xml  |    8 +-
 .../default/xui/en/panel_preferences_advanced.xml  |  305 +++++
 .../default/xui/en/panel_preferences_chat.xml      |  362 +++---
 .../default/xui/en/panel_preferences_general.xml   |  497 +++----
 .../default/xui/en/panel_preferences_graphics1.xml |  334 ++---
 .../newview/skins/default/xui/en/panel_profile.xml |    4 +-
 .../skins/default/xui/en/panel_progress.xml        |   28 +-
 .../skins/default/xui/en/panel_region_covenant.xml |   72 +-
 .../skins/default/xui/en/panel_region_debug.xml    |   43 +-
 .../skins/default/xui/en/panel_region_estate.xml   |   95 +-
 .../skins/default/xui/en/panel_region_general.xml  |   18 +-
 .../skins/default/xui/en/panel_region_terrain.xml  |   40 +-
 .../skins/default/xui/en/panel_region_texture.xml  |  140 +-
 .../skins/default/xui/en/panel_scrolling_param.xml |   16 +-
 .../skins/default/xui/en/panel_side_tray.xml       |  570 ++++++++
 indra/newview/skins/default/xui/en/strings.xml     |    2 +-
 .../skins/default/xui/en/widgets/button.xml        |    8 +-
 .../skins/default/xui/en/widgets/check_box.xml     |   13 +-
 .../skins/default/xui/en/widgets/color_swatch.xml  |    2 -
 .../skins/default/xui/en/widgets/combo_box.xml     |   33 +-
 .../skins/default/xui/en/widgets/drop_down.xml     |   18 +-
 .../skins/default/xui/en/widgets/flyout_button.xml |   15 +-
 .../skins/default/xui/en/widgets/line_editor.xml   |    3 +-
 .../default/xui/en/widgets/location_input.xml      |   84 +-
 .../skins/default/xui/en/widgets/progress_bar.xml  |    4 +-
 .../skins/default/xui/en/widgets/radio_group.xml   |    4 +-
 .../skins/default/xui/en/widgets/radio_item.xml    |    9 +-
 .../skins/default/xui/en/widgets/scroll_bar.xml    |   36 +-
 .../skins/default/xui/en/widgets/search_editor.xml |    5 +-
 .../skins/default/xui/en/widgets/side_tray.xml     |   10 +-
 .../default/xui/en/widgets/simple_text_editor.xml  |    4 +-
 .../skins/default/xui/en/widgets/slider_bar.xml    |    7 +-
 .../skins/default/xui/en/widgets/tab_container.xml |    8 +-
 .../skins/default/xui/en/widgets/text_editor.xml   |    4 +-
 indra/newview/viewer_manifest.py                   |    4 +
 install.xml                                        |    4 +-
 320 files changed, 5031 insertions(+), 3079 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png
 create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png
 create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png
 create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png
 create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png
 create mode 100644 indra/newview/skins/default/textures/containers/Accordion_Off.png
 create mode 100644 indra/newview/skins/default/textures/containers/Accordion_Over.png
 create mode 100644 indra/newview/skins/default/textures/containers/Accordion_Press.png
 create mode 100644 indra/newview/skins/default/textures/containers/Container.png
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Left_Off.png
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Left_Over.png
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Right_Off.png
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Right_Over.png
 create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png
 create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png
 create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png
 create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png
 create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png
 create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png
 create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
 create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png
 create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png
 create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png
 create mode 100644 indra/newview/skins/default/textures/navbar/FileMenu_Divider.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Help_Over.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Help_Press.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Home_Off.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Home_Over.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Info_Off.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Info_Over.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Info_Press.png
 create mode 100644 indra/newview/skins/default/textures/navbar/NavBar_BG.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Row_Selection.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Search.png
 create mode 100644 indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
 create mode 100644 indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Checkbox_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Checkbox_On.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Checkbox_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Checkbox_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ComboButton_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ComboButton_On.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/DropDown_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/DropDown_On.png
 create mode 100644 indra/newview/skins/default/textures/widgets/DropDown_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ProgressBar.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ProgressTrack.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_On.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_On_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/RadioButton_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/RadioButton_On.png
 create mode 100644 indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/RadioButton_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/RadioButton_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SliderThumb_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
 create mode 100644 indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png
 create mode 100644 indra/newview/skins/default/textures/widgets/TextField_Active.png
 create mode 100644 indra/newview/skins/default/textures/widgets/TextField_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/TextField_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/TextField_Search_Active.png
 create mode 100644 indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/widgets/TextField_Search_Off.png
 create mode 100644 indra/newview/skins/default/textures/windows/Flyout.png
 create mode 100644 indra/newview/skins/default/textures/windows/Flyout_Pointer.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Close_Press.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Close_Toast.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Dock_Press.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Gear_Background.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Gear_Over.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Gear_Press.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Undock_Press.png
 create mode 100644 indra/newview/skins/default/textures/windows/Resize_Corner.png
 create mode 100644 indra/newview/skins/default/textures/windows/Toast_CloseBtn.png
 create mode 100644 indra/newview/skins/default/textures/windows/Toast_Over.png
 create mode 100644 indra/newview/skins/default/textures/windows/Window_Background.png
 create mode 100644 indra/newview/skins/default/textures/windows/Window_Foreground.png
 create mode 100644 indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index ad7529ea0a..977251f807 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -227,7 +227,6 @@ else (STANDALONE)
       glib-2.0
       gstreamer-0.10
       gtk-2.0
-      llfreetype2
       pango-1.0
       )
 endif (STANDALONE)
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 117e8e28ab..e62d875a01 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -81,6 +81,7 @@ set(llui_SOURCE_FILES
     lltextparser.cpp
     lltrans.cpp
     llui.cpp
+    lluicolor.cpp
     lluicolortable.cpp
     lluictrl.cpp
     lluictrlfactory.cpp
@@ -154,6 +155,7 @@ set(llui_HEADER_FILES
     lltexteditor.h
     lltextparser.h
     lltrans.h
+    lluicolor.h
     lluicolortable.h
     lluiconstants.h
     lluictrlfactory.h
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 51ab3326fe..e19eacb774 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -83,12 +83,12 @@ LLComboBox::Params::Params()
 :	allow_text_entry("allow_text_entry", false),
 	show_text_as_tentative("show_text_as_tentative", true),
 	max_chars("max_chars", 20),
-	arrow_image("arrow_image"),
 	list_position("list_position", BELOW),
 	items("item"),
 	combo_button("combo_button"),
 	combo_list("combo_list"),
-	combo_editor("combo_editor")
+	combo_editor("combo_editor"),
+	drop_down_button("drop_down_button")
 {
 	addSynonym(items, "combo_item");
 }
@@ -104,19 +104,29 @@ LLComboBox::LLComboBox(const LLComboBox::Params& p)
 	mPrearrangeCallback(p.prearrange_callback()),
 	mTextEntryCallback(p.text_entry_callback()),
 	mSelectionCallback(p.selection_callback()),
-	mArrowImage(p.arrow_image),
 	mListPosition(p.list_position)
 {
 	// Text label button
 
-	LLButton::Params button_params = p.combo_button;
+	LLButton::Params button_params = (mAllowTextEntry ? p.combo_button : p.drop_down_button);
 	button_params.mouse_down_callback.function(boost::bind(&LLComboBox::onButtonDown, this));
 	button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM|FOLLOWS_RIGHT);
 	button_params.rect(p.rect);
-	button_params.pad_right(2);
+
+	if(mAllowTextEntry)
+	{
+		button_params.pad_right(2);
+	}
+
+	mArrowImage = button_params.image_unselected;
 
 	mButton = LLUICtrlFactory::create<LLButton>(button_params);
-	mButton->setRightHPad(2);  //redo to compensate for button hack that leaves space for a character
+	if(mAllowTextEntry)
+	{
+		//redo to compensate for button hack that leaves space for a character
+		//unless it is a "minimal combobox"(drop down)
+		mButton->setRightHPad(2);
+	}
 	addChild(mButton);
 
 	LLScrollListCtrl::Params params = p.combo_list;
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index bc98690a01..cb5f72dcbe 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -84,7 +84,6 @@ public:
 		Optional<commit_callback_t> 		prearrange_callback,
 											text_entry_callback,
 											selection_callback;
-		Optional<LLUIImage*>				arrow_image;
 
 		Optional<EPreferredPosition, PreferredPositionValues>	list_position;
 		
@@ -93,6 +92,8 @@ public:
 		Optional<LLScrollListCtrl::Params>	combo_list;
 		Optional<LLLineEditor::Params>		combo_editor;
 
+		Optional<LLButton::Params>          drop_down_button;
+
 		Multiple<ItemParams>				items;
 		
 		Params();
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index f1fc3d8f43..1e8b8a5537 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -177,8 +177,8 @@ void LLConsole::draw()
 
 //	F32 console_opacity = llclamp(gSavedSettings.getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
 	F32 console_opacity = llclamp(LLUI::sSettingGroups["config"]->getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
-//	LLColor4 color = gSavedSkinSettings.getColor("ConsoleBackground");
-	LLColor4 color = LLUI::sSettingGroups["color"]->getColor("ConsoleBackground");
+//	LLColor4 color = LLUIColorTable::instance().getColor("ConsoleBackground");
+	LLColor4 color = LLUIColorTable::instance().getColor("ConsoleBackground");
 	color.mV[VALPHA] *= console_opacity;
 
 	F32 line_height = mFont->getLineHeight();
diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h
index 8b53c46ae9..0448c20068 100644
--- a/indra/llui/lldraghandle.h
+++ b/indra/llui/lldraghandle.h
@@ -53,8 +53,8 @@ public:
 		Optional<LLUIColor> drag_shadow_color;
 		
 		Params() 
-		:	drag_highlight_color("", LLUI::getCachedColorFunctor("DefaultHighlightLight")),
-			drag_shadow_color("", LLUI::getCachedColorFunctor("DefaultShadowDark"))
+		:	drag_highlight_color("", LLUIColorTable::instance().getColor("DefaultHighlightLight")),
+			drag_shadow_color("", LLUIColorTable::instance().getColor("DefaultShadowDark"))
 		{
 			mouse_opaque(true);
 			follows.flags(FOLLOWS_ALL);
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 8932a7ccf2..d37459c040 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -66,7 +66,7 @@ const S32 TABBED_FLOATER_OFFSET = 0;
 
 std::string	LLFloater::sButtonActiveImageNames[BUTTON_COUNT] = 
 {
-	"closebox.tga",		//BUTTON_CLOSE
+	"Icon_Close_Foreground",		//BUTTON_CLOSE
 	"restore.tga",	//BUTTON_RESTORE
 	"minimize.tga",	//BUTTON_MINIMIZE
 	"tearoffbox.tga",	//BUTTON_TEAR_OFF
@@ -84,7 +84,7 @@ std::string	LLFloater::sButtonInactiveImageNames[BUTTON_COUNT] =
 
 std::string	LLFloater::sButtonPressedImageNames[BUTTON_COUNT] = 
 {
-	"close_in_blue.tga",		//BUTTON_CLOSE
+	"Icon_Close_Press",		//BUTTON_CLOSE
 	"restore_pressed.tga",	//BUTTON_RESTORE
 	"minimize_pressed.tga",	//BUTTON_MINIMIZE
 	"tearoff_pressed.tga",	//BUTTON_TEAR_OFF
@@ -221,8 +221,8 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
 		mPreviousMinimizedLeft(0),
 		mNotificationContext(NULL)
 {
-	static LLUICachedControl<LLColor4> default_background_color ("FloaterDefaultBackgroundColor", *(new LLColor4));
-	static LLUICachedControl<LLColor4> focus_background_color ("FloaterFocusBackgroundColor", *(new LLColor4));
+	static LLUIColor default_background_color = LLUIColorTable::instance().getColor("FloaterDefaultBackgroundColor");
+	static LLUIColor focus_background_color = LLUIColorTable::instance().getColor("FloaterFocusBackgroundColor");
 	
 	for (S32 i = 0; i < BUTTON_COUNT; i++)
 	{
@@ -1449,7 +1449,7 @@ void LLFloater::draw()
 		S32 bottom = LLPANEL_BORDER_WIDTH;
 
 		static LLUICachedControl<S32> shadow_offset_S32 ("DropShadowFloater", 0);
-		static LLUICachedControl<LLColor4> shadow_color_cached ("ColorDropShadow", *(new LLColor4));
+		static LLUIColor shadow_color_cached = LLUIColorTable::instance().getColor("ColorDropShadow");
 		LLColor4 shadow_color = shadow_color_cached;
 		F32 shadow_offset = (F32)shadow_offset_S32;
 
@@ -1474,7 +1474,7 @@ void LLFloater::draw()
 
 		if(gFocusMgr.childHasKeyboardFocus(this) && !getIsChrome() && !getCurrentTitle().empty())
 		{
-			static LLUICachedControl<LLColor4> titlebar_focus_color ("TitleBarFocusColor", *(new LLColor4));
+			static LLUIColor titlebar_focus_color = LLUIColorTable::instance().getColor("TitleBarFocusColor");
 			// draw highlight on title bar to indicate focus.  RDW
 			const LLFontGL* font = LLFontGL::getFontSansSerif();
 			LLRect r = getRect();
@@ -1533,10 +1533,10 @@ void LLFloater::draw()
 	{
 		// add in a border to improve spacialized visual aclarity ;)
 		// use lines instead of gl_rect_2d so we can round the edges as per james' recommendation
-		static LLUICachedControl<LLColor4> focus_border_color ("FloaterFocusBorderColor", *(new LLColor4));
-		static LLUICachedControl<LLColor4> unfocus_border_color ("FloaterUnfocusBorderColor", *(new LLColor4));
+		static LLUIColor focus_border_color = LLUIColorTable::instance().getColor("FloaterFocusBorderColor");
+		static LLUIColor unfocus_border_color = LLUIColorTable::instance().getColor("FloaterUnfocusBorderColor");
 		LLUI::setLineWidth(1.5f);
-		LLColor4 outlineColor = gFocusMgr.childHasKeyboardFocus(this) ? focus_border_color() : unfocus_border_color;
+		LLColor4 outlineColor = gFocusMgr.childHasKeyboardFocus(this) ? focus_border_color : unfocus_border_color;
 		gl_rect_2d_offset_local(0, getRect().getHeight() + 1, getRect().getWidth() + 1, 0, outlineColor, -LLPANEL_BORDER_WIDTH, FALSE);
 		LLUI::setLineWidth(1.f);
 	}
@@ -1699,7 +1699,6 @@ void LLFloater::buildButtons()
 		p.tab_stop(false);
 		p.follows.flags(FOLLOWS_TOP|FOLLOWS_RIGHT);
 		p.tool_tip(sButtonToolTips[i]);
-		p.image_color(LLUI::getCachedColorFunctor("FloaterButtonImageColor"));
 		p.scale_image(true);
 
 		LLButton* buttonp = LLUICtrlFactory::create<LLButton>(p);
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp
index 8846f2a8c4..a99c3a4fe6 100644
--- a/indra/llui/llflyoutbutton.cpp
+++ b/indra/llui/llflyoutbutton.cpp
@@ -54,11 +54,6 @@ LLFlyoutButton::LLFlyoutButton(const Params& p)
 
 	mActionButton = LLUICtrlFactory::create<LLButton>(bp);
 	addChild(mActionButton);
-
-	mButton->setOrigin(getRect().getWidth() - FLYOUT_BUTTON_ARROW_WIDTH, 0);
-	mButton->reshape(FLYOUT_BUTTON_ARROW_WIDTH, getRect().getHeight());
-	mButton->setFollows(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
-	mButton->setImageOverlay(mListPosition == BELOW ? "down_arrow.tga" : "up_arrow.tga", LLFontGL::RIGHT);
 }
 
 void LLFlyoutButton::onActionButtonClick(const LLSD& data)
@@ -75,7 +70,7 @@ void LLFlyoutButton::draw()
 
 	//FIXME: this should be an attribute of comboboxes, whether they have a distinct label or
 	// the label reflects the last selected item, for now we have to manually remove the label
-	mButton->setLabel(LLStringUtil::null);
+	setLabel(LLStringUtil::null);
 	LLComboBox::draw();	
 }
 
diff --git a/indra/llui/llflyoutbutton.h b/indra/llui/llflyoutbutton.h
index f60fe1eb35..1f1716593a 100644
--- a/indra/llui/llflyoutbutton.h
+++ b/indra/llui/llflyoutbutton.h
@@ -46,10 +46,14 @@ public:
 	struct Params : public LLInitParam::Block<Params, LLComboBox::Params>
 	{
 		Optional<LLButton::Params> action_button;
+		Deprecated                 allow_text_entry;
 
 		Params()
-		:	action_button("action_button")
-		{}
+		:	action_button("action_button"),
+		    allow_text_entry("allow_text_entry")
+		{
+			LLComboBox::Params::allow_text_entry = false;
+		}
 
 	};
 protected:
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 9a4ec7627e..a66f147dcc 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -323,7 +323,7 @@ F32 LLFocusMgr::getFocusFlashAmt() const
 
 LLColor4 LLFocusMgr::getFocusColor() const
 {
-	static LLUICachedControl<LLColor4> focus_color_cached ("FocusColor", *(new LLColor4));
+	static LLUIColor focus_color_cached = LLUIColorTable::instance().getColor("FocusColor");
 	LLColor4 focus_color = lerp(focus_color_cached, LLColor4::white, getFocusFlashAmt());
 	// de-emphasize keyboard focus when app has lost focus (to avoid typing into wrong window problem)
 	if (!mAppHasFocus)
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 5ea45e13cf..925f22d94e 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -184,6 +184,11 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
 	mBorder = LLUICtrlFactory::create<LLViewBorder>(border_p);
 	addChild( mBorder );
 
+	if(p.background_image.isProvided())
+	{
+		mImage = p.background_image;
+	}
+
 	// clamp text padding to current editor size
 	updateTextPadding();
 	setCursor(mText.length());
@@ -1525,12 +1530,12 @@ void LLLineEditor::draw()
 
 	LLColor4 bg_color = mReadOnlyBgColor.get();
 
-#if 0 // for when we're ready for image art.
+#if 1 // for when we're ready for image art.
 	if( hasFocus())
 	{
 		mImage->drawBorder(0, 0, getRect().getWidth(), getRect().getHeight(), gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
 	}
-	mImage->draw(getLocalRect(), mReadOnly ? mReadOnlyBgColor : mWriteableBgColor  );
+	mImage->draw(getLocalRect());
 #else // the old programmer art.
 	// drawing solids requires texturing be disabled
 	{
@@ -1691,7 +1696,7 @@ void LLLineEditor::draw()
 			mMaxHPixels - llround(rendered_pixels_right),
 			&rendered_pixels_right);
 	}
-#if 0 // for when we're ready for image art.
+#if 1 // for when we're ready for image art.
 	mBorder->setVisible(FALSE); // no more programmatic art.
 #endif
 
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 95221d5fc6..e79afe76d8 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2333,10 +2333,10 @@ BOOL LLMenuGL::appendMenu( LLMenuGL* menu )
 	p.label = menu->getLabel();
 	p.branch = menu;
 	p.jump_key = menu->getJumpKey();
-	p.enabled_color=LLUI::getCachedColorFunctor("MenuItemEnabledColor");
-	p.disabled_color=LLUI::getCachedColorFunctor("MenuItemDisabledColor");
-	p.highlight_bg_color=LLUI::getCachedColorFunctor("MenuItemHighlightBgColor");
-	p.highlight_fg_color=LLUI::getCachedColorFunctor("MenuItemHighlightFgColor");
+	p.enabled_color=LLUIColorTable::instance().getColor("MenuItemEnabledColor");
+	p.disabled_color=LLUIColorTable::instance().getColor("MenuItemDisabledColor");
+	p.highlight_bg_color=LLUIColorTable::instance().getColor("MenuItemHighlightBgColor");
+	p.highlight_fg_color=LLUIColorTable::instance().getColor("MenuItemHighlightFgColor");
 
 	LLMenuItemBranchGL* branch = LLUICtrlFactory::create<LLMenuItemBranchGL>(p);
 	success &= append( branch );
@@ -2743,7 +2743,7 @@ void LLMenuGL::draw( void )
 	if (mDropShadowed && !mTornOff)
 	{
 		static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0);
-		static LLUICachedControl<LLColor4> color_drop_shadow ("ColorDropShadow", *(new LLColor4));
+		static LLUIColor color_drop_shadow = LLUIColorTable::instance().getColor("ColorDropShadow");
 		gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0, 
 			color_drop_shadow, drop_shadow_floater );
 	}
@@ -3117,10 +3117,10 @@ BOOL LLMenuBarGL::appendMenu( LLMenuGL* menu )
 	p.label = menu->getLabel();
 	p.visible = menu->getVisible();
 	p.branch = menu;
-	p.enabled_color=LLUI::getCachedColorFunctor("MenuItemEnabledColor");
-	p.disabled_color=LLUI::getCachedColorFunctor("MenuItemDisabledColor");
-	p.highlight_bg_color=LLUI::getCachedColorFunctor("MenuItemHighlightBgColor");
-	p.highlight_fg_color=LLUI::getCachedColorFunctor("MenuItemHighlightFgColor");
+	p.enabled_color=LLUIColorTable::instance().getColor("MenuItemEnabledColor");
+	p.disabled_color=LLUIColorTable::instance().getColor("MenuItemDisabledColor");
+	p.highlight_bg_color=LLUIColorTable::instance().getColor("MenuItemHighlightBgColor");
+	p.highlight_fg_color=LLUIColorTable::instance().getColor("MenuItemHighlightFgColor");
 
 	LLMenuItemBranchDownGL* branch = LLUICtrlFactory::create<LLMenuItemBranchDownGL>(p);
 	success &= branch->addToAcceleratorList(&mAccelerators);
@@ -3804,10 +3804,10 @@ BOOL LLContextMenu::appendContextSubMenu(LLContextMenu *menu)
 	p.name = menu->getName();
 	p.label = menu->getLabel();
 	p.branch = menu;
-	p.enabled_color=LLUI::getCachedColorFunctor("MenuItemEnabledColor");
-	p.disabled_color=LLUI::getCachedColorFunctor("MenuItemDisabledColor");
-	p.highlight_bg_color=LLUI::getCachedColorFunctor("MenuItemHighlightBgColor");
-	p.highlight_fg_color=LLUI::getCachedColorFunctor("MenuItemHighlightFgColor");
+	p.enabled_color=LLUIColorTable::instance().getColor("MenuItemEnabledColor");
+	p.disabled_color=LLUIColorTable::instance().getColor("MenuItemDisabledColor");
+	p.highlight_bg_color=LLUIColorTable::instance().getColor("MenuItemHighlightBgColor");
+	p.highlight_fg_color=LLUIColorTable::instance().getColor("MenuItemHighlightFgColor");
 	
 	item = LLUICtrlFactory::create<LLContextMenuBranch>(p);
 	LLMenuGL::sMenuContainer->addChild(item->getBranch());
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 526e1c2583..ad257f46c2 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -379,7 +379,7 @@ public:
 			drop_shadow("drop_shadow", true),
 			bg_visible("bg_visible", true),
 			create_jump_keys("create_jump_keys", false),
-			bg_color("bg_color",  LLUI::getCachedColorFunctor( "MenuDefaultBgColor" )),
+			bg_color("bg_color",  LLUIColorTable::instance().getColor( "MenuDefaultBgColor" )),
 			scrollable("scrollable", false)
 		{
 			addSynonym(bg_visible, "opaque");
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index 8779eee28d..7557b87b94 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -244,7 +244,7 @@ void LLModalDialog::onClose(bool app_quitting)
 // virtual
 void LLModalDialog::draw()
 {
-	static LLUICachedControl<LLColor4> shadow_color ("ColorDropShadow", *(new LLColor4));
+	static LLUIColor shadow_color = LLUIColorTable::instance().getColor("ColorDropShadow");
 	static LLUICachedControl<S32> shadow_lines ("DropShadowFloater", 0);
 
 	gl_drop_shadow( 0, getRect().getHeight(), getRect().getWidth(), 0,
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 3a76e72868..6a6e15867b 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -428,14 +428,10 @@ void LLPanel::initFromParams(const LLPanel::Params& p)
 		mUIStrings[it->name] = it->text;
 	}
 
-	setName(p.name());
 	setLabel(p.label());
-
 	setShape(p.rect);
 	parseFollowsFlags(p);
 
-	setEnabled(p.enabled);
-	setVisible(p.visible);
 	setToolTip(p.tool_tip());
 	setSaveToXML(p.serializable);
 	
diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp
index 943e2f55f1..90f51b9919 100644
--- a/indra/llui/llresizehandle.cpp
+++ b/indra/llui/llresizehandle.cpp
@@ -63,7 +63,7 @@ LLResizeHandle::LLResizeHandle(const LLResizeHandle::Params& p)
 {
 	if( RIGHT_BOTTOM == mCorner)
 	{
-		mImage = LLUI::getUIImage("resize_handle_bottom_right_blue.tga");
+		mImage = LLUI::getUIImage("Resize_Corner");
 	}
 	switch( p.corner )
 	{
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
index 72329a4b32..943891c572 100644
--- a/indra/llui/llspinctrl.cpp
+++ b/indra/llui/llspinctrl.cpp
@@ -111,8 +111,8 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p)
 					.right(btn_right)
 					.height(spinctrl_btn_height);
 	up_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM);
-	up_button_params.image_unselected.name("spin_up_out_blue.tga");
-	up_button_params.image_selected.name("spin_up_in_blue.tga");
+	up_button_params.image_unselected.name("ScrollArrow_Up");
+	up_button_params.image_selected.name("ScrollArrow_Up");
 	up_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2));
 	up_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2));
 	up_button_params.tab_stop(false);
@@ -130,8 +130,8 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p)
 					.bottom(bottom)
 					.height(spinctrl_btn_height);
 	down_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM);
-	down_button_params.image_unselected.name("spin_down_out_blue.tga");
-	down_button_params.image_selected.name("spin_down_in_blue.tga");
+	down_button_params.image_unselected.name("ScrollArrow_Down");
+	down_button_params.image_selected.name("ScrollArrow_Down");
 	down_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2));
 	down_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2));
 	down_button_params.tab_stop(false);
diff --git a/indra/llui/llstatgraph.cpp b/indra/llui/llstatgraph.cpp
index 3bd2c9f9e7..55d6b3159f 100644
--- a/indra/llui/llstatgraph.cpp
+++ b/indra/llui/llstatgraph.cpp
@@ -107,10 +107,10 @@ void LLStatGraph::draw()
 	}
 
 	//gl_drop_shadow(0,  getRect().getHeight(), getRect().getWidth(), 0,
-	//				gSavedSkinSettings.getColor("ColorDropShadow"), 
+	//				LLUIColorTable::instance().getColor("ColorDropShadow"), 
 	//				(S32) gSavedSettings.getF32("DropShadowFloater") );
 
-	color = LLUI::sSettingGroups["color"]->getColor( "MenuDefaultBgColor" );
+	color = LLUIColorTable::instance().getColor( "MenuDefaultBgColor" );
 	gGL.color4fv(color.mV);
 	gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, TRUE);
 
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h
index 890abc7d67..1a94fcf2c6 100644
--- a/indra/llui/llstyle.h
+++ b/indra/llui/llstyle.h
@@ -106,7 +106,7 @@ protected:
 
 private:
 	BOOL		mVisible;
-	LLColor4	mColor;
+	LLUIColor	mColor;
 	std::string	mFontName;
 	LLFontGL*   mFont;		// cached for performance
 	std::string	mLink;
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 464e4be809..b812e876ef 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -314,7 +314,7 @@ void LLTextBox::draw()
 
 	if( mBorderDropShadowVisible )
 	{
-		static LLUICachedControl<LLColor4> color_drop_shadow ("ColorDropShadow", *(new LLColor4));
+		static LLUIColor color_drop_shadow = LLUIColorTable::instance().getColor("ColorDropShadow");
 		static LLUICachedControl<S32> drop_shadow_tooltip ("DropShadowTooltip", 0);
 		gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
 			color_drop_shadow, drop_shadow_tooltip);
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 34bced064e..6649264d9a 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -75,7 +75,7 @@ const S32	CURSOR_THICKNESS = 2;
 const S32	SPACES_PER_TAB = 4;
 
 
-LLColor4 LLTextEditor::mLinkColor = LLColor4::blue;
+LLUIColor LLTextEditor::mLinkColor = LLColor4::blue;
 void (* LLTextEditor::mURLcallback)(const std::string&)   = NULL;
 bool (* LLTextEditor::mSecondlifeURLcallback)(const std::string&)   = NULL;
 bool (* LLTextEditor::mSecondlifeURLcallbackRightClick)(const std::string&)   = NULL;
@@ -3083,8 +3083,8 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
 
 	if (style->getIsEmbeddedItem())
 	{
-		static LLUICachedControl<LLColor4> text_embedded_item_readonly_color ("TextEmbeddedItemReadOnlyColor", *(new LLColor4));
-		static LLUICachedControl<LLColor4> text_embedded_item_color ("TextEmbeddedItemColor", *(new LLColor4));
+		static LLUIColor text_embedded_item_readonly_color = LLUIColorTable::instance().getColor("TextEmbeddedItemReadOnlyColor");
+		static LLUIColor text_embedded_item_color = LLUIColorTable::instance().getColor("TextEmbeddedItemColor");
 		if (mReadOnly)
 		{
 			color = text_embedded_item_readonly_color;
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index f64353555e..d0769c2a8f 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -512,7 +512,7 @@ private:
 	// Data
 	//
 	LLKeywords		mKeywords;
-	static LLColor4 mLinkColor;
+	static LLUIColor mLinkColor;
 	static void			(*mURLcallback) (const std::string& url);
 	static bool			(*mSecondlifeURLcallback) (const std::string& url);
 	static bool			(*mSecondlifeURLcallbackRightClick) (const std::string& url);
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 1d3e5d7a15..12875b4ed1 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -1579,7 +1579,6 @@ void LLUI::initClass(const settings_map_t& settings,
 	sSettingGroups = settings;
 
 	if ((get_ptr_in_map(sSettingGroups, std::string("config")) == NULL) ||
-		(get_ptr_in_map(sSettingGroups, std::string("color")) == NULL) ||
 		(get_ptr_in_map(sSettingGroups, std::string("floater")) == NULL) ||
 		(get_ptr_in_map(sSettingGroups, std::string("ignores")) == NULL))
 	{
@@ -1590,7 +1589,7 @@ void LLUI::initClass(const settings_map_t& settings,
 	sAudioCallback = audio_callback;
 	sGLScaleFactor = (scale_factor == NULL) ? LLVector2(1.f, 1.f) : *scale_factor;
 	sWindow = NULL; // set later in startup
-	LLFontGL::sShadowColor = LLUI::sSettingGroups["color"]->getColor("ColorDropShadow");
+	LLFontGL::sShadowColor = LLUIColorTable::instance().getColor("ColorDropShadow");
 
 	static LLUICachedControl<bool> show_xui_names ("ShowXUINames", false);
 	LLUI::sShowXUINames = show_xui_names;
@@ -1855,13 +1854,6 @@ void LLUI::setHtmlHelp(LLHtmlHelp* html_help)
 	LLUI::sHtmlHelp = html_help;
 }
 
-// static
-boost::function<const LLColor4&()> LLUI::getCachedColorFunctor(const std::string& color_name)
-{
-	return LLCachedControl<LLColor4>(*sSettingGroups["color"], color_name, LLColor4::magenta);
-}
-
-// static
 LLControlGroup& LLUI::getControlControlGroup (const std::string& controlname)
 {
 	for (settings_map_t::iterator itor = sSettingGroups.begin();
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index dbd295d4e8..c0873247c0 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -45,6 +45,8 @@
 #include "lluiimage.h"		// *TODO: break this dependency, need to add #include "lluiimage.h" to all widgets that hold an Optional<LLUIImage*> in their paramblocks
 #include "llinitparam.h"
 #include "llregistry.h"
+#include "lluicolor.h"
+#include "lluicolortable.h"
 #include <boost/signals2.hpp>
 #include "lllazyvalue.h"
 
@@ -202,7 +204,6 @@ public:
 	static void screenRectToGL(const LLRect& screen, LLRect *gl);
 	static void glRectToScreen(const LLRect& gl, LLRect *screen);
 	static void setHtmlHelp(LLHtmlHelp* html_help);
-	static boost::function<const LLColor4&()> getCachedColorFunctor(const std::string& color_name);
 	// Returns the control group containing the control name, or the default group
 	static LLControlGroup& getControlControlGroup (const std::string& controlname);
 	
@@ -690,8 +691,6 @@ public:
 	{}
 };
 
-typedef LLLazyValue<LLColor4> LLUIColor;
-
 namespace LLInitParam
 {
 	template<>
@@ -767,11 +766,4 @@ namespace LLInitParam
 	};
 }
 
-namespace LLInitParam
-{
-    template<>
-	bool ParamCompare<LLLazyValue<LLColor4> >::equals(
-		const LLLazyValue<LLColor4> &a, const LLLazyValue<LLColor4> &b); 
-}
-
 #endif
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp
index 27ba6cc8b4..0320e998d0 100644
--- a/indra/llui/lluicolortable.cpp
+++ b/indra/llui/lluicolortable.cpp
@@ -11,7 +11,10 @@
 
 #include <queue>
 
+#include "lldir.h"
+#include "llui.h"
 #include "lluicolortable.h"
+#include "lluictrlfactory.h"
 
 LLUIColorTable::ColorParams::ColorParams()
 :	value("value"),
@@ -26,17 +29,16 @@ LLUIColorTable::ColorEntryParams::ColorEntryParams()
 }
 
 LLUIColorTable::Params::Params()
-:	color_entries("color_entries")
+:	color_entries("color")
 {
 }
 
-void LLUIColorTable::init(const Params& p)
+void LLUIColorTable::insertFromParams(const Params& p)
 {
 	// this map will contain all color references after the following loop
 	typedef std::map<std::string, std::string> string_string_map_t;
 	string_string_map_t unresolved_refs;
 
-	mColors.clear();
 	for(LLInitParam::ParamIterator<ColorEntryParams>::const_iterator it = p.color_entries().begin();
 		it != p.color_entries().end();
 		++it)
@@ -44,7 +46,7 @@ void LLUIColorTable::init(const Params& p)
 		ColorEntryParams color_entry = *it;
 		if(color_entry.color.value.isChosen())
 		{
-			mColors.insert(string_color_map_t::value_type(color_entry.name, color_entry.color.value));
+			setColor(color_entry.name, color_entry.color.value, mLoadedColors);
 		}
 		else
 		{
@@ -66,19 +68,21 @@ void LLUIColorTable::init(const Params& p)
 		// we haven't visited any references yet
 		visited_refs.clear();
 
-		string_string_map_t::iterator it = unresolved_refs.begin();
+		string_string_map_t::iterator current = unresolved_refs.begin();
+		string_string_map_t::iterator previous;
+
 		while(true)
 		{
-			if(it != unresolved_refs.end())
+			if(current != unresolved_refs.end())
 			{
 				// locate the current reference in the previously visited references...
-				string_color_ref_iter_map_t::iterator visited = visited_refs.lower_bound(it->first);
+				string_color_ref_iter_map_t::iterator visited = visited_refs.lower_bound(current->first);
 				if(visited != visited_refs.end()
-			    && !(visited_refs.key_comp()(it->first, visited->first)))
+			    && !(visited_refs.key_comp()(current->first, visited->first)))
 				{
 					// ...if we find the current reference in the previously visited references
 					// we know that there is a cycle
-					std::string ending_ref = it->first;
+					std::string ending_ref = current->first;
 					std::string warning("The following colors form a cycle: ");
 
 					// warn about the references in the chain and remove them from
@@ -102,17 +106,17 @@ void LLUIColorTable::init(const Params& p)
 				else
 				{
 					// ...continue along the reference chain
-					ref_chain.push(it->first);
-					visited_refs.insert(visited, string_color_ref_iter_map_t::value_type(it->first, it));
+					ref_chain.push(current->first);
+					visited_refs.insert(visited, string_color_ref_iter_map_t::value_type(current->first, current));
 				}
 			}
 			else
 			{
 				// since this reference does not refer to another reference it must refer to an
 				// actual color, lets find it...
-				string_color_map_t::iterator color_value = mColors.find(it->second);
+				string_color_map_t::iterator color_value = mLoadedColors.find(previous->second);
 
-				if(color_value != mColors.end())
+				if(color_value != mLoadedColors.end())
 				{
 					// ...we found the color, and we now add every reference in the reference chain
 					// to the color map
@@ -120,7 +124,7 @@ void LLUIColorTable::init(const Params& p)
 						iter != visited_refs.end();
 						++iter)
 					{
-						mColors.insert(string_color_map_t::value_type(iter->first, color_value->second));
+						setColor(iter->first, color_value->second, mLoadedColors);
 						unresolved_refs.erase(iter->second);
 					}
 
@@ -143,13 +147,142 @@ void LLUIColorTable::init(const Params& p)
 			}
 
 			// find the next color reference in the reference chain
-			it = unresolved_refs.find(it->second);
+			previous = current;
+			current = unresolved_refs.find(current->second);
+		}
+	}
+}
+
+void LLUIColorTable::clear()
+{
+	clearTable(mLoadedColors);
+	clearTable(mUserSetColors);
+}
+
+LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& default_color) const
+{
+	string_color_map_t::const_iterator iter = mUserSetColors.find(name);
+	if(iter != mUserSetColors.end())
+	{
+		return LLUIColor(&iter->second);
+	}
+
+	iter = mLoadedColors.find(name);
+	return (iter != mLoadedColors.end() ? LLUIColor(&iter->second) : LLUIColor(default_color));
+}
+
+// update user color, loaded colors are parsed on initialization
+void LLUIColorTable::setColor(const std::string& name, const LLColor4& color)
+{
+	setColor(name, color, mUserSetColors);
+}
+
+bool LLUIColorTable::loadFromSettings()
+{
+	bool result = false;
+
+	std::string default_filename = gDirUtilp->getExpandedFilename(LL_PATH_DEFAULT_SKIN, "colors_def.xml");
+	result |= loadFromFilename(default_filename);
+
+	std::string current_filename = gDirUtilp->getExpandedFilename(LL_PATH_TOP_SKIN, "colors_def.xml");
+	if(current_filename != default_filename)
+	{
+		result |= loadFromFilename(current_filename);
+	}
+
+	std::string user_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors_def.xml");
+	loadFromFilename(user_filename);
+
+	return result;
+}
+
+void LLUIColorTable::saveUserSettings() const
+{
+	Params params;
+
+	for(string_color_map_t::const_iterator it = mUserSetColors.begin();
+		it != mUserSetColors.end();
+		++it)
+	{
+		ColorEntryParams color_entry;
+		color_entry.name = it->first;
+		color_entry.color.value = it->second;
+
+		params.color_entries.add(color_entry);
+	}
+
+	LLXMLNodePtr output_node = new LLXMLNode("colors", false);
+	LLXUIParser::instance().writeXUI(output_node, params);
+
+	if(!output_node->isNull())
+	{
+		const std::string& filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors_def.xml");
+		LLFILE *fp = LLFile::fopen(filename, "w");
+
+		if(fp != NULL)
+		{
+			LLXMLNode::writeHeaderToFile(fp);
+			output_node->writeToFile(fp);
+
+			fclose(fp);
 		}
 	}
 }
 
-const LLColor4& LLUIColorTable::getColor(const std::string& name) const
+bool LLUIColorTable::colorExists(const std::string& color_name) const
+{
+	return ((mLoadedColors.find(color_name) != mLoadedColors.end())
+		 || (mUserSetColors.find(color_name) != mUserSetColors.end()));
+}
+
+void LLUIColorTable::clearTable(string_color_map_t& table)
+{
+	for(string_color_map_t::iterator it = table.begin();
+		it != table.end();
+		++it)
+	{
+		it->second = LLColor4::magenta;
+	}
+}
+
+// this method inserts a color into the table if it does not exist
+// if the color already exists it changes the color
+void LLUIColorTable::setColor(const std::string& name, const LLColor4& color, string_color_map_t& table)
+{
+	string_color_map_t::iterator it = table.lower_bound(name);
+	if(it != table.end()
+	&& !(table.key_comp()(name, it->first)))
+	{
+		it->second = color;
+	}
+	else
+	{
+		table.insert(it, string_color_map_t::value_type(name, color));
+	}
+}
+
+bool LLUIColorTable::loadFromFilename(const std::string& filename)
 {
-	string_color_map_t::const_iterator iter = mColors.find(name);
-	return (iter != mColors.end() ? iter->second : LLColor4::magenta);
+	LLXMLNodePtr root;
+
+	if(!LLXMLNode::parseFile(filename, root, NULL))
+	{
+		llwarns << "Unable to parse color file " << filename << llendl;
+		return false;
+	}
+
+	Params params;
+	LLXUIParser::instance().readXUI(root, params);
+
+	if(params.validateBlock())
+	{
+		insertFromParams(params);
+	}
+	else
+	{
+		llwarns << filename << " failed to load" << llendl;
+		return false;
+	}
+
+	return true;
 }
diff --git a/indra/llui/lluicolortable.h b/indra/llui/lluicolortable.h
index dcbb1ee5cb..f102a573b8 100644
--- a/indra/llui/lluicolortable.h
+++ b/indra/llui/lluicolortable.h
@@ -17,8 +17,11 @@
 
 #include "v4color.h"
 
+class LLUIColor;
+
 class LLUIColorTable : public LLSingleton<LLUIColorTable>
 {
+LOG_CLASS(LLUIColorTable);
 public:
 	struct ColorParams : LLInitParam::Choice<ColorParams>
 	{
@@ -44,15 +47,37 @@ public:
 	};
 
 	// define colors by passing in a param block that can be generated via XUI file or manually
-	void init(const Params& p);
+	void insertFromParams(const Params& p);
+
+	// reset all colors to default magenta color
+	void clear();
 
 	// color lookup
-	const LLColor4& getColor(const std::string& name) const;
+	LLUIColor getColor(const std::string& name, const LLColor4& default_color = LLColor4::magenta) const;
+
+	// if the color is in the table, it's value is changed, otherwise it is added
+	void setColor(const std::string& name, const LLColor4& color);
+
+	// returns true if color_name exists in the table
+	bool colorExists(const std::string& color_name) const;
+
+	// loads colors from settings files
+	bool loadFromSettings();
+
+	// saves colors specified by the user to the users skin directory
+	void saveUserSettings() const;
 
 private:
-	// consider using sorted vector
+	bool loadFromFilename(const std::string& filename);
+
+	// consider using sorted vector, can be much faster
 	typedef std::map<std::string, LLColor4>  string_color_map_t;
-	string_color_map_t mColors;
+	
+	void clearTable(string_color_map_t& table);
+	void setColor(const std::string& name, const LLColor4& color, string_color_map_t& table);
+
+	string_color_map_t mLoadedColors;
+	string_color_map_t mUserSetColors;
 };
 
 #endif // LL_LLUICOLORTABLE_H
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 0fbcf24c49..395bed7959 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -918,12 +918,4 @@ namespace LLInitParam
     {
     	return false;
     }
-
-    template<> 
-	bool ParamCompare<LLLazyValue<LLColor4> >::equals(
-		const LLLazyValue<LLColor4> &a, 
-		const LLLazyValue<LLColor4> &b)    
-    {
-    	return a.get() == b.get();
-    }
 }
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 24e4ad18e6..24caf51159 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -398,11 +398,11 @@ BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const std::string& na
 {
 	std::string colorstring;
 	BOOL res = node->getAttributeString(name.c_str(), colorstring);
-	if (res && LLUI::sSettingGroups["color"])
+	if (res)
 	{
-		if (LLUI::sSettingGroups["color"]->controlExists(colorstring))
+		if (LLUIColorTable::instance().colorExists(colorstring))
 		{
-			color.setVec(LLUI::sSettingGroups["color"]->getColor(colorstring));
+			color.setVec(LLUIColorTable::instance().getColor(colorstring));
 		}
 		else
 		{
@@ -1010,7 +1010,7 @@ bool LLXUIParser::writeUIColorValue(const void* val_ptr, const name_stack_t& sta
 		LLUIColor color = *((LLUIColor*)val_ptr);
 		//RN: don't write out the color that is represented by a function
 		// rely on param block exporting to get the reference to the color settings
-		if (color.isUsingFunction()) return false;
+		if (color.isReference()) return false;
 		node->setFloatValue(4, color.get().mV);
 		return true;
 	}
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index b9c61b1fed..f8d584bc75 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -305,7 +305,7 @@ fail:
 	static T* getDefaultWidget(const std::string& name)
 	{
 		dummy_widget_creator_func_t* dummy_func = LLDummyWidgetRegistry::instance().getValue(&typeid(T));
-		return dynamic_cast<T*>((*dummy_func)(name));
+		return dummy_func ? dynamic_cast<T*>((*dummy_func)(name)) : NULL;
 	}
 
 	template <class T> 
diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp
index 8e0de0cb0c..84bc2d1bab 100644
--- a/indra/llui/lluiimage.cpp
+++ b/indra/llui/lluiimage.cpp
@@ -74,7 +74,7 @@ void LLUIImage::setScaleRegion(const LLRectf& region)
 //TODO: move drawing implementation inside class
 void LLUIImage::draw(S32 x, S32 y, const LLColor4& color) const
 {
-	gl_draw_image(x, y, mImage, color, mClipRegion);
+	gl_draw_scaled_image(x, y, getWidth(), getHeight(), mImage, color, mClipRegion);
 }
 
 void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const
diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h
index e35026cd3d..e3b473b5f6 100644
--- a/indra/llui/lluiimage.h
+++ b/indra/llui/lluiimage.h
@@ -60,11 +60,11 @@ public:
 	
 	void drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const;
 	void drawSolid(const LLRect& rect, const LLColor4& color) const { drawSolid(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color); }
-	void drawSolid(S32 x, S32 y, const LLColor4& color) const { drawSolid(x, y, mImage->getWidth(0), mImage->getHeight(0), color); }
+	void drawSolid(S32 x, S32 y, const LLColor4& color) const { drawSolid(x, y, getWidth(), getHeight(), color); }
 
 	void drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, S32 border_width) const;
 	void drawBorder(const LLRect& rect, const LLColor4& color, S32 border_width) const { drawBorder(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color, border_width); }
-	void drawBorder(S32 x, S32 y, const LLColor4& color, S32 border_width) const { drawBorder(x, y, mImage->getWidth(0), mImage->getHeight(0), color, border_width); }
+	void drawBorder(S32 x, S32 y, const LLColor4& color, S32 border_width) const { drawBorder(x, y, getWidth(), getHeight(), color, border_width); }
 	
 	const std::string& getName() const { return mName; }
 
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index d225ad2767..29d0f6a168 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1325,13 +1325,6 @@ void LLView::draw()
 		LLRect rootRect = getRootView()->getRect();
 		LLRect screenRect;
 
-		// draw focused control on top of everything else
-		LLView* focus_view = gFocusMgr.getKeyboardFocus();
-		if (focus_view && focus_view->getParent() != this)
-		{
-			focus_view = NULL;
-		}
-
 		++sDepth;
 
 		for (child_list_reverse_iter_t child_iter = mChildList.rbegin(); child_iter != mChildList.rend();)  // ++child_iter)
@@ -1339,7 +1332,7 @@ void LLView::draw()
 			child_list_reverse_iter_t child = child_iter++;
 			LLView *viewp = *child;
 
-			if (viewp->getVisible() && viewp != focus_view && viewp->getRect().isValid())
+			if (viewp->getVisible() && viewp->getRect().isValid())
 			{
 				// Only draw views that are within the root view
 				localRectToScreen(viewp->getRect(),&screenRect);
@@ -1357,11 +1350,6 @@ void LLView::draw()
 
 		}
 		--sDepth;
-
-		if (focus_view && focus_view->getVisible())
-		{
-			drawChild(focus_view);
-		}
 	}
 
 	gGL.getTexUnit(0)->disable();
@@ -1398,7 +1386,7 @@ void LLView::drawDebugRect()
 			}
 			else
 			{
-				static LLUICachedControl<LLColor4> scroll_highlighted_color ("ScrollHighlightedColor", *(new LLColor4));
+				static LLUIColor scroll_highlighted_color = LLUIColorTable::instance().getColor("ScrollHighlightedColor");
 				border_color = scroll_highlighted_color;
 			}
 		}
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp
index 04577bfc3b..f53c62580f 100644
--- a/indra/llvfs/lldir_mac.cpp
+++ b/indra/llvfs/lldir_mac.cpp
@@ -142,8 +142,25 @@ LLDir_Mac::LLDir_Mac()
 		CFURLRefToLLString(executableParentURLRef, mExecutableDir, true);
 		
 		// mAppRODataDir
-		CFURLRef	resourcesURLRef = CFBundleCopyResourcesDirectoryURL(mainBundleRef);
-		CFURLRefToLLString(resourcesURLRef, mAppRODataDir, true);
+		// *NOTE: When running in a dev tree, use the copy of app_settings and
+		// skins in indra/newview/ rather than in the application bundle.  This
+		// mirrors Windows dev environment behavior and allows direct checkin
+		// of edited skins/xui files. JC
+		U32 indra_pos = mExecutableDir.find("/indra");
+		if (indra_pos != std::string::npos)
+		{
+			// ...we're in a dev checkout
+			mAppRODataDir = mExecutableDir.substr(0, indra_pos)
+				+ "/indra/newview";
+			llinfos << "Running in dev checkout with mAppRODataDir "
+				<< mAppRODataDir << llendl;
+		}
+		else
+		{
+			// ...normal installation running
+			CFURLRef resourcesURLRef = CFBundleCopyResourcesDirectoryURL(mainBundleRef);
+			CFURLRefToLLString(resourcesURLRef, mAppRODataDir, true);
+		}
 		
 		// mOSUserDir
 		error = FSFindFolder(kUserDomain, kApplicationSupportFolderType, true, &fileRef);
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index b80080e458..beaf5c3488 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -64,7 +64,7 @@ if (NOT LINUX OR VIEWER)
       ${UI_LIBRARIES}     # for GTK
       ${SDL_LIBRARY}
       )
-endif (VIEWER)
+endif (NOT LINUX OR VIEWER)
 
 if (DARWIN)
   list(APPEND llwindow_SOURCE_FILES
@@ -96,7 +96,7 @@ if (LINUX AND VIEWER)
        llkeyboardsdl.h
        llwindowsdl.h
        )
-endif (LINUX)
+endif (LINUX AND VIEWER)
 
 if (WINDOWS)
   list(APPEND llwindow_SOURCE_FILES
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index afa7f707f1..567fda0034 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3329,17 +3329,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>NotFullScreen</key>
-    <map>
-      <key>Comment</key>
-      <string>Run SL in non fullscreen mode</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>FullScreenAspectRatio</key>
     <map>
       <key>Comment</key>
@@ -5460,17 +5449,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>RenderCustomSettings</key>
-    <map>
-      <key>Comment</key>
-      <string>Do you want to set the graphics settings yourself</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>RenderDebugAlphaMask</key>
     <map>
       <key>Comment</key>
@@ -5758,6 +5736,21 @@
       <key>Value</key>
       <integer>2</integer>
     </map>
+    <key>RenderGlowLumWeights</key>
+    <map>
+      <key>Comment</key>
+      <string>Weights for each color channel to be used in calculating luminance (should add up to 1.0)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3</string>
+      <key>Value</key>
+      <array>
+        <real>0.299</real>
+        <real>0.587</real>
+        <real>0.114</real>
+      </array>
+    </map>
     <key>RenderGlowMaxExtractAlpha</key>
     <map>
       <key>Comment</key>
@@ -5813,6 +5806,21 @@
       <key>Value</key>
       <real>0.0</real>
     </map>
+    <key>RenderGlowWarmthWeights</key>
+    <map>
+      <key>Comment</key>
+      <string>Weight of each color channel used before finding the max warmth</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3</string>
+      <key>Value</key>
+      <array>
+        <real>1.0</real>
+        <real>0.5</real>
+        <real>0.7</real>
+      </array>
+    </map>
     <key>RenderGlowWidth</key>
     <map>
       <key>Comment</key>
@@ -6589,6 +6597,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowAdvancedGraphicsSettings</key>
+    <map>
+      <key>Comment</key>
+      <string>Show advanced graphics settings</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowAllObjectHoverTip</key>
     <map>
       <key>Comment</key>
@@ -7230,6 +7249,21 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SkyNightColorShift</key>
+    <map>
+      <key>Comment</key>
+      <string>Controls moonlight color (base color applied to moon as light source)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color3</string>
+      <key>Value</key>
+      <array>
+        <real>0.67</real>
+        <real>0.67</real>
+        <real>1.0</real>
+      </array>
+    </map>
     <key>SkyOverrideSimSunPosition</key>
     <map>
       <key>Comment</key>
@@ -9314,6 +9348,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>WindowFullScreen</key>
+    <map>
+      <key>Comment</key>
+      <string>Run SL in fullscreen mode</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>WindowHeight</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 8a050539d7..22d54fe627 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -361,7 +361,7 @@ LLAgent::LLAgent() :
 	mAutoPilotFinishedCallback(NULL),
 	mAutoPilotCallbackData(NULL),
 	
-	mEffectColor(0.f, 1.f, 1.f, 1.f),
+	mEffectColor(LLColor4(0.f, 1.f, 1.f, 1.f)),
 
 	mHaveHomePosition(FALSE),
 	mHomeRegionHandle( 0 ),
@@ -413,7 +413,7 @@ void LLAgent::init()
 	mCameraZoomFraction = 1.f;
 	mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject");
 
-	mEffectColor = gSavedSkinSettings.getColor4("EffectColor");
+	mEffectColor = LLUIColorTable::instance().getColor("EffectColor");
 
 	gSavedSettings.getControl("PreferredMaturity")->getValidateSignal()->connect(boost::bind(&LLAgent::validateMaturity, this, _2));
 	gSavedSettings.getControl("PreferredMaturity")->getSignal()->connect(boost::bind(&LLAgent::handleMaturity, this, _2));
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 94f6229838..743784b2ef 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -44,6 +44,7 @@
 #include "llcharacter.h" 			// LLAnimPauseRequest
 #include "llfollowcam.h" 			// Ventrella
 #include "llagentdata.h" 			// gAgentID, gAgentSessionID
+#include "lluicolor.h"
 #include "llvoavatardefines.h"
 
 extern const BOOL 	ANIMATE;
@@ -829,7 +830,7 @@ public:
 	F32				mHUDTargetZoom;	// Target zoom level for HUD objects (used when editing)
 	F32				mHUDCurZoom; 	// Current animated zoom level for HUD objects
 private:
-	LLColor4 		mEffectColor;
+	LLUIColor 		mEffectColor;
 
 /**                    Camera
  **                                                                            **
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2c570de697..0253d9e8d5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -668,7 +668,6 @@ bool LLAppViewer::init()
 	// Widget construction depends on LLUI being initialized
 	LLUI::settings_map_t settings_map;
 	settings_map["config"] = &gSavedSettings;
-	settings_map["color"] = &gSavedSkinSettings;
 	settings_map["ignores"] = &gWarningSettings;
 	settings_map["floater"] = &gSavedSettings; // *TODO: New settings file
 	settings_map["account"] = &gSavedPerAccountSettings;
@@ -1346,8 +1345,8 @@ bool LLAppViewer::cleanup()
 	// save their rects on delete.
 	gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
 	
-	//*FIX: don't overwrite user color tweaks with *all* colors
-	gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
+	LLUIColorTable::instance().saveUserSettings();
+
 	// PerAccountSettingsFile should be empty if no use has been logged on.
 	// *FIX:Mani This should get really saved in a "logoff" mode. 
 	gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE);
@@ -1361,7 +1360,7 @@ bool LLAppViewer::cleanup()
 	gWarningSettings.saveToFile(warnings_settings_filename, TRUE);
 
 	gSavedSettings.cleanup();
-	gSavedSkinSettings.cleanup();
+	LLUIColorTable::instance().clear();
 	gCrashSettings.cleanup();
 
 	// Save URL history file
@@ -1701,43 +1700,11 @@ std::string LLAppViewer::getSettingsFilename(const std::string& location_key,
 
 void LLAppViewer::loadColorSettings()
 {
-	gSavedSkinSettings.cleanup();
-
-	loadSettingsFromDirectory("DefaultSkin");
-	loadSettingsFromDirectory("CurrentSkin", true);
-	loadSettingsFromDirectory("UserSkin");
-
-	class ColorConverterFunctor : public LLControlGroup::ApplyFunctor
+	if(!LLUIColorTable::instance().loadFromSettings())
 	{
-	public:
-		explicit ColorConverterFunctor(LLUIColorTable::Params& result)
-			:mResult(result)
-		{
-		}
-
-		void apply(const std::string& name, LLControlVariable* control)
-		{
-			if(control->isType(TYPE_COL4))
-			{
-				LLUIColorTable::ColorParams color;
-				color.value = (LLColor4)control->getValue();
-
-				LLUIColorTable::ColorEntryParams color_entry;
-				color_entry.name = name;
-				color_entry.color = color;
-
-				mResult.color_entries.add(color_entry);
-			}
-		}
-
-	private:
-		LLUIColorTable::Params& mResult;
-	};
-
-	LLUIColorTable::Params params;
-	ColorConverterFunctor ccf(params);
-	LLControlGroup::getInstance("Skinning")->applyToAll(&ccf);
-	LLUIColorTable::instance().init(params);
+		convert_legacy_color_settings();
+		LLUIColorTable::instance().loadFromSettings();
+	}
 }
 
 bool LLAppViewer::initConfiguration()
@@ -1781,9 +1748,6 @@ bool LLAppViewer::initConfiguration()
 	gSavedSettings.setString("ClientSettingsFile", 
         gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
 
-	gSavedSettings.setString("SkinningSettingsFile",
-		gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("UserSkin", "Skinning")));
-
 	gSavedSettings.setString("VersionChannelName", LL_CHANNEL);
 
 #ifndef	LL_RELEASE_FOR_DOWNLOAD
@@ -2039,9 +2003,6 @@ bool LLAppViewer::initConfiguration()
     if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString())
     {   
         gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
-
-		gSavedSettings.setString("SkinningSettingsFile",
-			gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("UserSkin", "Skinning")));
     }
 
     mYieldTime = gSavedSettings.getS32("YieldTime");
@@ -2265,10 +2226,10 @@ bool LLAppViewer::initWindow()
 		gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
 		FALSE, ignorePixelDepth);
 		
-	if (!gSavedSettings.getBOOL("NotFullScreen"))
+	if (gSavedSettings.getBOOL("WindowFullScreen"))
 	{
+		// request to go full screen... which will be delayed until login
 		gViewerWindow->toggleFullscreen(FALSE);
-			// request to go full screen... which will be delayed until login
 	}
 	
 	if (gSavedSettings.getBOOL("WindowMaximized"))
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index d26da81179..604a77dac0 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -93,6 +93,11 @@ LLBottomTray::LLBottomTray()
 	}
 
 	LLIMMgr::getInstance()->addSessionObserver(this);
+
+	//this is to fix a crash that occurs because LLBottomTray is a singleton
+	//and thus is deleted at the end of the viewers lifetime, but to be cleanly
+	//destroyed LLBottomTray requires some subsystems that are long gone
+	LLUI::getRootView()->addChild(this);
 }
 
 LLBottomTray::~LLBottomTray()
@@ -495,4 +500,3 @@ LLWString LLBottomTray::stripChannelNumber(const LLWString &mesg, S32* channel)
 		return mesg;
 	}
 }
-
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 1844934e6a..355a90209a 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -684,7 +684,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 			{
 				std::string notifyMsg = notification->getMessage();
 				if (!notifyMsg.empty())
-					floater->addHistoryLine(notifyMsg,gSavedSkinSettings.getColor4("SystemChatColor"));
+					floater->addHistoryLine(notifyMsg,LLUIColorTable::instance().getColor("SystemChatColor"));
 			}
 		}
 
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 811ce39228..a97e56d60b 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -729,13 +729,11 @@ LLTalkButton::LLTalkButton(const LLUICtrl::Params& p)
 	speak_params.label("Speak");
 	speak_params.label_selected("Speak");
 	speak_params.font(LLFontGL::getFontSansSerifSmall());
-	speak_params.label_color(LLColor4::black);
-	speak_params.label_color_selected(LLColor4::black);
 	speak_params.tab_stop(false);
 	speak_params.is_toggle(true);
 	speak_params.picture_style(true);
-	speak_params.image_selected(LLUI::getUIImage("flyout_btn_left_selected.tga")); 
-	speak_params.image_unselected(LLUI::getUIImage("flyout_btn_left.tga"));
+	speak_params.image_selected(LLUI::getUIImage("SegmentedBtn_Left_Selected")); 
+	speak_params.image_unselected(LLUI::getUIImage("SegmentedBtn_Left_Off"));
 	mSpeakBtn = LLUICtrlFactory::create<LLButton>(speak_params);
 	addChild(mSpeakBtn);
 
@@ -749,8 +747,8 @@ LLTalkButton::LLTalkButton(const LLUICtrl::Params& p)
 	show_params.tab_stop(false);
 	show_params.is_toggle(true);
 	show_params.picture_style(true);
-	show_params.image_selected(LLUI::getUIImage("talk_btn_right_selected.tga"));
-	show_params.image_unselected(LLUI::getUIImage("talk_btn_right.tga"));
+	show_params.image_selected(LLUI::getUIImage("ComboButton_Selected"));
+	show_params.image_unselected(LLUI::getUIImage("ComboButton_Off"));
 	mShowBtn = LLUICtrlFactory::create<LLButton>(show_params);
 	addChild(mShowBtn);
 
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 0e5b943dd3..f43b625d17 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -369,7 +369,7 @@ BOOL LLFavoritesBarCtrl::postBuild()
 	{
 		menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu");
 	}
-	menu->setBackgroundColor(gSavedSkinSettings.getColor("MenuPopupBgColor"));
+	menu->setBackgroundColor(LLUIColorTable::instance().getColor("MenuPopupBgColor"));
 	mInventoryItemsPopupMenuHandle = menu->getHandle();
 
 	return TRUE;
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 35613b7c34..b8e2840fe6 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -434,7 +434,6 @@ void LLFeatureManager::applyRecommendedSettings()
 
 	setGraphicsLevel(level, false);
 	gSavedSettings.setU32("RenderQualityPerformance", level);
-	gSavedSettings.setBOOL("RenderCustomSettings", FALSE);
 
 	// now apply the tweaks to draw distance
 	// these are double negatives, because feature masks only work by
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 9df0a96888..bdd34dfca8 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -106,7 +106,7 @@ BOOL LLFloaterAbout::postBuild()
 	viewer_link_style->setVisible(true);
 	viewer_link_style->setFontName(LLStringUtil::null);
 	viewer_link_style->setLinkHREF(get_viewer_release_notes_url());
-	viewer_link_style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+	viewer_link_style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 
 	// Version string
 	std::string version = LLTrans::getString("SECOND_LIFE_VIEWER")
@@ -114,7 +114,7 @@ BOOL LLFloaterAbout::postBuild()
 				   LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
 				   __DATE__, __TIME__,
 				   gSavedSettings.getString("VersionChannelName").c_str());
-	support_widget->appendColoredText(version, FALSE, FALSE, LLUI::sSettingGroups["color"]->getColor("TextFgReadOnlyColor"));
+	support_widget->appendColoredText(version, FALSE, FALSE, LLUIColorTable::instance().getColor("TextFgReadOnlyColor"));
 	support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
 
 	std::string support;
@@ -136,7 +136,7 @@ BOOL LLFloaterAbout::postBuild()
 		server_link_style->setVisible(true);
 		server_link_style->setFontName(LLStringUtil::null);
 		server_link_style->setLinkHREF(region->getCapability("ServerReleaseNotes"));
-		server_link_style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+		server_link_style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 
 		const LLVector3d &pos = gAgent.getPositionGlobal();
 		LLUIString pos_text = getString("you_are_at");
@@ -158,7 +158,7 @@ BOOL LLFloaterAbout::postBuild()
 		support.append(gLastVersionChannel);
 		support.append("\n");
 
-		support_widget->appendColoredText(support, FALSE, FALSE, LLUI::sSettingGroups["color"]->getColor("TextFgReadOnlyColor"));
+		support_widget->appendColoredText(support, FALSE, FALSE, LLUIColorTable::instance().getColor("TextFgReadOnlyColor"));
 		support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style);
 
 		support = "\n\n";
@@ -246,7 +246,7 @@ BOOL LLFloaterAbout::postBuild()
 		support.append(getString ("PacketsLost", args) + "\n");
 	}
 
-	support_widget->appendColoredText(support, FALSE, FALSE, LLUI::sSettingGroups["color"]->getColor("TextFgReadOnlyColor"));
+	support_widget->appendColoredText(support, FALSE, FALSE, LLUIColorTable::instance().getColor("TextFgReadOnlyColor"));
 
 	// Fix views
 	support_widget->setCursorPos(0);
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 61ef3abda6..5250c798f9 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -368,11 +368,11 @@ void LLFloaterChat::addChat(const LLChat& chat,
 		F32 size = CHAT_MSG_SIZE;
 		if (chat.mSourceType == CHAT_SOURCE_SYSTEM)
 		{
-			text_color = gSavedSkinSettings.getColor("SystemChatColor");
+			text_color = LLUIColorTable::instance().getColor("SystemChatColor");
 		}
 		else if(from_instant_message)
 		{
-			text_color = gSavedSkinSettings.getColor("IMChatColor");
+			text_color = LLUIColorTable::instance().getColor("IMChatColor");
 			size = INSTANT_MSG_SIZE;
 		}
 		// We display anything if it's not an IM. If it's an IM, check pref...
@@ -453,37 +453,37 @@ LLColor4 get_text_color(const LLChat& chat)
 		switch(chat.mSourceType)
 		{
 		case CHAT_SOURCE_SYSTEM:
-			text_color = gSavedSkinSettings.getColor4("SystemChatColor");
+			text_color = LLUIColorTable::instance().getColor("SystemChatColor");
 			break;
 		case CHAT_SOURCE_AGENT:
 		    if (chat.mFromID.isNull())
 			{
-				text_color = gSavedSkinSettings.getColor4("SystemChatColor");
+				text_color = LLUIColorTable::instance().getColor("SystemChatColor");
 			}
 			else
 			{
 				if(gAgent.getID() == chat.mFromID)
 				{
-					text_color = gSavedSkinSettings.getColor4("UserChatColor");
+					text_color = LLUIColorTable::instance().getColor("UserChatColor");
 				}
 				else
 				{
-					text_color = gSavedSkinSettings.getColor4("AgentChatColor");
+					text_color = LLUIColorTable::instance().getColor("AgentChatColor");
 				}
 			}
 			break;
 		case CHAT_SOURCE_OBJECT:
 			if (chat.mChatType == CHAT_TYPE_DEBUG_MSG)
 			{
-				text_color = gSavedSkinSettings.getColor4("ScriptErrorColor");
+				text_color = LLUIColorTable::instance().getColor("ScriptErrorColor");
 			}
 			else if ( chat.mChatType == CHAT_TYPE_OWNER )
 			{
-				text_color = gSavedSkinSettings.getColor4("llOwnerSayChatColor");
+				text_color = LLUIColorTable::instance().getColor("llOwnerSayChatColor");
 			}
 			else
 			{
-				text_color = gSavedSkinSettings.getColor4("ObjectChatColor");
+				text_color = LLUIColorTable::instance().getColor("ObjectChatColor");
 			}
 			break;
 		default:
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
index 4964f04556..edc96715cd 100644
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@@ -173,7 +173,7 @@ void LLFloaterColorPicker::createUI ()
 
 		// argh!
 		const std::string s ( codec.str () );
-		mPalette.push_back ( new LLColor4 ( gSavedSkinSettings.getColor4 ( s )  ) );
+		mPalette.push_back ( new LLColor4 ( LLUIColorTable::instance().getColor ( s )  ) );
 	}
 }
 
@@ -1017,7 +1017,7 @@ BOOL LLFloaterColorPicker::handleMouseUp ( S32 x, S32 y, MASK mask )
 							std::ostringstream codec;
 							codec << "ColorPaletteEntry" << std::setfill ( '0' ) << std::setw ( 2 ) << curEntry + 1;
 							const std::string s ( codec.str () );
-							gSavedSkinSettings.setColor4( s, *mPalette [ curEntry ] );
+							LLUIColorTable::instance().setColor(s, *mPalette [ curEntry ] );
 						}
 					}
 
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 15d57ebbcc..6834af4fd5 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -45,6 +45,7 @@
 #include "llagent.h"
 #include "llavatarconstants.h"
 #include "llcheckboxctrl.h"
+#include "llcolorswatch.h"
 #include "llcombobox.h"
 #include "llcommandhandler.h"
 #include "lldirpicker.h"
@@ -332,7 +333,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.LogPath",				boost::bind(&LLFloaterPreference::onClickLogPath, this));
 	mCommitCallbackRegistrar.add("Pref.Logging",				boost::bind(&LLFloaterPreference::onCommitLogging, this));
 	mCommitCallbackRegistrar.add("Pref.OpenHelp",				boost::bind(&LLFloaterPreference::onOpenHelp, this));	
-	mCommitCallbackRegistrar.add("Pref.ChangeCustom",			boost::bind(&LLFloaterPreference::onChangeCustom, this));	
 	mCommitCallbackRegistrar.add("Pref.UpdateMeterText",		boost::bind(&LLFloaterPreference::updateMeterText, this, _1));	
 	mCommitCallbackRegistrar.add("Pref.HardwareSettings",       boost::bind(&LLFloaterPreference::onOpenHardwareSettings, this));	
 	mCommitCallbackRegistrar.add("Pref.HardwareDefaults",       boost::bind(&LLFloaterPreference::setHardwareDefaults, this));	
@@ -342,8 +342,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.AutoDetectAspect",       boost::bind(&LLFloaterPreference::onCommitAutoDetectAspect, this));	
 	mCommitCallbackRegistrar.add("Pref.onSelectAspectRatio",    boost::bind(&LLFloaterPreference::onKeystrokeAspectRatio, this));	
 	mCommitCallbackRegistrar.add("Pref.QualityPerformance",     boost::bind(&LLFloaterPreference::onChangeQuality, this, _2));	
-	
-	gSavedSkinSettings.getControl("HTMLLinkColor")->getCommitSignal()->connect(boost::bind(&handleHTMLLinkColorChanged,  _2));
 
 }
 
@@ -459,7 +457,7 @@ void LLFloaterPreference::apply()
 	applyResolution();
 	
 	// Only set window size if we're not in fullscreen mode
-	if(gSavedSettings.getBOOL("NotFullScreen"))
+	if(!gSavedSettings.getBOOL("WindowFullScreen"))
 	{
 		applyWindowSize();
 	}
@@ -544,7 +542,7 @@ void LLFloaterPreference::onBtnOK()
 		apply();
 		closeFloater(false);
 		gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
-		gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile") , TRUE );
+		LLUIColorTable::instance().saveUserSettings();
 		std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
 		// save all settings, even if equals defaults
 		gCrashSettings.saveToFile(crash_settings_filename, FALSE);
@@ -605,19 +603,6 @@ void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_
 }
 
 
-void LLFloaterPreference::onChangeCustom()
-{
-	// if custom is turned off, reset everything to defaults
-	if (this && getChild<LLCheckBoxCtrl>("CustomSettings")->getValue())
-	{
-		U32 set = (U32)getChild<LLSliderCtrl>("QualityPerformanceSelection")->getValueF32();
-		LLFeatureManager::getInstance()->setGraphicsLevel(set, true);	
-		updateMeterText(getChild<LLSliderCtrl>("DrawDistance"));
-	}
-
-	refreshEnabledGraphics();
-}
-
 void LLFloaterPreference::refreshEnabledGraphics()
 {
 	LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
@@ -781,12 +766,6 @@ void LLFloaterPreference::buildLists(void* data)
 void LLFloaterPreference::refreshEnabledState()
 {
 	
-	// disable graphics settings and exit if it's not set to custom
-	if(!gSavedSettings.getBOOL("RenderCustomSettings"))
-	{
-		return;
-	}
-	
 	LLCheckBoxCtrl* ctrl_reflections = getChild<LLCheckBoxCtrl>("Reflections");
 	LLRadioGroup* radio_reflection_detail = getChild<LLRadioGroup>("ReflectionDetailRadio");
 	
@@ -1249,7 +1228,7 @@ void LLFloaterPreference::applyResolution()
 	gSavedSettings.setS32("FullScreenWidth", supported_resolutions[resIndex].mWidth);
 	gSavedSettings.setS32("FullScreenHeight", supported_resolutions[resIndex].mHeight);
 	
-	gViewerWindow->requestResolutionUpdate(!gSavedSettings.getBOOL("NotFullScreen"));
+	gViewerWindow->requestResolutionUpdate(gSavedSettings.getBOOL("WindowFullScreen"));
 	
 	send_agent_update(TRUE);
 	
@@ -1298,6 +1277,12 @@ LLPanelPreference::LLPanelPreference()
 	//
 	mCommitCallbackRegistrar.add("setControlFalse",		boost::bind(&LLPanelPreference::setControlFalse,this, _2));
 }
+
+static void applyUIColor(const std::string& color_name, LLUICtrl* ctrl, const LLSD& param)
+{
+	LLUIColorTable::instance().setColor(color_name, LLColor4(param));
+}
+
 //virtual
 BOOL LLPanelPreference::postBuild()
 {
@@ -1460,6 +1445,55 @@ BOOL LLPanelPreference::postBuild()
 		refresh();
 	}
 	
+
+	if(hasChild("user") && hasChild("agent") && hasChild("im") 
+	&& hasChild("system") && hasChild("script_error") && hasChild("objects") 
+	&& hasChild("owner") && hasChild("background") && hasChild("links"))
+	{
+		LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("user");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "UserChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("UserChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("agent");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "AgentChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("AgentChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("im");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "IMChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("IMChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("system");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "SystemChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("SystemChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("script_error");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "ScriptErrorColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("ScriptErrorColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("objects");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "ObjectChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("ObjectChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("owner");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "llOwnerSayChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("llOwnerSayChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("background");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "BackgroundChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("BackgroundChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("links");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "HTMLLinkColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("HTMLLinkColor"));
+	}
+
+	if(hasChild("effect_color_swatch"))
+	{
+		LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("effect_color_swatch");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "EffectColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("EffectColor"));
+	}
+
 	apply();
 	return true;
 }
@@ -1475,16 +1509,25 @@ void LLPanelPreference::apply()
 		// Process view on top of the stack
 		LLView* curview = view_stack.front();
 		view_stack.pop_front();
-		LLUICtrl* ctrl = dynamic_cast<LLUICtrl*>(curview);
-		if (ctrl)
+
+		LLColorSwatchCtrl* color_swatch = dynamic_cast<LLColorSwatchCtrl *>(curview);
+		if (color_swatch)
+		{
+			mSavedColors[color_swatch->getName()] = color_swatch->get();
+		}
+		else
 		{
-			LLControlVariable* control = ctrl->getControlVariable();
-			if (control)
+			LLUICtrl* ctrl = dynamic_cast<LLUICtrl*>(curview);
+			if (ctrl)
 			{
-				mSavedValues[control] = control->getValue();
+				LLControlVariable* control = ctrl->getControlVariable();
+				if (control)
+				{
+					mSavedValues[control] = control->getValue();
+				}
 			}
 		}
-		
+			
 		// Push children onto the end of the work stack
 		for (child_list_t::const_iterator iter = curview->getChildList()->begin();
 			 iter != curview->getChildList()->end(); ++iter)
@@ -1504,6 +1547,17 @@ void LLPanelPreference::cancel()
 		LLSD ctrl_value = iter->second;
 		control->set(ctrl_value);
 	}
+
+	for (string_color_map_t::iterator iter = mSavedColors.begin();
+		 iter != mSavedColors.end(); ++iter)
+	{
+		LLColorSwatchCtrl* color_swatch = findChild<LLColorSwatchCtrl>(iter->first);
+		if(color_swatch)
+		{
+			color_swatch->set(iter->second);
+			color_swatch->onCommit();
+		}
+	}
 }
 
 void LLPanelPreference::setControlFalse(const LLSD& user_data)
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index afff610c69..cf2ccdce6d 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -163,6 +163,9 @@ public:
 private:
 	typedef std::map<LLControlVariable*, LLSD> control_values_map_t;
 	control_values_map_t mSavedValues;
+
+	typedef std::map<std::string, LLColor4> string_color_map_t;
+	string_color_map_t mSavedColors;
 };
 
 #endif  // LL_LLPREFERENCEFLOATER_H
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 8b6102c67f..53b40f8b7a 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -80,10 +80,6 @@ BOOL LLFloaterSettingsDebug::postBuild()
 	{
 		gSavedPerAccountSettings.applyToAll(&func);
 	}
-	if (key == "all" || key == "skin")
-	{
-		gSavedSkinSettings.applyToAll(&func);
-	}
 
 	settings_combo->sortByName();
 	settings_combo->updateSelection();
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index cb4f2a6711..fef0474062 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -1297,7 +1297,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 	floater->childSetColor("file_size_label", 
 		shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD 
 		&& got_bytes
-		&& previewp->getDataSize() > MAX_POSTCARD_DATASIZE ? LLColor4::red : LLUI::sSettingGroups["color"]->getColor( "LabelTextColor" ));
+		&& previewp->getDataSize() > MAX_POSTCARD_DATASIZE ? LLUIColor(LLColor4::red) : LLUIColorTable::instance().getColor( "LabelTextColor" ));
 
 	switch(shot_type)
 	{
diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp
index 12d12f37f2..16f4ecef07 100644
--- a/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/indra/newview/llfloatervoicedevicesettings.cpp
@@ -113,7 +113,7 @@ void LLPanelVoiceDeviceSettings::draw()
 			{
 				if (power_bar_idx < discrete_power)
 				{
-					LLColor4 color = (power_bar_idx >= 3) ? gSavedSkinSettings.getColor4("OverdrivenColor") : gSavedSkinSettings.getColor4("SpeakingColor");
+					LLColor4 color = (power_bar_idx >= 3) ? LLUIColorTable::instance().getColor("OverdrivenColor") : LLUIColorTable::instance().getColor("SpeakingColor");
 					gl_rect_2d(bar_view->getRect(), color, TRUE);
 				}
 				gl_rect_2d(bar_view->getRect(), LLColor4::grey, FALSE);
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 2fe817625a..9711e02f69 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -387,8 +387,8 @@ void LLFloaterWorldMap::reshape( S32 width, S32 height, BOOL called_from_parent
 // virtual
 void LLFloaterWorldMap::draw()
 {
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_track_disabled_color(gSavedSkinSettings, "MapTrackDisabledColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_disabled_color = LLUIColorTable::instance().getColor("MapTrackDisabledColor", LLColor4::white);
 	
 	// Hide/Show Mature Events controls
 	childSetVisible("events_mature_icon", gAgent.canAccessMature());
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index fd8c22b8e5..ebda8b25fd 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -793,13 +793,13 @@ BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 void LLFolderViewItem::draw()
 {
-	static LLCachedControl<LLColor4> sFgColor(gSavedSkinSettings, "MenuItemEnabledColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sHighlightBgColor(gSavedSkinSettings, "MenuItemHighlightBgColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sHighlightFgColor(gSavedSkinSettings, "MenuItemHighlightFgColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sFilterBGColor(gSavedSkinSettings, "FilterBackgroundColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sFilterTextColor(gSavedSkinSettings, "FilterTextColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sSuffixColor(gSavedSkinSettings, "InventoryItemSuffixColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sSearchStatusColor(gSavedSkinSettings, "InventorySearchStatusColor", DEFAULT_WHITE);
+	static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
+	static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
+	static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
+	static LLUIColor sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
+	static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
+	static LLUIColor sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemSuffixColor", DEFAULT_WHITE);
+	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
 
 	bool possibly_has_children = false;
 	bool up_to_date = mListener && mListener->isUpToDate();
@@ -2562,7 +2562,7 @@ LLFolderView::LLFolderView(const Params& p)
 	{
 		menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu");
 	}
-	menu->setBackgroundColor(gSavedSkinSettings.getColor("MenuPopupBgColor"));
+	menu->setBackgroundColor(LLUIColorTable::instance().getColor("MenuPopupBgColor"));
 	mPopupMenuHandle = menu->getHandle();
 
 }
@@ -3148,7 +3148,7 @@ void LLFolderView::commitRename( const LLSD& data )
 
 void LLFolderView::draw()
 {
-	static LLCachedControl<LLColor4> sSearchStatusColor(gSavedSkinSettings, "InventorySearchStatusColor", DEFAULT_WHITE);
+	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
 	if (mDebugFilters)
 	{
 		std::string current_filter_string = llformat("Current Filter: %d, Least Filter: %d, Auto-accept Filter: %d",
diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp
index e1e9d9c51e..8588de0fa0 100644
--- a/indra/newview/llhudmanager.cpp
+++ b/indra/newview/llhudmanager.cpp
@@ -40,6 +40,7 @@
 #include "llagent.h"
 #include "llhudeffect.h"
 #include "pipeline.h"
+#include "llui.h"
 #include "llviewercontrol.h"
 #include "llviewerobjectlist.h"
 
@@ -52,9 +53,9 @@ LLColor4 LLHUDManager::sChildColor;
 LLHUDManager::LLHUDManager()
 {
 
-	LLHUDManager::sParentColor = gSavedSkinSettings.getColor("FocusColor");
+	LLHUDManager::sParentColor = LLUIColorTable::instance().getColor("FocusColor");
 	// rdw commented out since it's not used.  Also removed from colors_base.xml
-	//LLHUDManager::sChildColor =gSavedSkinSettings.getColor("FocusSecondaryColor");
+	//LLHUDManager::sChildColor =LLUIColorTable::instance().getColor("FocusSecondaryColor");
 }
 
 LLHUDManager::~LLHUDManager()
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index efeac9c197..abb3acd974 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -292,7 +292,7 @@ void LLHUDText::renderText(BOOL for_select)
 	LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
 
 	// *TODO: make this a per-text setting
-	LLColor4 bg_color = gSavedSkinSettings.getColor4("BackgroundChatColor");
+	LLColor4 bg_color = LLUIColorTable::instance().getColor("BackgroundChatColor");
 	bg_color.setAlpha(gSavedSettings.getF32("ChatBubbleOpacity") * alpha_factor);
 
 	const S32 border_height = 16;
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 6acd174fc3..fbf990e1af 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1222,7 +1222,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(const std::string& session_label,
 
 			addHistoryLine(
 				session_start,
-				gSavedSkinSettings.getColor4("SystemChatColor"),
+				LLUIColorTable::instance().getColor("SystemChatColor"),
 				false);
 		}
 	}
@@ -2004,7 +2004,7 @@ void LLFloaterIMPanel::sendMsg()
 
 					BOOL other_was_typing = mOtherTyping;
 
-					addHistoryLine(history_echo, gSavedSkinSettings.getColor("IMChatColor"), true, gAgent.getID());
+					addHistoryLine(history_echo, LLUIColorTable::instance().getColor("IMChatColor"), true, gAgent.getID());
 
 					if (other_was_typing) 
 					{
@@ -2175,7 +2175,7 @@ void LLFloaterIMPanel::addTypingIndicator(const std::string &name)
 		mTypingLineStartIndex = mHistoryEditor->getWText().length();
 		LLUIString typing_start = sTypingStartString;
 		typing_start.setArg("[NAME]", name);
-		addHistoryLine(typing_start, gSavedSkinSettings.getColor4("SystemChatColor"), false);
+		addHistoryLine(typing_start, LLUIColorTable::instance().getColor("SystemChatColor"), false);
 		mOtherTypingName = name;
 		mOtherTyping = TRUE;
 	}
@@ -2232,7 +2232,7 @@ void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string
 	}
 
 	//self->addHistoryLine(line, LLColor4::grey, FALSE);
-	self->mHistoryEditor->appendColoredText(message, false, true, gSavedSkinSettings.getColor4("ChatHistoryTextColor"));
+	self->mHistoryEditor->appendColoredText(message, false, true, LLUIColorTable::instance().getColor("ChatHistoryTextColor"));
 }
 
 void LLFloaterIMPanel::showSessionStartError(
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index d6569663a2..bc98b609ec 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -745,7 +745,7 @@ void LLIMMgr::addMessage(
 			//<< "*** region_id: " << region_id << std::endl
 			//<< "*** position: " << position << std::endl;
 
-			floater->addHistoryLine(bonus_info.str(), gSavedSkinSettings.getColor4("SystemChatColor"));
+			floater->addHistoryLine(bonus_info.str(), LLUIColorTable::instance().getColor("SystemChatColor"));
 		}
 
 		make_ui_sound("UISndNewIncomingIMSession");
@@ -754,8 +754,8 @@ void LLIMMgr::addMessage(
 	// now add message to floater
 	bool is_from_system = target_id.isNull() || (from == SYSTEM_FROM);
 	const LLColor4& color = ( is_from_system ? 
-							  gSavedSkinSettings.getColor4("SystemChatColor") : 
-							  gSavedSkinSettings.getColor("IMChatColor"));
+							  LLUIColorTable::instance().getColor("SystemChatColor") : 
+							  LLUIColorTable::instance().getColor("IMChatColor"));
 	if ( !link_name )
 	{
 		floater->addHistoryLine(msg,color); // No name to prepend, so just add the message normally
@@ -1332,7 +1332,7 @@ void LLIMMgr::noteOfflineUsers(
 	S32 count = ids.count();
 	if(count == 0)
 	{
-		floater->addHistoryLine(sOnlyUserMessage, gSavedSkinSettings.getColor4("SystemChatColor"));
+		floater->addHistoryLine(sOnlyUserMessage, LLUIColorTable::instance().getColor("SystemChatColor"));
 	}
 	else
 	{
@@ -1348,7 +1348,7 @@ void LLIMMgr::noteOfflineUsers(
 				LLUIString offline = sOfflineMessage;
 				offline.setArg("[FIRST]", first);
 				offline.setArg("[LAST]", last);
-				floater->addHistoryLine(offline, gSavedSkinSettings.getColor4("SystemChatColor"));
+				floater->addHistoryLine(offline, LLUIColorTable::instance().getColor("SystemChatColor"));
 			}
 		}
 	}
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index fac0de0f33..2cee9de1eb 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -174,8 +174,7 @@ LLLocationInputCtrl::Params::Params()
 	add_landmark_image_disabled("add_landmark_image_disabled"),
 	add_landmark_button("add_landmark_button"),
 	add_landmark_hpad("add_landmark_hpad", 0),
-	info_button("info_button"),
-	background("background")
+	info_button("info_button")
 {
 }
 
@@ -185,11 +184,6 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mInfoBtn(NULL),
 	mAddLandmarkBtn(NULL)
 {
-	// Background image.
-	LLButton::Params bg_params = p.background;
-	mBackground = LLUICtrlFactory::create<LLButton>(bg_params);
-	addChildInBack(mBackground);
-
 	// "Place information" button.
 	LLButton::Params info_params = p.info_button;
 	mInfoBtn = LLUICtrlFactory::create<LLButton>(info_params);
@@ -213,8 +207,6 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	enableAddLandmarkButton(true);
 	addChild(mAddLandmarkBtn);
 	
-	setFocusReceivedCallback(boost::bind(&LLLocationInputCtrl::onFocusReceived, this));
-	setFocusLostCallback(boost::bind(&LLLocationInputCtrl::onFocusLost, this));
 	setPrearrangeCallback(boost::bind(&LLLocationInputCtrl::onLocationPrearrange, this, _2));
 
 	updateWidgetlayout();
@@ -354,6 +346,7 @@ void LLLocationInputCtrl::onFocusReceived()
 
 void LLLocationInputCtrl::onFocusLost()
 {
+	LLUICtrl::onFocusLost();
 	refreshLocation();
 }
 
@@ -462,7 +455,6 @@ void LLLocationInputCtrl::enableAddLandmarkButton(bool val)
 void LLLocationInputCtrl::updateAddLandmarkButton()
 {
 	bool cur_parcel_landmarked = false;
-
 	// Determine whether there are landmarks pointing to the current parcel.
 	LLInventoryModel::cat_array_t cats;
 	LLInventoryModel::item_array_t items;
@@ -481,21 +473,14 @@ void LLLocationInputCtrl::updateWidgetlayout()
 {
 	const LLRect&	rect			= getLocalRect();
 	const LLRect&	hist_btn_rect	= mButton->getRect();
-	LLRect			info_btn_rect	= mButton->getRect();
+	LLRect			info_btn_rect	= mInfoBtn->getRect();
 
 	// info button
 	info_btn_rect.setOriginAndSize(
-		0, (rect.getHeight() - info_btn_rect.getHeight()) / 2,
+		2, (rect.getHeight() - info_btn_rect.getHeight()) / 2,
 		info_btn_rect.getWidth(), info_btn_rect.getHeight());
 	mInfoBtn->setRect(info_btn_rect);
 
-	// background
-	mBackground->setRect(LLRect(info_btn_rect.getWidth(), rect.mTop,
-		rect.mRight - hist_btn_rect.getWidth(), rect.mBottom));
-
-	// history button
-	mButton->setRightHPad(0);
-
 	// "Add Landmark" button
 	{
 		LLRect al_btn_rect = mAddLandmarkBtn->getRect();
@@ -504,14 +489,4 @@ void LLLocationInputCtrl::updateWidgetlayout()
 			(rect.getHeight() - al_btn_rect.getHeight()) / 2);
 		mAddLandmarkBtn->setRect(al_btn_rect);
 	}
-
-	// text entry
-	if (mTextEntry)
-	{
-		LLRect text_entry_rect(rect);
-		text_entry_rect.mLeft = info_btn_rect.getWidth();
-		text_entry_rect.mRight = mAddLandmarkBtn->getRect().mLeft;
-		text_entry_rect.stretch(0, -1); // make space for border
-		mTextEntry->setRect(text_entry_rect);
-	}
 }
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index 1732853263..0a863f6dd8 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -61,8 +61,7 @@ public:
 											add_landmark_image_disabled;
 		Optional<S32>						add_landmark_hpad;
 		Optional<LLButton::Params>			add_landmark_button,
-											info_button,
-											background;
+											info_button;
 		Params();
 	};
 
@@ -70,6 +69,8 @@ public:
 	/*virtual*/ void		setEnabled(BOOL enabled);
 	/*virtual*/ BOOL		handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
 	/*virtual*/ BOOL		handleKeyHere(KEY key, MASK mask);
+	/*virtual*/ void		onFocusReceived();
+	/*virtual*/ void		onFocusLost();
 	//========================================================================
 
 	// LLUICtrl interface
@@ -98,8 +99,6 @@ private:
 	void					updateAddLandmarkButton();
 	void					updateWidgetlayout();
 
-	void					onFocusReceived();
-	void					onFocusLost();
 	void					onInfoButtonClicked();
 	void					onLocationHistoryLoaded();
 	void					onLocationPrearrange(const LLSD& data);
@@ -107,7 +106,6 @@ private:
 	void					onAddLandmarkButtonClicked();
 	void					onAgentParcelChange();
 
-	LLButton*				mBackground;
 	LLButton*				mAddLandmarkBtn;
 	LLButton*				mInfoBtn;
 	S32						mAddLandmarkHPad;
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp
index 7039776585..062e781d49 100644
--- a/indra/newview/llmanip.cpp
+++ b/indra/newview/llmanip.cpp
@@ -581,9 +581,9 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const std::string
 
 LLColor4 LLManip::setupSnapGuideRenderPass(S32 pass)
 {
-	static LLColor4 grid_color_fg = gSavedSkinSettings.getColor("GridlineColor");
-	static LLColor4 grid_color_bg = gSavedSkinSettings.getColor("GridlineBGColor");
-	static LLColor4 grid_color_shadow = gSavedSkinSettings.getColor("GridlineShadowColor");
+	static LLColor4 grid_color_fg = LLUIColorTable::instance().getColor("GridlineColor");
+	static LLColor4 grid_color_bg = LLUIColorTable::instance().getColor("GridlineBGColor");
+	static LLColor4 grid_color_shadow = LLUIColorTable::instance().getColor("GridlineShadowColor");
 
 	LLColor4 line_color;
 	F32 line_alpha = gSavedSettings.getF32("GridOpacity");
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index f228ea624b..d1d112c4bf 100644
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -1107,8 +1107,8 @@ BOOL LLManipRotate::updateVisiblity()
 		mCenterToProfilePlaneMag = mRadiusMeters * mRadiusMeters / mCenterToCamMag;
 		mCenterToProfilePlane = -mCenterToProfilePlaneMag * mCenterToCamNorm;
 
-		mCenterScreen.set((S32)((0.5f - mRotationCenter.mdV[VY]) / gAgent.mHUDCurZoom * gViewerWindow->getWindowWidth()),
-							(S32)((mRotationCenter.mdV[VZ] + 0.5f) / gAgent.mHUDCurZoom * gViewerWindow->getWindowHeight()));
+		mCenterScreen.set((S32)((0.5f - mRotationCenter.mdV[VY]) / gAgent.mHUDCurZoom * gViewerWindow->getWorldViewWidth()),
+							(S32)((mRotationCenter.mdV[VZ] + 0.5f) / gAgent.mHUDCurZoom * gViewerWindow->getWorldViewHeight()));
 		visible = TRUE;
 	}
 	else
@@ -1624,8 +1624,8 @@ void LLManipRotate::mouseToRay( S32 x, S32 y, LLVector3* ray_pt, LLVector3* ray_
 {
 	if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD)
 	{
-		F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) / gAgent.mHUDCurZoom;
-		F32 mouse_y = ((((F32)y) / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.mHUDCurZoom;
+		F32 mouse_x = (((F32)x / gViewerWindow->getWorldViewWidth()) - 0.5f) / gAgent.mHUDCurZoom;
+		F32 mouse_y = ((((F32)y) / gViewerWindow->getWorldViewHeight()) - 0.5f) / gAgent.mHUDCurZoom;
 
 		*ray_pt = LLVector3(-1.f, -mouse_x, mouse_y);
 		*ray_dir = LLVector3(1.f, 0.f, 0.f);
@@ -1699,7 +1699,7 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
 	F32 dist_y = mouse_dir_y.normVec();
 	F32 dist_z = mouse_dir_z.normVec();
 
-	F32 distance_threshold = (MAX_MANIP_SELECT_DISTANCE * mRadiusMeters) / gViewerWindow->getWindowHeight();
+	F32 distance_threshold = (MAX_MANIP_SELECT_DISTANCE * mRadiusMeters) / gViewerWindow->getWorldViewHeight();
 
 	if (llabs(dist_x - mRadiusMeters) * llmax(0.05f, proj_rot_x_axis) < distance_threshold)
 	{
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 5261c130ea..72596e850a 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -493,8 +493,8 @@ void LLManipScale::highlightManipulators(S32 x, S32 y)
 			mProjectedManipulators.insert(projManipulator);
 		}
 
-		F32 half_width = (F32)gViewerWindow->getWindowWidth() / 2.f;
-		F32 half_height = (F32)gViewerWindow->getWindowHeight() / 2.f;
+		F32 half_width = (F32)gViewerWindow->getWorldViewWidth() / 2.f;
+		F32 half_height = (F32)gViewerWindow->getWorldViewHeight() / 2.f;
 		LLVector2 manip2d;
 		LLVector2 mousePos((F32)x - half_width, (F32)y - half_height);
 		LLVector2 delta;
@@ -1368,7 +1368,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
 	else
 	{
 		F32 object_distance = dist_vec(mScaleCenter, LLViewerCamera::getInstance()->getOrigin());
-		mSnapRegimeOffset = (SNAP_GUIDE_SCREEN_OFFSET * gViewerWindow->getWindowWidth() * object_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
+		mSnapRegimeOffset = (SNAP_GUIDE_SCREEN_OFFSET * gViewerWindow->getWorldViewWidth() * object_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
 	}
 	LLVector3 cam_at_axis;
 	F32 snap_guide_length;
@@ -1381,7 +1381,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
 	{
 		cam_at_axis = LLViewerCamera::getInstance()->getAtAxis();
 		F32 manipulator_distance = dist_vec(box_corner_agent, LLViewerCamera::getInstance()->getOrigin());
-		snap_guide_length = (SNAP_GUIDE_SCREEN_LENGTH * gViewerWindow->getWindowWidth() * manipulator_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
+		snap_guide_length = (SNAP_GUIDE_SCREEN_LENGTH * gViewerWindow->getWorldViewWidth() * manipulator_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
 	}
 	
 	mSnapGuideLength = snap_guide_length / llmax(0.1f, (llmin(mSnapGuideDir1 * cam_at_axis, mSnapGuideDir2 * cam_at_axis)));
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index b8c2a3d64b..3a1ffd6546 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -414,7 +414,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 	
 	// Handle auto-rotation if necessary.
 	const F32 ROTATE_ANGLE_PER_SECOND = 30.f * DEG_TO_RAD;
-	const S32 ROTATE_H_MARGIN = gViewerWindow->getWindowWidth() / 20;
+	const S32 ROTATE_H_MARGIN = gViewerWindow->getWorldViewWidth() / 20;
 	const F32 rotate_angle = ROTATE_ANGLE_PER_SECOND / gFPSClamped;
 	BOOL rotated = FALSE;
 
@@ -426,7 +426,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 			gAgent.cameraOrbitAround(rotate_angle);
 			rotated = TRUE;
 		}
-		else if (x > gViewerWindow->getWindowWidth() - ROTATE_H_MARGIN)
+		else if (x > gViewerWindow->getWorldViewWidth() - ROTATE_H_MARGIN)
 		{
 			gAgent.cameraOrbitAround(-rotate_angle);
 			rotated = TRUE;
@@ -960,8 +960,8 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
 	LLVector2 manip_start_2d;
 	LLVector2 manip_end_2d;
 	LLVector2 manip_dir;
-	F32 half_width = gViewerWindow->getWindowWidth() / 2.f;
-	F32 half_height = gViewerWindow->getWindowHeight() / 2.f;
+	F32 half_width = gViewerWindow->getWorldViewWidth() / 2.f;
+	F32 half_height = gViewerWindow->getWorldViewHeight() / 2.f;
 	LLVector2 mousePos((F32)x - half_width, (F32)y - half_height);
 	LLVector2 mouse_delta;
 
@@ -1225,7 +1225,7 @@ void LLManipTranslate::renderSnapGuides()
 		{
 			LLVector3 cam_to_selection = getPivotPoint() - LLViewerCamera::getInstance()->getOrigin();
 			F32 current_range = cam_to_selection.normVec();
-			guide_size_meters = SNAP_GUIDE_SCREEN_SIZE * gViewerWindow->getWindowHeight() * current_range / LLViewerCamera::getInstance()->getPixelMeterRatio();
+			guide_size_meters = SNAP_GUIDE_SCREEN_SIZE * gViewerWindow->getWorldViewHeight() * current_range / LLViewerCamera::getInstance()->getPixelMeterRatio();
 	
 			F32 fraction_of_fov = mAxisArrowLength / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
 			F32 apparent_angle = fraction_of_fov * LLViewerCamera::getInstance()->getView();  // radians
@@ -1522,7 +1522,7 @@ void LLManipTranslate::renderSnapGuides()
 		
 		float a = line_alpha;
 
-		LLColor4 col = gSavedSkinSettings.getColor("SilhouetteChildColor");
+		LLColor4 col = LLUIColorTable::instance().getColor("SilhouetteChildColor");
 		{
 			//draw grid behind objects
 			LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
@@ -1800,7 +1800,7 @@ void LLManipTranslate::renderTranslationHandles()
 	// Drag handles 	
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
-		mArrowLengthMeters = mAxisArrowLength / gViewerWindow->getWindowHeight();
+		mArrowLengthMeters = mAxisArrowLength / gViewerWindow->getWorldViewHeight();
 		mArrowLengthMeters /= gAgent.mHUDCurZoom;
 	}
 	else
diff --git a/indra/newview/llmemoryview.cpp b/indra/newview/llmemoryview.cpp
index ab5db93027..3c7716e9c2 100644
--- a/indra/newview/llmemoryview.cpp
+++ b/indra/newview/llmemoryview.cpp
@@ -119,7 +119,7 @@ void LLMemoryView::draw()
 	const S32 UPDATE_INTERVAL = 60;
 	const S32 MARGIN_AMT = 10; 
 	static S32 curUpdate = UPDATE_INTERVAL;
-    static LLCachedControl<LLColor4> s_console_color(gSavedSkinSettings, "ConsoleBackground", LLColor4U::black);	
+    static LLUIColor s_console_color = LLUIColorTable::instance().getColor("ConsoleBackground", LLColor4U::black);	
 
 	// setup update interval
 	if (curUpdate >= UPDATE_INTERVAL)
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index b40af37f7e..1f623af434 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -112,12 +112,12 @@ void LLNetMap::translatePan( F32 delta_x, F32 delta_y )
 void LLNetMap::draw()
 {
  	static LLFrameTimer map_timer;
-	static LLCachedControl<LLColor4> map_avatar_color(gSavedSkinSettings, "MapAvatarColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_avatar_friend_color(gSavedSkinSettings, "MapAvatarFriendColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_track_disabled_color(gSavedSkinSettings, "MapTrackDisabledColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_frustum_color(gSavedSkinSettings, "MapFrustumColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_frustum_rotating_color(gSavedSkinSettings, "MapFrustumRotatingColor", LLColor4::white);
+	static LLUIColor map_avatar_color = LLUIColorTable::instance().getColor("MapAvatarColor", LLColor4::white);
+	static LLUIColor map_avatar_friend_color = LLUIColorTable::instance().getColor("MapAvatarFriendColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_disabled_color = LLUIColorTable::instance().getColor("MapTrackDisabledColor", LLColor4::white);
+	static LLUIColor map_frustum_color = LLUIColorTable::instance().getColor("MapFrustumColor", LLColor4::white);
+	static LLUIColor map_frustum_rotating_color = LLUIColorTable::instance().getColor("MapFrustumRotatingColor", LLColor4::white);
 	
 	if (mObjectImagep.isNull())
 	{
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index ff26707a56..196a86b29c 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -55,10 +55,10 @@ LLOutputMonitorCtrl::LLOutputMonitorCtrl(const LLOutputMonitorCtrl::Params& p)
 	mPower(0),
 	mIsMuted(true)
 {
-	static LLUICachedControl<LLColor4> output_monitor_muted_color("OutputMonitorMutedColor", LLColor4::orange);
-	static LLUICachedControl<LLColor4> output_monitor_overdriven_color("OutputMonitorOverdrivenColor", LLColor4::red);
-	static LLUICachedControl<LLColor4> output_monitor_normal_color("OutputMonitorNotmalColor", LLColor4::green);
-	static LLUICachedControl<LLColor4> output_monitor_bound_color("OutputMonitorBoundColor", LLColor4::white);
+	static LLUIColor output_monitor_muted_color = LLUIColorTable::instance().getColor("OutputMonitorMutedColor", LLColor4::orange);
+	static LLUIColor output_monitor_overdriven_color = LLUIColorTable::instance().getColor("OutputMonitorOverdrivenColor", LLColor4::red);
+	static LLUIColor output_monitor_normal_color = LLUIColorTable::instance().getColor("OutputMonitorNotmalColor", LLColor4::green);
+	static LLUIColor output_monitor_bound_color = LLUIColorTable::instance().getColor("OutputMonitorBoundColor", LLColor4::white);
 	static LLUICachedControl<S32> output_monitor_rects_number("OutputMonitorRectanglesNumber", 20);
 	static LLUICachedControl<F32> output_monitor_rect_width_ratio("OutputMonitorRectangleWidthRatio", 0.5f);
 	static LLUICachedControl<F32> output_monitor_rect_height_ratio("OutputMonitorRectangleHeightRatio", 0.8f);
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index ed7c7dce12..baa5f34849 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -187,12 +187,12 @@ LLSelectMgr::LLSelectMgr()
 	sHighlightUAnim		= gSavedSettings.getF32("SelectionHighlightUAnim");
 	sHighlightVAnim		= gSavedSettings.getF32("SelectionHighlightVAnim");
 
-	sSilhouetteParentColor =gSavedSkinSettings.getColor("SilhouetteParentColor");
-	sSilhouetteChildColor = gSavedSkinSettings.getColor("SilhouetteChildColor");
-	sHighlightParentColor = gSavedSkinSettings.getColor("HighlightParentColor");
-	sHighlightChildColor = gSavedSkinSettings.getColor("HighlightChildColor");
-	sHighlightInspectColor = gSavedSkinSettings.getColor("HighlightInspectColor");
-	sContextSilhouetteColor = gSavedSkinSettings.getColor("ContextSilhouetteColor")*0.5f;
+	sSilhouetteParentColor =LLUIColorTable::instance().getColor("SilhouetteParentColor");
+	sSilhouetteChildColor = LLUIColorTable::instance().getColor("SilhouetteChildColor");
+	sHighlightParentColor = LLUIColorTable::instance().getColor("HighlightParentColor");
+	sHighlightChildColor = LLUIColorTable::instance().getColor("HighlightChildColor");
+	sHighlightInspectColor = LLUIColorTable::instance().getColor("HighlightInspectColor");
+	sContextSilhouetteColor = LLUIColorTable::instance().getColor("ContextSilhouetteColor")*0.5f;
 
 	sRenderLightRadius = gSavedSettings.getBOOL("RenderLightRadius");
 	
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index daee3ecfa6..2871b16f5c 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -162,8 +162,8 @@ BOOL LLSideTrayTab::postBuild()
 	
 	title_panel->getChild<LLTextBox>(TAB_PANEL_CAPTION_TITLE_BOX)->setValue(mTabTitle);
 
-	static LLUICachedControl<LLColor4> default_background_color ("FloaterDefaultBackgroundColor", *(new LLColor4));
-	static LLUICachedControl<LLColor4> focus_background_color ("FloaterFocusBackgroundColor", *(new LLColor4));
+	static LLUIColor default_background_color = LLUIColorTable::instance().getColor("FloaterDefaultBackgroundColor");
+	static LLUIColor focus_background_color = LLUIColorTable::instance().getColor("FloaterFocusBackgroundColor");
 	
 	setTransparentColor(default_background_color);
 	setBackgroundColor(focus_background_color);
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index d287f25181..790669c07f 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -469,13 +469,24 @@ bool idle_startup()
 		
 		#if LL_WINDOWS
 			// On the windows dev builds, unpackaged, the message_template.msg 
-			// file will be located in 
-			// indra/build-vc**/newview/<config>/app_settings.
+			// file will be located in:
+			// build-vc**/newview/<config>/app_settings
 			if (!found_template)
 			{
 				message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "message_template.msg");
 				found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */
 			}	
+		#elif LL_DARWIN
+			// On Mac dev builds, message_template.msg lives in:
+			// indra/build-*/newview/<config>/Second Life/Contents/Resources/app_settings
+			if (!found_template)
+			{
+				message_template_path =
+					gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE,
+												   "../Resources/app_settings",
+												   "message_template.msg");
+				found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */
+			}		
 		#endif
 
 		if (found_template)
@@ -929,7 +940,7 @@ bool idle_startup()
 
 		
 		//For HTML parsing in text boxes.
-		LLTextEditor::setLinkColor( gSavedSkinSettings.getColor4("HTMLLinkColor") );
+		LLTextEditor::setLinkColor( LLUIColorTable::instance().getColor("HTMLLinkColor") );
 
 		// Load URL History File
 		LLURLHistory::loadFile("url_history.xml");
@@ -1604,7 +1615,7 @@ bool idle_startup()
 		// Since we connected, save off the settings so the user doesn't have to
 		// type the name/password again if we crash.
 		gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
-		gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
+		LLUIColorTable::instance().saveUserSettings();
 
 		//
 		// Initialize classes w/graphics stuff.
@@ -2187,7 +2198,7 @@ bool idle_startup()
 
 			// and make sure it's saved
 			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
-			gSavedSkinSettings.saveToFile( gSavedSettings.getString("SkinningSettingsFile") , TRUE );
+			LLUIColorTable::instance().saveUserSettings();
 		};
 
 		if (!gNoRender)
@@ -2576,7 +2587,7 @@ void login_callback(S32 option, void *userdata)
 		{
 			// turn off the setting and write out to disk
 			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
-			gSavedSkinSettings.saveToFile( gSavedSettings.getString("SkinningSettingsFile") , TRUE );
+			LLUIColorTable::instance().saveUserSettings();
 		}
 
 		// Next iteration through main loop should shut down the app cleanly.
@@ -2786,7 +2797,7 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
 {
 	// store off config state, as we might quit soon
 	gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);	
-	gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
+	LLUIColorTable::instance().saveUserSettings();
 	std::ostringstream message;
 
 	std::string msg;
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 8c2372ee74..58af603569 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -237,7 +237,7 @@ void LLStatusBar::draw()
 	if (isBackgroundVisible())
 	{
 		static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0);
-		static LLUICachedControl<LLColor4> color_drop_shadow ("ColorDropShadow");
+		static LLUIColor color_drop_shadow = LLUIColorTable::instance().getColor("ColorDropShadow");
 		gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0, 
 			color_drop_shadow, drop_shadow_floater );
 	}
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp
index a1384c28ba..a422db1cc1 100644
--- a/indra/newview/llstylemap.cpp
+++ b/indra/newview/llstylemap.cpp
@@ -64,7 +64,7 @@ const LLStyleSP &LLStyleMap::lookupAgent(const LLUUID &source)
 		style->setFontName(LLStringUtil::null);
 		if (source != LLUUID::null && source != gAgent.getID() )
 		{
-			style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+			style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 			std::string link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str());
 			style->setLinkHREF(link);
 		}
@@ -90,7 +90,7 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
 		style->setFontName(LLStringUtil::null);
 		if (id != LLUUID::null && !link.empty())
 		{
-			style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+			style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 			style->setLinkHREF(link);
 		}
 		else
@@ -115,6 +115,6 @@ void LLStyleMap::update()
 	{
 		LLStyleSP &style = iter->second;
 		// Update the link color in case it has been changed.
-		style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+		style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 	}
 }
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index ca78073575..ee6e36518f 100644
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -359,7 +359,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 			// Orbit tool
 			if (hasMouseCapture())
 			{
-				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWindowWidth();
+				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWorldViewWidth();
 
 				if (dx != 0)
 				{
@@ -387,7 +387,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 				F32 dist = (F32) camera_to_focus.normVec();
 
 				// Fudge factor for pan
-				F32 meters_per_pixel = 3.f * dist / gViewerWindow->getWindowWidth();
+				F32 meters_per_pixel = 3.f * dist / gViewerWindow->getWorldViewWidth();
 
 				if (dx != 0)
 				{
@@ -409,7 +409,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 			if (hasMouseCapture())
 			{
 
-				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWindowWidth();
+				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWorldViewWidth();
 
 				if (dx != 0)
 				{
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index 88e79fd4f4..abadd251c1 100644
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -510,8 +510,8 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 	const F32 RADIANS_PER_PIXEL_X = 0.01f;
 	const F32 RADIANS_PER_PIXEL_Y = 0.01f;
 
-	S32 dx = x - (gViewerWindow->getWindowWidth() / 2);
-	S32 dy = y - (gViewerWindow->getWindowHeight() / 2);
+	S32 dx = x - (gViewerWindow->getWorldViewWidth() / 2);
+	S32 dy = y - (gViewerWindow->getWorldViewHeight() / 2);
 
 	if (dx != 0 || dy != 0)
 	{
@@ -631,10 +631,10 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 			// Handle auto-rotation at screen edge.
 			LLVector3 grab_pos_agent = gAgent.getPosAgentFromGlobal( grab_point_global );
 
-			LLCoordGL grab_center_gl( gViewerWindow->getWindowWidth() / 2, gViewerWindow->getWindowHeight() / 2);
+			LLCoordGL grab_center_gl( gViewerWindow->getWorldViewWidth() / 2, gViewerWindow->getWorldViewHeight() / 2);
 			LLViewerCamera::getInstance()->projectPosAgentToScreen(grab_pos_agent, grab_center_gl);
 
-			const S32 ROTATE_H_MARGIN = gViewerWindow->getWindowWidth() / 20;
+			const S32 ROTATE_H_MARGIN = gViewerWindow->getWorldViewWidth() / 20;
 			const F32 ROTATE_ANGLE_PER_SECOND = 30.f * DEG_TO_RAD;
 			const F32 rotate_angle = ROTATE_ANGLE_PER_SECOND / gFPSClamped;
 			// ...build mode moves camera about focus point
@@ -649,7 +649,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 					gAgent.cameraOrbitAround(rotate_angle);
 				}
 			}
-			else if (grab_center_gl.mX > gViewerWindow->getWindowWidth() - ROTATE_H_MARGIN)
+			else if (grab_center_gl.mX > gViewerWindow->getWorldViewWidth() - ROTATE_H_MARGIN)
 			{
 				if (gAgent.getFocusOnAvatar())
 				{
@@ -662,7 +662,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 			}
 
 			// Don't move above top of screen or below bottom
-			if ((grab_center_gl.mY < gViewerWindow->getWindowHeight() - 6)
+			if ((grab_center_gl.mY < gViewerWindow->getWorldViewHeight() - 6)
 				&& (grab_center_gl.mY > 24))
 			{
 				// Transmit update to simulator
@@ -884,7 +884,7 @@ void LLToolGrab::handleHoverInactive(S32 x, S32 y, MASK mask)
 
 	// Look for cursor against the edge of the screen
 	// Only works in fullscreen
-	if (!gSavedSettings.getBOOL("NotFullScreen"))
+	if (gSavedSettings.getBOOL("WindowFullScreen"))
 	{
 		if (gAgent.cameraThirdPerson() )
 		{
@@ -893,7 +893,7 @@ void LLToolGrab::handleHoverInactive(S32 x, S32 y, MASK mask)
 				gAgent.yaw(rotate_angle);
 				//gAgent.setControlFlags(AGENT_CONTROL_YAW_POS);
 			}
-			else if (x == (gViewerWindow->getWindowWidth() - 1) )
+			else if (x == (gViewerWindow->getWorldViewWidth() - 1) )
 			{
 				gAgent.yaw(-rotate_angle);
 				//gAgent.setControlFlags(AGENT_CONTROL_YAW_NEG);
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp
index 72fd8b3bac..3dc0ea646a 100644
--- a/indra/newview/lltoolgun.cpp
+++ b/indra/newview/lltoolgun.cpp
@@ -137,7 +137,7 @@ void LLToolGun::draw()
 	{
 		LLUIImagePtr crosshair = LLUI::getUIImage("crosshairs.tga");
 		crosshair->draw(
-			( gViewerWindow->getWindowWidth() - crosshair->getWidth() ) / 2,
-			( gViewerWindow->getWindowHeight() - crosshair->getHeight() ) / 2);
+			( gViewerWindow->getWorldViewWidth() - crosshair->getWidth() ) / 2,
+			( gViewerWindow->getWorldViewHeight() - crosshair->getHeight() ) / 2);
 	}
 }
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index e3ee209030..cf3d15a12a 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -180,6 +180,8 @@ void LLToolMgr::setCurrentTool( LLTool* tool )
 
 	mBaseTool = tool;
 	updateToolStatus();
+
+	mSavedTool = NULL;
 }
 
 LLTool* LLToolMgr::getCurrentTool()
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
index 8e4f637832..5929ecd928 100644
--- a/indra/newview/lltracker.cpp
+++ b/indra/newview/lltracker.cpp
@@ -112,7 +112,7 @@ void LLTracker::stopTracking(void* userdata)
 // static virtual
 void LLTracker::drawHUDArrow()
 {
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
 	
 	/* tracking autopilot destination has been disabled 
 	   -- 2004.01.09, Leviathan
@@ -163,7 +163,7 @@ void LLTracker::render3D()
 		return;
 	}
 	
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
 	
 	// Arbitary location beacon
 	if( instance()->mIsTrackingLocation )
diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp
index f5160fd26c..153e3e7382 100644
--- a/indra/newview/lluploaddialog.cpp
+++ b/indra/newview/lluploaddialog.cpp
@@ -144,7 +144,7 @@ void LLUploadDialog::setMessage( const std::string& msg)
 		msg_rect.setOriginAndSize( msg_x, msg_y, max_msg_width, line_height );
 		mLabelBox[line_num]->setRect(msg_rect);
 		mLabelBox[line_num]->setText(cur_line);
-		mLabelBox[line_num]->setColor( gSavedSkinSettings.getColor( "LabelTextColor" ) );
+		mLabelBox[line_num]->setColor( LLUIColorTable::instance().getColor( "LabelTextColor" ) );
 		mLabelBox[line_num]->setVisible(TRUE);
 		msg_y -= line_height;
 		++line_num;
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 320b950649..0f3feb789f 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -78,7 +78,6 @@ BOOL 				gHackGodmode = FALSE;
 
 
 LLControlGroup gSavedSettings("Global");	// saved at end of session
-LLControlGroup gSavedSkinSettings("Skinning");	// saved at end of session
 LLControlGroup gSavedPerAccountSettings("PerAccount"); // saved at end of session
 LLControlGroup gCrashSettings("CrashSettings");	// saved at end of session
 LLControlGroup gWarningSettings("Warnings"); // persists ignored dialogs/warnings
@@ -585,7 +584,6 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("DebugViews")->getSignal()->connect(boost::bind(&handleDebugViewsChanged, _2));
 	gSavedSettings.getControl("UserLogFile")->getSignal()->connect(boost::bind(&handleLogFileChanged, _2));
 	gSavedSettings.getControl("RenderHideGroupTitle")->getSignal()->connect(boost::bind(handleHideGroupTitleChanged, _2));
-	gSavedSkinSettings.getControl("EffectColor")->getSignal()->connect(boost::bind(handleEffectColorChanged, _2));
 	gSavedSettings.getControl("HighResSnapshot")->getSignal()->connect(boost::bind(handleHighResSnapshotChanged, _2));
 	gSavedSettings.getControl("VectorizePerfTest")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _2));
 	gSavedSettings.getControl("VectorizeEnable")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _2));
@@ -603,6 +601,69 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("VelocityInterpolate")->getSignal()->connect(boost::bind(&handleVelocityInterpolate, _2));
 }
 
+class ColorConvertFunctor : public LLControlGroup::ApplyFunctor
+{
+public:
+    ColorConvertFunctor(LLUIColorTable::Params& params)
+        :mParams(params)
+    {
+    }
+
+    void apply(const std::string& name, LLControlVariable* control)
+    {
+        if(control->isType(TYPE_COL4))
+        {
+            LLUIColorTable::ColorParams color_params;
+            color_params.value = LLColor4(control->getValue());
+
+            mParams.color_entries.add(LLUIColorTable::ColorEntryParams().name(name).color(color_params));
+        }
+    }
+
+private:
+    LLUIColorTable::Params& mParams;
+};
+
+static void convert_legacy_color_settings(const std::string& location_key, ELLPath path)
+{
+	LLControlGroup::getInstance("Skinning")->cleanup();
+	LLAppViewer::instance()->loadSettingsFromDirectory(location_key);
+
+	LLUIColorTable::Params params;
+	ColorConvertFunctor ccf(params);
+	LLControlGroup::getInstance("Skinning")->applyToAll(&ccf);
+
+	LLXMLNodePtr output_node = new LLXMLNode("colors", false);
+	LLXUIParser::instance().writeXUI(output_node, params);
+
+	if(!output_node->isNull())
+	{
+		std::string filename = gDirUtilp->getExpandedFilename(path, "colors_def.xml");
+		LLFILE *fp = LLFile::fopen(filename, "w");
+
+		if(fp != NULL)
+		{
+			LLXMLNode::writeHeaderToFile(fp);
+			output_node->writeToFile(fp);
+
+			fclose(fp);
+		}
+	}
+
+	LLControlGroup::getInstance("Skinning")->cleanup();
+}
+
+void convert_legacy_color_settings()
+{
+	LLControlGroup saved_skin_settings("Skinning");
+
+	convert_legacy_color_settings("DefaultSkin", LL_PATH_DEFAULT_SKIN);
+	convert_legacy_color_settings("CurrentSkin", LL_PATH_TOP_SKIN);
+	convert_legacy_color_settings("UserSkin", LL_PATH_USER_SKIN);
+
+	saved_skin_settings.cleanup();
+}
+
 
 #if TEST_CACHED_CONTROL
 
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h
index 3271e5fe9b..0e1c24e4fb 100644
--- a/indra/newview/llviewercontrol.h
+++ b/indra/newview/llviewercontrol.h
@@ -50,9 +50,12 @@ void settings_setup_listeners();
 // for the graphics settings
 void create_graphics_group(LLControlGroup& group);
 
+// convert legacy colors.xml LLSD based color settings to
+// newer colors_def.xml XUI/Params based color settings
+void convert_legacy_color_settings();
+
 // saved at end of session
 extern LLControlGroup gSavedSettings;
-extern LLControlGroup gSavedSkinSettings;
 extern LLControlGroup gSavedPerAccountSettings;
 extern LLControlGroup gWarningSettings;
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 826aca5e64..ae7099d382 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -523,7 +523,7 @@ void init_menus()
 	///
 	LLColor4 color;
 
-	LLColor4 context_menu_color = gSavedSkinSettings.getColor("MenuPopupBgColor");
+	LLColor4 context_menu_color = LLUIColorTable::instance().getColor("MenuPopupBgColor");
 	
 	gPieSelf->setBackgroundColor( context_menu_color );
 	gPieAvatar->setBackgroundColor( context_menu_color );
@@ -532,17 +532,17 @@ void init_menus()
 
 	gPieLand->setBackgroundColor( context_menu_color );
 
-	color = gSavedSkinSettings.getColor( "MenuPopupBgColor" );
+	color = LLUIColorTable::instance().getColor( "MenuPopupBgColor" );
 	gPopupMenuView->setBackgroundColor( color );
 
 	// If we are not in production, use a different color to make it apparent.
 	if (LLViewerLogin::getInstance()->isInProductionGrid())
 	{
-		color = gSavedSkinSettings.getColor( "MenuBarBgColor" );
+		color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
 	}
 	else
 	{
-		color = gSavedSkinSettings.getColor( "MenuNonProductionBgColor" );
+		color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
 	}
 	gMenuBarView = LLUICtrlFactory::getInstance()->createFromFile<LLMenuBarGL>("menu_viewer.xml", gMenuHolder);
 	gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT));
@@ -7983,6 +7983,7 @@ void initialize_menus()
 
 
 	// Advanced > XUI
+	commit.add("Advanced.ReloadColorSettings", boost::bind(&LLUIColorTable::loadFromSettings, LLUIColorTable::getInstance()));
 	view_listener_t::addMenu(new LLAdvancedShowFontTest(), "Advanced.ShowFontTest");
 	view_listener_t::addMenu(new LLAdvancedLoadUIFromXML(), "Advanced.LoadUIFromXML");
 	view_listener_t::addMenu(new LLAdvancedSaveUIToXML(), "Advanced.SaveUIToXML");
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 8e9c798aca..468c9fbb66 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1020,16 +1020,16 @@ void LLViewerObjectList::shiftObjects(const LLVector3 &offset)
 
 void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
 {
-	LLColor4 above_water_color = gSavedSkinSettings.getColor( "NetMapOtherOwnAboveWater" );
-	LLColor4 below_water_color = gSavedSkinSettings.getColor( "NetMapOtherOwnBelowWater" );
+	LLColor4 above_water_color = LLUIColorTable::instance().getColor( "NetMapOtherOwnAboveWater" );
+	LLColor4 below_water_color = LLUIColorTable::instance().getColor( "NetMapOtherOwnBelowWater" );
 	LLColor4 you_own_above_water_color = 
-						gSavedSkinSettings.getColor( "NetMapYouOwnAboveWater" );
+						LLUIColorTable::instance().getColor( "NetMapYouOwnAboveWater" );
 	LLColor4 you_own_below_water_color = 
-						gSavedSkinSettings.getColor( "NetMapYouOwnBelowWater" );
+						LLUIColorTable::instance().getColor( "NetMapYouOwnBelowWater" );
 	LLColor4 group_own_above_water_color = 
-						gSavedSkinSettings.getColor( "NetMapGroupOwnAboveWater" );
+						LLUIColorTable::instance().getColor( "NetMapGroupOwnAboveWater" );
 	LLColor4 group_own_below_water_color = 
-						gSavedSkinSettings.getColor( "NetMapGroupOwnBelowWater" );
+						LLUIColorTable::instance().getColor( "NetMapGroupOwnBelowWater" );
 
 
 	for (S32 i = 0; i < mMapObjects.count(); i++)
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp
index 5b60ed5a27..2056a4be1b 100644
--- a/indra/newview/llviewerparceloverlay.cpp
+++ b/indra/newview/llviewerparceloverlay.cpp
@@ -206,12 +206,12 @@ void LLViewerParcelOverlay::updateOverlayTexture()
 	{
 		return;
 	}
-	const LLColor4U avail = gSavedSkinSettings.getColor4("PropertyColorAvail");
-	const LLColor4U owned = gSavedSkinSettings.getColor4("PropertyColorOther");
-	const LLColor4U group = gSavedSkinSettings.getColor4("PropertyColorGroup");
-	const LLColor4U self  = gSavedSkinSettings.getColor4("PropertyColorSelf");
-	const LLColor4U for_sale  = gSavedSkinSettings.getColor4("PropertyColorForSale");
-	const LLColor4U auction  = gSavedSkinSettings.getColor4("PropertyColorAuction");
+	const LLColor4U avail = LLUIColorTable::instance().getColor("PropertyColorAvail").get();
+	const LLColor4U owned = LLUIColorTable::instance().getColor("PropertyColorOther").get();
+	const LLColor4U group = LLUIColorTable::instance().getColor("PropertyColorGroup").get();
+	const LLColor4U self  = LLUIColorTable::instance().getColor("PropertyColorSelf").get();
+	const LLColor4U for_sale  = LLUIColorTable::instance().getColor("PropertyColorForSale").get();
+	const LLColor4U auction  = LLUIColorTable::instance().getColor("PropertyColorAuction").get();
 
 	// Create the base texture.
 	U8 *raw = mImageRaw->getData();
@@ -314,11 +314,11 @@ void LLViewerParcelOverlay::updatePropertyLines()
 	
 	S32 row, col;
 
-	const LLColor4U self_coloru  = gSavedSkinSettings.getColor4("PropertyColorSelf");
-	const LLColor4U other_coloru = gSavedSkinSettings.getColor4("PropertyColorOther");
-	const LLColor4U group_coloru = gSavedSkinSettings.getColor4("PropertyColorGroup");
-	const LLColor4U for_sale_coloru = gSavedSkinSettings.getColor4("PropertyColorForSale");
-	const LLColor4U auction_coloru = gSavedSkinSettings.getColor4("PropertyColorAuction");
+	const LLColor4U self_coloru  = LLUIColorTable::instance().getColor("PropertyColorSelf").get();
+	const LLColor4U other_coloru = LLUIColorTable::instance().getColor("PropertyColorOther").get();
+	const LLColor4U group_coloru = LLUIColorTable::instance().getColor("PropertyColorGroup").get();
+	const LLColor4U for_sale_coloru = LLUIColorTable::instance().getColor("PropertyColorForSale").get();
+	const LLColor4U auction_coloru = LLUIColorTable::instance().getColor("PropertyColorAuction").get();
 
 	// Build into dynamic arrays, then copy into static arrays.
 	LLDynamicArray<LLVector3, 256> new_vertex_array;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 2689fff533..569eba2f20 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1526,10 +1526,10 @@ void LLViewerWindow::initBase()
 	params.rect(LLRect (0, 1, 1, 0));
 	params.h_pad(4);
 	params.v_pad(2);
-	params.text_color(gSavedSkinSettings.getColor( "ToolTipTextColor" ));
-	params.border_color(gSavedSkinSettings.getColor( "ToolTipBorderColor" ));
+	params.text_color(LLUIColorTable::instance().getColor( "ToolTipTextColor" ));
+	params.border_color(LLUIColorTable::instance().getColor( "ToolTipBorderColor" ));
 	params.border_visible(false);
-	params.background_color(gSavedSkinSettings.getColor( "ToolTipBgColor" ));
+	params.background_color(LLUIColorTable::instance().getColor( "ToolTipBgColor" ));
 	params.bg_visible(true);
 	params.font.style("NORMAL");
 	params.border_drop_shadow_visible(true);
@@ -1824,7 +1824,7 @@ void LLViewerWindow::reshape(S32 width, S32 height)
 
 
 		// store the mode the user wants (even if not there yet)
-		gSavedSettings.setBOOL("NotFullScreen", !mWantFullscreen);
+		gSavedSettings.setBOOL("WindowFullScreen", mWantFullscreen);
 
 		// store new settings for the mode we are in, regardless
 		if (!mWindow->getFullscreen())
@@ -1887,19 +1887,19 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
 
     if(god_mode && LLViewerLogin::getInstance()->isInProductionGrid())
     {
-        new_bg_color = gSavedSkinSettings.getColor( "MenuBarGodBgColor" );
+        new_bg_color = LLUIColorTable::instance().getColor( "MenuBarGodBgColor" );
     }
     else if(god_mode && !LLViewerLogin::getInstance()->isInProductionGrid())
     {
-        new_bg_color = gSavedSkinSettings.getColor( "MenuNonProductionGodBgColor" );
+        new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionGodBgColor" );
     }
     else if(!god_mode && !LLViewerLogin::getInstance()->isInProductionGrid())
     {
-        new_bg_color = gSavedSkinSettings.getColor( "MenuNonProductionBgColor" );
+        new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
     }
     else 
     {
-        new_bg_color = gSavedSkinSettings.getColor( "MenuBarBgColor" );
+        new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
     }
 
     if(gMenuBarView)
@@ -2162,10 +2162,11 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 	LLUICtrl* keyboard_focus = gFocusMgr.getKeyboardFocus();
 	if( keyboard_focus )
 	{
+		LLLineEditor* chat_bar = gBottomTray ? gBottomTray->getChatBox() : NULL;
 		// arrow keys move avatar while chatting hack
-		if (gChatBar && gChatBar->inputEditorHasFocus())
+		if (chat_bar && chat_bar->hasFocus())
 		{
-			if (gChatBar->getCurrentChat().empty() || gSavedSettings.getBOOL("ArrowKeysMoveAvatar"))
+			if (chat_bar->getText().empty() || gSavedSettings.getBOOL("ArrowKeysMoveAvatar"))
 			{
 				switch(key)
 				{
@@ -2895,15 +2896,17 @@ void LLViewerWindow::updateKeyboardFocus()
 
 	if(LLSideTray::instanceCreated())//just getInstance will create sidetray. we don't want this
 		LLSideTray::getInstance()->highlightFocused();
-	
 
-	if (gSavedSettings.getBOOL("ChatBarStealsFocus") 
-		&& gChatBar 
-		&& gFocusMgr.getKeyboardFocus() == NULL 
-		&& gChatBar->isInVisibleChain())
-	{
-		gChatBar->startChat(NULL);
-	}
+	//NOTE: this behavior is no longer desirable with a permanently visible chat batr
+	// which would *always* steal focus, disallowing navigation of the world via WASD controls --RN
+	
+	//if (gSavedSettings.getBOOL("ChatBarStealsFocus") 
+	//	&& gChatBar 
+	//	&& gFocusMgr.getKeyboardFocus() == NULL 
+	//	&& gChatBar->isInVisibleChain())
+	//{
+	//	gChatBar->startChat(NULL);
+	//}
 
 
 }
@@ -4649,7 +4652,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
 	BOOL was_maximized = gSavedSettings.getBOOL("WindowMaximized");
 	mWantFullscreen = fullscreen;
 	mShowFullscreenProgress = show_progress_bar;
-	gSavedSettings.setBOOL("NotFullScreen", !mWantFullscreen);
+	gSavedSettings.setBOOL("WindowFullScreen", mWantFullscreen);
 
 	//gResizeScreenTexture = TRUE;
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c2b54ec9c6..b38e71236d 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2660,7 +2660,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 					new_name = TRUE;
 				}
 				
-				LLColor4 avatar_name_color = gSavedSkinSettings.getColor( "AvatarNameColor" );
+				LLColor4 avatar_name_color = LLUIColorTable::instance().getColor( "AvatarNameColor" );
 				avatar_name_color.setAlpha(alpha);
 				mNameText->setColor(avatar_name_color);
 				
@@ -2802,7 +2802,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 				std::deque<LLChat>::iterator chat_iter = mChats.begin();
 				mNameText->clearString();
 
-				LLColor4 new_chat = gSavedSkinSettings.getColor( "AvatarNameColor" );
+				LLColor4 new_chat = LLUIColorTable::instance().getColor( "AvatarNameColor" );
 				LLColor4 normal_chat = lerp(new_chat, LLColor4(0.8f, 0.8f, 0.8f, 1.f), 0.7f);
 				LLColor4 old_chat = lerp(normal_chat, LLColor4(0.6f, 0.6f, 0.6f, 1.f), 0.7f);
 				if (mTyping && mChats.size() >= MAX_BUBBLE_CHAT_UTTERANCES) 
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index d99758edf8..d4df141477 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -368,7 +368,7 @@ LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 		initSunDirection(mSunDefaultPosition, LLVector3(0, 0, 0));
 	}
 	mAmbientScale = gSavedSettings.getF32("SkyAmbientScale");
-	mNightColorShift = gSavedSkinSettings.getColor3("SkyNightColorShift");
+	mNightColorShift = gSavedSettings.getColor3("SkyNightColorShift");
 	mFogColor.mV[VRED] = mFogColor.mV[VGREEN] = mFogColor.mV[VBLUE] = 0.5f;
 	mFogColor.mV[VALPHA] = 0.0f;
 	mFogRatio = 1.2f;
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 9ac758433c..9e04c14beb 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -284,7 +284,7 @@ BOOL is_agent_in_region(LLViewerRegion* region, LLSimInfo* info)
 
 void LLWorldMapView::draw()
 {
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
 	
 	LLTextureView::clearDebugImages();
 
@@ -908,8 +908,8 @@ void LLWorldMapView::drawImageStack(const LLVector3d& global_pos, LLUIImagePtr i
 
 void LLWorldMapView::drawAgents()
 {
-	static LLCachedControl<LLColor4> map_avatar_color(gSavedSkinSettings, "MapAvatarColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_avatar_friend_color(gSavedSkinSettings, "MapAvatarFriendColor", LLColor4::white);
+	static LLUIColor map_avatar_color = LLUIColorTable::instance().getColor("MapAvatarColor", LLColor4::white);
+	static LLUIColor map_avatar_friend_color = LLUIColorTable::instance().getColor("MapAvatarFriendColor", LLColor4::white);
 	
 	F32 agents_scale = (gMapScale * 0.9f) / 256.f;
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 25ed853146..88d2eab66d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -5094,8 +5094,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
 		F32 minLum = llmax(gSavedSettings.getF32("RenderGlowMinLuminance"), 0.0f);
 		F32 maxAlpha = gSavedSettings.getF32("RenderGlowMaxExtractAlpha");		
 		F32 warmthAmount = gSavedSettings.getF32("RenderGlowWarmthAmount");	
-		LLVector3 lumWeights = gSavedSkinSettings.getVector3("RenderGlowLumWeights");
-		LLVector3 warmthWeights = gSavedSkinSettings.getVector3("RenderGlowWarmthWeights");
+		LLVector3 lumWeights = gSavedSettings.getVector3("RenderGlowLumWeights");
+		LLVector3 warmthWeights = gSavedSettings.getVector3("RenderGlowWarmthWeights");
 		gGlowExtractProgram.uniform1f("minLuminance", minLum);
 		gGlowExtractProgram.uniform1f("maxExtractAlpha", maxAlpha);
 		gGlowExtractProgram.uniform3f("lumWeights", lumWeights.mV[0], lumWeights.mV[1], lumWeights.mV[2]);
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 49ea0bc8aa..94b9b04bb0 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -123,9 +123,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.94</real>
-        <real>0.61</real>
-        <real>0</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -171,9 +171,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>1</real>
-        <real>0.75</real>
-        <real>0.24</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>0.5</real>
       </array>
     </map>
@@ -203,10 +203,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.86</real>
-        <real>0.86</real>
-        <real>0.86</real>
-        <real>1</real>
+          <real>1</real>
+          <real>1</real>
+          <real>1</real>
+          <real>1</real>
       </array>
     </map>
     <key>ButtonLabelDisabledColor</key>
@@ -219,10 +219,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.58</real>
-        <real>0.66</real>
-        <real>0.84</real>
-        <real>0.78</real>
+        <real>0.75</real>
+        <real>0.75</real>
+        <real>0.75</real>
+        <real>0.7799999713897705078125</real>
       </array>
     </map>
     <key>ButtonLabelSelectedColor</key>
@@ -251,10 +251,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.64</real>
-        <real>0.75</real>
-        <real>0.93</real>
-        <real>0.78</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
+        <real>0.7799999713897705078125</real>
       </array>
     </map>
     <key>ButtonSelectedBgColor</key>
@@ -267,9 +267,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.24</real>
-        <real>0.24</real>
-        <real>0.24</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -299,9 +299,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.24</real>
-        <real>0.24</real>
-        <real>0.24</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -411,9 +411,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.5</real>
-        <real>0.0</real>
-        <real>0.0</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>1.0</real>
       </array>
     </map>
@@ -1003,9 +1003,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0</real>
-        <real>0</real>
-        <real>0.08</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -1035,9 +1035,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.94</real>
-        <real>0.61</real>
-        <real>0</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>1</real>
       </array>
     </map>
@@ -1115,9 +1115,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.94</real>
-        <real>0.61</real>
-        <real>0</real>
+        <real>0.272800028324127197265625</real>
+        <real>0.607199966907501220703125</real>
+        <real>0.5601749420166015625</real>
         <real>1</real>
       </array>
     </map>
@@ -1131,9 +1131,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.94</real>
-        <real>0.65</real>
-        <real>0.35</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>1</real>
       </array>
     </map>
@@ -1211,9 +1211,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.27</real>
-        <real>0.67</real>
-        <real>1</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>1</real>
       </array>
     </map>
@@ -1259,10 +1259,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.60</real>
-        <real>0.60</real>
-        <real>1.0</real>
-        <real>1.0</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
+        <real>1</real>
       </array>
     </map>
     <key>HealthTextColor</key>
@@ -1404,9 +1404,9 @@
       <key>Value</key>
       <array>
         <real>1</real>
+        <real>0.5</real>
         <real>0</real>
         <real>1</real>
-        <real>1</real>
       </array>
     </map>
     <key>HighlightParentColor</key>
@@ -1595,9 +1595,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.64</real>
-        <real>0.75</real>
-        <real>0.93</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>0.5</real>
       </array>
     </map>
@@ -1611,9 +1611,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.58</real>
-        <real>0.66</real>
-        <real>0.84</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -1724,9 +1724,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.0</real>
         <real>1.0</real>
-        <real>0.0</real>
+        <real>1.0</real>
+        <real>1.0</real>
         <real>1.0</real>
       </array>
     </map>
@@ -1756,10 +1756,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>1.0</real>
-        <real>1.0</real>
-        <real>1.0</real>
-        <real>1.0</real>
+        <real>0.53125</real>
+        <real>0</real>
+        <real>0.498047053813934326171875</real>
+        <real>1</real>
       </array>
     </map>
     <key>MapFrustumColor</key>
@@ -1854,9 +1854,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.24</real>
-        <real>0.5</real>
-        <real>0.24</real>
+        <real>0.0</real>
+        <real>0.0</real>
+        <real>0.0</real>
         <real>1</real>
       </array>
     </map>
@@ -2014,9 +2014,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.72</real>
-        <real>0.72</real>
-        <real>0.74</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -2500,36 +2500,6 @@
         <real>0.4</real>
       </array>
     </map>
-    <key>RenderGlowLumWeights</key>
-    <map>
-      <key>Comment</key>
-      <string>Weights for each color channel to be used in calculating luminance (should add up to 1.0)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Vector3</string>
-      <key>Value</key>
-      <array>
-        <real>0.299</real>
-        <real>0.587</real>
-        <real>0.114</real>
-      </array>
-    </map>
-    <key>RenderGlowWarmthWeights</key>
-    <map>
-      <key>Comment</key>
-      <string>Weight of each color channel used before finding the max warmth</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Vector3</string>
-      <key>Value</key>
-      <array>
-        <real>1.0</real>
-        <real>0.5</real>
-        <real>0.7</real>
-      </array>
-    </map>
     <key>ScriptBgReadOnlyColor</key>
     <map>
       <key>Comment</key>
@@ -2572,10 +2542,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.39</real>
-        <real>0.39</real>
-        <real>0.39</real>
-        <real>0.16</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
+        <real>0.1599999964237213134765625</real>
       </array>
     </map>
     <key>ScrollBgReadOnlyColor</key>
@@ -2716,9 +2686,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.24</real>
-        <real>0.3</real>
-        <real>0.49</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -2732,9 +2702,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.6</real>
-        <real>0.6</real>
-        <real>0.62</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -2770,21 +2740,6 @@
         <real>1</real>
       </array>
     </map>
-    <key>SkyNightColorShift</key>
-    <map>
-      <key>Comment</key>
-      <string>Controls moonlight color (base color applied to moon as light source)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Color3</string>
-      <key>Value</key>
-      <array>
-        <real>0.67</real>
-        <real>0.67</real>
-        <real>1.0</real>
-      </array>
-    </map>
     <key>SliderDisabledThumbColor</key>
     <map>
       <key>Comment</key>
@@ -2795,9 +2750,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0</real>
-        <real>0</real>
-        <real>0</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -2811,9 +2766,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.78</real>
-        <real>0.78</real>
-        <real>0.78</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png
new file mode 100644
index 0000000000..19c842b816
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png
new file mode 100644
index 0000000000..e47f913db1
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png
new file mode 100644
index 0000000000..b9879dcc8a
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png
new file mode 100644
index 0000000000..e2c67de9c0
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png
new file mode 100644
index 0000000000..08f7493a02
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Off.png b/indra/newview/skins/default/textures/containers/Accordion_Off.png
new file mode 100644
index 0000000000..414f4509c6
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Over.png b/indra/newview/skins/default/textures/containers/Accordion_Over.png
new file mode 100644
index 0000000000..5416d73310
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_Over.png differ
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Press.png b/indra/newview/skins/default/textures/containers/Accordion_Press.png
new file mode 100644
index 0000000000..1578e0dfc5
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_Press.png differ
diff --git a/indra/newview/skins/default/textures/containers/Container.png b/indra/newview/skins/default/textures/containers/Container.png
new file mode 100644
index 0000000000..511eb94386
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Container.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png
new file mode 100644
index 0000000000..1951413f8d
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png
new file mode 100644
index 0000000000..295cd89a57
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png
new file mode 100644
index 0000000000..8364716e02
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png
new file mode 100644
index 0000000000..21f1c2d8a8
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png
new file mode 100644
index 0000000000..0758cbcf0d
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png
new file mode 100644
index 0000000000..3946917c7c
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png
new file mode 100644
index 0000000000..eeef28e5a5
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png
new file mode 100644
index 0000000000..c2cbc2b1e5
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png differ
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png
new file mode 100644
index 0000000000..b0f1f16398
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png
new file mode 100644
index 0000000000..41b5d24d87
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png
new file mode 100644
index 0000000000..083acc0156
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png
new file mode 100644
index 0000000000..ee4649a8f9
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png
new file mode 100644
index 0000000000..55c02160e3
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png
new file mode 100644
index 0000000000..2f6ea90196
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
new file mode 100644
index 0000000000..642113b135
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png
new file mode 100644
index 0000000000..01fd765c3d
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png
new file mode 100644
index 0000000000..74e00635f1
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png differ
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png
new file mode 100644
index 0000000000..8a0d98a780
Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png
new file mode 100644
index 0000000000..19569501fe
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png
new file mode 100644
index 0000000000..a91b74819f
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png
new file mode 100644
index 0000000000..3648c42656
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png
new file mode 100644
index 0000000000..a2caf227a7
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
new file mode 100644
index 0000000000..a4060e5e37
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png
new file mode 100644
index 0000000000..9c2815ebba
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
new file mode 100644
index 0000000000..377b707529
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png
new file mode 100644
index 0000000000..a69a729bd4
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png differ
diff --git a/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png
new file mode 100644
index 0000000000..5ab4abc5b8
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Help_Over.png b/indra/newview/skins/default/textures/navbar/Help_Over.png
new file mode 100644
index 0000000000..b9bc0d0f87
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Help_Over.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Help_Press.png b/indra/newview/skins/default/textures/navbar/Help_Press.png
new file mode 100644
index 0000000000..ed3695f9d5
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Help_Press.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Home_Off.png b/indra/newview/skins/default/textures/navbar/Home_Off.png
new file mode 100644
index 0000000000..fe3bc63b77
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Home_Off.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Home_Over.png b/indra/newview/skins/default/textures/navbar/Home_Over.png
new file mode 100644
index 0000000000..d9c6b3842e
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Home_Over.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Info_Off.png b/indra/newview/skins/default/textures/navbar/Info_Off.png
new file mode 100644
index 0000000000..64722255a3
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Info_Off.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Info_Over.png b/indra/newview/skins/default/textures/navbar/Info_Over.png
new file mode 100644
index 0000000000..84f1d03129
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Info_Over.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Info_Press.png b/indra/newview/skins/default/textures/navbar/Info_Press.png
new file mode 100644
index 0000000000..169105829e
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Info_Press.png differ
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG.png b/indra/newview/skins/default/textures/navbar/NavBar_BG.png
new file mode 100644
index 0000000000..1df61751a8
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/NavBar_BG.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png
new file mode 100644
index 0000000000..fc4f0c07ef
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Row_Selection.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Search.png b/indra/newview/skins/default/textures/navbar/Search.png
new file mode 100644
index 0000000000..c43519d5f1
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Search.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
new file mode 100644
index 0000000000..918be7555f
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png
new file mode 100644
index 0000000000..b3316386b9
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 84dd3ffd7a..e6c9cdb246 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,75 +1,85 @@
 <textures version="101">
 
-  <texture name="icn_scrollbar_thumb.tga" preload="true" scale.top="7" scale.left="4" scale.bottom="8" scale.right="4" />
-  <texture name="icn_scrollbar_bg.tga" preload="true" scale.top="7" scale.left="4" scale.bottom="8" scale.right="4" />
+  <texture name="ScrollThumb_Vert" file_name="widgets/ScrollThumb_Vert.png" preload="true" scale.left="4" scale.top="53" scale.bottom="10" scale.right="4" />
+  <texture name="ScrollTrack_Vert" file_name="widgets/ScrollTrack_Vert.png" preload="true" scale.left="2" scale.top="40" scale.bottom="13" scale.right="0" />
   <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4"/>
+
+  <!--There are still references to this old textfield art in the code somewhere -erica-->
   <texture name="icn_textfield_enabled.tga" scale.left="5" scale.top="5" scale.bottom="5" scale.right="5"/>
-  
-  <texture name="button_disabled_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
-  
-  <texture name="button_enabled_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
-  
-  <texture name="toolbar_btn_enabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> 
+  <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114"/>
 
-  <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> 
-  
-  <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> 
-  
-  <texture name="button_enabled_selected_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
-  
-  <texture name="checkbox_disabled_false.tga"	preload="true"/>
-  <texture name="checkbox_disabled_true.tga"	preload="true"/>
-  <texture name="checkbox_enabled_false.tga"	preload="true"/>
-  <texture name="checkbox_enabled_true.tga"	preload="true"/>
-  
-  <texture name="close_in_blue.tga"	preload="true"/>
+  <texture name="TextField_Search_Disabled" file_name="widgets/TextField_Search_Disabled.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Off" file_name="widgets/TextField_Off.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Search_Active" file_name="widgets/TextField_Search_Active.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Search_Off" file_name="widgets/TextField_Search_Off.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Disabled" file_name="widgets/TextField_Disabled.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+
+  <texture name="PushButton_Off" file_name="widgets/PushButton_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+
+  <texture name="toolbar_btn_enabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
+  <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
+  <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
+
+  <texture name="Checkbox_Off_Disabled" file_name="widgets/Checkbox_Disabled.png" preload="true" />
+  <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" />
+  <texture name="Checkbox_Off" file_name="widgets/Checkbox_Off.png" preload="true" />
+  <texture name="Checkbox_On" file_name="widgets/Checkbox_On.png" preload="true" />
 
   <texture name="minimize_inactive.tga" preload="true"/>
-  <texture name="minimize.tga"	preload="true"/>
+  <texture name="minimize.tga" preload="true" />
   <texture name="minimize_pressed.tga"	preload="true"/>
-  
-  <texture name="radio_active_false.tga"	preload="true"/>
-  <texture name="radio_active_true.tga"	preload="true"/>
-  <texture name="radio_inactive_false.tga"	preload="true"/>
-  <texture name="radio_inactive_true.tga"	preload="true"/>
-  
-  <texture name="combobox_arrow.tga"	preload="true"/>
-  
-  <texture name="resize_handle_bottom_right_blue.tga" preload="true"/>
-  
-  <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/>
-  
+
+  <texture name="Icon_Close_Background" file_name="windows/Icon_Close_Background.png" preload="true" />
+  <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
+  <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" />
+
+  <texture name="RadioButton_Off" file_name="widgets/RadioButton_Off.png" preload="true" />
+  <texture name="RadioButton_On" file_name="widgets/RadioButton_On.png" preload="true" />
+  <texture name="RadioButton_Disabled" file_name="widgets/RadioButton_Disabled.png" preload="true" />
+  <texture name="RadioButton_On_Disabled" file_name="widgets/RadioButton_On_Disabled.png"	preload="true" />
+
+  <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Over" file_name="widgets/ComboButton_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Press" file_name="widgets/ComboButton_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+
+  <texture name="DropDown_Disabled" file_name="widgets/DropDown_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_Over" file_name="widgets/DropDown_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+
+  <texture name="Resize_Corner" file_name="windows/Resize_Corner.png" preload="true"/>
+
+  <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
+
   <texture name="rounded_square_soft.tga"	file_name="rounded_square_soft.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/>
-  
+
   <texture name="toolbar_tab.tga"	preload="true" scale.left="6" scale.top="42" scale.right="104" scale.bottom="8"/>
   <texture name="toolbar_bg.tga"	preload="true" scale.left="6" scale.top="42" scale.right="96" scale.bottom="16"/>
-  
-  <texture name="progressbar_fill.tga"	preload="true" scale.left="10" scale.top="7" scale.right="65" scale.bottom="7"/>
-  <texture name="progressbar_track.tga"	preload="true" scale.left="10" scale.top="7" scale.right="80" scale.bottom="7"/>
-  
-  <texture name="scrollbutton_down_in_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_down_out_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_left_in_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_left_out_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_right_in_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_right_out_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_up_in_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_up_out_blue.tga"	preload="true"/>
-  <texture name="spin_down_in_blue.tga"	preload="true"/>
-  <texture name="spin_down_out_blue.tga"	preload="true"/>
-  <texture name="spin_up_in_blue.tga"	preload="true"/>
-  <texture name="spin_up_out_blue.tga"	preload="true"/>
-  
-  <texture name="square_btn_32x128.tga"	preload="true" scale.left="8" scale.top="10" scale.right="120" scale.bottom="10"/>
-  <texture name="square_btn_selected_32x128.tga"	preload="true" scale.left="2" scale.top="10" scale.right="126" scale.bottom="10"/>
-  
-  <texture name="tab_bottom_blue.tga"	preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
-  <texture name="tab_bottom_selected_blue.tga"	preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
-  <texture name="tab_left.tga"	preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
-  <texture name="tab_left_selected.tga"	preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
+
+  <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="10" scale.right="48" scale.bottom="2" />
+  <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
+
+  <texture name="ScrollArrow_Down" file_name="widgets/ScrollArrow_Down.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+  <texture name="ScrollArrow_Left"	file_name="widgets/ScrollArrow_Left.png" preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+  <texture name="ScrollArrow_Right" file_name="widgets/ScrollArrow_Right.png" preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+  <texture name="ScrollArrow_Up" file_name="widgets/ScrollArrow_Up.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+
+  <texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
+  <texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
+  <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png"	preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
+  <texture name="TabTop_Left_Selected" file_name="containers/TabTop_Left_Selected.png"	preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
   <texture name="tab_top_blue.tga"	preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
   <texture name="tab_top_selected_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
-  
+
   <texture name="startup_logo.j2c" preload="true"/>
   <texture name="color_swatch_alpha.tga" preload="true"/>
 
@@ -115,7 +125,7 @@
   <texture name="inv_folder_sound.tga"/>
   <texture name="inv_folder_texture.tga"/>
   <texture name="inv_folder_trash.tga"/>
-  
+
   <texture name="inv_item_animation.tga"/>
   <texture name="inv_item_skin.tga"/>
   <texture name="inv_item_callingcard_offline.tga"/>
@@ -142,13 +152,13 @@
   <texture name="inv_item_texture.tga"/>
   <texture name="inv_item_underpants.tga"/>
   <texture name="inv_item_undershirt.tga"/>
-  
+
   <texture name="lag_status_critical.tga"/>
   <texture name="lag_status_good.tga"/>
   <texture name="lag_status_warning.tga"/>
-  
+
   <texture name="legend.tga"/>
-  
+
   <texture name="map_avatar_16.tga"/>
   <texture name="map_avatar_8.tga"/>
   <texture name="map_avatar_you_8.tga"/>
@@ -158,17 +168,17 @@
   <texture name="map_infohub.tga"/>
   <texture name="map_telehub.tga"/>
   <texture name="map_track_16.tga"/>
-  
+
   <texture name="media_icon.tga" file_name="icn_label_media.tga" />
   <texture name="music_icon.tga" file_name="icn_label_music.tga" />
   <texture name="noentrylines.j2c" use_mips="true"/>
   <texture name="noentrypasslines.j2c" use_mips="true"/>
-  
+
   <texture name="notify_tip_icon.tga"/>
   <texture name="notify_caution_icon.tga"/>
   <texture name="notify_next.png" preload="true"/>
   <texture name="notify_box_icon.tga"/>
-  
+
   <texture name="object_cone.tga"/>
   <texture name="object_cone_active.tga"/>
   <texture name="object_cube.tga"/>
@@ -199,11 +209,11 @@
   <texture name="object_tree_active.tga"/>
   <texture name="object_tube.tga"/>
   <texture name="object_tube_active.tga"/>
-  
+
   <texture name="pixiesmall.j2c" use_mips="true"/>
   <texture name="script_error.j2c" use_mips="true"/>
   <texture name="silhouette.j2c" use_mips="true"/>
-  
+
   <texture name="status_no_build.tga"/>
   <texture name="status_voice.tga"/>
   <texture name="status_buy_currency.tga"/>
@@ -214,7 +224,7 @@
   <texture name="status_health.tga"/>
   <texture name="status_no_push.tga"/>
   <texture name="status_no_scripts.tga"/>
-  
+
   <texture name="tool_dozer.tga"/>
   <texture name="tool_dozer_active.tga"/>
   <texture name="tool_zoom.tga"/>
@@ -226,7 +236,7 @@
   <texture name="icn_active-speakers-typing1.tga"/>
   <texture name="icn_active-speakers-typing2.tga"/>
   <texture name="icn_active-speakers-typing3.tga"/>
-  
+
   <texture name="icn_voice_ptt-off.tga"/>
   <texture name="icn_voice_ptt-on.tga"/>
   <texture name="icn_voice_ptt-on-lvl1.tga"/>
@@ -234,39 +244,51 @@
   <texture name="icn_voice_ptt-on-lvl3.tga"/>
   <texture name="icn_voice-call-end.tga"/>
   <texture name="icn_voice-call-start.tga"/>
-  
+
   <texture name="mute_icon.tga"/>
-  
-  <texture name="icn_slide-groove_dark.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
-  <texture name="icn_slide-highlight.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
-  <texture name="icn_slide-thumb_dark.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
-  
+
+  <texture name="SliderTrack_Horiz" file_name="widgets/SliderTrack_Horiz.png" scale.left="4" scale.top="4" scale.right="100" scale.bottom="2" />
+  <texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" />
+
+
   <texture name="icn_speaker-muted_dark.tga"/>
   <texture name="icn_speaker_dark.tga"/>
 
   <texture name="icn_voice-localchat.tga"/>
   <texture name="icn_voice-groupfocus.tga"/>
   <texture name="icn_voice-pvtfocus.tga"/>
-  
+
   <texture name="icn_media-pause.tga"/>
   <texture name="icn_media-play.tga"/>
   <texture name="icn_music-play.tga"/>
   <texture name="icn_music-pause.tga"/>
   <texture name="icn_media_web.tga" preload="true"/>
   <texture name="icn_media_movie.tga" preload="true"/>
-  
+
   <texture name="icn_chatbar.tga"/>
   <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
   <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
-  
-  <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114"/>
 
-  <texture name="flyout_btn_right_selected.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/>
-  <texture name="flyout_btn_right.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/>
-  <texture name="flyout_btn_right_disabled.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/>
-  <texture name="flyout_btn_left_selected.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/>
-  <texture name="flyout_btn_left.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/>
-  <texture name="flyout_btn_left_disabled.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/>
+  <texture name="SegmentedBtn_Left_Off" file_name="widgets/SegmentedBtn_Left_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Press" file_name="widgets/SegmentedBtn_Left_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Disabled" file_name="widgets/SegmentedBtn_Left_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Selected" file_name="widgets/SegmentedBtn_Left_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Selected_Press" file_name="widgets/SegmentedBtn_Left_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Selected_Disabled" file_name="widgets/SegmentedBtn_Left_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+
+  <texture name="SegmentedBtn_Middle_Off" file_name="widgets/SegmentedBtn_Middle_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Press" file_name="widgets/SegmentedBtn_Middle_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Disabled" file_name="widgets/SegmentedBtn_Middle_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Selected" file_name="widgets/SegmentedBtn_Middle_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Selected_Press" file_name="widgets/SegmentedBtn_Middle_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Selected_Disabled" file_name="widgets/SegmentedBtn_Middle_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+
+  <texture name="SegmentedBtn_Right_Off" file_name="widgets/SegmentedBtn_Right_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Press" file_name="widgets/SegmentedBtn_Right_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Disabled" file_name="widgets/SegmentedBtn_Right_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Selected" file_name="widgets/SegmentedBtn_Right_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Selected_Press" file_name="widgets/SegmentedBtn_Right_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Selected_Disabled" file_name="widgets/SegmentedBtn_Right_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
 
   <texture name="move_forward_out.tga" preload="true"/>
   <texture name="move_forward_in.tga" preload="true"/>
@@ -282,7 +304,7 @@
   <texture name="move_up_out.tga" preload="true"/>
   <texture name="move_down_in.tga" preload="true"/>
   <texture name="move_down_out.tga" preload="true"/>
-  
+
   <texture name="cam_rotate_out.tga" preload="true"/>
   <texture name="cam_rotate_in.tga" preload="true"/>
   <texture name="cam_zoom_out.tga" preload="true"/>
@@ -306,7 +328,7 @@
   <texture name="close_inactive_blue.tga"/>
   <texture name="closebox.tga"/>
   <texture name="icn_clear_lineeditor.tga" />
-  
+
   <texture name="up_arrow.tga" file_name="up_arrow.png"/>
   <texture name="down_arrow.tga" file_name="down_arrow.png"/>
 
@@ -321,17 +343,36 @@
   <texture name="icn_label_media.tga"/>
   <texture name="arrow_down.tga"/>
   <texture name="cloud-particle.j2c" use_mips="true"/>
-  
+
   <texture name="skin_thumbnail_default.png" preload="true" />
 
   <texture name="default_land_picture.j2c"/>
   <texture name="default_profile_picture.j2c"/>
   <texture name="locked_image.j2c"/>
-  <texture name="menu_separator" file_name="menu_separator.png"/>
+  <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
 
-  <texture name="sidebar_tab_left.tga"			preload="true" scale.left="16" scale.top="8" scale.right="112" scale.bottom="9"/>
-  <texture name="sidebar_tab_left_selected.tga"	preload="true" scale.left="16" scale.top="8" scale.right="112" scale.bottom="9"/>
+  <texture name="TaskPanel_Tab_Off" file_name="taskpanel/TaskPanel_Tab_Off.png" preload="true" scale.left="4" scale.top="29" scale.right="36" scale.bottom="4" />
+  <texture name="TaskPanel_Tab_Selected" file_name="taskpanel/TaskPanel_Tab_Selected.png" preload="true" scale.left="5" scale.top="30" scale.right="36" scale.bottom="5" />
+  <texture name="TaskPanel_BG" file_name="taskpanel/TaskPanel_BG.png" preload="true" scale.left="4" scale.top="146" scale.right="146" scale.bottom="4" />
+  <texture name="TaskPanel_Tab_Unselected" file_name="taskpanel/TaskPanel_Tab_Over.png" preload="true" scale.left="5" scale.top="30" scale.right="36" scale.bottom="5" />
+
+  <texture name="Arrow_Left_Off" file_name="navbar/Arrow_Left_Off.png" preload="true"/>
+  <texture name="Arrow_Left_Press" file_name="navbar/Arrow_Left_Press.png" preload="true"/>
+  <texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true"/>
+  <texture name="Arrow_Right_Press" file_name="navbar/Arrow_Right_Press.png" preload="true"/>
+  <texture name="Home_Off" file_name="navbar/Home_Off.png" preload="true"/>
+  <texture name="Home_Press" file_name="navbar/Home_Press.png" preload="true"/>
+  <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="true"/>
+  <texture name="Info_Press" file_name="navbar/Info_Press.png" preload="true"/>
+  <texture name="Favorite_Star_Over" file_name="navbar/Favorite_Star_Over.png" preload="true"/>
+  <texture name="History_Arrow" file_name="navbar/History_Arrow.png" preload="true"/>
+  <texture name="Search" file_name="navbar/Search.png" preload="true"/>
+  <texture name="Help_Off" file_name="navbar/Help_Off.png" preload="true"/>
+  <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="true"/>
+  
+  <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="true"/>
+  <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="true"/>
+  <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="true"/>
+  
 
-  <texture name="teleport_history_backward.tga" preload="true"/>
-  <texture name="teleport_history_forward.tga" preload="true"/>
 </textures>
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
new file mode 100644
index 0000000000..c1ee210099
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
new file mode 100644
index 0000000000..2525405f37
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
new file mode 100644
index 0000000000..2d9dba1592
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Checkbox_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
new file mode 100644
index 0000000000..beaa7bcbf6
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png
new file mode 100644
index 0000000000..bc504d130e
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
new file mode 100644
index 0000000000..5bced95a89
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Over.png b/indra/newview/skins/default/textures/widgets/Checkbox_Over.png
new file mode 100644
index 0000000000..5a7162addf
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Checkbox_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
new file mode 100644
index 0000000000..44be193678
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
new file mode 100644
index 0000000000..d0fff1b3c3
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
new file mode 100644
index 0000000000..80402458b7
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_On.png b/indra/newview/skins/default/textures/widgets/ComboButton_On.png
new file mode 100644
index 0000000000..b42cc7542e
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ComboButton_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
new file mode 100644
index 0000000000..bbc0657487
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
new file mode 100644
index 0000000000..b295752ea9
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Off.png b/indra/newview/skins/default/textures/widgets/DropDown_Off.png
new file mode 100644
index 0000000000..4764ed4ee2
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/DropDown_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png
new file mode 100644
index 0000000000..10262d3979
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/DropDown_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Press.png b/indra/newview/skins/default/textures/widgets/DropDown_Press.png
new file mode 100644
index 0000000000..16cb25cc77
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/DropDown_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ProgressBar.png b/indra/newview/skins/default/textures/widgets/ProgressBar.png
new file mode 100644
index 0000000000..edf11ac1f5
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ProgressBar.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ProgressTrack.png b/indra/newview/skins/default/textures/widgets/ProgressTrack.png
new file mode 100644
index 0000000000..bb6d9f4144
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ProgressTrack.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
new file mode 100644
index 0000000000..04e91bdaab
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Off.png b/indra/newview/skins/default/textures/widgets/PushButton_Off.png
new file mode 100644
index 0000000000..1ee0329e66
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png
new file mode 100644
index 0000000000..661d1c5611
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png
new file mode 100644
index 0000000000..064a4c4f7f
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png
new file mode 100644
index 0000000000..48e8aa2eab
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Over.png
new file mode 100644
index 0000000000..c227f07513
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png
new file mode 100644
index 0000000000..0a4a3a6ad9
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png
new file mode 100644
index 0000000000..0a4a3a6ad9
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png
new file mode 100644
index 0000000000..661d1c5611
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png
new file mode 100644
index 0000000000..064a4c4f7f
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
new file mode 100644
index 0000000000..48e8aa2eab
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
new file mode 100644
index 0000000000..a1052684b9
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
new file mode 100644
index 0000000000..c58e0305ef
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On.png b/indra/newview/skins/default/textures/widgets/RadioButton_On.png
new file mode 100644
index 0000000000..c09a2197c7
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/RadioButton_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
new file mode 100644
index 0000000000..d7d444fd0c
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png
new file mode 100644
index 0000000000..3e7d803a28
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
new file mode 100644
index 0000000000..a707e8ceb8
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Over.png b/indra/newview/skins/default/textures/widgets/RadioButton_Over.png
new file mode 100644
index 0000000000..a5c8cbe293
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/RadioButton_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
new file mode 100644
index 0000000000..33eaa14030
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png
new file mode 100644
index 0000000000..186822da43
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png
new file mode 100644
index 0000000000..605d159eaa
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png
new file mode 100644
index 0000000000..42f999a451
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png
new file mode 100644
index 0000000000..c79547dffd
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png
new file mode 100644
index 0000000000..176ffcdbb9
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png
new file mode 100644
index 0000000000..e353542ad9
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png
new file mode 100644
index 0000000000..4d245eb57a
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png
new file mode 100644
index 0000000000..dd2fceb716
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
new file mode 100644
index 0000000000..8a085aa966
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png
new file mode 100644
index 0000000000..cf78ea3924
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
new file mode 100644
index 0000000000..fc7fd93e7a
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png
new file mode 100644
index 0000000000..53587197da
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png
new file mode 100644
index 0000000000..4f31c48c02
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png
new file mode 100644
index 0000000000..f89ee3f68f
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png
new file mode 100644
index 0000000000..3b39c51a77
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png
new file mode 100644
index 0000000000..57ed79d733
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png
new file mode 100644
index 0000000000..7afb9c99c3
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png
new file mode 100644
index 0000000000..77c4224539
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png
new file mode 100644
index 0000000000..8b93dd551e
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png
new file mode 100644
index 0000000000..3f207cbea2
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png
new file mode 100644
index 0000000000..5b8878e0cb
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png
new file mode 100644
index 0000000000..379953216b
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png
new file mode 100644
index 0000000000..379953216b
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png
new file mode 100644
index 0000000000..77c4224539
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png
new file mode 100644
index 0000000000..8b93dd551e
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png
new file mode 100644
index 0000000000..3f207cbea2
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
new file mode 100644
index 0000000000..deb87c8489
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png
new file mode 100644
index 0000000000..220df9db25
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png
new file mode 100644
index 0000000000..5bbcdcb0b4
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png
new file mode 100644
index 0000000000..dde367f05e
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png
new file mode 100644
index 0000000000..d4f30b9adb
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
new file mode 100644
index 0000000000..ca7027da91
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
new file mode 100644
index 0000000000..220df9db25
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png
new file mode 100644
index 0000000000..5bbcdcb0b4
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
new file mode 100644
index 0000000000..dde367f05e
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png
new file mode 100644
index 0000000000..8e6b9c8c6f
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png
new file mode 100644
index 0000000000..b1521199ff
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png
new file mode 100644
index 0000000000..467c43fc90
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png
new file mode 100644
index 0000000000..2049736897
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png
new file mode 100644
index 0000000000..1574f48b28
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png
new file mode 100644
index 0000000000..2717e7d7b0
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png
new file mode 100644
index 0000000000..3883518033
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png
new file mode 100644
index 0000000000..3883518033
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png
new file mode 100644
index 0000000000..ab31f6ded7
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png
new file mode 100644
index 0000000000..2049736897
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png
new file mode 100644
index 0000000000..1574f48b28
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
new file mode 100644
index 0000000000..b627232012
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
new file mode 100644
index 0000000000..b627232012
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png
new file mode 100644
index 0000000000..b6f900d3bd
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
new file mode 100644
index 0000000000..7081f9cfe0
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
new file mode 100644
index 0000000000..232006ee5a
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png differ
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png
new file mode 100644
index 0000000000..cd002b3973
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png differ
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Active.png
new file mode 100644
index 0000000000..ca6daab4e0
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/TextField_Active.png differ
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png
new file mode 100644
index 0000000000..3d205a3f2e
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Off.png
new file mode 100644
index 0000000000..911d907acc
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/TextField_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png
new file mode 100644
index 0000000000..fa79cb6260
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png differ
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png
new file mode 100644
index 0000000000..8b504af101
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png
new file mode 100644
index 0000000000..862b13d219
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png differ
diff --git a/indra/newview/skins/default/textures/windows/Flyout.png b/indra/newview/skins/default/textures/windows/Flyout.png
new file mode 100644
index 0000000000..5596b194c9
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Flyout.png differ
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Pointer.png b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png
new file mode 100644
index 0000000000..69fc08ceaa
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
new file mode 100644
index 0000000000..fb59f2e61e
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png
new file mode 100644
index 0000000000..7177c803b0
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png
new file mode 100644
index 0000000000..ecf01c617a
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png
new file mode 100644
index 0000000000..cadd6bc8ce
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png
new file mode 100644
index 0000000000..08f8cfc3d4
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png
new file mode 100644
index 0000000000..db74b93afd
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png
new file mode 100644
index 0000000000..1032e45f7e
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png
new file mode 100644
index 0000000000..01dbde102b
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png
new file mode 100644
index 0000000000..6614bdd165
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png
new file mode 100644
index 0000000000..d790cf57ef
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png
new file mode 100644
index 0000000000..fdae4b75f6
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png differ
diff --git a/indra/newview/skins/default/textures/windows/Resize_Corner.png b/indra/newview/skins/default/textures/windows/Resize_Corner.png
new file mode 100644
index 0000000000..16ed63e428
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Resize_Corner.png differ
diff --git a/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png
new file mode 100644
index 0000000000..78b137cdaf
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png differ
diff --git a/indra/newview/skins/default/textures/windows/Toast_Over.png b/indra/newview/skins/default/textures/windows/Toast_Over.png
new file mode 100644
index 0000000000..807e8e553c
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Toast_Over.png differ
diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png
new file mode 100644
index 0000000000..e9f15e76b9
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Window_Background.png differ
diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png
new file mode 100644
index 0000000000..e76e9f3c79
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Window_Foreground.png differ
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index cef204eb5f..8084d2427e 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -1,5 +1,633 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Bauen">
+	<button label="" label_selected="" name="button focus" tool_tip="Fokus"/>
+	<button label="" label_selected="" name="button move" tool_tip="Verschieben"/>
+	<button label="" label_selected="" name="button edit" tool_tip="Bearbeiten"/>
+	<button label="" label_selected="" name="button create" tool_tip="Erstellen"/>
+	<button label="" label_selected="" name="button land" tool_tip="Land"/>
+	<check_box label="Zoom" name="radio zoom"/>
+	<check_box label="Orbit (Strg)" name="radio orbit"/>
+	<check_box label="Schwenken (Strg-Umschalt)" name="radio pan"/>
+	<check_box label="Verschieben" name="radio move"/>
+	<check_box label="Heben (Strg)" name="radio lift"/>
+	<check_box label="Rotieren (Strg-Umschalt)" name="radio spin"/>
+	<check_box label="Position" name="radio position"/>
+	<check_box label="Drehen (Strg)" name="radio rotate"/>
+	<check_box label="Dehnen (Strg-Umschalt)" name="radio stretch"/>
+	<check_box label="Textur auswählen" name="radio select face"/>
+	<check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/>
+	<text name="text ruler mode">
+		Lineal:
+	</text>
+	<combo_box name="combobox grid mode">
+		<combo_item name="World">
+			Welt
+		</combo_item>
+		<combo_item name="Local">
+			Lokal
+		</combo_item>
+		<combo_item name="Reference">
+			Referenz
+		</combo_item>
+	</combo_box>
+	<check_box label="Beide Seiten dehnen" name="checkbox uniform"/>
+	<check_box label="Texturen dehnen" name="checkbox stretch textures"/>
+	<check_box label="Raster verwenden" name="checkbox snap to grid"/>
+	<button label="Optionen..." label_selected="Optionen..." name="Options..."/>
+	<text name="text status">
+		Zum Verschieben ziehen, zum Kopieren Umschalttaste-Ziehen
+	</text>
+	<button label="" label_selected="" name="ToolCube" tool_tip="Würfel"/>
+	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
+	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
+	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraeder"/>
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="Zylinder"/>
+	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Halbzylinder"/>
+	<button label="" label_selected="" name="ToolCone" tool_tip="Kegel"/>
+	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Halbkegel"/>
+	<button label="" label_selected="" name="ToolSphere" tool_tip="Kugel"/>
+	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Halbkugel"/>
+	<button label="" label_selected="" name="ToolTorus" tool_tip="Torus"/>
+	<button label="" label_selected="" name="ToolTube" tool_tip="Rohr"/>
+	<button label="" label_selected="" name="ToolRing" tool_tip="Ring"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="Baum"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Gras"/>
+	<check_box label="Auswahl behalten" name="checkbox sticky"/>
+	<check_box label="Auswahl kopieren" name="checkbox copy selection"/>
+	<check_box label="Zentrieren" name="checkbox copy centers"/>
+	<check_box label="Drehen" name="checkbox copy rotates"/>
+	<check_box label="Land auswählen" name="radio select land"/>
+	<check_box label="Einebnen" name="radio flatten"/>
+	<check_box label="Anheben" name="radio raise"/>
+	<check_box label="Absenken" name="radio lower"/>
+	<check_box label="Glätten" name="radio smooth"/>
+	<check_box label="Aufrauen" name="radio noise"/>
+	<check_box label="Zurücksetzen" name="radio revert"/>
+	<button label="Übernehmen" label_selected="Übernehmen" name="button apply to selection" tool_tip="Ausgewähltes Land ändern"/>
+	<text name="Bulldozer:">
+		Planierraupe:
+	</text>
+	<text name="Dozer Size:">
+		Größe
+	</text>
+	<text name="Strength:">
+		Stärke
+	</text>
+	<text name="obj_count">
+		Ausgewählte Objekte: [COUNT]
+	</text>
+	<text name="prim_count">
+		Primitive: [COUNT]
+	</text>
+	<tab_container name="Object Info Tabs">
+		<panel label="Allgemein" name="General">
+			<text name="Name:">
+				Name:
+			</text>
+			<text name="Description:">
+				Beschreibung:
+			</text>
+			<text name="Creator:">
+				Ersteller:
+			</text>
+			<text name="Creator Name">
+				Thrax Linden
+			</text>
+			<button label="Profil..." label_selected="Profil..." name="button creator profile"/>
+			<text name="Owner:">
+				Eigentümer:
+			</text>
+			<text name="Owner Name">
+				Thrax Linden
+			</text>
+			<button label="Profil..." label_selected="Profil..." name="button owner profile"/>
+			<text name="Group:">
+				Gruppe:
+			</text>
+			<text name="Group Name Proxy">
+				Die Lindens
+			</text>
+			<button label="Festlegen..." label_selected="Festlegen..." name="button set group"/>
+			<text name="Permissions:">
+				Berechtigungen:
+			</text>
+			<text name="perm_modify">
+				Sie können dieses Objekt ändern.
+			</text>
+			<check_box label="Mit Gruppe teilen" name="checkbox share with group" tool_tip="Allen Mitgliedern der zugeordneten Gruppe die Erlaubnis erteilen, Ihre Berechtigungen für dieses Objekt zu teilen und zu verwenden. Sie müssen Übereignen, um Rollenbeschränkungen zu aktivieren."/>
+			<string name="text deed continued">
+				Ãœbertragung...
+			</string>
+			<string name="text deed">
+				Ãœbertragung
+			</string>
+			<button label="Übertragung..." label_selected="Übertragung..." name="button deed" tool_tip="In der Gruppe gemeinsam verwendete Objekte können von einem Gruppenfunktionär übertragen werden."/>
+			<check_box label="Verschieben durch beliebige Personen zulassen" name="checkbox allow everyone move"/>
+			<check_box label="Kopieren durch beliebige Personen zulassen" name="checkbox allow everyone copy"/>
+			<check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
+			<check_box label="Zu verkaufen" name="checkbox for sale"/>
+			<text name="Cost">
+				Preis:L$
+			</text>
+			<radio_group name="sale type">
+				<radio_item name="Original">
+					Original
+				</radio_item>
+				<radio_item name="Copy">
+					Kopieren
+				</radio_item>
+				<radio_item name="Contents">
+					Inhalt
+				</radio_item>
+			</radio_group>
+			<text name="Next owner can:">
+				Nächster Eigentümer kann:
+			</text>
+			<check_box label="Ändern" name="checkbox next owner can modify"/>
+			<check_box label="Kopieren" name="checkbox next owner can copy"/>
+			<check_box label="Wiederverkaufen" name="checkbox next owner can transfer"/>
+			<text name="label click action">
+				Bei Linksklicken:
+			</text>
+			<combo_box name="clickaction">
+				<combo_item name="Touch/grab(default)">
+					Berühren/Greifen (Standard)
+				</combo_item>
+				<combo_item name="Sitonobject">
+					Auf Objekt sitzen
+				</combo_item>
+				<combo_item name="Buyobject">
+					Objekt kaufen
+				</combo_item>
+				<combo_item name="Payobject">
+					Objekt bezahlen
+				</combo_item>
+				<combo_item name="Open">
+					Öffnen
+				</combo_item>
+				<combo_item name="Play">
+					Parzellenmedien wiedergeben
+				</combo_item>
+				<combo_item name="Opemmedia">
+					Parzellenmedien öffnen
+				</combo_item>
+			</combo_box>
+			<text name="B:">
+				B:
+			</text>
+			<text name="O:">
+				O;
+			</text>
+			<text name="G:">
+				G:
+			</text>
+			<text name="E:">
+				E:
+			</text>
+			<text name="N:">
+				N:
+			</text>
+			<text name="F:">
+				F:
+			</text>
+			<string name="text modify info 1">
+				Sie können dieses Objekt ändern.
+			</string>
+			<string name="text modify info 2">
+				Sie können diese Objekte ändern.
+			</string>
+			<string name="text modify info 3">
+				Sie können dieses Objekt nicht ändern.
+			</string>
+			<string name="text modify info 4">
+				Sie können diese Objekte nicht ändern.
+			</string>
+			<string name="text modify warning">
+				Gesamtes Objekt muss gewählt werden, um Berechtigungen festzulegen.
+			</string>
+			<string name="Cost Default">
+				Preis:L$
+			</string>
+			<string name="Cost Total">
+				Summe:L$
+			</string>
+			<string name="Cost Per Unit">
+				Stückpreis:L$
+			</string>
+			<string name="Cost Mixed">
+				Mischpreis
+			</string>
+			<string name="Sale Mixed">
+				Mischverkauf
+			</string>
+		</panel>
+		<panel label="Objekt" name="Object">
+			<text name="select_single">
+				Wählen Sie nur ein Primitivum aus, um Parameter zu bearbeiten.
+			</text>
+			<text name="edit_object">
+				Objektparameter bearbeiten:
+			</text>
+			<check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/>
+			<check_box label="Physisch" name="Physical Checkbox Ctrl" tool_tip="Gestattet, das Objekt geschoben und von Schwerkraft beeinflusst wird"/>
+			<check_box label="Temporär" name="Temporary Checkbox Ctrl" tool_tip="Verursacht, dass Objekt 1 Minute nach Erstellung gelöscht wird."/>
+			<check_box label="Phantom" name="Phantom Checkbox Ctrl" tool_tip="Verursacht, dass Objekt nicht mit anderen Objekten oder Avataren kollidiert"/>
+			<text name="label position">
+				Position (Meter)
+			</text>
+			<spinner label="X" name="Pos X"/>
+			<spinner label="Y" name="Pos Y"/>
+			<spinner label="Z" name="Pos Z"/>
+			<text name="label size">
+				Größe (Meter)
+			</text>
+			<spinner label="X" name="Scale X"/>
+			<spinner label="Y" name="Scale Y"/>
+			<spinner label="Z" name="Scale Z"/>
+			<text name="label rotation">
+				Rotation (Grad)
+			</text>
+			<spinner label="X" name="Rot X"/>
+			<spinner label="Y" name="Rot Y"/>
+			<spinner label="Z" name="Rot Z"/>
+			<text name="label material">
+				Material
+			</text>
+			<combo_box name="material">
+				<combo_item name="Stone">
+					Stein
+				</combo_item>
+				<combo_item name="Metal">
+					Metall
+				</combo_item>
+				<combo_item name="Glass">
+					Glas
+				</combo_item>
+				<combo_item name="Wood">
+					Holz
+				</combo_item>
+				<combo_item name="Flesh">
+					Fleisch
+				</combo_item>
+				<combo_item name="Plastic">
+					Kunststoff
+				</combo_item>
+				<combo_item name="Rubber">
+					Gummi
+				</combo_item>
+			</combo_box>
+			<text name="label basetype">
+				Bausteintyp
+			</text>
+			<combo_box name="comboBaseType">
+				<combo_item name="Box">
+					Quader
+				</combo_item>
+				<combo_item name="Cylinder">
+					Zylinder
+				</combo_item>
+				<combo_item name="Prism">
+					Prisma
+				</combo_item>
+				<combo_item name="Sphere">
+					Kugel
+				</combo_item>
+				<combo_item name="Torus">
+					Torus
+				</combo_item>
+				<combo_item name="Tube">
+					Rohr
+				</combo_item>
+				<combo_item name="Ring">
+					Ring
+				</combo_item>
+				<combo_item name="Sculpted">
+					Geformt
+				</combo_item>
+			</combo_box>
+			<text name="text cut">
+				Pfadschnitt Beginn und Ende
+			</text>
+			<spinner label="B" name="cut begin"/>
+			<spinner label="E" name="cut end"/>
+			<text name="text hollow">
+				Hohl
+			</text>
+			<text name="text skew">
+				Versatz
+			</text>
+			<spinner name="Scale 1"/>
+			<spinner name="Skew"/>
+			<text name="Hollow Shape">
+				Hohlform
+			</text>
+			<combo_box name="hole">
+				<combo_item name="Default">
+					Standard
+				</combo_item>
+				<combo_item name="Circle">
+					Kreis
+				</combo_item>
+				<combo_item name="Square">
+					Quadrat
+				</combo_item>
+				<combo_item name="Triangle">
+					Dreieck
+				</combo_item>
+			</combo_box>
+			<text name="text twist">
+				Torsion
+			</text>
+			<spinner label="B" name="Twist Begin"/>
+			<spinner label="E" name="Twist End"/>
+			<text name="scale_taper">
+				Verjüngung
+			</text>
+			<text name="scale_hole">
+				Lochgröße
+			</text>
+			<spinner label="X" name="Taper Scale X"/>
+			<spinner label="Y" name="Taper Scale Y"/>
+			<text name="text topshear">
+				Verscherung
+			</text>
+			<spinner label="X" name="Shear X"/>
+			<spinner label="Y" name="Shear Y"/>
+			<text name="advanced_cut">
+				Profilschnitt-Beginn und Ende
+			</text>
+			<text name="advanced_dimple">
+				Vertiefung-Beginn und Ende
+			</text>
+			<text name="advanced_slice">
+				Anfang/Ende abschneiden
+			</text>
+			<spinner label="B" name="Path Limit Begin"/>
+			<spinner label="E" name="Path Limit End"/>
+			<text name="text taper2">
+				Verjüngung
+			</text>
+			<spinner label="X" name="Taper X"/>
+			<spinner label="Y" name="Taper Y"/>
+			<text name="text radius delta">
+				Radius
+			</text>
+			<text name="text revolutions">
+				Umdrehungen
+			</text>
+			<spinner name="Radius Offset"/>
+			<texture_picker label="Textur für gestaltetes 
+Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+			<check_box label="Spiegeln" name="sculpt mirror control" tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln."/>
+			<check_box label="Wenden" name="sculpt invert control" tool_tip="Dreht die Normalen des geformten Primitivs von innen nach außen."/>
+			<text name="label sculpt type">
+				Naht
+			</text>
+			<combo_box name="sculpt type control">
+				<combo_item name="None">
+					(keiner)
+				</combo_item>
+				<combo_item name="Sphere">
+					Kugel
+				</combo_item>
+				<combo_item name="Torus">
+					Torus
+				</combo_item>
+				<combo_item name="Plane">
+					Fläche
+				</combo_item>
+				<combo_item name="Cylinder">
+					Zylinder
+				</combo_item>
+			</combo_box>
+		</panel>
+		<panel label="Eigenschaften" name="Features">
+			<text name="select_single">
+				Wählen Sie nur einen einzelnen Baustein aus, um Eigenschaften zu bearbeiten.
+			</text>
+			<text name="edit_object">
+				Objekteigenschaften bearbeiten:
+			</text>
+			<check_box label="Flexibler Weg" name="Flexible1D Checkbox Ctrl" tool_tip="Gestattet, dass Objekt um die Z-Achse gebogen wird. (nur Client-Seite)"/>
+			<spinner label="Weichheit" name="FlexNumSections"/>
+			<spinner label="Schwerkraft" name="FlexGravity"/>
+			<spinner label="Ziehen" name="FlexFriction"/>
+			<spinner label="Wind" name="FlexWind"/>
+			<spinner label="Spannung" name="FlexTension"/>
+			<spinner label="Erzwingen X" name="FlexForceX"/>
+			<spinner label="Erzwingen Y" name="FlexForceY"/>
+			<spinner label="Erzwingen Z" name="FlexForceZ"/>
+			<check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Verursacht, dass Objekt Licht emittiert"/>
+			<text name="label color">
+				Farbe
+			</text>
+			<color_swatch label="" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/>
+			<spinner label="Intensität" name="Light Intensity"/>
+			<spinner label="Radius" name="Light Radius"/>
+			<spinner label="Abnehmend" name="Light Falloff"/>
+		</panel>
+		<panel label="Textur" name="Texture">
+			<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
+			<color_swatch label="Farbe" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/>
+			<text name="color trans">
+				Transparenz %
+			</text>
+			<text name="glow label">
+				Leuchten
+			</text>
+			<check_box label="Ganz hell" name="checkbox fullbright"/>
+			<text name="tex gen">
+				Zuordnung
+			</text>
+			<combo_box name="combobox texgen">
+				<combo_item name="Default">
+					Standard
+				</combo_item>
+				<combo_item name="Planar">
+					Eben
+				</combo_item>
+			</combo_box>
+			<text name="label shininess">
+				Glanz
+			</text>
+			<combo_box name="combobox shininess">
+				<combo_item name="None">
+					Kein
+				</combo_item>
+				<combo_item name="Low">
+					Niedrig
+				</combo_item>
+				<combo_item name="Medium">
+					Mittel
+				</combo_item>
+				<combo_item name="High">
+					Hoch
+				</combo_item>
+			</combo_box>
+			<text name="label bumpiness">
+				Holprigkeit
+			</text>
+			<combo_box name="combobox bumpiness">
+				<combo_item name="None">
+					Keine
+				</combo_item>
+				<combo_item name="Brightness">
+					Helligkeit
+				</combo_item>
+				<combo_item name="Darkness">
+					Dunkelheit
+				</combo_item>
+				<combo_item name="woodgrain">
+					Holzmaserung
+				</combo_item>
+				<combo_item name="bark">
+					Rinde
+				</combo_item>
+				<combo_item name="bricks">
+					Ziegel
+				</combo_item>
+				<combo_item name="checker">
+					Karo
+				</combo_item>
+				<combo_item name="concrete">
+					Beton
+				</combo_item>
+				<combo_item name="crustytile">
+					verkrustete Fliesen
+				</combo_item>
+				<combo_item name="cutstone">
+					Steinplatten
+				</combo_item>
+				<combo_item name="discs">
+					Scheiben
+				</combo_item>
+				<combo_item name="gravel">
+					Kies
+				</combo_item>
+				<combo_item name="petridish">
+					Petrischale
+				</combo_item>
+				<combo_item name="siding">
+					Verkleidung
+				</combo_item>
+				<combo_item name="stonetile">
+					Steinfliesen
+				</combo_item>
+				<combo_item name="stucco">
+					Stuck
+				</combo_item>
+				<combo_item name="suction">
+					Saugen
+				</combo_item>
+				<combo_item name="weave">
+					gewoben
+				</combo_item>
+			</combo_box>
+			<text name="tex scale">
+				Wiederholungen
+			</text>
+			<spinner label="Horizontal (U)" name="TexScaleU"/>
+			<check_box label="Umkehren" name="checkbox flip s"/>
+			<spinner label="Vertikal (V)" name="TexScaleV"/>
+			<check_box label="Umkehren" name="checkbox flip t"/>
+			<text name="tex rotate">
+				Rotation (Grad)
+			</text>
+			<string name="string repeats per meter">
+				Kacheln pro Meter
+			</string>
+			<string name="string repeats per face">
+				Wiederholungen pro Fläche
+			</string>
+			<text name="rpt">
+				Kacheln pro Meter
+			</text>
+			<button label="Ãœbernehmen" label_selected="Ãœbernehmen" name="button apply"/>
+			<text name="tex offset">
+				Versatz
+			</text>
+			<spinner label="Horizontal (U)" name="TexOffsetU"/>
+			<spinner label="Vertikal (V)" name="TexOffsetV"/>
+			<text name="textbox autofix">
+				Medientextur ausrichten
+(zuerst laden)
+			</text>
+			<button label="Ausrichten" label_selected="Ausrichten" name="button align"/>
+		</panel>
+		<panel label="Inhalt" name="Contents">
+			<button label="Neues Skript" label_selected="Neues Skript..." name="button new script"/>
+			<button label="Berechtigungen..." name="button permissions"/>
+		</panel>
+	</tab_container>
+	<panel name="land info panel">
+		<text name="label_parcel_info">
+			Parzelleninformation
+		</text>
+		<text name="label_area_price">
+			Preis: L$ [PRICE] für [AREA] m2.
+		</text>
+		<text name="label_area">
+			Fläche: [AREA] m2
+		</text>
+		<button label="Info zu Land..." label_selected="Info zu Land..." name="button about land"/>
+		<check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Parzellen nach Eigentümer farbig kennzeichnen"/>
+		<button label="?" label_selected="?" name="button show owners help"/>
+		<text name="label_parcel_modify">
+			Parzelle ändern
+		</text>
+		<button label="Unterteilen..." label_selected="Unterteilen..." name="button subdivide land"/>
+		<button label="Zusammenlegen" label_selected="Zusammenlegen" name="button join land"/>
+		<text name="label_parcel_trans">
+			Land-Transaktionen
+		</text>
+		<button label="Land kaufen..." label_selected="Land kaufen..." name="button buy land"/>
+		<button label="Land aufgeben..." label_selected="Land aufgeben..." name="button abandon land"/>
+	</panel>
+	<string name="status_rotate">
+		An den farbigen Bändern ziehen, um das Objekt zu drehen
+	</string>
+	<string name="status_scale">
+		Klicken und ziehen, um die ausgewählte Seite zu dehnen
+	</string>
+	<string name="status_move">
+		Maus verschiebt, Umschalt-Taste und Maus kopiert
+	</string>
+	<string name="status_modifyland">
+		Klicken und halten, um das Land zu bearbeiten
+	</string>
+	<string name="status_camera">
+		Klicken und ziehen, um die Ansicht zu ändern
+	</string>
+	<string name="status_grab">
+		Ziehen, um Objekte zu verschieben, Strg zum Heben, Strg-Umschalt zum Drehen
+	</string>
+	<string name="status_place">
+		Inworld klicken, um zu bauen.
+	</string>
+	<string name="status_selectland">
+		Klicken und ziehen, um Land auszuwählen
+	</string>
+	<string name="grid_screen_text">
+		Bildschirm
+	</string>
+	<string name="grid_local_text">
+		Lokal
+	</string>
+	<string name="grid_world_text">
+		Welt
+	</string>
+	<string name="grid_reference_text">
+		Referenz
+	</string>
+	<string name="grid_attachment_text">
+		Anhang
+	</string>
+</floater>
+
+<!-- original file
+
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="toolbox floater" title="" short_title="Bauen">
 	<button label="" label_selected="" name="button focus" tool_tip="Fokus"/>
 	<button label="" label_selected="" name="button move" tool_tip="Verschieben"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Bearbeiten"/>
@@ -623,3 +1251,5 @@ Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild
 		Anhang
 	</string>
 </floater>
+
+-->
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index ce19248755..2ce40e5787 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -5,6 +5,89 @@
 diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, 
 allgemeine Gruppeneinstellungen und Mitgliederoptionen.
 
+Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
+	</string>
+	<string name="group_info_unchanged">
+		Die allgemeine Gruppeninfo wurde geändert.
+	</string>
+	<button label="?" label_selected="?" name="help_button"/>
+	<line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor"/>
+	<text name="group_name">
+		Neuen Gruppennamen hier eingeben
+	</text>
+	<text name="prepend_founded_by">
+		Gegründet von
+	</text>
+	<text left_delta="79" name="founder_name">
+		(wartet)
+	</text>
+	<text name="group_charter_label">
+		Gruppencharta
+	</text>
+	<texture_picker label="Gruppeninsignien" name="insignia" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+	<text_editor name="charter">
+		Gruppencharta
+	</text_editor>
+	<button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/>
+	<button label="Detailansicht" label_selected="Detailansicht" name="info_button"/>
+	<text name="text_owners_and_visible_members">
+		Eigentümer und sichtbare Mitglieder
+	</text>
+	<text name="text_owners_are_shown_in_bold">
+		(Eigentümer werden fettgedruckt angezeigt)
+	</text>
+	<name_list name="visible_members">
+		<column label="Mitgliedsname" name="name" relwidth="0.40"/>
+		<column label="Titel" name="title" relwidth="0.25"/>
+		<column label="Letzte Anmeldung" name="online" relwidth="0.35"/>
+	</name_list>
+	<text name="text_group_preferences">
+		Gruppeneinstellungen
+	</text>
+	<panel name="preferences_container">
+		<check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/>
+		<check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/>
+		<check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen."/>
+		<spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
+		<combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe „Mature“ sind.">
+			<combo_item name="select_mature">
+				- Mature wählen -
+			</combo_item>
+			<combo_item name="mature">
+				Mature-Inhalt
+			</combo_item>
+			<combo_item name="pg">
+				PG-Inhalt
+			</combo_item>
+		</combo_box>
+		<panel name="title_container">
+			<text name="active_title_label">
+				Mein aktiver Titel
+			</text>
+			<combo_box name="active_title" tool_tip="Legt fest, was im Namensschild Ihres Avatars angezeigt wird, wenn diese Gruppe aktiviert ist."/>
+		</panel>
+		<check_box label="Gruppenmitteilungen erhalten" name="receive_notices" tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können.  Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten."/>
+		<check_box label="Gruppe im Profil anzeigen" name="list_groups_in_profile" tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird"/>
+	</panel>
+	<string name="incomplete_member_data_str">
+		Mitgliedsdaten werden abgerufen
+	</string>
+	<string name="confirm_group_create_str">
+		Die Gründung dieser Gruppe kostet 100 L$. 
+Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gruppe ausgeben möchten?
+Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein.
+	</string>
+</panel>
+
+<!-- original file
+
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Allgemein" name="general_tab">
+	<string name="help_text">
+		Die Registerkarte „Allgemein“ enthält Informationen über
+diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, 
+allgemeine Gruppeneinstellungen und Mitgliederoptionen.
+
 Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
 	</string>
 	<string name="group_info_unchanged">
@@ -78,3 +161,5 @@ Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gr
 Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein.
 	</string>
 </panel>
+
+-->
diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
index c038d97822..e2e30b7479 100644
--- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
@@ -1,3 +1,87 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Land und L$" name="land_money_tab">
+	<string name="help_text">
+		Parzellen in Gruppenbesitz werden zusammen mit Beitragsdetails angezeigt. Ein Warnhinweis wird angezeigt, solange der Wert für das insgesamt verwendete Land gleich oder weniger ist als der Gesamtbeitrag. Die Registerkarten „Planung“, „Details“ und „Verkäufe“ enthalten Informationen über die Gruppenfinanzen.
+	</string>
+	<button label="?" name="help_button"/>
+	<string name="cant_view_group_land_text">
+		Sie sind nicht berechtigt, Landeigentum der Gruppe anzuzeigen.
+	</string>
+	<string name="cant_view_group_accounting_text">
+		Sie sind nicht berechtigt, die Finanzinformationen der Gruppe anzuzeigen.
+	</string>
+	<string name="loading_txt">
+		Wird geladen...
+	</string>
+	<text name="group_land_heading">
+		Land in Gruppenbesitz
+	</text>
+	<scroll_list name="group_parcel_list">
+		<column label="Parzellenname" name="name"/>
+		<column label="Region" name="location"/>
+		<column label="Typ" name="type"/>
+		<column label="Gebiet" name="area"/>
+		<column label="" name="hidden"/>
+	</scroll_list>
+	<button label="Auf Karte" label_selected="Auf Karte" name="map_button"/>
+	<text name="total_contributed_land_label">
+		Gesamtbeitrag:
+	</text>
+	<text name="total_contributed_land_value">
+		[AREA] qm
+	</text>
+	<text name="total_land_in_use_label">
+		Insgesamt verwendetes Land:
+	</text>
+	<text name="total_land_in_use_value">
+		[AREA] qm
+	</text>
+	<text name="land_available_label">
+		Land verfügbar:
+	</text>
+	<text name="land_available_value">
+		[AREA] qm
+	</text>
+	<text name="your_contribution_label">
+		Ihr Beitrag:
+	</text>
+	<string name="land_contrib_error">
+		Ihr Landbeitrag kann nicht festgelegt werden.
+	</string>
+	<text name="your_contribution_max_value">
+		qm (max. [AMOUNT])
+	</text>
+	<text name="group_over_limit_text">
+		Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit das verwendete Land gehalten werden kann.
+	</text>
+	<text name="group_money_heading">
+		Gruppen-L$
+	</text>
+	<tab_container name="group_money_tab_container">
+		<panel label="Planung" name="group_money_planning_tab">
+			<text_editor name="group_money_planning_text">
+				Wird berechnet...
+			</text_editor>
+		</panel>
+		<panel label="Details" name="group_money_details_tab">
+			<text_editor name="group_money_details_text">
+				Wird berechnet...
+			</text_editor>
+			<button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_details_button" tool_tip="Zurück in der Zeit"/>
+			<button label="Später &gt;" label_selected="Später &gt;" name="later_details_button" tool_tip="Weiter in der Zeit"/>
+		</panel>
+		<panel label="Verkäufe" name="group_money_sales_tab">
+			<text_editor name="group_money_sales_text">
+				Wird berechnet...
+			</text_editor>
+			<button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_sales_button" tool_tip="Zurück in der Zeit"/>
+			<button label="Später &gt;" label_selected="Später &gt;" name="later_sales_button" tool_tip="Weiter in der Zeit"/>
+		</panel>
+	</tab_container>
+</panel>
+
+<!--
+
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Land und L$" name="land_money_tab">
 	<string name="help_text">
@@ -80,3 +164,5 @@ das verwendete Land gehalten werden kann.
 		</panel>
 	</tab_container>
 </panel>
+
+-->
diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml
index 12dcbb1321..8d4afd356e 100644
--- a/indra/newview/skins/default/xui/de/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml
@@ -1,3 +1,78 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Mitteilungen" name="notices_tab">
+	<text name="help_text">
+		Mitteilungen sind eine schnelle Möglichkeit, 
+Mitglieder auf dem Laufenden zu halten und 
+Objekte im Anhang zu versenden. Mitteilungen werden
+nur an Mitglieder mit einer entsprechenden Rolle 
+gesendet. Mitteilungen können unter 
+„Allgemein“ ausgeschaltet werden.
+	</text>
+	<text name="no_notices_text">
+		Keine älteren Mitteilungen.
+	</text>
+	<button label="?" label_selected="?" name="help_button" />
+	<text name="lbl">
+		Gruppenmitteilungsarchiv
+	</text>
+	<text name="lbl2">
+		Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung, um sie anzuzeigen. Klicken Sie „Aktualisieren“, um neue Mitteilungen zu suchen. Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.
+	</text>
+	<scroll_list name="notice_list">
+		<column label="" name="icon" />
+		<column label="Thema" name="subject" />
+		<column label="Von" name="from" />
+		<column label="Datum" name="date" />
+	</scroll_list>
+	<text name="notice_list_none_found">
+		Nicht gefunden.
+	</text>
+	<button label="Neue Mitteilung" label_selected="Neue Mitteilung"
+	     name="create_new_notice" />
+	<button label="Aktualisieren" label_selected="Liste aktualisieren"
+	     name="refresh_notices" />
+	<panel label="Neue Mitteilung" name="panel_create_new_notice">
+		<text name="lbl">
+			Mitteilung schreiben
+		</text>
+		<text name="lbl2">
+			Geben Sie einen Betreff für die Mitteilung ein. Sie können der Mitteilung ein Objekt anfügen, indem Sie es aus dem Inventar in dieses Feld ziehen. Angehängte Objekte müssen kopier-und transferierbar sein. Ordner können nicht gesendet werden.
+		</text>
+		<text name="lbl3">
+			Betreff:
+		</text>
+		<text name="lbl4">
+			Nachricht:
+		</text>
+		<text name="lbl5">
+			Anhängen:
+		</text>
+		<button label="Anhang entfernen" label_selected="Anhang entfernen"
+		     name="remove_attachment" />
+		<button label="Mitteilung senden" label_selected="Mitteilung senden" name="send_notice" />
+		<panel name="drop_target"
+		     tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
+	</panel>
+	<panel label="Ältere Notiz anzeigen" name="panel_view_past_notice">
+		<text name="lbl">
+			Archivierte Mitteilung
+		</text>
+		<text name="lbl2">
+			Klicken Sie zum Senden einer Mitteilung auf „Neue Mitteilung“.
+		</text>
+		<text name="lbl3">
+			Betreff:
+		</text>
+		<text name="lbl4">
+			Nachricht:
+		</text>
+		<button label="Anlage öffnen" label_selected="Anlage öffnen" name="open_attachment" />
+	</panel>
+</panel>
+
+
+<!-- original file
+
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Mitteilungen" name="notices_tab">
 	<text name="help_text">
@@ -74,3 +149,8 @@ und transferierbar sein. Ordner können nicht gesendet werden.
 		<button label="Anlage öffnen" label_selected="Anlage öffnen" name="open_attachment" />
 	</panel>
 </panel>
+
+-->
+
+
+
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
index d4589f83e4..d7f47de46f 100644
--- a/indra/newview/skins/default/xui/de/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml
@@ -12,8 +12,165 @@
 			Mitglieder und Rollen
 		</text>
 		<text name="static2">
-			Gruppenmitgliedern werden Rollen mit Fähigkeiten zugewiesen. Diese 
-Einstellungen können zur flexibleren Organisation angepasst werden.
+			Gruppenmitgliedern werden Rollen mit Fähigkeiten zugewiesen. Diese Einstellungen können zur flexibleren Organisation angepasst werden.
+		</text>
+	</panel>
+	<panel name="roles_header">
+		<text name="static">
+			Rollen
+		</text>
+		<text name="role_properties_modifiable">
+			Wählen Sie eine Rolle. Sie können ihren Namen, ihre Beschreibung und den Mitgliedstitel ändern.
+		</text>
+		<text name="role_properties_not_modifiable">
+			Rolle anklicken um Mitglieder und Fähigkeiten anzuzeigen.
+		</text>
+		<text name="role_actions_modifiable">
+			Sie können der Rolle auch Fähigkeiten zuweisen.
+		</text>
+		<text name="role_actions_not_modifiable">
+			Sie können zugewiesene Fähigkeiten anzeigen, aber nicht bearbeiten.
+		</text>
+	</panel>
+	<panel name="actions_header">
+		<text name="static">
+			Fähigkeiten
+		</text>
+		<text name="static2">
+			Sie können Fähigkeiten-Beschreibungen anzeigen und welche Rollen bzw. Mitglieder diese Fähigkeit haben.
+		</text>
+	</panel>
+	<tab_container name="roles_tab_container">
+		<panel label="Mitglieder" name="members_sub_tab" tool_tip="Mitglieder">
+			<button label="Suchen" name="search_button"/>
+			<button label="Alle anzeigen" name="show_all_button"/>
+			<name_list name="member_list">
+				<column label="Mitgliedsname" name="name"/>
+				<column label="Ãœbertragene Landanteile" name="donated"/>
+				<column label="Letzte Anmeldung" name="online"/>
+			</name_list>
+			<button label="Neues Mitglied einladen..." name="member_invite"/>
+			<button label="Aus Gruppe werfen" name="member_eject"/>
+			<string name="help_text">
+				Sie können Mitgliedern Rollen zuweisen und entziehen.
+Drücken Sie die Strg-Taste und klicken Sie auf Namen,
+um mehrere Mitglieder auszuwählen.
+			</string>
+		</panel>
+		<panel label="Rollen" name="roles_sub_tab">
+			<button label="Suchen" name="search_button"/>
+			<button label="Alle anzeigen" name="show_all_button"/>
+			<scroll_list name="role_list">
+				<column label="Rolle" name="name"/>
+				<column label="Titel" name="title"/>
+				<column label="Mitglieder" name="members"/>
+			</scroll_list>
+			<button label="Neue Rolle erstellen..." name="role_create"/>
+			<button label="Rolle löschen" name="role_delete"/>
+			<string name="help_text">
+				Rollen haben einen Titel und umfassen bestimmte
+Fähigkeiten. Mitglieder können mehrere 
+Rollen innehaben. Eine Gruppe kann bis zu 10 Rollen
+definieren, darunter „Jeder“ und „Eigentümer“.
+			</string>
+			<string name="cant_delete_role">
+				Die Rollen „Jeder“ und „Eigentümer“ können nicht gelöscht werden.
+			</string>
+		</panel>
+		<panel label="Fähigkeiten" name="actions_sub_tab">
+			<button label="Suchen" name="search_button"/>
+			<button label="Alle anzeigen" name="show_all_button"/>
+			<scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
+				<column label="" name="icon"/>
+				<column label="" name="action"/>
+			</scroll_list>
+			<string name="help_text">
+				Fähigkeiten verleihen Mitgliedern in Rollen bestimmte
+Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
+			</string>
+		</panel>
+	</tab_container>
+	<panel name="members_footer">
+		<text name="static">
+			Rollen
+		</text>
+		<text name="static2">
+			Zulässige Fähigkeiten
+		</text>
+		<scroll_list name="member_assigned_roles">
+			<column label="" name="checkbox"/>
+			<column label="" name="role"/>
+		</scroll_list>
+		<scroll_list name="member_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
+			<column label="" name="icon"/>
+			<column label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="roles_footer">
+		<text name="static">
+			Name
+		</text>
+		<text name="static2">
+			Beschreibung
+		</text>
+		<line_editor name="role_name">
+			Angestellte
+		</line_editor>
+		<text name="static3">
+			Titel
+		</text>
+		<line_editor name="role_title">
+			(wartet)
+		</line_editor>
+		<text_editor name="role_description">
+			(wartet)
+		</text_editor>
+		<text name="static4">
+			Mitglieder in Rolle
+		</text>
+		<text name="static5" tool_tip="Eine Liste der Fähigkeiten der aktuell ausgewählten Rolle.">
+			Zulässige Fähigkeiten
+		</text>
+		<check_box label="Mitglieder sind sichtbar" name="role_visible_in_list" tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte „Allgemein“ für Personen außerhalb der Gruppe sichtbar sind."/>
+		<scroll_list name="role_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
+			<column label="" name="icon"/>
+			<column label="" name="checkbox"/>
+			<column label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="actions_footer">
+		<text name="static">
+			Beschreibung
+		</text>
+		<text_editor name="action_description">
+			Diese Fähigkeit heißt „Mitglieder aus dieser Gruppe werfen“. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden.
+		</text_editor>
+		<text name="static2">
+			Rollen mit Fähigkeit
+		</text>
+		<text name="static3">
+			Mitglieder mit Fähigkeit
+		</text>
+	</panel>
+</panel>
+
+<!-- original file
+
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Mitglieder und Rollen" name="roles_tab">
+	<string name="default_needs_apply_text">
+		Das Unterregister enthält nicht übernommene Änderungen.
+	</string>
+	<string name="want_apply_text">
+		Diese Änderungen übernehmen?
+	</string>
+	<button label="?" name="help_button"/>
+	<panel name="members_header">
+		<text name="static">
+			Mitglieder und Rollen
+		</text>
+		<text name="static2">
+			Gruppenmitgliedern werden Rollen mit Fähigkeiten zugewiesen. Diese Einstellungen können zur flexibleren Organisation angepasst werden.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -155,3 +312,5 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
 		</text>
 	</panel>
 </panel>
+
+-->
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
index 59d0d45425..2f585d5974 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -4,7 +4,7 @@
  height="556"
  layout="topleft"
  name="Animation Preview"
- width="300">
+ width="280">
     <floater.string
      name="failed_to_initialize">
         Failed to initialize motion
@@ -385,7 +385,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
      increment="0.01"
      initial_value="0"
      label="Ease In (sec)"
-     label_width="65"
+     label_width="75"
      layout="topleft"
      left="10"
      max_val="10"
@@ -399,14 +399,14 @@ Maximum animation length is [MAX_LENGTH] seconds.
      increment="0.01"
      initial_value="0"
      label="Ease Out (sec)"
-     label_width="75"
+     label_width="80"
      layout="topleft"
-     left_pad="15"
+     left_pad="10"
      max_val="10"
      name="ease_out_time"
      tool_tip="Amount of time (in seconds) over which animations blends out."
      top_delta="0"
-     width="135" />
+     width="130" />
     <button
      follows="top|right"
      height="28"
@@ -440,7 +440,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
      layout="topleft"
      left="80"
      name="playback_slider"
-     right="290"
+     right="275"
      show_text="false" />
     <text
      type="string"
@@ -461,7 +461,7 @@ We recommend BVH files exported from Poser 4.
      label="Cancel"
      layout="topleft"
      name="cancel_btn"
-     right="290"
+     right="265"
      width="123" />
     <button
      follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index cf75da078e..6d7e3a9c45 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_tear_off="false"
- height="340"
+ height="360"
  layout="topleft"
  name="floaterbulkperms"
  title="Bulk change content permissions"
- width="480">
+ width="280">
     <floater.string
      name="nothing_to_modify_text">
         Selection contains no editable contents.
@@ -242,7 +242,7 @@
      font="SansSerif"
      height="10"
      layout="topleft"
-     left="165"
+     left="140"
      name="newperms"
      top="30"
      width="206">
@@ -253,7 +253,7 @@
      height="16"
      label="Share with group"
      layout="topleft"
-     left="170"
+     left="140"
      name="share_with_group"
      top="54"
      width="106" />
@@ -303,27 +303,27 @@
      initial_value="true"
      label="Resell/Give away"
      layout="topleft"
-     left_delta="88"
+     left="145"
      name="next_owner_transfer"
-     top_delta="0"
+     top_delta="20"
      width="106" />
     <scroll_list
      enabled="false"
      follows="left|top|right|bottom"
      height="130"
      layout="topleft"
-     left="130"
+     left="120"
      name="queue output"
-     top="170"
-     width="335" />
+     top="185"
+     width="150" />
     <button
      follows="left|top"
      height="20"
      label="Apply"
      layout="topleft"
-     left="265"
+     left="65"
      name="apply"
-     top="310"
+     top_pad="10"
      width="100" />
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index 174337480a..22db78a309 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -8,7 +8,7 @@
  name="floater_buy_contents"
  save_rect="true"
  title="Buy Contents"
- width="300">
+ width="280">
     <floater.string
      name="no_copy_text">
         (no copy)
@@ -41,7 +41,7 @@
      left_delta="0"
      name="item_list"
      top_pad="4"
-     width="281">
+     width="250">
         <scroll_list.columns
          name="icon"
          width="16" />
@@ -68,7 +68,7 @@
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
-     left="216"
+     left="211"
      name="cancel_btn"
      top="224"
      width="60" />
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 44ef32ee36..499fcf5a8a 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -8,7 +8,7 @@
  name="contents"
  save_rect="true"
  title="Buy Copy of Object"
- width="300">
+ width="280">
     <floater.string
      name="title_buy_text">
         Buy
@@ -36,13 +36,13 @@
      left="15"
      name="object_list"
      top="24"
-     width="281">
+     width="250">
         <scroll_list.columns
          name="icon"
          width="16" />
         <scroll_list.columns
          name="text"
-         width="300" />
+         width="234" />
     </scroll_list>
     <text
      type="string"
@@ -54,7 +54,7 @@
      left_delta="0"
      name="contents_text"
      top_pad="4"
-     width="281">
+     width="250">
         and its contents:
     </text>
     <scroll_list
@@ -64,13 +64,13 @@
      left_delta="0"
      name="item_list"
      top_pad="4"
-     width="281">
+     width="250">
         <scroll_list.columns
          name="icon"
          width="16" />
         <scroll_list.columns
          name="text"
-         width="300" />
+         width="234" />
     </scroll_list>
     <text
      type="string"
@@ -91,7 +91,7 @@
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
-     left="216"
+     left="211"
      name="cancel_btn"
      top="224"
      width="60" />
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index c4d024ae8b..9751ae970b 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -4,10 +4,10 @@
  height="465"
  layout="topleft"
  min_height="200"
- min_width="350"
+ min_width="280"
  name="gestures"
  title="Active Gestures"
- width="350">
+ width="280">
     <floater.string
      name="loading">
         Loading...
@@ -24,7 +24,7 @@
      layout="topleft"
      left="15"
      name="help_label">
-        Double-click a gesture to play animations and sounds.
+        Double-click a gesture to play.
     </text>
     <scroll_list
      bottom_delta="390"
@@ -35,22 +35,22 @@
      left="15"
      name="gesture_list"
      right="-15">
+        <scroll_list.columns
+         label="Name"
+         name="name"
+         width="105" />
         <scroll_list.columns
          label="Trigger"
          name="trigger"
          width="70" />
-        <scroll_list.columns
-         label="Key"
-         name="shortcut"
-         width="70" />
-        <scroll_list.columns
+       <scroll_list.columns
          label=""
          name="key"
          width="-1" />
         <scroll_list.columns
-         label="Name"
-         name="name"
-         width="160" />
+         label="Key"
+         name="shortcut"
+         width="50" />
     </scroll_list>
     <button
      follows="bottom|right"
@@ -89,3 +89,4 @@
      top_delta="0"
      width="83" />
 </floater>
+
diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml
index 7493a9a90d..e8b8fee678 100644
--- a/indra/newview/skins/default/xui/en/floater_im.xml
+++ b/indra/newview/skins/default/xui/en/floater_im.xml
@@ -24,7 +24,7 @@
     </multi_floater.string>
     <multi_floater.string
      name="muted_message">
-        You have muted this resident. Sending a message will automatically unmute them.
+        You have blocked this resident. Sending a message will automatically unblock them.
     </multi_floater.string>
     <multi_floater.string
      name="generic_request_error">
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index 8bff916f9d..f07a146471 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -5,7 +5,7 @@
  layout="topleft"
  name="Inventory Finder"
  title="inventory_recent_items"
- width="160">
+ width="280">
     <icon
      height="16"
      image_name="inv_item_animation.tga"
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index 0ed4bb4e07..faf14575e4 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="383"
+ height="400"
  layout="topleft"
  name="land holdings floater"
  title="My Land"
- width="600">
+ width="280">
     <floater.string
      name="area_string">
         [AREA] sq. meters
@@ -16,23 +16,23 @@
      left="8"
      name="parcel list"
      top="24"
-     width="584">
+     width="270">
         <scroll_list.columns
-         label="Parcel Name"
+         label="Parcel"
          name="name"
-         width="163" />
+         width="69" />
         <scroll_list.columns
          label="Region"
          name="location"
-         width="175" />
+         width="74" />
         <scroll_list.columns
          label="Type"
          name="type"
-         width="140" />
+         width="55" />
         <scroll_list.columns
          label="Area"
          name="area"
-         width="87" />
+         width="10" />
         <scroll_list.columns
          label=""
          name="hidden"
@@ -40,6 +40,7 @@
     </scroll_list>
     <button
      height="20"
+     font="SansSerifSmall"
      label="Teleport"
      label_selected="Teleport"
      layout="topleft"
@@ -50,6 +51,7 @@
      width="100" />
     <button
      height="20"
+     font="SansSerifSmall"
      label="Show on Map"
      label_selected="Show on Map"
      layout="topleft"
@@ -77,15 +79,15 @@
      left_delta="-4"
      name="grant list"
      top_pad="4"
-     width="584">
+     width="270">
         <scroll_list.columns
          label="Group"
          name="group"
-         width="330" />
+         width="125" />
         <scroll_list.columns
          label="Area"
          name="area"
-         width="220" />
+         width="125" />
     </scroll_list>
     <text
      type="string"
@@ -96,8 +98,9 @@
      left_delta="4"
      name="allowed_label"
      top_pad="4"
-     width="348">
-        Allowed land holdings at current payment plan:
+     width="150">
+        Allowed land holdings at
+current payment plan:
     </text>
     <text
      type="string"
@@ -105,9 +108,9 @@
      follows="left|top"
      height="16"
      layout="topleft"
-     left_delta="340"
+     left_pad="5"
      name="allowed_text"
-     top_delta="0"
+     top_delta="10"
      width="132">
         [AREA] sq. meters
     </text>
@@ -119,8 +122,8 @@
      layout="topleft"
      left="12"
      name="current_label"
-     top="341"
-     width="348">
+     top_pad="5"
+     width="150">
         Current land holdings:
     </text>
     <text
@@ -129,7 +132,7 @@
      follows="left|top"
      height="16"
      layout="topleft"
-     left_delta="340"
+     left_pad="5"
      name="current_text"
      top_delta="0"
      width="132">
@@ -144,9 +147,10 @@
      layout="topleft"
      left="12"
      name="available_label"
-     top="361"
-     width="348">
-        Available for land purchases:
+     top_pad="5"
+     width="150">
+        Available for land
+purchases:
     </text>
     <text
      type="string"
@@ -155,10 +159,10 @@
      font="SansSerifBold"
      height="16"
      layout="topleft"
-     left_delta="340"
+     left_pad="5"
      name="available_text"
-     top_delta="0"
+     top_delta="5"
      width="140">
         [AREA] sq. meters
     </text>
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml
index 7a0ec8282c..6b6b2c80ba 100644
--- a/indra/newview/skins/default/xui/en/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml
@@ -4,7 +4,7 @@
  height="140"
  layout="topleft"
  name="mute by name"
- title="Mute object by name"
+ title="Block object by name"
  width="375">
     <text
      type="string"
@@ -18,7 +18,7 @@
      left_delta="25"
      name="message"
      right="380">
-        Mute by name only affects object chat and IM, not sounds.
+        Block by name only affects object chat and IM, not sounds.
 You must type the object&apos;s name exactly.
     </text>
     <line_editor
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 1760d5b818..55ae3ee2b0 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -48,31 +48,6 @@
         <button.commit_callback
          function="Pref.Apply" />
     </button>
-    <button
-     follows="left|bottom"
-     height="20"
-     label="About"
-     label_selected="About"
-     layout="topleft"
-     left_delta="-512"
-     name="About..."
-     top_delta="0"
-     width="90">
-        <button.commit_callback
-         function="Floater.Show"
-         parameter="sl_about" />
-    </button>
-    <button
-     follows="left|bottom"
-     height="20"
-     help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417"
-     label="Help"
-     label_selected="Help"
-     layout="topleft"
-     left_pad="3"
-     name="Help"
-     top_delta="0"
-     width="90" />
     <tab_container
      follows="left|top|right|bottom"
      height="410"
@@ -90,65 +65,115 @@
          label="General"
          layout="topleft"
          name="general" />
+        <panel
+         filename="panel_preferences_graphics1.xml"
+         label="Graphics"
+         layout="topleft"
+         name="display" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_input.xml"
-         label="Input &amp; Camera"
+         filename="panel_preferences_im.xml"
+         label="Privacy"
          layout="topleft"
-         name="input" />
+         name="im" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_network.xml"
-         label="Network"
+         filename="panel_preferences_audio.xml"
+         label="Sound"
          layout="topleft"
-         name="network" />
+         name="audio" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_web.xml"
-         label="Web"
+         filename="panel_preferences_chat.xml"
+         label="Chat"
          layout="topleft"
-         name="web" />
+         name="chat" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_graphics1.xml"
-         label="Graphics"
+         filename="panel_preferences_popups.xml"
+         label="Alerts"
          layout="topleft"
-         name="display" />
+         name="msgs" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_audio.xml"
-         label="Audio &amp; Video"
+         filename="panel_preferences_input.xml"
+         label="Setup"
          layout="topleft"
-         name="audio" />
+         name="input" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_chat.xml"
-         label="Text Chat"
+         filename="panel_preferences_advanced.xml"
+         label="Advanced"
          layout="topleft"
-         name="chat" />
+         name="input" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_voice.xml"
-         label="Voice Chat"
+         filename="panel_preferences_advanced2.xml"
+         label="Move, not to Advanced"
          layout="topleft"
-         name="voice" />
+         name="input" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_im.xml"
-         label="Communication"
+         filename="panel_preferences_advanced3.xml"
+         label="Not in specs"
          layout="topleft"
-         name="im" />
+         name="input" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_popups.xml"
-         label="Popups"
+         filename="panel_preferences_advanced4.xml"
+         label="Storage/Kill"
          layout="topleft"
-         name="msgs" />
+         name="input" />
+        <!--panel
+		 class="panel_preference"
+         filename="panel_preferences_network.xml"
+         label="Network"
+         layout="topleft"
+         name="network" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_web.xml"
+         label="Web"
+         layout="topleft"
+         name="web" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_voice.xml"
+         label="Voice Chat"
+         layout="topleft"
+         name="voice" />
         <panel
 		 class="panel_preference"
          filename="panel_preferences_skins.xml"
          label="Skins"
          layout="topleft"
-         name="skins" />
+         name="skins" /-->
     </tab_container>
+    
+        <!--button
+     follows="left|bottom"
+     height="20"
+     label="About"
+     label_selected="About"
+     layout="topleft"
+     left_delta="-512"
+     name="About..."
+     top_delta="0"
+     width="90">
+        <button.commit_callback
+         function="Floater.Show"
+         parameter="sl_about" />
+    </button-->
+    <!--bottom"
+     height="20"
+     help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417"
+     label="Help"
+     label_selected="Help"
+     layout="topleft"
+     left_pad="3"
+     name="Help"
+     top_delta="0"
+     width="90" /-->
+
+    
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
index 50aabfc895..36accdfc77 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -4,7 +4,7 @@
  height="85"
  layout="topleft"
  name="preview_anim"
- width="300">
+ width="280">
     <floater.string
      name="Title">
         Animation: [NAME]
@@ -13,14 +13,14 @@
      border_style="line"
      border_thickness="1"
      follows="left|top|right"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="19"
      layout="topleft"
      left="93"
      max_length="127"
      name="desc"
      top="19"
-     width="194" />
+     width="127" />
     <text
      type="string"
      length="1"
@@ -36,16 +36,18 @@
     </text>
     <button
      height="19"
+     font="SansSerifSmall"
      label="Play in World"
      label_selected="Stop"
      layout="topleft"
-     left="27"
+     left="20"
      name="Anim play btn"
      tool_tip="Play this animation so that others can see it."
      top="47"
      width="96" />
     <button
      height="19"
+     font="SansSerifSmall"
      label="Play Locally"
      label_selected="Stop"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 9d183d8103..a463b2274d 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  auto_tile="true"
- height="350"
+ height="400"
  layout="topleft"
  name="gesture_preview"
- width="450">
+ width="280">
     <floater.string
      name="step_anim">
         Animation to play:
@@ -41,10 +41,10 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left="16"
+     left="10"
      name="desc_label"
      top="25"
      width="100">
@@ -57,15 +57,15 @@
      left_delta="84"
      name="desc"
      top_delta="-4"
-     width="330" />
+     width="180" />
     <text
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left="16"
+     left="10"
      name="trigger_label"
      top="54"
      width="100">
@@ -79,18 +79,18 @@
      max_length="31"
      name="trigger_editor"
      top_delta="-4"
-     width="105" />
+     width="100" />
     <text
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left_pad="15"
+     left="10"
      name="replace_text"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!"
-     top_delta="4"
+     top="79"
      width="200">
         Replace with:
     </text>
@@ -98,7 +98,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="80"
+     left_delta="84"
      max_length="31"
      name="replace_editor"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
@@ -108,12 +108,12 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left="16"
+     left="10"
      name="key_label"
-     top="83"
+     top="104"
      width="100">
         Shortcut Key:
     </text>
@@ -137,12 +137,12 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left="16"
+     left="10"
      name="library_label"
-     top="112"
+     top="135"
      width="100">
         Library:
     </text>
@@ -150,10 +150,10 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left_pad="104"
+     left_pad="75"
      name="steps_label"
      top_delta="0"
      width="100">
@@ -163,10 +163,10 @@
      follows="top|left"
      height="110"
      layout="topleft"
-     left="16"
+     left="10"
      name="library_list"
-     top="132"
-     width="100">
+     top="150"
+     width="80">
         <scroll_list.rows
          value="Animation" />
         <scroll_list.rows
@@ -179,57 +179,61 @@
     <button
      follows="top|left"
      height="20"
+     font="SansSerifSmall"
      label="Add &gt;&gt;"
      layout="topleft"
      left_pad="14"
      name="add_btn"
      top_delta="0"
-     width="80" />
+     width="70" />
     <button
      follows="top|left"
      height="20"
-     label="Move Up"
+     font="SansSerifSmall"
+     label="Up"
      layout="topleft"
      left_delta="0"
      name="up_btn"
      top_pad="10"
-     width="80" />
+     width="70" />
     <button
      follows="top|left"
      height="20"
-     label="Move Down"
+     font="SansSerifSmall"
+     label="Down"
      layout="topleft"
      left_delta="0"
      name="down_btn"
      top_pad="10"
-     width="80" />
+     width="70" />
     <button
      follows="top|left"
      height="20"
+     font="SansSerifSmall"
      label="Remove"
      layout="topleft"
      left_delta="0"
      name="delete_btn"
      top_pad="10"
-     width="80" />
+     width="70" />
     <scroll_list
      follows="top|left"
      height="110"
      layout="topleft"
-     left="220"
+     left="185"
      name="step_list"
-     top="132"
-     width="210" />
+     top="150"
+     width="85" />
     <text
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="60"
      layout="topleft"
-     left="16"
+     left="10"
      name="help_label"
-     top="252"
+     top="270"
      width="200">
         All steps happen simultaneously, 
 unless you add wait steps.
@@ -238,9 +242,9 @@ unless you add wait steps.
      follows="top|left"
      height="60"
      layout="topleft"
-     left_pad="6"
+     left="10"
      name="options_text"
-     top_delta="0"
+     top="300"
      width="205" />
     <combo_box
      follows="top|left"
@@ -248,7 +252,7 @@ unless you add wait steps.
      layout="topleft"
      left_delta="10"
      name="animation_list"
-     top="272"
+     top="320"
      width="100" />
     <combo_box
      follows="top|left"
@@ -298,9 +302,9 @@ unless you add wait steps.
      height="20"
      label="until animations are done"
      layout="topleft"
-     left="232"
+     left="16"
      name="wait_anim_check"
-     top="267"
+     top="315"
      width="100" />
     <check_box
      follows="top|left"
@@ -325,10 +329,10 @@ unless you add wait steps.
      height="20"
      label="Active"
      layout="topleft"
-     left="140"
+     left="20"
      name="active_check"
      tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys.  Gestures usually become inactive when there is a key binding conflict."
-     top="323"
+     top="365"
      width="100" />
     <button
      follows="top|left"
@@ -348,4 +352,4 @@ unless you add wait steps.
      name="save_btn"
      top_delta="0"
      width="80" />
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
index 07a50ac589..19f21090ca 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
@@ -4,7 +4,7 @@
  height="85"
  layout="topleft"
  name="preview_sound"
- width="300">
+ width="280">
     <floater.string
      name="Title">
         Sound: [NAME]
@@ -16,11 +16,11 @@
      font="SansSerif"
      height="19"
      layout="topleft"
-     left="95"
+     left="85"
      max_length="127"
      name="desc"
      top="19"
-     width="192" />
+     width="127" />
     <text
      type="string"
      length="1"
@@ -28,7 +28,7 @@
      font="SansSerif"
      height="19"
      layout="topleft"
-     left_delta="-82"
+     left="10"
      name="desc txt"
      top_delta="0"
      width="80">
@@ -37,10 +37,11 @@
     <button
      follows="left|top"
      height="19"
+     font="SansSerifSmall"
      label="Play Locally"
      label_selected="Play Locally"
      layout="topleft"
-     left="168"
+     left="145"
      name="Sound audition btn"
      sound_flags="0"
      tool_tip="Play this sound so that only you can hear it."
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 48694e5fb6..a890de3e28 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -5,7 +5,7 @@
  name="regioninfo"
  save_rect="true"
  title="Region/Estate"
- width="480">
+ width="280">
     <tab_container
      bottom="512"
      follows="left|right|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 26c805c0f7..2b6f2d5dde 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_minimize="false"
- height="485"
+ height="600"
  layout="topleft"
  name="sell land"
  title="Sell Land"
- width="450">
+ width="280">
     <texture_picker
      enabled="false"
      follows="top|left"
      height="135"
      layout="topleft"
-     left="244"
+     left="50"
      name="info_image"
-     right="424"
-     top="40"
+     right="230"
+     top="20"
      width="180" />
     <text
      type="string"
      length="1"
-     bottom_delta="-144"
+     top="145"
      follows="top|left"
      layout="topleft"
      left="16"
@@ -67,13 +67,13 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifHuge"
+     font="SansSerifBig"
      height="24"
      layout="topleft"
      left="16"
      name="info_action"
      text_color="white"
-     top="141"
+     top="190"
      width="200">
         To sell this parcel:
     </text>
@@ -84,14 +84,14 @@
      layout="topleft"
      left="0"
      name="step_price"
-     top="167"
+     top="211"
      width="64" />
     <text
      type="string"
      length="1"
      bottom_delta="-38"
      follows="top|left"
-     font="SansSerifBig"
+     font="SansSerif"
      height="16"
      layout="topleft"
      left="72"
@@ -108,7 +108,7 @@
      left="72"
      name="price_text"
      right="-20">
-        Choose an appropriate price for this land.
+        Choose an appropriate price.
     </text>
     <text
      type="string"
@@ -137,9 +137,9 @@
      length="1"
      height="16"
      layout="topleft"
-     left_pad="10"
+     left="72"
      name="price_per_m"
-     top_delta="0"
+     top_delta="25"
      width="200">
         (L$[PER_METER] per square meter)
     </text>
@@ -156,7 +156,7 @@
      length="1"
      bottom_delta="-38"
      follows="top|left"
-     font="SansSerifBig"
+     font="SansSerif"
      height="16"
      layout="topleft"
      left="72"
@@ -173,7 +173,8 @@
      left="72"
      name="sell_to_text"
      right="-20">
-        Choose whether to sell to anyone or a particular buyer.
+        Choose whether to sell to anyone
+or a particular buyer.
     </text>
     <combo_box
      follows="top|right"
@@ -181,8 +182,8 @@
      layout="topleft"
      left_delta="0"
      name="sell_to"
-     top_delta="16"
-     width="140">
+     top_delta="32"
+     width="130">
         <combo_box.item
          enabled="false"
          label="select one --"
@@ -202,10 +203,11 @@
      left_delta="0"
      name="sell_to_agent"
      top_pad="4"
-     width="150" />
+     width="130" />
     <button
      height="16"
-     label="Select..."
+     font="SansSerifSmall"
+     label="Select"
      layout="topleft"
      left_pad="5"
      name="sell_to_select_agent"
@@ -224,7 +226,7 @@
      length="1"
      bottom_delta="-38"
      follows="top|left"
-     font="SansSerifBig"
+     font="SansSerif"
      height="16"
      layout="topleft"
      left="72"
@@ -235,16 +237,18 @@
     <text
      type="string"
      length="1"
+     font="SansSerifSmall"
      bottom_delta="20"
      follows="top|left"
      height="16"
      layout="topleft"
      left="72"
      name="sell_objects_text">
-        Land owner&apos;s transferable objects on parcel will change ownership.
+        Land owner&apos;s transferable objects
+on parcel will change ownership.
     </text>
     <radio_group
-     bottom_delta="44"
+     top_pad="15"
      follows="top|right"
      height="40"
      layout="topleft"
@@ -275,21 +279,22 @@
     </radio_group>
     <button
      height="16"
+     font="SansSerifSmall"
      label="Show Objects"
      layout="topleft"
      name="show_objects"
-     right="414"
-     top="393"
+     left="100"
+     top_pad="10"
      width="110" />
     <text
      type="string"
      length="1"
-     bottom_delta="35"
+     bottom_delta="30"
      follows="top|left"
      font="SansSerifBig"
      height="16"
      layout="topleft"
-     left="72"
+     left="16"
      name="nag_message_label"
      right="-20">
         REMEMBER: All sales are final.
@@ -297,19 +302,21 @@
     <button
      follows="bottom|left"
      height="20"
+     font="SansSerifSmall"
      label="Set Land For Sale"
      layout="topleft"
      left_delta="0"
      name="sell_btn"
-     top_pad="15"
+     top_pad="10"
      width="130" />
     <button
      follows="bottom|right"
      height="20"
+     font="SansSerifSmall"
      label="Cancel"
      layout="topleft"
-     left_pad="152"
+     left_pad="30"
      name="cancel_btn"
      top_delta="0"
      width="90" />
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
index bcec046456..ef9aef7f6f 100644
--- a/indra/newview/skins/default/xui/en/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
@@ -4,7 +4,7 @@
  layout="topleft"
  name="telehub"
  title="Telehub"
- width="272">
+ width="280">
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
index 5a17ffefac..021474d7ab 100644
--- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
@@ -69,15 +69,4 @@
      name="font_checkbox"
      top_pad="14"
      width="150" />
-    <check_box
-     height="16"
-     label="Custom Button"
-     layout="topleft"
-     left_delta="0"
-     name="check_button_checkbox"
-     top_pad="14"
-     width="150">
-        <check_box.check_button
-         image_unselected="close_in_blue.tga" />
-    </check_box>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
new file mode 100644
index 0000000000..21956c2eac
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ height="200"
+ layout="topleft"
+ name="floater_test_navigation_bar"
+ width="900">
+  <panel
+    name="navigation_bar"
+    filename="panel_navigation_bar.xml"
+    left="10"
+    right="-10" 
+    top="30"
+    height="100"
+    border="true"
+      />           
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 17b73b47ab..83cbbd410b 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- follows="left|top"
- height="550"
+ follows="left|top|right"
+ height="615"
  layout="topleft"
  name="toolbox floater"
  save_rect="true"
- short_title="Build"
+ short_title="Build Tools"
  single_instance="true"
  sound_flags="0"
- width="272">
+ width="280">
     <floater.string
      name="status_rotate">
         Drag colored bands to rotate object
@@ -69,11 +69,10 @@
      image_selected="tool_zoom_active.tga"
      image_unselected="tool_zoom.tga"
      layout="topleft"
-     left="4"
+     left="10"
      name="button focus"
      picture_style="true"
      tool_tip="Focus"
-     top="2"
      width="32" />
     <button
      follows="left|top"
@@ -83,11 +82,10 @@
      image_selected="tool_grab_active.tga"
      image_unselected="tool_grab.tga"
      layout="topleft"
-     left_pad="4"
+     left_pad="8"
      name="button move"
      picture_style="true"
      tool_tip="Move"
-     top_delta="0"
      width="32" />
     <button
      follows="left|top"
@@ -97,11 +95,10 @@
      image_selected="tool_face_active.tga"
      image_unselected="tool_face.tga"
      layout="topleft"
-     left_pad="4"
+     left_pad="8"
      name="button edit"
      picture_style="true"
      tool_tip="Edit"
-     top_delta="0"
      width="32" />
     <button
      follows="left|top"
@@ -111,11 +108,10 @@
      image_selected="tool_create_active.tga"
      image_unselected="tool_create.tga"
      layout="topleft"
-     left_pad="4"
+     left_pad="8"
      name="button create"
      picture_style="true"
      tool_tip="Create"
-     top_delta="0"
      width="32" />
     <button
      follows="left|top"
@@ -125,158 +121,128 @@
      image_selected="tool_dozer_active.tga"
      image_unselected="tool_dozer.tga"
      layout="topleft"
-     left_pad="4"
+     left_pad="8"
      name="button land"
      picture_style="true"
      tool_tip="Land"
-     top_delta="0"
      width="32" />
-    <slider_bar
+    <text
+     type="string"
+     text_color="LabelSelectedDisabledColor"
+     length="1"
      follows="left|top"
-     height="14"
-     increment="0.01"
-     initial_value="0.125"
      layout="topleft"
-     left="114"
-     max_val="0.5"
-     name="slider zoom"
-     top="55"
-     width="134" />
-    <radio_group
-     draw_border="false"
-     height="45"
+     left="8"
+     name="text status"
+     top_pad="3"
+     width="280">
+        Drag to move, shift-drag to copy
+    </text>
+   <radio_group
      layout="topleft"
-     left_delta="-110"
-     name="focus_radio_group"
-     top_delta="0"
-     width="114">
+     left="10"
+      height="70"
+      top="54"
+     name="focus_radio_group">
         <radio_item
-         height="16"
+         top_pad="6"
          label="Zoom"
          layout="topleft"
-         left="0"
-         name="radio zoom"
-         top="-1"
-         width="114" />
+         name="radio zoom" />
         <radio_item
-         height="16"
+         top_pad="6"
          label="Orbit (Ctrl)"
          layout="topleft"
-         left_delta="0"
-         name="radio orbit"
-         top_delta="15"
-         width="114" />
+         name="radio orbit" />
         <radio_item
-         height="16"
+         top_pad="6"
          label="Pan (Ctrl-Shift)"
          layout="topleft"
-         left_delta="0"
-         name="radio pan"
-         top_delta="15"
-         width="114" />
+         name="radio pan" />
     </radio_group>
-    <radio_group
-     draw_border="false"
-     height="45"
+   <slider_bar
+     follows="left|top"
+     height="14"
+     increment="0.01"
+     initial_value="0.125"
      layout="topleft"
-     left_delta="0"
-     name="move_radio_group"
-     top_delta="0"
-     width="114">
+     max_val="0.5"
+     top_delta="-2"
+     left_delta="100"
+     name="slider zoom"
+     width="134" />
+   <radio_group
+      left="10"
+      height="70"
+      top="54"
+     layout="topleft"
+     name="move_radio_group">
         <radio_item
-         height="16"
+      top_pad="6"
          label="Move"
          layout="topleft"
-         left="0"
-         name="radio move"
-         top="-1"
-         width="114" />
+         name="radio move" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Lift (Ctrl)"
          layout="topleft"
-         left_delta="0"
-         name="radio lift"
-         top_delta="15"
-         width="114" />
+         name="radio lift" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Spin (Ctrl-Shift)"
          layout="topleft"
-         left_delta="0"
-         name="radio spin"
-         top_delta="15"
-         width="114" />
-    </radio_group>
+         name="radio spin" />
+   </radio_group>
     <radio_group
-     draw_border="false"
-     height="60"
+     follows="left|top"
+      left="10"
+      top="54"
+      height="70"
      layout="topleft"
-     left_delta="0"
-     name="edit_radio_group"
-     top_delta="0"
-     width="114">
+     name="edit_radio_group">
         <radio_item
-         height="16"
-         label="Position"
+         label="Move"
          layout="topleft"
-         left="0"
-         name="radio position"
-         top="-1"
-         width="114" />
+         name="radio position" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Rotate (Ctrl)"
          layout="topleft"
-         left_delta="0"
-         name="radio rotate"
-         top_delta="15"
-         width="114" />
+         name="radio rotate" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Stretch (Ctrl-Shift)"
          layout="topleft"
-         left_delta="0"
-         name="radio stretch"
-         top_delta="15"
-         width="123" />
+         name="radio stretch" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Select Texture"
          layout="topleft"
-         left_delta="0"
-         name="radio select face"
-         top_delta="15"
-         width="114" />
+         name="radio select face" />
     </radio_group>
     <check_box
-     control_name="EditLinkedParts"
-     height="16"
-     label="Edit linked parts"
-     layout="topleft"
-     left_delta="0"
-     name="checkbox edit linked parts"
-     top_pad="3"
-     width="114" />
-    <text
-     type="string"
-     length="1"
+      left="10"
      follows="left|top"
-     height="14"
+      control_name="EditLinkedParts"
+     label="Edit linked prims"
      layout="topleft"
-     left_delta="2"
-     name="text ruler mode"
-     top_pad="6"
-     width="68">
+     name="checkbox edit linked parts" />
+    <text
+      left="10"
+      type="string"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      name="text ruler mode">
         Ruler:
     </text>
     <combo_box
-     height="20"
+     height="19"
+      left="30"
      layout="topleft"
-     left_delta="40"
+     follows="left|top"
      name="combobox grid mode"
-     top_delta="-2"
-     width="86">
+     width="90">
         <combo_box.item
          label="World"
          value="World" />
@@ -289,57 +255,42 @@
     </combo_box>
     <check_box
      control_name="ScaleUniform"
-     height="16"
+     height="19"
      label="Stretch Both Sides"
      layout="topleft"
      left="143"
      name="checkbox uniform"
-     top="54"
+      top="54"
      width="134" />
     <check_box
      control_name="ScaleStretchTextures"
-     height="16"
+     height="19"
      initial_value="true"
      label="Stretch Textures"
      layout="topleft"
-     left_delta="0"
      name="checkbox stretch textures"
      top_pad="1"
      width="134" />
     <check_box
      control_name="SnapEnabled"
-     height="16"
+     height="19"
      initial_value="true"
      label="Use Grid"
      layout="topleft"
-     left_delta="0"
      name="checkbox snap to grid"
      top_pad="1"
      width="134" />
     <button
      follows="left|top"
      font="SansSerifSmall"
-     height="20"
+     height="19"
+     left_delta="40"
+     top_delta="20"
      label="Options..."
      label_selected="Options..."
      layout="topleft"
-     left_delta="20"
      name="Options..."
-     top="103"
-     valign="center"
-     width="80" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="4"
-     name="text status"
-     top="36"
-     width="264">
-        Drag to move, shift-drag to copy
-    </text>
+     width="78" /> 
     <button
      follows="left|top"
      height="24"
@@ -348,11 +299,11 @@
      image_selected="object_cube_active.tga"
      image_unselected="object_cube.tga"
      layout="topleft"
-     left_delta="0"
+     left="4"
      name="ToolCube"
      picture_style="true"
      tool_tip="Cube"
-     top_delta="15"
+     top="51"
      width="24" />
     <button
      follows="left|top"
@@ -552,8 +503,8 @@
      width="24" />
     <check_box
      control_name="CreateToolKeepSelected"
-     height="16"
-     label="Keep selected"
+     height="19"
+     label="Keep Tool selected"
      layout="topleft"
      left="4"
      name="checkbox sticky"
@@ -561,8 +512,8 @@
      width="128" />
     <check_box
      control_name="CreateToolCopySelection"
-     height="16"
-     label="Copy selected"
+     height="19"
+     label="Copy selection"
      layout="topleft"
      left_delta="0"
      name="checkbox copy selection"
@@ -570,9 +521,9 @@
      width="134" />
     <check_box
      control_name="CreateToolCopyCenters"
-     height="16"
+     height="19"
      initial_value="true"
-     label="Center"
+     label="Center Copy"
      layout="topleft"
      left_delta="18"
      name="checkbox copy centers"
@@ -580,15 +531,14 @@
      width="134" />
     <check_box
      control_name="CreateToolCopyRotates"
-     height="16"
-     label="Rotate"
+     height="19"
+     label="Rotate Copy"
      layout="topleft"
      left_delta="0"
      name="checkbox copy rotates"
      top_delta="16"
      width="134" />
     <radio_group
-     draw_border="false"
      height="105"
      layout="topleft"
      left="4"
@@ -596,7 +546,7 @@
      top="54"
      width="114">
         <radio_item
-         height="16"
+         height="19"
          label="Select Land"
          layout="topleft"
          left="0"
@@ -604,7 +554,7 @@
          top="-1"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Flatten"
          layout="topleft"
          left_delta="0"
@@ -612,7 +562,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Raise"
          layout="topleft"
          left_delta="0"
@@ -620,7 +570,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Lower"
          layout="topleft"
          left_delta="0"
@@ -628,7 +578,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Smooth"
          layout="topleft"
          left_delta="0"
@@ -636,7 +586,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Roughen"
          layout="topleft"
          left_delta="0"
@@ -644,7 +594,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Revert"
          layout="topleft"
          left_delta="0"
@@ -652,27 +602,16 @@
          top_delta="15"
          width="114" />
     </radio_group>
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="20"
-     label="Apply"
-     label_selected="Apply"
-     layout="topleft"
-     left_delta="112"
-     name="button apply to selection"
-     tool_tip="Modify Selected Land"
-     top_delta="-2"
-     width="78" />
+    
     <text
      type="string"
      length="1"
      follows="left|top"
      height="12"
      layout="topleft"
-     left_delta="2"
+     left="125"
      name="Bulldozer:"
-     top_pad="4"
+     top="57"
      width="100">
         Bulldozer:
     </text>
@@ -682,22 +621,22 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="132"
      name="Dozer Size:"
-     top="94"
-     width="100">
+     left="135"
+     top_pad="5"
+     width="50">
         Size
     </text>
     <slider_bar
      follows="left|top"
-     height="16"
+     height="19"
      initial_value="2.0"
      layout="topleft"
-     left_delta="46"
      max_val="11"
      min_val="1"
+     left_pad="0"
      name="slider brush size"
-     top_delta="0"
+     top_delta="-3"
      width="80" />
     <text
      type="string"
@@ -705,71 +644,79 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="132"
      name="Strength:"
-     top="116"
-     width="100">
+     left="135"
+     top_pad="5"
+     width="50">
         Strength
     </text>
     <slider_bar
      follows="left|top"
-     height="16"
+     height="19"
+     left_pad="0"
      initial_value="0.00"
      layout="topleft"
-     left_delta="46"
      max_val="2"
      min_val="-1"
      name="slider force"
-     top_delta="0"
+     top_delta="-3"
      width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="19"
+     label="Apply"
+     label_selected="Apply"
+     top_pad="5"
+     layout="topleft"
+     left="135"
+     name="button apply to selection"
+     tool_tip="Modify Selected Land"
+     width="78" />
     <text
      type="string"
+     text_color="LabelSelectedDisabledColor"
      length="1"
+     top_pad="7"
+     height="12"
      follows="left|top"
      halign="right"
-     height="16"
      layout="topleft"
-     left="118"
+     left="115"
      name="obj_count"
-     top="135"
      width="143">
-        Selected objects: [COUNT]
+        Objects: [COUNT]
     </text>
     <text
      type="string"
+     text_color="LabelSelectedDisabledColor"
      length="1"
      follows="left|top"
      halign="right"
-     height="16"
      layout="topleft"
-     left_delta="0"
      name="prim_count"
-     top_delta="12"
      width="143">
-        primitives: [COUNT]
+        Prims: [COUNT]
     </text>
     <tab_container
      follows="left|top"
-     height="384"
+     height="400"
      layout="topleft"
      left="0"
      name="Object Info Tabs"
-     tab_max_width="52"
+     tab_max_width="55"
      tab_min_width="40"
      tab_position="top"
-     top="166"
-     width="272">
+     top="180"
+     width="280">
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
-         height="367"
          label="General"
          layout="topleft"
-         left="1"
          mouse_opaque="false"
          name="General"
-         top="16"
-         width="270">
+         top="16">
             <panel.string
              name="text deed continued">
                 Deed...
@@ -780,35 +727,35 @@
             </panel.string>
             <panel.string
              name="text modify info 1">
-                You can modify this object.
+                You can modify this object
             </panel.string>
             <panel.string
              name="text modify info 2">
-                You can modify these objects.
+                You can modify these objects
             </panel.string>
             <panel.string
              name="text modify info 3">
-                You cannot modify this object.
+                You can't modify this object
             </panel.string>
             <panel.string
              name="text modify info 4">
-                You cannot modify these objects.
+                You can't modify these objects
             </panel.string>
             <panel.string
              name="text modify warning">
-                Must select entire object to set permissions.
+                This object has linked parts
             </panel.string>
             <panel.string
              name="Cost Default">
-                Price:           L$
+                Price: L$
             </panel.string>
             <panel.string
              name="Cost Total">
-                Total Price:  L$
+                Total Price: L$
             </panel.string>
             <panel.string
              name="Cost Per Unit">
-                Price Per:     L$
+                Price Per: L$
             </panel.string>
             <panel.string
              name="Cost Mixed">
@@ -826,17 +773,15 @@
              layout="topleft"
              left="10"
              name="Name:"
-             top="10"
-             width="78">
+             top_pad="8"
+             width="90">
                 Name:
             </text>
             <line_editor
-             border_style="line"
-             border_thickness="1"
              follows="left|top|right"
-             height="16"
+             height="19"
              layout="topleft"
-             left_delta="78"
+             left_pad="0"
              max_length="63"
              name="Object Name"
              select_on_focus="true"
@@ -850,319 +795,163 @@
              layout="topleft"
              left="10"
              name="Description:"
-             top="30"
-             width="78">
+             top_pad="3"
+             width="90">
                 Description:
             </text>
             <line_editor
-             border_style="line"
-             border_thickness="1"
              follows="left|top|right"
-             height="16"
+             height="19"
              layout="topleft"
-             left_delta="78"
+             left_pad="0"
              max_length="127"
              name="Object Description"
              select_on_focus="true"
              top_delta="0"
              width="172" />
+
             <text
              type="string"
+             left="10"
              length="1"
              follows="left|top"
-             height="16"
+             height="19"
              layout="topleft"
-             left="10"
              name="Creator:"
-             top="50"
-             width="78">
+             width="90">
                 Creator:
             </text>
+<!-- TODO: add person inspector to creator name -->
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             left_pad="0"
+             height="19"
              layout="topleft"
-             left_delta="78"
              name="Creator Name"
-             top_delta="0"
-             width="88">
+             width="150">
                 Thrax Linden
             </text>
-            <button
+<!--TODO: Kill this-->
+<!--            <button
              follows="top|right"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Profile..."
              label_selected="Profile..."
              layout="topleft"
              left_pad="6"
              name="button creator profile"
-             top_delta="-4"
-             width="78" />
+             tool_tip="View creator profile"
+             width="78" />-->
             <text
              type="string"
              length="1"
+             left="10"
              follows="left|top"
-             height="16"
+             height="19"
              layout="topleft"
-             left="10"
              name="Owner:"
-             top="70"
-             width="78">
+             width="90">
                 Owner:
             </text>
+<!--TODO: add person inspector to creator name-->
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="19"
              layout="topleft"
-             left_delta="78"
              name="Owner Name"
-             top_delta="0"
-             width="88">
+             left_pad="0"
+             width="150">
                 Thrax Linden
             </text>
-            <button
+<!--TODO: Kill this-->
+<!--<button
              follows="top|right"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Profile..."
              label_selected="Profile..."
              layout="topleft"
              left_pad="6"
              name="button owner profile"
-             top_delta="-4"
-             width="78" />
-            <text
+             tool_tip="View owner profile"
+             width="78" />-->
+           <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
              layout="topleft"
              left="10"
+             height="19"
              name="Group:"
-             top="90"
-             width="78">
+             width="90">
                 Group:
             </text>
             <name_box
-             follows="left|top"
-             height="16"
-             initial_value="(retrieving)"
-             layout="topleft"
-             left_delta="78"
-             name="Group Name Proxy"
-             top_delta="0"
-             width="88" />
-            <button
-             follows="top|right"
-             font="SansSerifSmall"
-             height="20"
-             label="Set..."
-             label_selected="Set..."
-             layout="topleft"
-             left_pad="6"
-             name="button set group"
-             top_delta="-4"
-             width="78" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="Permissions:"
-             top="110"
-             width="85">
-                Permissions:
-            </text>
-            <text
-             type="string"
-             length="1"
              follows="left|top|right"
-             height="16"
+             height="19"
+             initial_value="Loading..."
              layout="topleft"
-             left_delta="0"
-             name="perm_modify"
-             top_pad="4"
-             width="250">
-                You can modify this object.
-            </text>
-            <check_box
-             height="16"
-             label="Share with group"
-             layout="topleft"
-             left_delta="0"
-             name="checkbox share with group"
-             tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
-             top_pad="4"
-             width="166" />
+             left_pad="0"
+             name="Group Name Proxy"
+             width="170" />
             <button
              follows="top|right"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Deed..."
              label_selected="Deed..."
              layout="topleft"
-             left_delta="172"
              name="button deed"
-             tool_tip="Group shared objects can be deeded by a group officer."
-             top="166"
-             width="78" />
-            <check_box
-             height="16"
-             label="Allow anyone to move"
-             layout="topleft"
-             left="10"
-             name="checkbox allow everyone move"
-             top="190"
-             width="142" />
-            <check_box
-             height="16"
-             label="Allow anyone to copy"
-             layout="topleft"
-             left_delta="0"
-             name="checkbox allow everyone copy"
-             top_pad="4"
-             width="141" />
-            <check_box
-             height="16"
-             label="Show in search"
+             top_pad="0"
+             left="102"
+             tool_tip="Deeding gives this item away with Next Owner permissions. Group shared objects can be deeded by a group officer."
+             width="80" />
+            <button
+            follows="left|top"
+             font="SansSerifSmall"
+             height="19"
+             label="Set..."
+             label_selected="Set..."
              layout="topleft"
-             left_delta="0"
-             name="search_check"
-             tool_tip="Let people see this object in search results"
-             top_pad="4"
-             width="78" />
+             left_pad="7"
+             name="button set group"
+             tool_tip="Choose a group to share this object's permissions"
+             width="80" />
             <check_box
-             height="16"
-             label="For Sale"
-             layout="topleft"
-             left_delta="0"
-             name="checkbox for sale"
-             top_pad="4"
-             width="78" />
-            <text
-             type="string"
-             length="1"
+             height="19"
              follows="left|top"
-             height="16"
+             label="Share"
              layout="topleft"
-             left_pad="12"
-             name="Cost"
-             top_delta="0"
-             width="78">
-                Price:  L$
-            </text>
-            <line_editor
-             border_style="line"
-             border_thickness="1"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="2"
-             max_length="25"
-             name="Edit Cost"
-             top_delta="0"
-             width="75" />
-            <radio_group
-             draw_border="false"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left="42"
-             name="sale type"
-             top="270"
-             width="218">
-                <radio_item
-                 height="16"
-                 label="Original"
-                 layout="topleft"
-                 left="0"
-                 name="Original"
-                 top="0"
-                 width="70" />
-                <radio_item
-                 height="16"
-                 label="Copy"
-                 layout="topleft"
-                 left_delta="70"
-                 name="Copy"
-                 top_delta="0"
-                 width="70" />
-                <radio_item
-                 height="16"
-                 label="Contents"
-                 layout="topleft"
-                 left_delta="70"
-                 name="Contents"
-                 top_delta="0"
-                 width="76" />
-            </radio_group>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="Next owner can:"
-             top="288"
-             width="250">
-                Next owner can:
-            </text>
-            <check_box
-             follows="left|top|right"
-             height="16"
-             label="Modify"
-             layout="topleft"
-             left_delta="0"
-             name="checkbox next owner can modify"
-             top_pad="6"
-             width="250" />
-            <check_box
-             follows="left|top|right"
-             height="16"
-             label="Copy"
-             layout="topleft"
-             left_delta="60"
-             name="checkbox next owner can copy"
-             top_delta="0"
-             width="190" />
-            <check_box
-             follows="left|top|right"
-             height="16"
-             label="Resell/Give away"
-             layout="topleft"
-             left_delta="60"
-             name="checkbox next owner can transfer"
-             top_delta="0"
-             width="130" />
+             name="checkbox share with group"
+             tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+             left="100"
+             width="93" />
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="10"
+             height="19"
              layout="topleft"
+             top_pad="7"
              left="10"
              name="label click action"
-             top="322"
-             width="150">
-                When Left-Clicked:
+             width="90">
+                Click to:
             </text>
             <combo_box
-             height="18"
+             follows="left|top"
+             height="22"
              layout="topleft"
-             left_delta="0"
              name="clickaction"
-             top_pad="7"
-             width="150">
+             width="170"
+             left_pad="0">
                 <combo_box.item
-                 label="Touch/grab (default)"
+                 label="Touch  (default)"
                  value="Touch/grab (default)" />
                 <combo_box.item
                  label="Sit on object"
@@ -1176,88 +965,275 @@
                 <combo_box.item
                  label="Open"
                  value="Open" />
-                <combo_box.item
+<!--TODO: Kill this-->
+<!--                <combo_box.item
                  label="Play parcel media"
                  value="Play" />
                 <combo_box.item
                  label="Open parcel media"
-                 value="Open Media" />
+                 value="Open Media" />-->
             </combo_box>
+            <check_box
+             height="20"
+             label="For Sale:"
+             layout="topleft"
+             name="checkbox for sale"
+             left="10"
+             width="90" />
+<!-- NEW SALE TYPE COMBO BOX -->
+      <combo_box
+            left_pad="0"
+            layout="topleft"
+            follows="left|top"
+            allow_text_entry="false"
+            height="22"
+            width="170"
+            max_chars="20"
+            mouse_opaque="true"
+            name="sale type">
+         <combo_item
+            name="Copy"
+            value="Copy">
+            Copy
+         </combo_item>
+         <combo_item
+            name="Contents"
+            value="Contents">
+                  Contents
+         </combo_item>
+         <combo_item
+            name="Original"
+            value="Original">
+                  Original
+         </combo_item>
+      </combo_box>
+<!-- NEW PRICE SPINNER -->
+      <spinner
+        follows="left|top"
+        decimal_digits="0"
+        increment="1"
+        control_name="Edit Cost"
+        name="Edit Cost"
+        label="Price: L$"
+        label_width="60"
+        width="170"
+        min_val="1"
+        height="19"
+        max_val="999999999" />
+        <panel
+         border="false"
+         follows="left|top|right"
+         layout="topleft"
+         mouse_opaque="false"
+         background_visible="true"
+         bg_alpha_color="FloaterUnfocusBorderColor"
+         name="perms_build"
+         left="0"
+         height="140"
+         width="280">
+            <text
+             type="string"
+             length="1"
+             left="10"
+             top_pad="6"
+             height="19"
+             follows="left|top|right"
+             layout="topleft"
+             name="perm_modify"
+             width="180">
+                You can modify this object
+            </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
+             top_pad="0"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left="88"
+             left="17"
              name="B:"
-             top="105"
-             width="174">
+             width="30">
                 B:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left_delta="50"
+             left_pad="0"
              name="O:"
-             top_delta="0"
-             width="124">
-                O;
+             width="30">
+                O:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left_delta="50"
+             left_pad="0"
              name="G:"
-             top_delta="0"
-             width="74">
+             width="30">
                 G:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
+             left_pad="0"
              layout="topleft"
-             left="88"
              name="E:"
-             top="117"
-             width="174">
+             width="30">
                 E:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left_delta="50"
+             left_pad="0"
              name="N:"
-             top_delta="0"
-             width="124">
+             width="30">
                 N:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left_delta="50"
+             left_pad="0"
              name="F:"
-             top_delta="0"
-             width="74">
+             width="30">
                 F:
             </text>
+             <check_box
+             left="15"
+             height="19"
+             label="Show in search"
+             layout="topleft"
+             name="search_check"
+             tool_tip="Let people see this object in search results"
+              />
+            <text
+               type="string"
+               follows="left|top"
+               name="Next owner can:"
+               width="250"
+               top_pad="7"
+               left="10">
+                 Anyone:
+            </text>
+            <check_box
+             height="19"
+             label="Move"
+             layout="topleft"
+             name="checkbox allow everyone move"
+             left="15"
+             width="85" />
+            <check_box
+             height="19"
+             label="Copy"
+             layout="topleft"
+             left_pad="0"
+             name="checkbox allow everyone copy"
+             width="260" />
+            <text
+               type="string"
+               follows="left|top"
+               height="19"
+               name="Next owner can:"
+               width="270"
+               left="10">
+                  Next owner:
+            </text>
+            <check_box
+             follows="left|top|right"
+             label="Modify"
+             layout="topleft"
+             left="15"
+             name="checkbox next owner can modify"
+             width="85" />
+            <check_box
+             follows="left|top|right"
+             height="19"
+             label="Copy"
+             layout="topleft"
+             left_pad="0"
+             name="checkbox next owner can copy"
+             width="90" />
+            <check_box
+             follows="left|top|right"
+             height="19"
+             label="Transfer"
+             layout="topleft"
+             name="checkbox next owner can transfer"
+             left_pad="0"
+             top_delta="0"
+             tool_tip="Next owner can give away or resell this object"
+             width="90" />
+        </panel>
+<!--TODO: KILL THIS-->
+<!--<text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="19"
+             layout="topleft"
+             left_pad="12"
+             name="Cost"
+             top_delta="0"
+             width="78">
+                Price:  L$
+            </text>
+            <line_editor
+             follows="left|top|right"
+             height="19"
+             layout="topleft"
+             left_pad="0"
+             max_length="25"
+             name="Edit Cost"
+             top_delta="0"
+             width="75" />-->
+<!--TODO: KILL THIS-->
+<!--<radio_group
+             follows="left|top|right"
+             height="19"
+             left="15"
+             layout="topleft"
+             name="sale type"
+             width="218">
+                <radio_item
+                 height="19"
+                 label="Original"
+                 layout="topleft"
+                 left="0"
+                 name="Original"
+                 top="0"
+                 width="70" />
+                <radio_item
+                 height="19"
+                 label="Copy"
+                 layout="topleft"
+                 left_delta="70"
+                 name="Copy"
+                 top_delta="0"
+                 width="70" />
+                <radio_item
+                 height="19"
+                 label="Contents"
+                 layout="topleft"
+                 left_delta="70"
+                 name="Contents"
+                 top_delta="0"
+                 width="76" />
+        </radio_group>-->
         </panel>
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
          height="367"
          label="Object"
@@ -1266,7 +1242,7 @@
          mouse_opaque="false"
          name="Object"
          top_delta="0"
-         width="270">
+         width="280">
             <text
              type="string"
              length="1"
@@ -1292,7 +1268,7 @@
                 Edit object parameters:
             </text>
             <check_box
-             height="16"
+             height="19"
              label="Locked"
              layout="topleft"
              left_delta="-2"
@@ -1301,7 +1277,7 @@
              top_pad="10"
              width="123" />
             <check_box
-             height="16"
+             height="19"
              label="Physical"
              layout="topleft"
              left_delta="0"
@@ -1310,7 +1286,7 @@
              top_pad="2"
              width="123" />
             <check_box
-             height="16"
+             height="19"
              label="Temporary"
              layout="topleft"
              left_delta="0"
@@ -1319,7 +1295,7 @@
              top_pad="2"
              width="123" />
             <check_box
-             height="16"
+             height="19"
              label="Phantom"
              layout="topleft"
              left_delta="0"
@@ -1327,6 +1303,48 @@
              tool_tip="Causes object to not collide with other objects or avatars"
              top_pad="2"
              width="123" />
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="0"
+             name="label material"
+             top_pad="9"
+             width="121">
+                Material
+            </text>
+            <combo_box
+             height="19"
+             layout="topleft"
+             left_delta="0"
+             name="material"
+             top_pad="4"
+             width="95">
+                <combo_box.item
+                 label="Stone"
+                 value="Stone" />
+                <combo_box.item
+                 label="Metal"
+                 value="Metal" />
+                <combo_box.item
+                 label="Glass"
+                 value="Glass" />
+                <combo_box.item
+                 label="Wood"
+                 value="Wood" />
+                <combo_box.item
+                 label="Flesh"
+                 value="Flesh" />
+                <combo_box.item
+                 label="Plastic"
+                 value="Plastic" />
+                <combo_box.item
+                 label="Rubber"
+                 value="Rubber" />
+            </combo_box>
             <text
              type="string"
              length="1"
@@ -1335,13 +1353,13 @@
              layout="topleft"
              left_delta="2"
              name="label position"
-             top_pad="4"
+             top_pad="8"
              width="121">
                 Position (meters)
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="X"
@@ -1352,11 +1370,11 @@
              min_val="-256"
              name="Pos X"
              text_enabled_color="0.43 0.06 0.06 1"
-             top_pad="4"
+             top_pad="5"
              width="87" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Y"
@@ -1367,11 +1385,11 @@
              min_val="-256"
              name="Pos Y"
              text_enabled_color="0 0.39 0.15 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Z"
@@ -1381,7 +1399,7 @@
              max_val="4096"
              name="Pos Z"
              text_enabled_color="0 0.26 0.51 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <text
              type="string"
@@ -1397,7 +1415,7 @@
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="X"
@@ -1408,11 +1426,11 @@
              min_val="0.01"
              name="Scale X"
              text_enabled_color="1 1 1 1"
-             top_pad="4"
+             top_pad="5"
              width="87" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Y"
@@ -1423,11 +1441,11 @@
              min_val="0.01"
              name="Scale Y"
              text_enabled_color="1 1 1 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Z"
@@ -1438,7 +1456,7 @@
              min_val="0.01"
              name="Scale Z"
              text_enabled_color="1 1 1 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <text
              type="string"
@@ -1455,7 +1473,7 @@
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="0"
              label="X"
@@ -1466,12 +1484,12 @@
              min_val="-9999"
              name="Rot X"
              text_enabled_color="1 1 1 1"
-             top_pad="6"
+             top_pad="5"
              width="87" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="0"
              label="Y"
@@ -1482,12 +1500,12 @@
              min_val="-9999"
              name="Rot Y"
              text_enabled_color="1 1 1 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="0"
              label="Z"
@@ -1498,68 +1516,28 @@
              min_val="-9999"
              name="Rot Z"
              text_enabled_color="1 1 1 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
+            
             <text
              type="string"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="0"
-             name="label material"
-             top_pad="6"
-             width="121">
-                Material
-            </text>
-            <combo_box
-             height="18"
-             layout="topleft"
-             left_delta="0"
-             name="material"
-             top_pad="4"
-             width="87">
-                <combo_box.item
-                 label="Stone"
-                 value="Stone" />
-                <combo_box.item
-                 label="Metal"
-                 value="Metal" />
-                <combo_box.item
-                 label="Glass"
-                 value="Glass" />
-                <combo_box.item
-                 label="Wood"
-                 value="Wood" />
-                <combo_box.item
-                 label="Flesh"
-                 value="Flesh" />
-                <combo_box.item
-                 label="Plastic"
-                 value="Plastic" />
-                <combo_box.item
-                 label="Rubber"
-                 value="Rubber" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="121"
+             left="125"
              name="label basetype"
              top="26"
-             width="141">
+             width="150">
                 Building Block Type
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="comboBaseType"
-             top_pad="6"
-             width="141">
+             top_pad="4"
+             width="150">
                 <combo_box.item
                  label="Box"
                  value="Box" />
@@ -1593,13 +1571,13 @@
              layout="topleft"
              left_delta="0"
              name="text cut"
-             top_pad="2"
-             width="141">
+             top_pad="6"
+             width="150">
                 Path Cut Begin and End
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.025"
              initial_value="0"
              label="B"
@@ -1608,17 +1586,17 @@
              left_delta="0"
              max_val="0.98"
              name="cut begin"
-             top_pad="6"
+             top_pad="4"
              width="68" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.025"
              initial_value="1"
              label="E"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              min_val="0.02"
              name="cut end"
              top_delta="0"
@@ -1629,9 +1607,9 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="text hollow"
-             top="98"
+             top_pad="6"
              width="68">
                 Hollow
             </text>
@@ -1650,23 +1628,23 @@
             <spinner
              decimal_digits="1"
              follows="left|top"
-             height="16"
+             height="19"
              increment="5"
              initial_value="0"
              layout="topleft"
-             left="121"
+             left="125"
              max_val="95"
              name="Scale 1"
-             top="112"
+             top_pad="4"
              width="68" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              max_val="0.95"
              min_val="-0.95"
              name="Skew"
@@ -1678,19 +1656,19 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="Hollow Shape"
-             top="133"
-             width="141">
+             top_pad="6"
+             width="150">
                 Hollow Shape
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="hole"
-             top_pad="6"
-             width="141">
+             top_pad="4"
+             width="150">
                 <combo_box.item
                  label="Default"
                  value="Default" />
@@ -1712,14 +1690,14 @@
              layout="topleft"
              left_delta="0"
              name="text twist"
-             top_pad="2"
-             width="141">
+             top_pad="4"
+             width="150">
                 Twist Begin and End
             </text>
             <spinner
              decimal_digits="0"
              follows="left|top"
-             height="16"
+             height="19"
              increment="9"
              initial_value="0"
              label="B"
@@ -1729,18 +1707,18 @@
              max_val="180"
              min_val="-180"
              name="Twist Begin"
-             top_pad="6"
+             top_pad="4"
              width="68" />
             <spinner
              decimal_digits="0"
              follows="left|top"
-             height="16"
+             height="19"
              increment="9"
              initial_value="0"
              label="E"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              max_val="180"
              min_val="-180"
              name="Twist End"
@@ -1752,10 +1730,10 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="scale_taper"
-             top="205"
-             width="141">
+             top_pad="6"
+             width="150">
                 Taper
             </text>
             <text
@@ -1767,13 +1745,13 @@
              left_delta="0"
              name="scale_hole"
              top_delta="0"
-             width="141">
+             width="150">
                 Hole Size
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="X"
@@ -1787,13 +1765,13 @@
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="Y"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              min_val="-1"
              name="Taper Scale Y"
              top_delta="0"
@@ -1804,16 +1782,16 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="text topshear"
-             top="239"
+             top_pad="6"
              width="141">
                 Top Shear
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="X"
@@ -1828,13 +1806,13 @@
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="Y"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              max_val="0.5"
              min_val="-0.5"
              name="Shear Y"
@@ -1846,10 +1824,10 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="advanced_cut"
-             top="273"
-             width="141">
+             top_pad="6"
+             width="150">
                 Profile Cut Begin and End
             </text>
             <text
@@ -1861,7 +1839,7 @@
              left_delta="0"
              name="advanced_dimple"
              top_delta="0"
-             width="141">
+             width="150">
                 Dimple Begin and End
             </text>
             <text
@@ -1873,12 +1851,12 @@
              left_delta="0"
              name="advanced_slice"
              top_delta="0"
-             width="141">
+             width="150">
                 Slice Begin and End
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.025"
              initial_value="0"
              label="B"
@@ -1887,17 +1865,17 @@
              left_delta="0"
              max_val="0.95"
              name="Path Limit Begin"
-             top_pad="3"
+             top_pad="4"
              width="68" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.025"
              initial_value="1"
              label="E"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              min_val="0.05"
              name="Path Limit End"
              top_delta="0"
@@ -1908,16 +1886,16 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="text taper2"
-             top="306"
-             width="141">
+             top_pad="6"
+             width="150">
                 Taper
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="X"
@@ -1926,18 +1904,18 @@
              left_delta="0"
              min_val="-1"
              name="Taper X"
-             top_pad="3"
+             top_pad="4"
              width="68" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="Y"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              min_val="-1"
              name="Taper Y"
              top_delta="0"
@@ -1948,9 +1926,9 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="text radius delta"
-             top="337"
+             top_pad="6"
              width="78">
                 Radius
             </text>
@@ -1960,7 +1938,7 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="73"
+             left_delta="78"
              name="text revolutions"
              top_delta="0"
              width="68">
@@ -1968,22 +1946,22 @@
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              layout="topleft"
-             left="121"
+             left="125"
              min_val="-1"
              name="Radius Offset"
-             top="350"
+             top_pad="4"
              width="68" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="1"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              max_val="4"
              min_val="1"
              name="Revolutions"
@@ -1996,14 +1974,14 @@
              height="141"
              label="Sculpt Texture"
              layout="topleft"
-             left="121"
+             left="125"
              name="sculpt texture control"
              tool_tip="Click to choose a picture"
              top="70"
              visible="false"
-             width="141" />
+             width="145" />
             <check_box
-             height="16"
+             height="19"
              label="Mirror"
              layout="topleft"
              left_delta="0"
@@ -2011,9 +1989,9 @@
              tool_tip="Flips sculpted prim along the X axis."
              top_pad="8"
              visible="false"
-             width="121" />
+             width="130" />
             <check_box
-             height="16"
+             height="19"
              label="Inside-out"
              layout="topleft"
              left_delta="0"
@@ -2032,17 +2010,17 @@
              name="label sculpt type"
              top_pad="10"
              visible="false"
-             width="121">
+             width="130">
                 Stitching type
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="sculpt type control"
-             top_pad="6"
+             top_pad="4"
              visible="false"
-             width="141">
+             width="150">
                 <combo_box.item
                  label="none)"
                  value="None" />
@@ -2060,8 +2038,9 @@
                  value="Cylinder" />
             </combo_box>
         </panel>
+
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
          height="367"
          label="Features"
@@ -2070,7 +2049,7 @@
          mouse_opaque="false"
          name="Features"
          top_delta="0"
-         width="270">
+         width="280">
             <text
              type="string"
              length="1"
@@ -2096,7 +2075,7 @@
                 Edit object features:
             </text>
             <check_box
-             height="16"
+             height="19"
              label="Flexible Path"
              layout="topleft"
              left_delta="0"
@@ -2106,7 +2085,7 @@
              width="121" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="2"
              label="Softness"
@@ -2115,11 +2094,11 @@
              left_delta="0"
              max_val="3"
              name="FlexNumSections"
-             top_pad="4"
+             top_pad="10"
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.5"
              initial_value="0.3"
              label="Gravity"
@@ -2133,7 +2112,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.5"
              initial_value="2"
              label="Drag"
@@ -2146,7 +2125,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.5"
              initial_value="0"
              label="Wind"
@@ -2159,7 +2138,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.5"
              initial_value="1"
              label="Tension"
@@ -2172,7 +2151,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Force X"
@@ -2186,7 +2165,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Force Y"
@@ -2200,7 +2179,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Force Z"
@@ -2213,7 +2192,7 @@
              top_pad="4"
              width="128" />
             <check_box
-             height="16"
+             height="19"
              label="Light"
              layout="topleft"
              left_delta="0"
@@ -2229,7 +2208,7 @@
              layout="topleft"
              left_delta="0"
              name="label color"
-             top_pad="11"
+             top_pad="15"
              width="58">
                 Color
             </text>
@@ -2243,22 +2222,22 @@
              left_delta="67"
              name="colorswatch"
              tool_tip="Click to open Color Picker"
-             top="237"
+             top_delta="-10"
              width="32" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0.5"
              label="Intensity"
              label_width="65"
              layout="topleft"
              left="10"
              name="Light Intensity"
-             top="273"
+             top_pad="4"
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="5"
              label="Radius"
              label_width="65"
@@ -2266,11 +2245,11 @@
              left_delta="0"
              max_val="20"
              name="Light Radius"
-             top_pad="4"
+             top_pad="0"
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.25"
              initial_value="1"
              label="Falloff"
@@ -2279,11 +2258,11 @@
              left_delta="0"
              max_val="2"
              name="Light Falloff"
-             top_pad="4"
+             top_pad="0"
              width="128" />
         </panel>
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
          height="367"
          label="Texture"
@@ -2292,7 +2271,7 @@
          mouse_opaque="false"
          name="Texture"
          top_delta="0"
-         width="270">
+         width="280">
             <panel.string
              name="string repeats per meter">
                 Repeats Per Meter
@@ -2320,7 +2299,7 @@
              height="80"
              label="Color"
              layout="topleft"
-             left_pad="26"
+             left_pad="25"
              name="colorswatch"
              tool_tip="Click to open Color Picker"
              top_delta="0"
@@ -2331,16 +2310,16 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="180"
+             left_pad="20"
              name="color trans"
-             top="1"
-             width="80">
+             top="10"
+             width="100">
                 Transparency %
             </text>
             <spinner
              decimal_digits="0"
              follows="left|top"
-             height="16"
+             height="19"
              increment="2"
              initial_value="0"
              layout="topleft"
@@ -2357,14 +2336,14 @@
              layout="topleft"
              left_delta="0"
              name="glow label"
-             top_pad="2"
+             top_pad="4"
              width="80">
                 Glow
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              layout="topleft"
              left_delta="0"
@@ -2372,7 +2351,7 @@
              top_pad="4"
              width="80" />
             <check_box
-             height="16"
+             height="19"
              label="Full Bright"
              layout="topleft"
              left_delta="0"
@@ -2387,12 +2366,12 @@
              layout="topleft"
              left="10"
              name="tex gen"
-             top="94"
+             top_pad="10"
              width="90">
                 Mapping
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="combobox texgen"
@@ -2413,12 +2392,12 @@
              layout="topleft"
              left="100"
              name="label shininess"
-             top="94"
+             top_pad="-33"
              width="70">
                 Shininess
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="combobox shininess"
@@ -2445,12 +2424,12 @@
              layout="topleft"
              left="180"
              name="label bumpiness"
-             top="94"
+             top_pad="-33"
              width="80">
                 Bumpiness
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="combobox bumpiness"
@@ -2519,13 +2498,13 @@
              layout="topleft"
              left="10"
              name="tex scale"
-             top="148"
+             top_pad="15"
              width="160">
                 Repeats per Face
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              label="Horizontal (U)"
              label_width="90"
@@ -2533,10 +2512,10 @@
              left="20"
              max_val="100"
              name="TexScaleU"
-             top="162"
+             top_pad="10"
              width="160" />
             <check_box
-             height="16"
+             height="19"
              label="Flip"
              layout="topleft"
              left_pad="10"
@@ -2545,7 +2524,7 @@
              width="70" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              label="Vertical (V)"
              label_width="90"
@@ -2553,10 +2532,10 @@
              left="20"
              max_val="100"
              name="TexScaleV"
-             top="180"
+             top_pad="0"
              width="160" />
             <check_box
-             height="16"
+             height="19"
              label="Flip"
              layout="topleft"
              left_pad="10"
@@ -2571,14 +2550,14 @@
              layout="topleft"
              left="10"
              name="tex rotate"
-             top="218"
+             top_pad="20"
              width="102">
                 Rotation (degrees)
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="0"
              layout="topleft"
@@ -2596,14 +2575,14 @@
              layout="topleft"
              left="10"
              name="rpt"
-             top="240"
+             top_pad="0"
              width="160">
                 Repeats Per Meter
             </text>
             <spinner
              decimal_digits="1"
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="1"
              layout="topleft"
              left_delta="102"
@@ -2615,7 +2594,7 @@
             <button
              follows="left|top"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Apply"
              label_selected="Apply"
              layout="topleft"
@@ -2631,13 +2610,13 @@
              layout="topleft"
              left="10"
              name="tex offset"
-             top="278"
+             top_pad="20"
              width="160">
                 Offset
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              label="Horizontal (U)"
              label_width="90"
@@ -2645,11 +2624,11 @@
              left="20"
              min_val="-1"
              name="TexOffsetU"
-             top="292"
+             top_pad="10"
              width="160" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              label="Vertical (V)"
              label_width="90"
@@ -2659,11 +2638,12 @@
              name="TexOffsetV"
              top_pad="2"
              width="160" />
-            <text
+<!--TODO: KILL THIS-->
+ <!--           <text
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="19"
              layout="topleft"
              left="10"
              name="textbox autofix"
@@ -2675,17 +2655,17 @@
             <button
              follows="left|top"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Align"
              label_selected="Align"
              layout="topleft"
              left="112"
              name="button align"
              top="340"
-             width="68" />
+             width="68" />-->
         </panel>
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
          height="367"
          label="Content"
@@ -2694,10 +2674,10 @@
          mouse_opaque="false"
          name="Contents"
          top_delta="0"
-         width="270">
+         width="280">
             <button
              follows="left|top"
-             height="20"
+             height="19"
              label="New Script"
              label_selected="New Script..."
              layout="topleft"
@@ -2707,7 +2687,7 @@
              width="100" />
             <button
              follows="left|top"
-             height="20"
+             height="19"
              label="Permissions..."
              layout="topleft"
              left_pad="10"
@@ -2716,29 +2696,30 @@
              width="100" />
             <panel_inventory
              follows="left|top"
-             height="325"
+             height="300"
              layout="topleft"
              left="10"
              name="contents_inventory"
              top="35"
-             width="252" />
+             width="260" />
         </panel>
     </tab_container>
     <panel
-     follows="left|top"
+      follows="left|top"
      height="384"
      layout="topleft"
      left_delta="0"
      name="land info panel"
      top_delta="0"
-     width="272">
+     width="280">
         <text
          type="string"
          length="1"
+         font="SansSerifBig"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
-         left="40"
+         left="20"
          name="label_parcel_info"
          top="24"
          width="150">
@@ -2748,9 +2729,9 @@
          type="string"
          length="1"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
-         left="48"
+         left="30"
          name="label_area_price"
          top="48"
          width="150">
@@ -2760,7 +2741,7 @@
          type="string"
          length="1"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
          left_delta="0"
          name="label_area"
@@ -2770,7 +2751,7 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="About Land..."
          label_selected="About Land..."
          layout="topleft"
@@ -2780,31 +2761,32 @@
          width="112" />
         <check_box
          control_name="ShowParcelOwners"
-         height="16"
+         height="19"
          label="Show owners"
          layout="topleft"
          left_delta="0"
          name="checkbox show owners"
          tool_tip="Colour parcels according to their ownership"
          top_pad="8"
-         width="100" />
+         width="140" />
         <button
          follows="left|top"
-         height="18"
+         height="19"
          label="?"
          label_selected="?"
          layout="topleft"
-         left_delta="94"
+         left_pad="5"
          name="button show owners help"
          top_delta="-2"
          width="18" />
         <text
          type="string"
          length="1"
+         font="SansSerifBig"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
-         left="40"
+         left="20"
          name="label_parcel_modify"
          top="152"
          width="150">
@@ -2812,17 +2794,17 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="Subdivide..."
          label_selected="Subdivide..."
          layout="topleft"
-         left="48"
+         left="30"
          name="button subdivide land"
          top="172"
          width="112" />
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="Join..."
          label_selected="Join..."
          layout="topleft"
@@ -2833,10 +2815,11 @@
         <text
          type="string"
          length="1"
+         font="SansSerifBig"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
-         left="40"
+         left="20"
          name="label_parcel_trans"
          top="256"
          width="150">
@@ -2844,17 +2827,17 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="Buy Land..."
          label_selected="Buy Land..."
          layout="topleft"
-         left="48"
+         left="30"
          name="button buy land"
          top="276"
          width="112" />
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="Abandon Land..."
          label_selected="Abandon Land..."
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml
index 82a9750cda..cf59d44d01 100644
--- a/indra/newview/skins/default/xui/en/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml
@@ -4,7 +4,7 @@
  height="87"
  layout="topleft"
  name="url_entry"
- width="500">
+ width="280">
     <text
      type="string"
      length="1"
@@ -12,7 +12,7 @@
      follows="top|left"
      height="15"
      layout="topleft"
-     left="20"
+     left="10"
      name="media_label"
      top="20">
         Media URL:
@@ -26,44 +26,48 @@
      max_chars="255"
      name="media_entry"
      top_delta="-4"
-     width="370" />
+     width="190" />
     <button
      follows="top|left"
      height="20"
+     font="SansSerifSmall"
      label="OK"
      layout="topleft"
-     left="20"
+     left="10"
      name="ok_btn"
      top="50"
      width="64" />
     <button
      follows="top|left"
      height="20"
+     font="SansSerifSmall"
      label="Cancel"
      layout="topleft"
-     left_pad="28"
+     left_pad="5"
      name="cancel_btn"
      top_delta="0"
      width="64" />
     <button
      follows="top|right"
      height="20"
+     font="SansSerifSmall"
      label="Clear"
      layout="topleft"
-     left_pad="220"
+     left_pad="65"
      name="clear_btn"
      top_delta="0"
      width="64" />
     <text
      type="string"
      length="1"
+     font="SansSerifSmall"
      bottom_delta="-2"
      follows="bottom|left"
      height="15"
      layout="topleft"
-     left="220"
+     left="152"
      name="loading_label"
-     visible="false">
+     visible="true">
         Loading...
     </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 483291044d..ced8ba83f7 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -19,13 +19,25 @@
   </font>
 
   <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>"MtBkLfRg.ttf"</file>
+    <file>Helvetica.dfont</file>
+  <os name="Windows">
+      <file>arial.ttf</file>
+      </os>
+    <os name="Mac">
+      <file>Helvetica.dfont</file>
+      </os>
   </font>
 
   <font name="SansSerifBold" 
 	comment="Name of bold sans-serif font" 
 	font_style="Bold">
-    <file>MtBdLfRg.ttf</file>
+    <file>Helvetica.dfont</file>
+    <os name="Windows">
+      <file>arialbd.ttf</file>
+      </os>
+    <os name="Mac">
+      <file>Helvetica.dfont</file>
+      </os>
   </font>
 
   <font name="Monospace"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 926b51d4c1..1d1a1c063e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -228,7 +228,7 @@
              parameter="active speakers" />
         </menu_item_check>
         <menu_item_check
-         label="Mute List"
+         label="Block List"
          layout="topleft"
          name="Mute List">
             <menu_item_check.on_check
@@ -2831,6 +2831,13 @@
          layout="topleft"
          name="XUI"
          tear_off="true">
+            <menu_item_call
+               label="Reload Color Settings"
+               layout="topleft"
+               name="Reload Color Settings">
+              <menu_item_call.on_click
+               function="Advanced.ReloadColorSettings" />
+            </menu_item_call>
             <menu_item_call
              label="Show Font Test"
              layout="topleft"
@@ -3092,7 +3099,8 @@
                  function="Advanced.ToggleInfoDisplay"
                  parameter="agent target" />
             </menu_item_check>
-         <!--   <menu_item_check
+<!-- Appears not to exist anymore
+            <menu_item_check
              label="Debug Rotation"
              layout="topleft"
              name="Debug Rotation">
@@ -3103,6 +3111,7 @@
                  function="ToggleControl"
                  parameter="DebugAvatarRotation" />
             </menu_item_check> -->
+-->
             <menu_item_call
              label="Dump Attachments"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 47b21dc64d..0a63da1463 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2836,7 +2836,7 @@ Do you REALLY want to kick all users off the grid?
    icon="alertmodal.tga"
    name="MuteLinden"
    type="alertmodal">
-Sorry, you cannot mute a Linden.
+Sorry, you cannot block a Linden.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -2851,10 +2851,10 @@ You cannot start an auction on a parcel which is already set for sale.  Disable
 
   <notification
    icon="alertmodal.tga"
-   label="Mute object by name failed"
+   label="Block object by name failed"
    name="MuteByNameFailed"
    type="alertmodal">
-You already have muted this name.
+You already have blocked this name.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -5708,7 +5708,7 @@ An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECT
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -5729,7 +5729,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -5750,7 +5750,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -5974,7 +5974,7 @@ Is this OK?
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -6181,7 +6181,7 @@ You may only select up to [MAX_SELECT] items from this list.
    name="VoiceInviteP2P"
    type="notify">
 [NAME] is inviting you to a Voice Chat call.
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
     <unique>
       <context key="NAME"/>
     </unique>
@@ -6197,7 +6197,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -6205,21 +6205,21 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
    icon="notify.tga"
    name="AutoUnmuteByIM"
    type="notify">
-[FIRST] [LAST] was sent an instant message and has been automatically unmuted.
+[FIRST] [LAST] was sent an instant message and has been automatically unblocked.
   </notification>
 
   <notification
    icon="notify.tga"
    name="AutoUnmuteByMoney"
    type="notify">
-[FIRST] [LAST] was given money and has been automatically unmuted.
+[FIRST] [LAST] was given money and has been automatically unblocked.
   </notification>
 
   <notification
    icon="notify.tga"
    name="AutoUnmuteByInventory"
    type="notify">
-[FIRST] [LAST] was offered inventory and has been automatically unmuted.
+[FIRST] [LAST] was offered inventory and has been automatically unblocked.
   </notification>
 
   <notification
@@ -6227,7 +6227,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
    name="VoiceInviteGroup"
    type="notify">
 [NAME] has joined a Voice Chat call with the group [GROUP].
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
     <unique>
       <context key="NAME"/>
       <context key="GROUP"/>
@@ -6244,7 +6244,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -6253,7 +6253,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
    name="VoiceInviteAdHoc"
    type="notify">
 [NAME] has joined a Voice Chat call with a conference chat...
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this user.
+Click Accept to join the call or Decline to decline the invitation. Click Block to block this user.
     <unique>
       <context key="NAME"/>
     </unique>
@@ -6269,7 +6269,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -6278,7 +6278,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
    name="InviteAdHoc"
    type="notify">
 [NAME] is inviting you to a conference chat.
-Click Accept to join the chat or Decline to decline the invitation. Click Mute to mute this user.
+Click Accept to join the chat or Decline to decline the invitation. Click Block to block this user.
     <unique>
       <context key="NAME"/>
     </unique>
@@ -6294,7 +6294,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 1e222db7b5..a29ab971a4 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -22,7 +22,7 @@
 	  </panel>
 		<icon name="DUMMY" image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
 	  <panel follows="left|right" auto_resize="true" width="90" height="28" min_height="28">
-		<combo_box follows="left|right" height="20" label="Gestures" left="0" bottom="6" name="Gesture" top_delta="0" width="90" />
+		<combo_box follows="left" height="20" label="Gestures" left="0" bottom="6" name="Gesture" top_delta="0" width="90" />
 	  </panel>
 	  	<icon name="DUMMY" image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
 	  <panel follows="left|right" auto_resize="true" width="250" height="28" min_height="28">
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 10d10f60ff..b79f5f09d9 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="all"
- height="466"
+ height="514"
  label="General"
  layout="topleft"
  left="1"
  name="general_tab"
  top="466"
- width="418">
+ width="279">
     <panel.string
      name="help_text">
         The General tab contains general information about
@@ -41,44 +41,45 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      label="?"
      label_selected="?"
      layout="topleft"
-     left="391"
+     left="250"
      name="help_button"
      top="8"
      width="20" />
     <line_editor
      follows="left|top"
-     font="SansSerif"
+     font="SansSerifSmall"
      halign="left"
      height="16"
      label="Type your new group name here"
      layout="topleft"
-     left_delta="-384"
+     left_delta="-245"
      max_length="35"
      name="group_name_editor"
      top_delta="0"
-     width="300" />
+     width="200" />
     <text
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerifBig"
+     font="SansSerifSmall"
      height="16"
      layout="topleft"
      left_delta="0"
      name="group_name"
-     top_delta="-4"
-     width="300">
+     top_delta="0"
+     width="200">
         Type your new group name here
     </text>
     <text
      type="string"
      length="1"
+     follows="left|top"
      height="16"
      layout="topleft"
      left_delta="0"
      name="prepend_founded_by"
      top_pad="4"
-     width="100">
+     width="67">
         Founded by
     </text>
     <name_box
@@ -89,65 +90,69 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      left_delta="63"
      name="founder_name"
      top_delta="0"
-     width="200" />
-    <text
+     width="133" />
+    <text_editor
      type="string"
      length="1"
-     height="16"
+     follows="left|top"
+     halign="left"
+     height="125"
+     hide_scrollbar="true"
      layout="topleft"
-     name="group_charter_label"
-     right="410"
-     top="40"
-     width="265">
+     max_length="511"
+     name="charter"
+     right="270"
+     top="42"
+     width="170"
+     word_wrap="true">
         Group Charter
-    </text>
+    </text_editor>
     <texture_picker
      follows="left|top"
-     height="144"
-     label="Group Insignia"
+     height="96"
+     label=""
      layout="topleft"
-     left_delta="-138"
+     left_delta="-95"
      name="insignia"
      tool_tip="Click to choose a picture"
      top_delta="1"
-     width="128" />
-    <text_editor
+     width="85" />
+    <text
+      follows="left|top"
      type="string"
      length="1"
-     follows="left|top"
-     halign="left"
-     height="160"
-     hide_scrollbar="true"
+     height="16"
      layout="topleft"
-     max_length="511"
-     name="charter"
-     right="410"
-     top="55"
-     width="265"
-     word_wrap="true">
+     name="group_charter_label"
+     right="270"
+     top="167"
+     width="170">
         Group Charter
-    </text_editor>
+    </text>
     <button
      follows="left|top"
      height="22"
+     font="SansSerifSmall"
      label="Join (L$0)"
      label_selected="Join (L$0)"
      layout="topleft"
      left="7"
      name="join_button"
-     top="193"
-     width="128" />
+     top="160"
+     width="85" />
     <button
      follows="left|top"
      height="22"
-     label="Detailed View"
+     font="SansSerifSmall"
+     label="Details"
      label_selected="Detailed View"
      layout="topleft"
      left_delta="0"
      name="info_button"
      top_delta="0"
-     width="128" />
+     width="85" />
     <text
+      follows="left|top"
      type="string"
      length="1"
      font="SansSerif"
@@ -155,11 +160,12 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      layout="topleft"
      left_delta="0"
      name="text_owners_and_visible_members"
-     top_pad="4"
-     width="160">
+     top_pad="15"
+     width="270">
         Owners &amp; Visible Members
     </text>
     <text
+      follows="left|top"
      type="string"
      length="1"
      height="16"
@@ -167,7 +173,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      left_delta="0"
      name="text_owners_are_shown_in_bold"
      top_delta="16"
-     width="160">
+     width="270">
         (Owners are shown in bold)
     </text>
     <name_list
@@ -180,7 +186,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      left_delta="0"
      name="visible_members"
      top_pad="8"
-     width="404">
+     width="263">
         <name_list.columns
          label="Member Name"
          name="name"
@@ -195,6 +201,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          relative_width="0.25" />
     </name_list>
     <text
+      follows="left|top"
      type="string"
      length="1"
      bottom_delta="18"
@@ -208,12 +215,12 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      bevel_style="in"
      border="true"
      follows="left|top"
-     height="96"
+     height="115"
      layout="topleft"
      left_delta="0"
      name="preferences_container"
      top_pad="8"
-     width="404">
+     width="263">
         <check_box
          height="16"
          initial_value="true"
@@ -223,7 +230,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          name="show_in_group_list"
          tool_tip="Let people see this group in search results."
          top="4"
-         width="95" />
+         width="63" />
         <check_box
          follows="right|top"
          height="16"
@@ -233,16 +240,16 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          name="open_enrollement"
          tool_tip="Sets whether this group allows new members to join   without being invited."
          top_pad="2"
-         width="95" />
+         width="63" />
         <check_box
          height="16"
          label="Enrollment fee: L$"
          layout="topleft"
-         left_delta="16"
+         left_delta="0"
          name="check_enrollment_fee"
          tool_tip="Sets whether to require an enrollment fee to join the group."
          top="40"
-         width="95" />
+         width="63" />
         <spinner
          decimal_digits="0"
          follows="left|top"
@@ -251,8 +258,9 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          increment="1"
          label_width="10"
          layout="topleft"
-         left_pad="21"
+         left="25"
          max_val="99999"
+         top="60"
          name="spin_enrollment_fee"
          tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
          top_delta="-2"
@@ -263,8 +271,8 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          left="6"
          name="group_mature_check"
          tool_tip="Sets whether your group information is considered mature."
-         top="64"
-         width="130">
+         top="90"
+         width="120">
             <combo_box.item
              label="Select Mature -"
              value="Select" />
@@ -280,7 +288,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          length="1"
          height="16"
          layout="topleft"
-         left="225"
+         left="150"
          name="active_title_label"
          top="4"
          width="95">
@@ -296,7 +304,8 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          width="95" />
         <check_box
          height="16"
-         label="Receive group notices"
+         font="SansSerifSmall"
+         label="Receive notices"
          layout="topleft"
          left_delta="0"
          name="receive_notices"
@@ -305,7 +314,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          width="95" />
         <check_box
          height="16"
-         label="List group in my profile"
+         label="List in my profile"
          layout="topleft"
          left_delta="0"
          name="list_groups_in_profile"
@@ -313,4 +322,4 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          top_pad="2"
          width="95" />
     </panel>
-</panel>
+</panel> 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 35691661f1..7ff53b8491 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="all"
- height="470"
+ height="514"
  label="Land &amp; L$"
  layout="topleft"
  left="1"
  name="land_money_tab"
  top="470"
- width="418">
+ width="280">
     <panel.string
      name="help_text">
         Parcels owned by the group are listed along with contribution details. A warning appears until the Total Land in Use is less than or equal to the Total Contribution. The Planning, Details, and Sales tabs provide information about the group&apos;s finances.
@@ -30,10 +30,11 @@
         Unable to set your land contribution.
     </panel.string>
     <button
+      follows="left|top"
      height="16"
      label="?"
      layout="topleft"
-     left="391"
+     left="250"
      name="help_button"
      top="8"
      width="20" />
@@ -44,7 +45,7 @@
      font="SansSerifBig"
      height="16"
      layout="topleft"
-     left_delta="-384"
+     left_delta="-250"
      name="group_land_heading"
      top_delta="-4"
      width="150">
@@ -60,23 +61,23 @@
      left_delta="0"
      name="group_parcel_list"
      top_pad="6"
-     width="404">
+     width="275">
         <scroll_list.columns
-         label="Parcel Name"
+         label="Parcel"
          name="name"
-         width="100" />
+         width="67" />
         <scroll_list.columns
          label="Region"
          name="location"
-         width="120" />
+         width="72" />
         <scroll_list.columns
          label="Type"
          name="type"
-         width="100" />
+         width="60" />
         <scroll_list.columns
          label="Area"
          name="area"
-         width="61" />
+         width="20" />
         <scroll_list.columns
          label=""
          name="hidden"
@@ -85,13 +86,13 @@
     <button
      follows="top"
      height="20"
-     label="Show on Map"
+     label="Map"
      label_selected="Show on Map"
      layout="topleft"
-     left="312"
+     left="225"
      name="map_button"
      top="150"
-     width="100"
+     width="50"
      enabled="false" />
     <text
      type="string"
@@ -100,10 +101,10 @@
      halign="right"
      height="16"
      layout="topleft"
-     left_delta="-305"
+     left_delta="-226"
      name="total_contributed_land_label"
      top_delta="4"
-     width="120">
+     width="100">
         Total Contribution:
     </text>
     <text
@@ -125,10 +126,10 @@
      halign="right"
      height="16"
      layout="topleft"
-     left="7"
+     left="0"
      name="total_land_in_use_label"
      top="172"
-     width="120">
+     width="100">
         Total Land In Use:
     </text>
     <text
@@ -150,10 +151,10 @@
      halign="right"
      height="16"
      layout="topleft"
-     left="7"
+     left="10"
      name="land_available_label"
      top="190"
-     width="120">
+     width="90">
         Land Available:
     </text>
     <text
@@ -175,10 +176,10 @@
      halign="right"
      height="16"
      layout="topleft"
-     left="7"
+     left="0"
      name="your_contribution_label"
      top="208"
-     width="120">
+     width="100">
         Your Contribution:
     </text>
     <line_editor
@@ -200,9 +201,22 @@
      layout="topleft"
      left_pad="5"
      name="your_contribution_max_value"
-     top_delta="2"
-     width="200">
-        sq. meters ([AMOUNT] max)
+     top_delta="2">
+         sq. meters
+    </text>
+     <text
+     type="string"
+     length="1"
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="20"
+     name="your_contribution_max_value"
+     top="226"
+     top_delta="0"
+     width="180">
+        ([AMOUNT] max)
     </text>
     <icon
      height="16"
@@ -210,21 +224,24 @@
      layout="topleft"
      left="9"
      name="group_over_limit_icon"
-     top="235"
+     top="245"
      visible="false"
      width="16" />
     <text
+      follows="left|top"
      type="string"
      length="1"
-     height="16"
+     word_wrap="true"
+     font="SansSerifSmall"
+     height="50"
      layout="topleft"
      left_pad="5"
      name="group_over_limit_text"
      text_color="GroupOverTierColor"
-     top_delta="1"
-     width="400">
+     top_delta="0"
+     width="250">
         Group members must contribute more land credits to support land in use.
-    </text>
+    </text> 
     <text
      type="string"
      length="1"
@@ -234,7 +251,7 @@
      layout="topleft"
      left="12"
      name="group_money_heading"
-     top="261"
+     top_delta="40"
      width="150">
         Group L$
     </text>
@@ -245,18 +262,18 @@
      left="6"
      name="group_money_tab_container"
      tab_position="top"
-     top="286"
-     width="406">
+     top_pad="10"
+     width="270">
         <panel
          border="true"
          follows="left|top|right|bottom"
-         height="255"
+         height="180"
          label="Planning"
          layout="topleft"
          left="1"
          name="group_money_planning_tab"
          top="5"
-         width="398">
+         width="270">
             <text_editor
              type="string"
              length="1"
@@ -269,105 +286,101 @@
              max_length="4096"
              name="group_money_planning_text"
              top="5"
-             width="382">
+             width="260">
                 Computing...
             </text_editor>
         </panel>
-        <panel
+      <panel
          border="true"
-         follows="all"
-         height="250"
+         follows="left|top|right|bottom"
+         height="180"
          label="Details"
          layout="topleft"
          left_delta="0"
          name="group_money_details_tab"
-         top_delta="163"
-         width="398">
-            <text_editor
+         top_delta="0"
+         width="270">
+          <text_editor
              type="string"
              length="1"
              bg_readonly_color="0.784314 0.819608 0.8 1"
-             follows="left|top"
+             follows="all"
              font="Monospace"
-             height="125"
+             height="140"
              layout="topleft"
              left="8"
              max_length="4096"
              name="group_money_details_text"
              top="7"
-             width="382">
+             width="260">
                 Computing...
-            </text_editor>
-            <button
-             follows="left|top"
+            </text_editor> 
+          <button
              height="20"
              label="&lt; Earlier"
              label_selected="&lt; Earlier"
              layout="topleft"
-             left="24"
+             left="30"
              name="earlier_details_button"
              tool_tip="Go back in time"
-             top="136"
+             top_pad="5"
              width="80" />
             <button
-             follows="left|top"
              height="20"
              label="Later &gt;"
              label_selected="Later &gt;"
              layout="topleft"
-             left_pad="190"
+             left_pad="20"
              name="later_details_button"
              tool_tip="Go forward in time"
              top_delta="0"
-             width="80" />
+             width="80" />  
         </panel>
-        <panel
+      <panel
          border="true"
-         follows="all"
-         height="164"
+         follows="left|top|right|bottom"
+         height="180"
          label="Sales"
          layout="topleft"
          left_delta="0"
          name="group_money_sales_tab"
          top_delta="-1"
-         width="398">
+         width="270">
             <text_editor
              type="string"
              length="1"
              bg_readonly_color="0.784314 0.819608 0.8 1"
-             follows="left|top"
+             follows="all"
              font="Monospace"
-             height="125"
+             height="140"
              layout="topleft"
              left="8"
              max_length="4096"
              name="group_money_sales_text"
              top="7"
-             width="382">
+             width="260">
                 Computing...
             </text_editor>
             <button
-             follows="left|top"
              height="20"
              label="&lt; Earlier"
              label_selected="&lt; Earlier"
              layout="topleft"
-             left="24"
+             left="30"
              name="earlier_sales_button"
              tool_tip="Go back in time"
-             top="136"
+             top_pad="5"
              width="80" />
             <button
-             follows="left|top"
              height="20"
              label="Later &gt;"
              label_selected="Later &gt;"
              layout="topleft"
-             left_pad="190"
+             left_pad="20"
              name="later_sales_button"
              tool_tip="Go forward in time"
              top_delta="0"
              width="80" />
         </panel>
     </tab_container>
-</panel>
+</panel> 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 345cc734e6..981fd2dde1 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="all"
- height="466"
+ height="514"
  label="Notices"
  layout="topleft"
  left="1"
  name="notices_tab"
  top="466"
- width="418">
+ width="279">
     <panel.string
      name="help_text">
         Notices are a quick way to communicate across a 
@@ -23,40 +23,43 @@ the General tab.
         There are no past notices.
     </panel.string>
     <button
+      follows="left|top"
      height="16"
      label="?"
      label_selected="?"
      layout="topleft"
-     left="391"
+     left="250"
      name="help_button"
      top="8"
      width="20" />
     <text
+      follows="left|top"
      type="string"
      length="1"
      font="SansSerifBig"
      height="16"
      layout="topleft"
-     left_delta="-384"
+     left_delta="-245"
      name="lbl"
      top_delta="-4"
-     width="436">
+     width="279">
         Group Notices Archive
     </text>
     <text
+      follows="left|top"
      type="string"
      length="1"
-     height="16"
+     word_wrap="true"
+     height="73"
      layout="topleft"
      left_delta="0"
      name="lbl2"
-     top_pad="4"
-     width="436">
-        Notices are kept for 14 days. Click the notice below you wish to view.
-Click the &apos;Refresh&apos; button to check if new notices have been received.
-Notice lists are limited to 200 notices per group on a daily basis.
+     top_pad="6"
+     width="270">
+        Notices are kept for 14 days. Click the notice below if you wish to view. Click the &apos;Refresh&apos; button to check if new notices have been received. Notice lists are limited to 200 notices per group on a daily basis.
     </text>
     <scroll_list
+      follows="left|top"
      column_padding="0"
      draw_heading="true"
      heading_height="14"
@@ -64,8 +67,8 @@ Notice lists are limited to 200 notices per group on a daily basis.
      layout="topleft"
      left_delta="0"
      name="notice_list"
-     top_pad="28"
-     width="404">
+     top_pad="0"
+     width="270">
         <scroll_list.columns
          label=""
          name="icon"
@@ -73,20 +76,21 @@ Notice lists are limited to 200 notices per group on a daily basis.
         <scroll_list.columns
          label="Subject"
          name="subject"
-         width="171" />
+         width="100" />
         <scroll_list.columns
          label="From"
          name="from"
-         width="125" />
+         width="83" />
         <scroll_list.columns
          label="Date"
          name="date"
-         width="85" />
+         width="50" />
         <scroll_list.columns
          name="sort"
          width="-1" />
     </scroll_list>
     <text
+      follows="left|top"
      type="string"
      length="1"
      layout="topleft"
@@ -95,33 +99,38 @@ Notice lists are limited to 200 notices per group on a daily basis.
         None found.
     </text>
     <button
+      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Create New Notice"
      label_selected="Create New Notice"
      layout="topleft"
      left_delta="0"
      name="create_new_notice"
      top_delta="-2"
-     width="150" />
+     width="125" />
     <button
+      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Refresh"
      label_selected="Refresh List"
      layout="topleft"
-     left_pad="164"
+     left_pad="70"
      name="refresh_notices"
      top_delta="0"
-     width="90" />
+     width="75" />
     <panel
-     follows="all"
+     follows="left|top"
      height="268"
      label="Create New Notice"
      layout="topleft"
      left="1"
      name="panel_create_new_notice"
-     top="198"
-     width="418">
+     top="225"
+     width="270">
         <text
+         follows="left|top"
          type="string"
          length="1"
          font="SansSerifBig"
@@ -130,25 +139,25 @@ Notice lists are limited to 200 notices per group on a daily basis.
          left="7"
          mouse_opaque="false"
          name="lbl"
-         top="2"
-         width="436">
+         top_pad="10"
+         width="270">
             Create a Notice
         </text>
         <text
+         follows="left|top"
          type="string"
+         word_wrap="true"
          length="1"
-         height="16"
+         height="90"
          layout="topleft"
          left_delta="0"
          name="lbl2"
          top_pad="4"
-         width="436">
-            You must enter a subject to send a notice. You can add a single
-item to a notice by dragging it from your inventory to this 
-panel. Attached items must be copiable and transferrable,
-and you can&apos;t send a folder.
+         width="196">
+            You must enter a subject to send a notice. You can add a single item to a notice by dragging it from your inventory to this panel. Attached items must be copiable and transferrable, and you can&apos;t send a folder.
         </text>
         <text
+         follows="left|top"
          type="string"
          length="1"
          halign="right"
@@ -156,7 +165,7 @@ and you can&apos;t send a folder.
          layout="topleft"
          left_delta="0"
          name="lbl3"
-         top_pad="47"
+         top_pad="10"
          width="55">
             Subject:
         </text>
@@ -165,12 +174,13 @@ and you can&apos;t send a folder.
          border_thickness="1"
          height="16"
          layout="topleft"
-         left_pad="3"
+         left_pad="2"
          max_length="63"
          name="create_subject"
          top_delta="0"
-         width="264" />
+         width="200" />
         <text
+         follows="left|top"
          type="string"
          length="1"
          halign="right"
@@ -178,21 +188,22 @@ and you can&apos;t send a folder.
          layout="topleft"
          left="7"
          name="lbl4"
-         top="103"
+         top_pad="2"
          width="55">
             Message:
         </text>
         <text_editor
-         height="120"
+         height="75"
          hide_scrollbar="true"
          layout="topleft"
          left_pad="3"
          max_length="511"
          name="create_message"
-         top_delta="2"
-         width="346"
+         top_delta="0"
+         width="200"
          word_wrap="true" />
         <text
+         follows="left|top"
          type="string"
          length="1"
          halign="right"
@@ -200,7 +211,7 @@ and you can&apos;t send a folder.
          layout="topleft"
          left="7"
          name="lbl5"
-         top="228"
+         top_pad="2"
          width="55">
             Attach:
         </text>
@@ -208,12 +219,12 @@ and you can&apos;t send a folder.
          enabled="false"
          height="16"
          layout="topleft"
-         left_pad="4"
+         left_pad="2"
          max_length="63"
          mouse_opaque="false"
          name="create_inventory_name"
-         top_delta="2"
-         width="211" />
+         top_delta="0"
+         width="200" />
         <icon
          height="16"
          layout="topleft"
@@ -222,31 +233,35 @@ and you can&apos;t send a folder.
          top_delta="0"
          width="16" />
         <button
+         follows="left|top"
          height="20"
+         font="SansSerifSmall"
          label="Remove Attachment"
          label_selected="Remove Attachment"
          layout="topleft"
-         left_pad="197"
+         left_pad="-15"
          name="remove_attachment"
-         top_delta="-4"
+         top_delta="20"
          width="135" />
         <button
+         follows="left|top"
          height="20"
-         label="Send Notice"
+         font="SansSerifSmall"
+         label="Send"
          label_selected="Send Notice"
          layout="topleft"
-         left_delta="0"
+         left_delta="140"
          name="send_notice"
-         top_delta="20"
-         width="135" />
+         top_delta="0"
+         width="60" />
         <panel
          bevel_style="in"
          border="true"
          height="76"
          layout="topleft"
-         left="335"
+         left="200"
          name="drop_target2"
-         top="20"
+         top="28"
          width="76" />
         <icon
          height="64"
@@ -255,7 +270,7 @@ and you can&apos;t send a folder.
          left_delta="5"
          mouse_opaque="true"
          name="drop_icon"
-         top="25"
+         top="35"
          width="64" />
         <group_drop_target
          height="466"
@@ -264,17 +279,17 @@ and you can&apos;t send a folder.
          name="drop_target"
          tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice."
          top="-198"
-         width="422" />
-    </panel>
+         width="280" />
+   </panel> 
     <panel
-     follows="all"
+     follows="left|top"
      height="268"
      label="View Past Notice"
      layout="topleft"
-     left_delta="0"
+     left="1"
      name="panel_view_past_notice"
-     top_delta="0"
-     width="418">
+     top="225"
+     width="270">
         <text
          type="string"
          length="1"
@@ -284,19 +299,20 @@ and you can&apos;t send a folder.
          left="7"
          mouse_opaque="false"
          name="lbl"
-         top="2"
-         width="436">
+         top_pad="10"
+         width="270">
             Archived Notice
         </text>
         <text
          type="string"
          length="1"
          height="16"
+         word_wrap="true"
          layout="topleft"
          left_delta="0"
          name="lbl2"
-         top_pad="4"
-         width="436">
+         top_pad="10"
+         width="270">
             To send a new notice, click the &apos;Create New Notice&apos; button above.
         </text>
         <text
@@ -318,12 +334,12 @@ and you can&apos;t send a folder.
          enabled="false"
          height="16"
          layout="topleft"
-         left_pad="3"
+         left_pad="2"
          max_length="63"
          name="view_subject"
          top_delta="0"
          visible="false"
-         width="346" />
+         width="210" />
         <text
          type="string"
          length="1"
@@ -332,30 +348,32 @@ and you can&apos;t send a folder.
          layout="topleft"
          left="7"
          name="lbl4"
-         top="80"
+         top_pad="5"
          visible="false"
          width="55">
             Message:
         </text>
         <text_editor
          enabled="false"
-         height="206"
+         height="100"
          hide_scrollbar="true"
          layout="topleft"
-         left_delta="0"
+         left_pad="3"
          max_length="511"
          name="view_message"
-         top_delta="-42"
-         width="404"
+         top_delta="2"
+         width="210"
          word_wrap="true" />
         <button
+         follows="left|top"
          height="20"
+         font="SansSerifSmall"
          label="Open Attachment"
          label_selected="Open Attachment"
          layout="topleft"
-         left_delta="0"
+         left_delta="-60"
          name="open_attachment"
-         top_pad="4"
+         top_pad="20"
          width="110" />
         <line_editor
          enabled="false"
@@ -366,7 +384,7 @@ and you can&apos;t send a folder.
          mouse_opaque="false"
          name="view_inventory_name"
          top_delta="1"
-         width="264" />
+         width="145" />
         <icon
          height="16"
          layout="topleft"
@@ -375,4 +393,4 @@ and you can&apos;t send a folder.
          top_delta="0"
          width="16" />
     </panel>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index c758da4b63..750f84fbb3 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="true"
- height="466"
+ height="514"
  label="Members &amp; Roles"
  layout="topleft"
  left="1"
  name="roles_tab"
  top="466"
- width="418">
+ width="280">
     <panel.string
      name="default_needs_apply_text">
         There are unapplied changes on the current sub-tab.
@@ -19,20 +19,22 @@
     <panel.string
      name="help_text" />
     <button
+     follows="left|top"
      height="16"
      label="?"
      layout="topleft"
-     left="391"
+     left="250"
      name="help_button"
      top="8"
      width="20" />
     <panel
+     follows="left|top"
      height="24"
      layout="topleft"
      left="7"
      name="members_header"
      top="0"
-     width="380">
+     width="273">
         <text
          type="string"
          length="1"
@@ -48,24 +50,25 @@
         <text
          type="string"
          length="1"
-         height="32"
+         word_wrap="true"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="static2"
          top_pad="4"
-         width="400">
-            Group Members are assigned Roles with Abilities. These settings can 
-easily be customized, allowing for greater organization and flexibility.
+         width="270">
+            Group Members are assigned Roles with Abilities. These settings can easily be customized, allowing for greater organization and flexibility.
         </text>
     </panel>
     <panel
+     follows="left|top"
      height="24"
      layout="topleft"
      left_delta="0"
      name="roles_header"
      top_delta="0"
      visible="false"
-     width="380">
+     width="280">
         <text
          type="string"
          length="1"
@@ -81,58 +84,63 @@ easily be customized, allowing for greater organization and flexibility.
         <text
          type="string"
          length="1"
-         height="16"
+         word_wrap="true"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="role_properties_modifiable"
          top_pad="4"
          visible="false"
-         width="394">
+         width="270">
             Select a Role below.  You can modify its Name, Description and Member Title.
         </text>
         <text
          type="string"
          length="1"
-         height="16"
+         word_wrap="true"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="role_properties_not_modifiable"
          top_delta="0"
-         width="394">
+         width="270">
             Select a Role below to see its properties, Members and allowed Abilities.
         </text>
         <text
          type="string"
          length="1"
+         word_wrap="true"
          height="16"
          layout="topleft"
          left_delta="0"
          name="role_actions_modifiable"
-         top_delta="14"
+         top_delta="24"
          visible="false"
-         width="394">
+         width="270">
             You can also assign Abilities to the Role.
         </text>
         <text
          type="string"
          length="1"
+         word_wrap="true"
          height="16"
          layout="topleft"
          left_delta="0"
          name="role_actions_not_modifiable"
          top_delta="0"
-         width="394">
+         width="270">
             You may view, but not modify, assigned Abilities.
         </text>
     </panel>
     <panel
+     follows="left|top"
      height="24"
      layout="topleft"
      left_delta="0"
      name="actions_header"
      top_delta="20"
      visible="false"
-     width="380">
+     width="280">
         <text
          type="string"
          length="1"
@@ -148,14 +156,14 @@ easily be customized, allowing for greater organization and flexibility.
         <text
          type="string"
          length="1"
-         height="32"
+         word_wrap="true"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="static2"
          top_pad="4"
-         width="394">
-            You can view an Ability&apos;s Description and which Roles and Members can 
-execute the Ability.
+         width="270">
+            You can view an Ability&apos;s Description and which Roles and Members can execute the Ability.
         </text>
     </panel>
     <tab_container
@@ -164,8 +172,8 @@ execute the Ability.
      left_delta="-1"
      name="roles_tab_container"
      tab_position="top"
-     top_pad="10"
-     width="406">
+     top="85"
+     width="275">
         <panel
          border="true"
          height="164"
@@ -175,7 +183,7 @@ execute the Ability.
          name="members_sub_tab"
          tool_tip="Members"
          top="16"
-         width="406">
+         width="275">
             <panel.string
              name="help_text">
                 You can add or remove Roles assigned to Members.
@@ -222,36 +230,38 @@ clicking on their names.
              multi_select="true"
              name="member_list"
              top="24"
-             width="396">
+             width="265">
                 <name_list.columns
-                 label="Member Name"
+                 label="Member"
                  name="name"
-                 width="136" />
+                 width="90" />
                 <name_list.columns
-                 label="Donated Tier"
+                 label="Donations"
                  name="donated"
-                 width="136" />
+                 width="95" />
                 <name_list.columns
-                 label="Last Login"
+                 label="Online"
                  name="online"
-                 width="116" />
+                 width="80" />
             </name_list>
             <button
              height="19"
-             label="Invite New Member ..."
+             font="SansSerifSmall"
+             label="Invite"
              layout="topleft"
              left_delta="0"
              name="member_invite"
              top_pad="1"
-             width="146" />
+             width="100" />
             <button
              height="19"
-             label="Eject From Group"
+             font="SansSerifSmall"
+             label="Eject"
              layout="topleft"
-             left_pad="103"
+             left_pad="65"
              name="member_eject"
              top_delta="0"
-             width="146" />
+             width="100" />
             <icon
              height="16"
              image_name="inv_folder_plain_closed.tga"
@@ -268,7 +278,7 @@ clicking on their names.
          left_delta="0"
          name="roles_sub_tab"
          top_delta="0"
-         width="398">
+         width="275">
             <panel.string
              name="help_text">
                 Roles have a title and an allowed list of Abilities
@@ -332,36 +342,38 @@ including the Everyone and Owner Roles.
              left="4"
              name="role_list"
              top="23"
-             width="396">
+             width="265">
                 <scroll_list.columns
-                 label="Role Name"
+                 label="Role"
                  name="name"
-                 width="126" />
+                 width="80" />
                 <scroll_list.columns
                  label="Title"
                  name="title"
-                 width="186" />
+                 width="90" />
                 <scroll_list.columns
                  label="Members"
                  name="members"
-                 width="76" />
+                 width="95" />
             </scroll_list>
             <button
              height="19"
-             label="Create New Role ..."
+             font="SansSerifSmall"
+             label="Create New Role"
              layout="topleft"
              left_delta="0"
              name="role_create"
              top_pad="2"
-             width="146" />
+             width="125" />
             <button
              height="19"
+             font="SansSerifSmall"
              label="Delete Role"
              layout="topleft"
-             left_pad="95"
+             left_pad="15"
              name="role_delete"
              top_delta="0"
-             width="146" />
+             width="125" />
         </panel>
         <panel
          border="true"
@@ -371,7 +383,7 @@ including the Everyone and Owner Roles.
          left_delta="0"
          name="actions_sub_tab"
          top_delta="0"
-         width="398">
+         width="275">
             <panel.string
              name="help_text">
                 Abilities allow Members in Roles to do specific
@@ -419,7 +431,7 @@ things in this group. There&apos;s a broad variety of Abilities.
              search_column="1"
              tool_tip="Select an Ability to view more details."
              top="23"
-             width="392">
+             width="265">
                 <scroll_list.columns
                  label=""
                  name="icon"
@@ -427,7 +439,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                 <scroll_list.columns
                  label=""
                  name="action"
-                 width="356" />
+                 width="247" />
             </scroll_list>
             <icon
              height="16"
@@ -438,13 +450,13 @@ things in this group. There&apos;s a broad variety of Abilities.
              width="16" />
         </panel>
     </tab_container>
-    <panel
-     height="215"
+      <panel
+     height="50"
      layout="topleft"
      left_delta="1"
      name="members_footer"
      top_pad="20"
-     width="406">
+     width="270">
         <text
          type="string"
          length="1"
@@ -463,21 +475,21 @@ things in this group. There&apos;s a broad variety of Abilities.
          font="SansSerif"
          height="16"
          layout="topleft"
-         left_pad="50"
+         left_pad="30"
          name="static2"
          top_delta="0"
-         width="150">
+         width="100">
             Allowed Abilities
         </text>
         <scroll_list
          draw_stripes="false"
          enabled="false"
-         height="198"
+         height="75"
          layout="topleft"
          left="0"
          name="member_assigned_roles"
          top="1"
-         width="145">
+         width="125">
             <scroll_list.columns
              label=""
              name="checkbox"
@@ -485,18 +497,18 @@ things in this group. There&apos;s a broad variety of Abilities.
             <scroll_list.columns
              label=""
              name="role"
-             width="109" />
+             width="107" />
         </scroll_list>
         <scroll_list
          draw_stripes="false"
          enabled="false"
-         height="198"
+         height="75"
          layout="topleft"
          left_pad="5"
          name="member_allowed_actions"
          tool_tip="For Details of each Allowed Ability see the Abilities tab."
          top_delta="0"
-         width="254">
+         width="140">
             <scroll_list.columns
              label=""
              name="icon"
@@ -504,7 +516,7 @@ things in this group. There&apos;s a broad variety of Abilities.
             <scroll_list.columns
              label=""
              name="action"
-             width="224" />
+             width="126" />
         </scroll_list>
     </panel>
     <panel
@@ -514,7 +526,7 @@ things in this group. There&apos;s a broad variety of Abilities.
      name="roles_footer"
      top_delta="0"
      visible="false"
-     width="406">
+     width="270">
         <text
          type="string"
          length="1"
@@ -533,7 +545,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          font="SansSerif"
          height="16"
          layout="topleft"
-         left_pad="50"
+         left_pad="40"
          name="static2"
          top_delta="0"
          width="100">
@@ -551,7 +563,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="20"
          name="role_name"
          top="0"
-         width="145">
+         width="130">
             Employees
         </line_editor>
         <text
@@ -578,7 +590,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="20"
          name="role_title"
          top_delta="16"
-         width="145">
+         width="130">
             (waiting)
         </line_editor>
         <text_editor
@@ -588,11 +600,11 @@ things in this group. There&apos;s a broad variety of Abilities.
          height="48"
          hide_scrollbar="true"
          layout="topleft"
-         left="150"
+         left="135"
          max_length="254"
          name="role_description"
          top="0"
-         width="254"
+         width="135"
          word_wrap="true">
             (waiting)
         </text_editor>
@@ -614,22 +626,22 @@ things in this group. There&apos;s a broad variety of Abilities.
          font="SansSerif"
          height="16"
          layout="topleft"
-         left_pad="30"
+         left_pad="20"
          name="static5"
          tool_tip="A list of Abilities the currently selected role can perform."
          top_delta="0"
-         width="240">
+         width="100">
             Allowed Abilities
         </text>
         <name_list
          draw_stripes="false"
          enabled="false"
-         height="105"
+         height="125"
          layout="topleft"
          left="0"
          name="role_assigned_members"
          top="74"
-         width="145" />
+         width="130" />
         <check_box
          height="16"
          label="Members are visible"
@@ -638,17 +650,17 @@ things in this group. There&apos;s a broad variety of Abilities.
          name="role_visible_in_list"
          tool_tip="Sets whether members of this role are visible in the General tab   to people outside of the group."
          top_pad="4"
-         width="361" />
+         width="130" />
         <scroll_list
          draw_stripes="false"
          height="125"
          layout="topleft"
-         left="150"
+         left="135"
          name="role_allowed_actions"
          search_column="2"
          tool_tip="For Details of each Allowed Ability see the Abilities tab."
          top="74"
-         width="254">
+         width="130">
             <scroll_list.columns
              label=""
              name="icon"
@@ -663,14 +675,14 @@ things in this group. There&apos;s a broad variety of Abilities.
              width="220" />
         </scroll_list>
     </panel>
-    <panel
+   <panel
      height="215"
      layout="topleft"
      left_delta="0"
      name="actions_footer"
      top_delta="0"
      visible="false"
-     width="406">
+     width="270">
         <text
          type="string"
          length="1"
@@ -695,7 +707,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="512"
          name="action_description"
          top_delta="16"
-         width="404"
+         width="270"
          word_wrap="true">
             This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
         </text_editor>
@@ -708,7 +720,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left_delta="0"
          name="static2"
          top_pad="10"
-         width="145">
+         width="125">
             Roles with Ability
         </text>
         <text
@@ -717,10 +729,10 @@ things in this group. There&apos;s a broad variety of Abilities.
          font="SansSerif"
          height="16"
          layout="topleft"
-         left_pad="5"
+         left_pad="10"
          name="static3"
          top_delta="0"
-         width="200">
+         width="125">
             Members with Ability
         </text>
         <scroll_list
@@ -730,7 +742,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          name="action_roles"
          top="74"
-         width="145" />
+         width="130" />
         <name_list
          enabled="false"
          height="125"
@@ -738,6 +750,6 @@ things in this group. There&apos;s a broad variety of Abilities.
          left_pad="5"
          name="action_members"
          top_delta="0"
-         width="254" />
+         width="135" />
     </panel>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index fa1abaa595..9d4c411201 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -8,15 +8,16 @@
  layout="topleft"
  name="navigation_bar"
  width="600">
-    <button
+     <button
      follows="left|top"
      font="SansSerifSmall"
      height="20"
-     image_disabled="navbar_bg_button.tga"
-     image_disabled_selected="navbar_bg_button.tga"
-     image_overlay="navbar_back.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Arrow_Left_Off"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
      layout="topleft"
      left="5"
      name="back_btn"
@@ -24,15 +25,17 @@
      tool_tip="Go back to previous location"
      top="8"
      width="20" />
+
     <button
      follows="left|top"
      font="SansSerifSmall"
      height="20"
-     image_disabled="navbar_bg_button.tga"
-     image_disabled_selected="navbar_bg_button.tga"
-     image_overlay="navbar_forward.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Arrow_Right_Off"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
      layout="topleft"
      left_pad="2"
      name="forward_btn"
@@ -44,11 +47,12 @@
      follows="left|top"
      font="SansSerifSmall"
      height="20"
-     image_disabled="navbar_bg_button.tga"
-     image_disabled_selected="navbar_bg_button.tga"
-     image_overlay="navbar_home.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Home_Off"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
      layout="topleft"
      left_pad="5"
      name="home_btn"
@@ -68,69 +72,86 @@
      name="location_combo"
      top_delta="0"
      width="320">
+     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
+        <location_input.add_landmark_button
+         height="18"
+         name="location_combo_add"
+         width="20" />
+        <location_input.info_button
+         height="18"
+         name="location_combo_info"
+         width="20" />
+      -->
     </location_input>
+
+<!--     <button -->
+<!--      follows="right|top" -->
+<!--      height="20" -->
+<!--      image_disabled="TextField_Search_Off" -->
+<!--      image_disabled_selected="TextField_Search_Off" -->
+<!--      image_hover_selected="TextField_Search_Off" -->
+<!--      image_hover_unselected="TextField_Search_Off" -->
+<!--      image_selected="TextField_Search_Off" -->
+<!--      image_unselected="TextField_Search_Off" -->
+<!--      layout="topleft" -->
+<!--      left_pad="5" -->
+<!--      mouse_opaque="false" -->
+<!--      name="search_bg" -->
+<!--      picture_style="true" -->
+<!--      top_delta="0" -->
+<!--      width="168" /> -->
+    
     <button
      follows="right|top"
-     height="20"
-     image_disabled="navbar_bg_center.tga"
-     image_disabled_selected="navbar_bg_center.tga"
-     image_hover_selected="navbar_bg_center.tga"
-     image_hover_unselected="navbar_bg_center.tga"
-     image_selected="navbar_bg_center.tga"
-     image_unselected="navbar_bg_center.tga"
+     height="16"
+     image_disabled="Search"
+     image_disabled_selected="Search"
+     image_selected="Search"
+     image_unselected="Search"
      layout="topleft"
      left_pad="5"
-     mouse_opaque="false"
-     name="search_bg"
+     name="search_btn"
      picture_style="true"
-     top_delta="0"
-     width="168" />
+     scale_image="false"
+     tool_tip="Search"
+     top_delta="2"
+     width="16" />
+    
     <line_editor
      bevel_style="none"
      border_style="line"
+     border.border_thickness="0"
      commit_on_focus_lost="false"
      follows="right|top"
      halign="right"
      height="18"
-     label="Search"
+     label="Search All"
      layout="topleft"
-     left_delta="0"
+     left_pad="2"
      mouse_opaque="false"
      name="search_input"
-     tool_tip="Search"
-     top_delta="1"
-     width="152" />
-    <button
-     follows="right|top"
-     height="16"
-     image_disabled="status_search_btn.png"
-     image_disabled_selected="status_search_btn_pressed.png"
-     image_selected="status_search_btn_pressed.png"
-     image_unselected="status_search_btn.png"
-     layout="topleft"
-     left_delta="152"
-     name="search_btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Search"
-     top_delta="1"
-     width="16" />
+     tool_tip="Search All"
+     top_delta="-1"
+     width="135" /> 
+    
     <button
      follows="right|top"
      font="SansSerifSmall"
      height="20"
-     image_disabled="navbar_bg_button.tga"
-     image_disabled_selected="navbar_bg_button.tga"
-     image_overlay="navbar_help.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Help_Off"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
      layout="topleft"
-     left_pad="5"
+     left_pad="15"
      name="help_btn"
      picture_style="true"
      tool_tip="Help"
-     top_delta="-2"
+     top_delta="0"
      width="20" />
+
     <favorites_bar
      follows="left|right|top"
      height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index ae385731f9..e2597b4700 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -26,7 +26,7 @@
       layout="topleft"
       height="390" width="332"
       follows="left|top|right|bottom"
-      background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1"
+      background_visible="true" bevel_style="bright" 
       label="Nearby" name="nearby_panel"
     >
       <avatar_list
@@ -60,7 +60,7 @@
       layout="topleft"
       height="390" width="332"
       follows="left|top|right|bottom"
-      background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1"
+      background_visible="true" bevel_style="bright" 
       label="Friends" name="friends_panel"
      >
       <avatar_list
@@ -115,7 +115,7 @@
       layout="topleft"
       height="390" width="332"  
       follows="left|top|right|bottom"
-      background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1"
+      background_visible="true" bevel_style="bright" 
       label="Groups" name="groups_panel"
      >
       <group_list
@@ -182,7 +182,7 @@
       layout="topleft"
       height="390" width="332"
       follows="left|top|right|bottom"
-      background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1"
+      background_visible="true" bevel_style="bright"
       label="Recent" name="recent_panel"
      >
       <avatar_list
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
new file mode 100644
index 0000000000..6b6191e6eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<panel
+ border="true"
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="408"
+ layout="topleft"
+ left="102"
+ name="advanced"
+ top="1"
+ width="517">
+        <text
+     type="string"
+     text_color="LabelSelectedDisabledColor"
+     length="1"
+     follows="left|top"
+     layout="topleft"
+     left="8"
+     name="text status"
+     top_pad="3"
+     width="280">
+Beware the Trout!
+    </text>
+        
+        <!-- ADVANCED -->
+
+    <check_box
+     control_name="SmallAvatarNames"
+     height="16"
+     initial_value="true"
+     label="Small Avatar Names"
+     layout="topleft"
+     left_delta="30"
+     name="small_avatar_names_checkbox"
+     top="20"
+     width="200" />
+    <check_box
+     control_name="ArrowKeysMoveAvatar"
+     height="16"
+     label="Arrow keys always move avatar when chatting"
+     layout="topleft"
+     left_delta="0"
+     name="arrow_keys_move_avatar_check"
+     top_pad="10"
+     width="237" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     name="text_box7"
+     top_pad="10"
+     width="128">
+        Bubble Chat:
+    </text>
+    <slider
+     control_name="ChatBubbleOpacity"
+     follows="left|top"
+     height="12"
+     increment="0.05"
+     initial_value="1"
+     label="Opacity"
+     layout="topleft"
+     left_delta="0"
+     name="bubble_chat_opacity"
+     top_pad="10"
+     width="200" />
+    
+        <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="30"
+     name="UI Size:"
+     top_pad="10"
+     width="100">
+        UI Size:
+    </text>
+    <slider
+     can_edit_text="true"
+     control_name="UIScaleFactor"
+     decimal_digits="2"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="1"
+     layout="topleft"
+     left_delta="0"
+     max_val="1.4"
+     min_val="0.75"
+     name="ui_scale_slider"
+     top_pad="10"
+     width="180" />
+    <spinner
+     control_name="UIScaleFactor"
+     height="16"
+     increment="0.025"
+     initial_value="1"
+     layout="topleft"
+     left_pad="10"
+     max_val="1.4"
+     min_val="0.75"
+     name="ui_scale_slider"
+     top_delta="0"
+     width="58" />
+    <check_box
+     control_name="UIAutoScale"
+     height="16"
+     label="Resolution independent scale"
+     layout="topleft"
+     left="30"
+     name="ui_auto_scale"
+     top_pad="10"
+     width="256" />
+    <!--text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="30"
+     name="DisplayResLabel"
+     top_pad="10"
+     width="128">
+        Display Resolution:
+    </text>
+    <combo_box
+     height="18"
+     layout="topleft"
+     left_pad="5"
+     name="fullscreen combo"
+     top_delta="-1"
+     width="150" /-->
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="30"
+     name="AspectRatioLabel1"
+     tool_tip="width / height"
+     top_pad="5"
+     width="160">
+        Aspect Ratio:
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     height="16"
+     layout="topleft"
+     left_pad="0"
+     max_chars="100"
+     name="aspect_ratio"
+     tool_tip="width / height"
+     top_delta="0"
+     width="150">
+        <combo_box.item
+         enabled="true"
+         label="4:3 (Standard CRT)"
+         value="1.333333" />
+        <combo_box.item
+         enabled="true"
+         label="5:4 (1280x1024 LCD)"
+         value="1.25" />
+        <combo_box.item
+         enabled="true"
+         label="8:5 (Widescreen)"
+         value="1.6" />
+        <combo_box.item
+         enabled="true"
+         label="16:9 (Widescreen)"
+         value="1.7777777" />
+    </combo_box>
+    <check_box
+     control_name="FullScreenAutoDetectAspectRatio"
+     height="16"
+     label="Auto-detect ratio"
+     layout="topleft"
+     left_pad="5"
+     name="aspect_auto_detect"
+     top_delta="1"
+     width="256">
+        <check_box.commit_callback
+         function="Pref.AutoDetectAspect" />
+    </check_box>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name=" Camera Options:"
+     top_pad="10"
+     width="266">
+        Camera Options:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="camera_fov_label"
+     top_pad="10"
+     width="128">
+        Camera View Angle:
+    </text>
+    <slider 
+     can_edit_text="true"
+	 control_name="CameraAngle"
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.025"
+     initial_value="1.57"
+     layout="topleft"
+     left="128"
+     max_val="2.97"
+     min_val="0.17"
+     name="camera_fov"
+     show_text="false"
+     top_delta="0"
+     width="128" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="Camera Follow Distance:"
+     top_pad="10"
+     width="128">
+        Camera Follow Distance:
+    </text>
+    <slider
+     can_edit_text="true"
+     control_name="CameraOffsetScale"
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.025"
+     initial_value="1"
+     layout="topleft"
+     left_delta="128"
+     max_val="3"
+     min_val="0.5"
+     name="camera_offset_scale"
+     show_text="false"
+     top_delta="0"
+     width="128" />
+    
+        <check_box
+     control_name="EditCameraMovement"
+     height="16"
+     label="Automatic Edit Camera Movement"
+     layout="topleft"
+     left="10"
+     name="edit_camera_movement"
+     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
+     top_pad="5"
+     width="201" />
+    <check_box
+     control_name="AppearanceCameraMovement"
+     height="16"
+     label="Automatic Appearance Camera Movement"
+     layout="topleft"
+     left_pad="5"
+     name="appearance_camera_movement"
+     tool_tip="Use automatic camera positioning while in edit mode"
+     top_delta="0"
+     width="242" />
+
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="10"
+     name="text2"
+     top_pad="5"
+     width="128">
+        Avatar Display Options:
+    </text>
+    <check_box
+     control_name="FirstPersonAvatarVisible"
+     height="16"
+     label="Show Avatar in Mouselook"
+     layout="topleft"
+     left_pad="10"
+     name="first_person_avatar_visible"
+     top_delta="0"
+     width="256" />
+
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index bda437ab29..1d32229c9b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -9,25 +9,13 @@
  name="chat"
  top="1"
  width="517">
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="12"
-     mouse_opaque="false"
-     top="10"
-     width="128">
-        Chat Font Size:
-    </text>
     <radio_group
      height="30"
      layout="topleft"
-     left_pad="8"
+     left="30"
 	 control_name="ChatFontSize"
      name="chat_font_size"
-     top_delta="0"
+     top="10"
      width="331">
         <radio_item
          height="16"
@@ -35,8 +23,8 @@
          layout="topleft"
          left="0"
          name="radio"
-         top="8"
-         width="98" />
+         top="10"
+         width="125" />
         <radio_item
          height="16"
          label="Medium"
@@ -44,7 +32,7 @@
          left_pad="12"
          name="radio2"
          top_delta="0"
-         width="98" />
+         width="125" />
         <radio_item
          height="16"
          label="Large"
@@ -52,45 +40,56 @@
          left_pad="12"
          name="radio3"
          top_delta="0"
-         width="98" />
+         width="125" />
     </radio_group>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="12"
-     mouse_opaque="false"
-     name="text_box2"
-     top="54"
-     width="128">
-        Chat Color:
-    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      control_name="UserChatColor"
      follows="left|top"
      height="47"
-     label="You"
      layout="topleft"
-     left_pad="8"
+     left="30"
      name="user"
-     top_delta="-1"
+     top_pad="10"
      width="44" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Me
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      control_name="AgentChatColor"
      follows="left|top"
      height="47"
-     label="Others"
      layout="topleft"
-     left_pad="10"
+     left="180"
      name="agent"
-     top_delta="0"
+     top_pad="-17"
      width="44" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Others
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
@@ -98,13 +97,25 @@
      control_name="IMChatColor"
      follows="left|top"
      height="47"
-     label="IM"
      label_width="60"
      layout="topleft"
-     left_pad="10"
+     left="350"
      name="im"
-     top_delta="0"
+     top_pad="-17"
      width="44" />
+        <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        IM
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
@@ -112,13 +123,25 @@
      control_name="SystemChatColor"
      follows="left|top"
      height="47"
-     label="System"
      label_width="44"
      layout="topleft"
-     left_pad="10"
+     left="30"
      name="system"
-     top_delta="0"
+     top_pad="40"
      width="44" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        System
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
@@ -126,63 +149,35 @@
      control_name="ScriptErrorColor"
      follows="left|top"
      height="47"
-     label="Errors"
      layout="topleft"
-     left_pad="10"
+     left="180"
      name="script_error"
-     top_delta="0"
+     top_pad="-17"
      width="44" />
-    <color_swatch
-     border_color="0.45098 0.517647 0.607843 1"
-     can_apply_immediately="true"
-     color="0.7 0.9 0.7 1"
-     control_name="ObjectChatColor"
+    <text
+     type="string"
+     length="1"
      follows="left|top"
-     height="47"
-     label="Objects"
+     height="10"
      layout="topleft"
-     left="148"
-     name="objects"
-     top="103"
-     width="44" />
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Errors
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      color="0.7 0.9 0.7 1"
-     control_name="llOwnerSayChatColor"
-     follows="left|top"
-     height="47"
-     label="Owner"
-     layout="topleft"
-     left_pad="10"
-     name="owner"
-     top_delta="0"
-     width="44" />
-    <color_swatch
-     border_color="0.45098 0.517647 0.607843 1"
-     can_apply_immediately="true"
-     color="0 0 0 1"
-     control_name="BackgroundChatColor"
-     follows="left|top"
-     height="47"
-     label="Bubble"
-     layout="topleft"
-     left_pad="10"
-     name="background"
-     top_delta="0"
-     width="44" />
-    <color_swatch
-     border_color="0.45098 0.517647 0.607843 1"
-     can_apply_immediately="true"
-     color="0.6 0.6 1 1"
-     control_name="HTMLLinkColor"
+     control_name="ObjectChatColor"
      follows="left|top"
      height="47"
-     label="URLs"
      layout="topleft"
-     left_pad="10"
-     name="links"
-     top_delta="0"
+     left="350"
+     name="objects"
+     top_pad="-17"
      width="44" />
     <text
      type="string"
@@ -190,56 +185,50 @@
      follows="left|top"
      height="10"
      layout="topleft"
-     left="12"
+     left_pad="5"
      mouse_opaque="false"
-     name="text_box3"
-     top="168"
-     width="135">
-        Chat Console:
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Objects
     </text>
-    <spinner
-     control_name="ChatPersistTime"
-     decimal_digits="0"
+    <color_swatch
+     border_color="0.45098 0.517647 0.607843 1"
+     can_apply_immediately="true"
+     color="0.7 0.9 0.7 1"
+     control_name="llOwnerSayChatColor"
      follows="left|top"
-     height="16"
-     increment="1"
-     initial_value="10"
-     label="Fade chat after"
-     label_width="80"
+     height="47"
      layout="topleft"
-     left_pad="1"
-     max_val="60"
-     min_val="2"
-     name="fade_chat_time"
-     top_delta="2"
-     width="130" />
+     left="30"
+     name="owner"
+     top_pad="40"
+     width="44" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="10"
      layout="topleft"
-     left_pad="4"
+     left_pad="5"
      mouse_opaque="false"
-     name="text_box4"
-     top_delta="0"
-     width="80">
-        (seconds)
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Owner
     </text>
-    <spinner
-     control_name="ConsoleMaxLines"
-     decimal_digits="0"
+    <color_swatch
+     border_color="0.45098 0.517647 0.607843 1"
+     can_apply_immediately="true"
+     color="0 0 0 1"
+     control_name="BackgroundChatColor"
      follows="left|top"
-     height="16"
-     increment="1"
-     initial_value="10"
+     height="47"
      layout="topleft"
-     left_delta="58"
-     max_val="50"
-     min_val="1"
-     name="max_chat_count"
-     top_delta="0"
-     width="60" />
+     left="180"
+     name="background"
+     top_pad="-17"
+     width="44" />
     <text
      type="string"
      length="1"
@@ -248,123 +237,62 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="text_box5"
-     top_delta="0"
-     width="60">
-        (# lines)
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Bubble
     </text>
-    <slider
-     control_name="ConsoleBackgroundOpacity"
+    <color_swatch
+     border_color="0.45098 0.517647 0.607843 1"
+     can_apply_immediately="true"
+     color="0.6 0.6 1 1"
+     control_name="HTMLLinkColor"
      follows="left|top"
-     height="12"
-     increment="0.05"
-     initial_value="1"
-     label="Opacity"
-     layout="topleft"
-     left="148"
-     name="console_opacity"
-     top="193"
-     width="200" />
-    <check_box
-     control_name="ChatFullWidth"
-     height="16"
-     label="Use full screen width  (Requires restart)"
+     height="47"
      layout="topleft"
-     left_delta="0"
-     name="chat_full_width_check"
-     top_pad="9"
-     width="239" />
+     left="350"
+     name="links"
+     top_pad="-17"
+     width="44" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="10"
      layout="topleft"
-     left="12"
+     left_pad="5"
      mouse_opaque="false"
-     name="text_box6"
-     top="245"
-     width="135">
-        Chat Options:
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        URLs
     </text>
-    <check_box
-     control_name="CloseChatOnReturn"
-     height="16"
-     label="Close chat bar after hitting return"
-     layout="topleft"
-     left_pad="1"
-     name="close_chat_on_return_check"
-     top_delta="2"
-     width="237" />
-    <check_box
-     control_name="ArrowKeysMoveAvatar"
-     height="16"
-     label="Arrow keys always move avatar when chatting"
-     layout="topleft"
-     left_delta="0"
-     name="arrow_keys_move_avatar_check"
-     top_pad="4"
-     width="237" />
-    <check_box
-     control_name="ChatShowTimestamps"
-     height="16"
-     label="Show timestamps in Local Chat"
-     layout="topleft"
-     left_delta="0"
-     name="show_timestamps_check"
-     top_pad="4"
-     width="237" />
-    <check_box
-     control_name="ScriptErrorsAsChat"
-     height="16"
-     label="Show script errors and warnings as regular chat"
-     layout="topleft"
-     left_delta="0"
-     name="script_errors_as_chat"
-     top_pad="4"
-     width="275" />
     <check_box
      control_name="PlayTypingAnim"
      height="16"
      initial_value="true"
      label="Play typing animation when chatting"
      layout="topleft"
-     left_delta="0"
+     left="30"
      name="play_typing_animation"
-     top_pad="4"
-     width="237" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="12"
-     mouse_opaque="false"
-     name="text_box7"
-     top="359"
-     width="128">
-        Bubble Chat:
-    </text>
+     top_pad="40"
+     width="400" />
     <check_box
      control_name="UseChatBubbles"
      height="16"
      label="Show chat bubbles"
      layout="topleft"
-     left_pad="8"
+     left_delta="0"
      name="bubble_text_chat"
-     top_delta="1"
-     width="237" />
-    <slider
-     control_name="ChatBubbleOpacity"
-     follows="left|top"
-     height="12"
-     increment="0.05"
-     initial_value="1"
-     label="Opacity"
+     top_pad="5"
+     width="400" />
+    <check_box
+     enabled="false"
+     height="16"
+     label="Email me IMs when I'm offline"
      layout="topleft"
      left_delta="0"
-     name="bubble_chat_opacity"
-     top_pad="4"
-     width="200" />
+     name="send_im_to_email"
+     top_pad="5"
+     width="400" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index b30bda3e59..8b88afa9b2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -9,338 +9,28 @@
  name="general_panel"
  top="1"
  width="517">
-    <combo_box
-     control_name="LoginLocation"
-     follows="left|bottom"
-     height="18"
-     layout="topleft"
-     left_delta="151"
-     name="start_location_combo"
-     top="7"
-     width="155">
-        <combo_box.item
-         label="My Last Location"
-         value="last" />
-        <combo_box.item
-         label="My Home"
-         value="home" />
-    </combo_box>
-    <check_box
-     control_name="ShowStartLocation"
-     height="16"
-     initial_value="true"
-     label="Show Start Location on Login Screen"
-     layout="topleft"
-     left_delta="0"
-     name="show_location_checkbox"
-     top_pad="3"
-     width="256" />
-    <combo_box
-     control_name="RenderName"
-     height="18"
-     layout="topleft"
-     left_delta="4"
-     name="fade_out_combobox"
-     top_pad="7"
-     width="146">
-        <combo_box.item
-         label="Never"
-         value="0" />
-        <combo_box.item
-         label="Show Temporarily"
-         value="1" />
-        <combo_box.item
-         label="Always"
-         value="2" />
-    </combo_box>
-    <check_box
-     control_name="SmallAvatarNames"
-     height="16"
-     initial_value="true"
-     label="Small Avatar Names"
-     layout="topleft"
-     left_delta="-4"
-     name="small_avatar_names_checkbox"
-     top_pad="9"
-     width="200" />
-    <check_box
-     control_name="RenderNameHideSelf"
-     height="16"
-     label="Hide My Name On My Screen"
-     layout="topleft"
-     left_delta="0"
-     name="show_my_name_checkbox"
-     top_pad="2"
-     width="200" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="group_titles_textbox"
-     top="120"
-     width="394">
-        Group Titles:
-    </text>
-    <check_box
-     control_name="RenderHideGroupTitleAll"
-     height="16"
-     label="Hide All Group Titles"
-     layout="topleft"
-     left_delta="141"
-     name="show_all_title_checkbox"
-     top_delta="0"
-     width="256" />
-    <check_box
-     control_name="RenderHideGroupTitle"
-     height="16"
-     label="Hide My Group Title"
-     layout="topleft"
-     left_delta="0"
-     name="show_my_title_checkbox"
-     top_pad="2"
-     width="256" />
-    <color_swatch
-     border_color="0.45098 0.517647 0.607843 1"
-     control_name="EffectColor"
-     follows="left|top"
-     height="48"
-     layout="topleft"
-     left_delta="2"
-     name="effect_color_swatch"
-     tool_tip="Click to open Color Picker"
-     top_pad="8"
-     width="32" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="10"
-     name="UI Size:"
-     top="203"
-     width="128">
-        UI Size:
-    </text>
-    <spinner
-     control_name="UIScaleFactor"
-     height="16"
-     increment="0.025"
-     initial_value="1"
-     layout="topleft"
-     left_pad="16"
-     max_val="1.4"
-     min_val="0.75"
-     name="ui_scale_slider"
-     top_delta="-2"
-     width="58" />
-    <check_box
-     control_name="UIAutoScale"
-     height="16"
-     label="Use resolution independent scale"
-     layout="topleft"
-     left_delta="-3"
-     name="ui_auto_scale"
-     top_pad="3"
-     width="256" />
-    <spinner
-     control_name="AFKTimeout"
-     decimal_digits="0"
-     follows="left|top"
-     height="16"
-     increment="1"
-     initial_value="300"
-     label="Away Timeout:"
-     label_width="141"
-     layout="topleft"
-     left="10"
-     max_val="600"
-     min_val="30"
-     name="afk_timeout_spinner"
-     top="244"
-     width="202" />
-    <check_box
-     control_name="NotifyMoneyChange"
-     height="16"
-     label="Notify when Linden dollars (L$) spent or received"
-     layout="topleft"
-     left="151"
-     name="notify_money_change_checkbox"
-     top="270"
-     width="256" />
-    <text
+   <text
      type="string"
      length="1"
      follows="left|top"
      height="10"
      layout="topleft"
-     left="10"
-     name="maturity_desired_label"
-     top="312"
-     width="394">
-        Rating:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="141"
-     name="maturity_desired_prompt"
-     top_delta="0"
-     width="394">
-        I want to access content rated:
-    </text>
-    <combo_box
-     control_name="PreferredMaturity"
-     height="18"
-     layout="topleft"
-     left_delta="164"
-     name="maturity_desired_combobox"
-     top_delta="-2"
-     width="150">
-        <combo_box.item
-         label="PG, Mature and Adult"
-         value="42" />
-        <combo_box.item
-         label="PG and Mature"
-         value="21" />
-        <combo_box.item
-         label="PG only"
-         value="13" />
-    </combo_box>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     name="maturity_desired_textbox"
-     top_delta="2"
-     width="150">
-        PG only
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="start_location_textbox"
-     top="10"
-     width="394">
-        Start Location:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     name="show_names_textbox"
-     top_pad="34"
-     width="394">
-        Show Names:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     name="effects_color_textbox"
-     top_pad="110"
-     width="394">
-        Color For My Effects:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="220"
-     name="seconds_textbox"
-     top="244"
-     width="128">
-        seconds
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="18"
-     layout="topleft"
-     left="10"
-     name="crash_report_textbox"
-     top="344"
-     width="394">
-        Crash reports:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="18"
-     layout="topleft"
-     left_delta="0"
+     left="30"
      name="language_textbox"
-     top_pad="4"
-     width="394">
-        Language:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="18"
-     layout="topleft"
-     left_delta="293"
-     name="language_textbox2"
-     top_delta="1"
+     top="10"
      width="400">
-        (Requires restart for full effect)
+        Language:
     </text>
     <combo_box
-     control_name="CrashSubmitBehavior"
-     height="18"
-     layout="topleft"
-     left="153"
-     name="crash_behavior_combobox"
-     top="344"
-     width="146">
-        <combo_box.item
-         enabled="true"
-         label="Ask before sending"
-         value="Ask before sending" />
-        <combo_box.item
-         enabled="true"
-         label="Always send"
-         value="Always send" />
-        <combo_box.item
-         enabled="true"
-         label="Never send"
-         value="Never send" />
-    </combo_box>
-    <combo_box
-     allow_text_entry="true"
      control_name="Language"
      follows="left|bottom"
-     height="16"
+     height="18"
      layout="topleft"
-     left_delta="0"
+     left_delta="50"
      max_chars="135"
      name="language_combobox"
-     top_pad="4"
-     width="146">
+     top_pad="10"
+     width="155">
         <combo_box.item
          enabled="true"
          label="System Default"
@@ -414,14 +104,173 @@
          label="Test Language"
          value="test" />
     </combo_box>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="175"
+     name="language_textbox2"
+     top_delta="1"
+     width="400">
+        (Requires restart)
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="maturity_desired_prompt"
+     top_pad="10"
+     width="400">
+        I want to access content rated:
+    </text>
+    <combo_box
+     control_name="PreferredMaturity"
+     follows="left|bottom"
+     height="18"
+     layout="topleft"
+     left_delta="50"
+     name="start_location_combo"
+     top_pad="10"
+     width="155">
+        <combo_box.item
+         label="PG, Mature and Adult"
+         value="42" />
+        <combo_box.item
+         label="PG and Mature"
+         value="21" />
+        <combo_box.item
+         label="PG"
+         value="13" />
+    </combo_box>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="start_location_textbox"
+     top_delta="20"
+     width="394">
+        Start Location:
+    </text>
+    <combo_box
+     control_name="LoginLocation"
+     follows="left|bottom"
+     height="18"
+     layout="topleft"
+     left_delta="50"
+     name="start_location_combo"
+     top_pad="10"
+     width="155">
+        <combo_box.item
+         label="My Last Location"
+         value="last" />
+        <combo_box.item
+         label="My Home"
+         value="home" />
+    </combo_box>
+    <check_box
+     control_name="ShowStartLocation"
+     height="16"
+     initial_value="true"
+     label="Show on Login"
+     layout="topleft"
+     left_delta="175"
+     name="show_location_checkbox"
+     top_delta="1"
+     width="256" />        
+        
+   <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="10"
+    layout="topleft"
+    left="30"
+    name="name_tags_textbox"
+    top_pad="10"
+    width="400">
+       Name tags:
+   </text>
+   <!-- THIS IS A NEW RADIO GROUP ADDED BY LIS -->
+   <radio_group
+     height="30"
+     layout="topleft"
+     left_delta="50"
+	 control_name="NameTags"
+     name="Name_Tag_Preference"
+     top_pad="10">
+        <radio_item
+         height="16"
+         label="On"
+         layout="topleft"
+         left="0"
+         name="radio"
+         top_pad="0"
+         width="98" />
+        <radio_item
+         height="16"
+         label="Off"
+         layout="topleft"
+         left_pad="12"
+         name="radio2"
+         top_delta="0"
+         width="98" />
+        <radio_item
+         height="16"
+         label="Show briefly"
+         layout="topleft"
+         left_pad="12"
+         name="radio3"
+         top_delta="0"
+         width="98" />
+    </radio_group>
     <check_box
-     control_name="LanguageIsPublic"
+     control_name="RenderNameHideSelf"
      height="16"
-     label="Share language with objects"
+     label="Show my name"
      layout="topleft"
-     left_delta="-2"
-     name="language_is_public"
-     tool_tip="This lets in-world objects know your preferred language."
-     top_pad="2"
+     left_delta="0"
+     name="show_my_name_checkbox"
+     top_pad="5"
+     width="300" />
+   <check_box
+     control_name="RenderHideGroupTitleAll"
+     height="16"
+     label="Show group titles"
+     layout="topleft"
+     left_delta="0"
+     name="show_all_title_checkbox"
+     top_pad="5"
      width="256" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="effects_color_textbox"
+     top_pad="10"
+     width="400">
+        My Effects:
+    </text>
+    <color_swatch
+     border_color="0.45098 0.517647 0.607843 1"
+     control_name="EffectColor"
+     follows="left|top"
+     height="48"
+     layout="topleft"
+     left_delta="50"
+     name="effect_color_swatch"
+     tool_tip="Click to open Color Picker"
+     top_pad="10"
+     width="32" />
+    
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 8db8c8f31d..7b802fb5b3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -17,133 +17,34 @@
      name="aspect_ratio_text">
         [NUM]:[DEN]
     </panel.string>
-    <button
-     follows="left|top"
-     height="18"
-     label="?"
-     layout="topleft"
-     left="470"
-     name="GraphicsPreferencesHelpButton"
-     top="4"
-     width="22">
-        <button.commit_callback
-         function="Pref.OpenHelp" />
-    </button>
-    <check_box
-	 control_name="NotFullScreen"
-     height="16"
-     label="Run Second Life in a window"
-     layout="topleft"
-     left_delta="-460"
-     name="windowed mode"
-     top_delta="3"
-     width="100">
-        <check_box.commit_callback
-         function="Pref.OpenHelp" />
-    </check_box>
-    <text_editor
-	 make_visible_control="NotFullScreen"
-     type="string"
-     length="1"
-     bg_readonly_color="0 0 0 0"
-     enabled="false"
-     follows="left|top"
-     height="20"
-     hide_border="true"
-     hide_scrollbar="true"
-     layout="topleft"
-     left_delta="0"
-     max_length="65535"
-     name="FullScreenInfo"
-     tab_stop="false"
-     top_delta="16"
-     width="350"
-     word_wrap="true">
-        If unchecked, viewer will display full-screen when logged in.
-    </text_editor>
     <text
-	 make_visible_control="NotFullScreen"
      type="string"
      length="1"
      follows="left|top"
      height="12"
      layout="topleft"
-     left_delta="0"
+     left="30"
      name="WindowSizeLabel"
-     top_pad="7"
+     top="10"
      width="128">
-        Window Size:
+        Window size:
     </text>
-    <combo_box
-	 make_visible_control="NotFullScreen"
-     height="18"
-     layout="topleft"
-     left_pad="47"
-     name="windowsize combo"
-     top_delta="-1"
-     width="150">
-        <combo_box.item
-         enabled="true"
-         label="640x480"
-         value="640 x 480" />
-        <combo_box.item
-         enabled="true"
-         label="800x600 "
-         value="800 x 600" />
-        <combo_box.item
-         enabled="true"
-         label="720x480 (NTSC)"
-         value="720 x 480" />
-        <combo_box.item
-         enabled="true"
-         label="768x576 (PAL)"
-         value="768 x 576" />
-        <combo_box.item
-         enabled="true"
-         label="1024x768"
-         value="1024 x 768" />
-    </combo_box>
-    <text
-	 make_invisible_control="NotFullScreen"
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_delta="-175"
-     name="DisplayResLabel"
-     top_delta="1"
-     width="128">
-        Display Resolution:
-    </text>
-    <combo_box
-	 make_invisible_control="NotFullScreen"
-     height="18"
-     layout="topleft"
-     left_pad="47"
-     name="fullscreen combo"
-     top_delta="-1"
-     width="150" />
-    <text
-	 make_invisible_control="NotFullScreen"
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
+    <check_box
+     control_name="WindowFullScreen"
+     height="16"
+     label="Use fullscreen"
      layout="topleft"
-     left="10"
-     name="AspectRatioLabel1"
-     tool_tip="width / height"
-     top="27"
-     width="160">
-        Aspect Ratio:
-    </text>
+     left_delta="30"
+     name="windowed mode"
+     top_pad="5"
+     width="100">
+    </check_box>
     <combo_box
-	 make_invisible_control="NotFullScreen"
+	 make_visible_control="WindowFullScreen"
      allow_text_entry="true"
      height="16"
      layout="topleft"
-     left_pad="15"
+     left_delta="175"
      max_chars="100"
      name="aspect_ratio"
      tool_tip="width / height"
@@ -169,42 +70,17 @@
          function="setControlFalse"
 		 parameter="FullScreenAutoDetectAspectRatio" />
     </combo_box>
-    <check_box
-	 make_invisible_control="NotFullScreen"
-     control_name="FullScreenAutoDetectAspectRatio"
-     height="16"
-     label="Auto-detect ratio"
-     layout="topleft"
-     left_pad="23"
-     name="aspect_auto_detect"
-     top_delta="1"
-     width="256">
-        <check_box.commit_callback
-         function="Pref.AutoDetectAspect" />
-    </check_box>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="10"
-     name="HigherText"
-     top="73"
-     width="80">
-        Quality and
-    </text>
-    <text
+     <text
      type="string"
      length="1"
      follows="left|top"
      height="12"
      layout="topleft"
-     left_delta="0"
-     name="QualityText"
-     top_pad="2"
-     width="95">
-        Performance:
+     left="30"
+     name="QualitySpeed"
+     top_pad="5"
+     width="400">
+        Quality and speed:
     </text>
     <text
      type="string"
@@ -212,9 +88,9 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="115"
+     left_delta="35"
      name="FasterText"
-     top="74"
+     top_pad="5"
      width="80">
         Faster
     </text>
@@ -224,80 +100,20 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="158"
-     name="ShadersPrefText"
-     top="93"
-     width="40">
-        Low
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_pad="7"
-     name="ShadersPrefText2"
+     left_delta="240"
+     name="BetterText"
      top_delta="0"
-     width="40">
-        Mid
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_pad="7"
-     name="ShadersPrefText3"
-     top_delta="0"
-     width="40">
-        High
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_pad="7"
-     name="ShadersPrefText4"
-     top_delta="0"
-     width="40">
-        Ultra
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="334"
-     name="HigherText2"
-     top="68"
      width="80">
-        Higher
+        Better
     </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_delta="0"
-     name="QualityText2"
-     top_pad="2"
-     width="95">
-        Quality
-    </text>
-    <icon
+        <icon
      color="0.12 0.12 0.12 1"
      height="14"
      image_name="rounded_square.tga"
      layout="topleft"
-     left="173"
+     left="140"
      name="LowGraphicsDivet"
-     top="75"
+     top_delta="2"
      width="2" />
     <icon
      color="0.12 0.12 0.12 1"
@@ -343,29 +159,64 @@
 	 <slider.commit_callback
 			function="Pref.QualityPerformance"/>
 	</slider>		
-    <check_box
-     control_name="RenderCustomSettings"
-     height="16"
-     initial_value="true"
-     label="Custom"
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
      layout="topleft"
-     left_pad="70"
-     name="CustomSettings"
-     top_delta="1"
-     width="256">
-        <check_box.commit_callback
-         function="Pref.ChangeCustom" />
-    </check_box>
-	<panel
-	 make_visible_control="RenderCustomSettings"
-     border="true"
+     left="130"
+     name="ShadersPrefText"
+     top_delta="20"
+     width="80">
+        Low
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left_delta="42"
+     name="ShadersPrefText2"
+     top_delta="10"
+     width="80">
+        Mid
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left_delta="42"
+     name="ShadersPrefText3"
+     top_delta="-10"
+     width="40">
+        High
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left_delta="42"
+     name="ShadersPrefText4"
+     top_delta="10"
+     width="40">
+        Ultra
+    </text>
+    <panel
+	 make_visible_control="ShowAdvancedGraphicsSettings"
+     border="false"
 	 follows="top|left"
      height="260"
      label="CustomGraphics"
      layout="topleft"
      left="5"
      name="CustomGraphics Panel"
-     top="115"
+     top="117"
      width="485">
 		<text
 		type="string"
@@ -897,24 +748,37 @@
 	</panel>	
     <button
      height="20"
-     label="Recommended Settings"
+     label="Reset"
      layout="topleft"
-     left="130"
+     left="15"
      name="Defaults"
      top="380"
-     width="170">
+     width="155">
         <button.commit_callback
          function="Pref.HardwareDefaults" />
     </button>
+    <button
+     control_name="ShowAdvancedGraphicsSettings"
+     height="20"
+     is_toggle="true"
+     label="Advanced"
+     layout="topleft"
+     left_pad="5"
+     name="Advanced"
+     top_delta="0"
+     width="155">
+        <button.commit_callback
+         function="Pref.ChangeCustom" />
+    </button>
     <button
      height="20"
-     label="Hardware Options"
-     label_selected="Hardware Options"
+     label="Hardware"
+     label_selected="Hardware"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="GraphicsHardwareButton"
      top_delta="0"
-     width="170">
+     width="155">
         <button.commit_callback
          function="Pref.HardwareSettings" />
     </button>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index f99d629aed..1af3c6511d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -578,7 +578,7 @@
          top="0"
          width="50" />
     </panel>
-    <panel
+   <!-- <panel
      bottom="625"
      follows="bottom|left"
      height="30"
@@ -607,5 +607,5 @@
          name="edit_appearance_btn"
          top="0"
          width="130" />
-    </panel>
+    </panel> -->
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 6139bae874..4f23c4d26d 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -61,28 +61,28 @@
                      width="640" />
                     <text
                      follows="left|right|top"
-                     font="SansSerif"
+                     font="SansSerifHuge"
                      font_shadow="hard"
-                     halign="center"
+                     halign="left"
                      height="20"
                      layout="topleft"
-                     left_delta="0"
+                     left_delta="47"
                      name="title_text"
                      text_color="LoginProgressBoxTextColor"
                      top_delta="50"
-                     width="640" />
+                     width="593" />
                     <text
                      follows="left|right|top"
                      font="SansSerif"
                      font_shadow="hard"
-                     halign="center"
+                     halign="left"
                      height="20"
                      layout="topleft"
                      left_delta="0"
                      name="progress_text"
                      text_color="LoginProgressBoxTextColor"
                      top_pad="5"
-                     width="640" />
+                     width="593" />
                     <progress_bar
                      bottom="115"
                      color_bar="1 1 1 0.96"
@@ -94,17 +94,17 @@
                      right="-45" />
                     <text
                      follows="left|right|top|bottom"
-                     font="SansSerif"
+                     font="SansSerifLarge"
                      font_shadow="hard"
-                     halign="center"
+                     halign="left"
                      height="100"
                      layout="topleft"
-                     left="20"
-                     line_spacing="8"
+                     left="30"
+                     line_spacing="2"
                      name="message_text"
                      text_color="LoginProgressBoxTextColor"
                      top="145"
-                     width="600" />
+                     width="610" />
                 </layout_panel>
                 <layout_panel
                  height="200"
@@ -125,9 +125,9 @@
      follows="right|bottom"
      height="22"
      layout="topleft"
-     left="-86"
+     left="-106"
      name="cancel_btn"
      picture_style="true"
-     top="730"
-     width="70" />
+     top="700"
+     width="90" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index 7bd548d464..8265ab3227 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="350"
  label="Covenant"
  layout="topleft"
  left="0"
  name="Covenant"
  top="320"
- width="480">
+ width="280">
     <panel.string
      name="can_resell">
         Purchased land in this region may be resold.
@@ -49,7 +49,7 @@
      mouse_opaque="false"
      name="estate_name_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Name:
     </text>
     <text
@@ -58,7 +58,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="estate_name_text"
      top_delta="0"
@@ -75,7 +75,7 @@
      mouse_opaque="false"
      name="estate_owner_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Owner:
     </text>
     <text
@@ -84,7 +84,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="estate_owner_text"
      top_delta="0"
@@ -102,7 +102,7 @@
      mouse_opaque="false" 
      name="estate_cov_lbl" 
      top_pad="5"
-     width="100">
+     width="75">
         Covenant:
     </text>
     <text
@@ -111,11 +111,11 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="covenant_timestamp_text"
      top_delta="0"
-     width="308">
+     width="167">
         Last Modified Wed Dec 31 16:00:00 1969
     </text>
     <button
@@ -136,11 +136,11 @@
      follows="left|top"
      height="100"
      layout="topleft"
-     left="110"
+     left="80"
      max_length="65535"
      name="covenant_editor"
      top_delta="30"
-     width="340"
+     width="193"
      word_wrap="true">
         There is no Covenant provided for this Estate.
     </text_editor>
@@ -150,7 +150,7 @@
      height="18"
      label="Reset"
      layout="topleft"
-     left_delta="250"
+     left_delta="75"
      name="reset_covenant"
      top_pad="5"
      width="90" />
@@ -161,11 +161,12 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left="120"
+     left="85"
      name="covenant_help_text"
      top_pad="10"
-     width="460">
-        Changes to the covenant will show on all parcels in the estate.
+     width="190">
+        Changes to the covenant will show
+on all parcels in the estate.
     </text>
     <text
      type="string"
@@ -175,9 +176,10 @@
      layout="topleft"
      left_delta="0"
      name="covenant_instructions"
-     top_pad="5"
-     width="465">
-        Drag and drop a notecard to change the Covenant for this Estate.
+     top_pad="15"
+     width="190">
+        Drag and drop a notecard to change
+the Covenant for this Estate.
     </text>
 
     <text
@@ -190,7 +192,7 @@
      left="5"
      mouse_opaque="false"
      name="region_section_lbl"
-     top_pad="5"
+     top_pad="10"
      width="100">
         Region
     </text>
@@ -204,7 +206,7 @@
      mouse_opaque="false"
      name="region_name_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Name:
     </text>
     <text
@@ -213,7 +215,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="region_name_text"
      top_delta="0"
@@ -230,7 +232,7 @@
      mouse_opaque="false"
      name="region_landtype_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Type:
     </text>
     <text
@@ -239,7 +241,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="region_landtype_text"
      top_delta="0"
@@ -256,7 +258,7 @@
      mouse_opaque="false"
      name="region_maturity_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Rating:
     </text>
     <text
@@ -265,7 +267,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="region_maturity_text"
      top_delta="0"
@@ -282,7 +284,7 @@
      mouse_opaque="false"
      name="resellable_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Resale:
     </text>
     <text
@@ -291,12 +293,13 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="resellable_clause"
      top_delta="0"
-     width="330">
-        Land in this region may not be resold.
+     width="190">
+        Land in this region may not be
+resold.
     </text>
     <text
      type="string"
@@ -307,8 +310,8 @@
      left="10"
      mouse_opaque="false"
      name="changeable_lbl"
-     top_pad="5"
-     width="100">
+     top_pad="10"
+     width="75">
         Subdivide:
     </text>
     <text
@@ -317,12 +320,13 @@
      follows="left|top"
      height="30"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="changeable_clause"
      top_delta="0"
-     width="330">
-        Land in this region may not be joined/subdivided.
+     width="190">
+        Land in this region may not be
+joined/subdivided.
     </text>
 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 22dc0aa0d0..6a43bf3c4b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -8,7 +8,7 @@
  left="0"
  name="Debug"
  top="320"
- width="480">
+ width="280">
     <text
      type="string"
      length="1"
@@ -32,7 +32,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="400">
+     width="220">
         unknown
     </text>
     <check_box
@@ -96,12 +96,13 @@
      enabled="false"
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Apply"
      layout="topleft"
      left="60"
      name="apply_btn"
      top="100"
-     width="100" />
+     width="80" />
     <text
      type="string"
      length="1"
@@ -120,7 +121,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left="30"
+     left="20"
      name="resident_text_lbl"
      top="175"
      width="60">
@@ -139,25 +140,26 @@
      mouse_opaque="false"
      name="target_avatar_name"
      top_delta="-2"
-     width="180">
+     width="115">
         (none)
     </line_editor>
     <button
      follows="left|top"
      height="20"
-     label="Choose..."
+     font="SansSerifSmall"
+     label="Choose"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="choose_avatar_btn"
      top_delta="0"
-     width="80" />
-    <text
+     width="70" />
+   <text
      type="string"
      length="1"
      follows="left|top"
      height="20"
      layout="topleft"
-     left="30"
+     left="20"
      name="options_text_lbl"
      top="198"
      width="60">
@@ -165,7 +167,7 @@
     </text>
     <check_box
      height="20"
-     label="Return only those objects with scripts"
+     label="With scripts"
      layout="topleft"
      left_delta="60"
      name="return_scripts"
@@ -174,7 +176,7 @@
      width="80" />
     <check_box
      height="20"
-     label="Return only those objects on someone else&apos;s land"
+     label="On someone else&apos;s land"
      layout="topleft"
      left_delta="0"
      name="return_other_land"
@@ -183,7 +185,7 @@
      width="80" />
     <check_box
      height="20"
-     label="Return objects in every region of this estate"
+     label="In every region of this estate"
      layout="topleft"
      left_delta="0"
      name="return_estate_wide"
@@ -193,22 +195,24 @@
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Return"
      layout="topleft"
-     left="30"
+     left="20"
      name="return_btn"
      top="263"
      width="80" />
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Get Top Colliders..."
      layout="topleft"
      left="10"
      name="top_colliders_btn"
      tool_tip="List of objects experiencing the most potential collisions"
      top="313"
-     width="150" />
+     width="130" />
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -222,13 +226,14 @@
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Get Top Scripts..."
      layout="topleft"
      left="10"
      name="top_scripts_btn"
      tool_tip="List of objects spending the most time running scripts"
      top_pad="5"
-     width="150" />
+     width="130" />
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -242,13 +247,14 @@
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Restart Region"
      layout="topleft"
      left="10"
      name="restart_btn"
      tool_tip="Give 2 minute countdown and restart region"
      top_pad="5"
-     width="130" />
+     width="110" />
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -262,11 +268,12 @@
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Delay Restart"
      layout="topleft"
      left="10"
      name="cancel_restart_btn"
      tool_tip="Delay region restart by one hour"
      top_pad="5"
-     width="130" />
+     width="110" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 95e1456c6e..1dafd50cdb 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="950"
  label="Estate"
  layout="topleft"
  left="0"
  name="Estate"
  top="320"
- width="480">
+ width="280">
     <panel.string
      name="email_unsupported">
         Feature unsupported
@@ -287,16 +287,15 @@ regions in the estate.
      name="kick_user_from_estate_btn"
      top_pad="5"
      width="250" />
-
     <text
      type="string"
      length="1"
-     bottom="34"
+     top="490"
      follows="left|top"
      height="20"
      layout="topleft"
      name="estate_manager_label"
-     right="470"
+     left="8"
      width="200">
         Estate Managers:
     </text>
@@ -306,7 +305,7 @@ regions in the estate.
      height="18"
      label="?"
      layout="topleft"
-     left_delta="182"
+     left_delta="232"
      name="estate_manager_help"
      top_delta="-1"
      width="18" />
@@ -315,9 +314,9 @@ regions in the estate.
      follows="top|left"
      height="60"
      layout="topleft"
-     right="470"
+     left="8"
      top_pad="5"
-     width="200" />
+     width="250" />
     <name_list
      follows="left|top"
      height="60"
@@ -326,23 +325,23 @@ regions in the estate.
      multi_select="true"
      name="estate_manager_name_list"
      top_delta="0"
-     width="200" />
+     width="250" />
     <button
      follows="left|top"
      height="20"
-     label="Remove..."
+     label="Add..."
      layout="topleft"
-     name="remove_estate_manager_btn"
-     right="470"
+     left="8"
+     name="add_estate_manager_btn"
      top_pad="5"
      width="90" />
     <button
      follows="left|top"
      height="20"
-     label="Add..."
+     label="Remove..."
      layout="topleft"
-     left_delta="-110"
-     name="add_estate_manager_btn"
+     name="remove_estate_manager_btn"
+     left_pad="70"
      top_delta="0"
      width="90" />
     <text
@@ -351,7 +350,7 @@ regions in the estate.
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="0"
+     left="8"
      name="allow_resident_label"
      top_pad="5"
      width="200">
@@ -363,7 +362,7 @@ regions in the estate.
      height="18"
      label="?"
      layout="topleft"
-     left_delta="182"
+     left_delta="232"
      name="allow_resident_help"
      top_delta="-1"
      width="18" />
@@ -372,9 +371,9 @@ regions in the estate.
      follows="top|left"
      height="60"
      layout="topleft"
-     right="470"
+     left="8"
      top_pad="5"
-     width="200" />
+     width="250" />
     <name_list
      follows="left|top"
      height="60"
@@ -383,23 +382,23 @@ regions in the estate.
      multi_select="true"
      name="allowed_avatar_name_list"
      top_delta="0"
-     width="200" />
+     width="250" />
     <button
      follows="left|top"
      height="20"
-     label="Remove..."
+     label="Add..."
      layout="topleft"
-     name="remove_allowed_avatar_btn"
-     right="470"
+     left="8"
+     name="add_allowed_avatar_btn"
      top_pad="5"
      width="90" />
     <button
      follows="left|top"
      height="20"
-     label="Add..."
+     label="Remove..."
      layout="topleft"
-     left_delta="-110"
-     name="add_allowed_avatar_btn"
+     name="remove_allowed_avatar_btn"
+     left_pad="70"
      top_delta="0"
      width="90" />
     <text
@@ -408,7 +407,7 @@ regions in the estate.
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="0"
+     left="8"
      name="allow_group_label"
      top_pad="5"
      width="200">
@@ -420,7 +419,7 @@ regions in the estate.
      height="18"
      label="?"
      layout="topleft"
-     left_delta="182"
+     left_delta="232"
      name="allow_group_help"
      top_delta="-1"
      width="18" />
@@ -429,9 +428,9 @@ regions in the estate.
      follows="top|left"
      height="60"
      layout="topleft"
-     right="470"
+     left="8"
      top_pad="5"
-     width="200" />
+     width="250" />
     <name_list
      follows="left|top"
      height="60"
@@ -440,23 +439,23 @@ regions in the estate.
      multi_select="true"
      name="allowed_group_name_list"
      top_delta="0"
-     width="200" />
+     width="250" />
     <button
      follows="left|top"
      height="20"
-     label="Remove..."
+     label="Add..."
      layout="topleft"
-     name="remove_allowed_group_btn"
-     right="470"
+     left="8"
+     name="add_allowed_group_btn"
      top_pad="5"
      width="90" />
     <button
      follows="left|top"
      height="20"
-     label="Add..."
+     label="Remove..."
      layout="topleft"
-     left_delta="-110"
-     name="add_allowed_group_btn"
+     name="remove_allowed_group_btn"
+     left_pad="70"
      top_delta="0"
      width="90" />
     <text
@@ -465,7 +464,7 @@ regions in the estate.
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="0"
+     left="8"
      name="ban_resident_label"
      top_pad="5"
      width="200">
@@ -477,7 +476,7 @@ regions in the estate.
      height="18"
      label="?"
      layout="topleft"
-     left_delta="182"
+     left_delta="232"
      name="ban_resident_help"
      top_delta="-1"
      width="18" />
@@ -486,9 +485,9 @@ regions in the estate.
      follows="top|left"
      height="60"
      layout="topleft"
-     right="470"
+     left="8"
      top_pad="5"
-     width="200" />
+     width="250" />
     <name_list
      follows="left|top"
      height="60"
@@ -497,23 +496,23 @@ regions in the estate.
      multi_select="true"
      name="banned_avatar_name_list"
      top_delta="0"
-     width="200" />
+     width="250" />
     <button
      follows="left|top"
      height="20"
-     label="Remove..."
+     label="Add..."
      layout="topleft"
-     name="remove_banned_avatar_btn"
-     right="470"
+     left="8"
+     name="add_banned_avatar_btn"
      top_pad="5"
      width="90" />
     <button
      follows="left|top"
      height="20"
-     label="Add..."
+     label="Remove..."
      layout="topleft"
-     left_delta="-110"
-     name="add_banned_avatar_btn"
+     name="remove_banned_avatar_btn"
+     left_pad="70"
      top_delta="0"
      width="90" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 661cb97c66..90cc209a68 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="360"
  label="Region"
  layout="topleft"
  left="0"
  name="General"
- top="320"
- width="480">
+ top="360"
+ width="280">
     <text
      type="string"
      length="1"
@@ -32,7 +32,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="400">
+     width="200">
         unknown
     </text>
     <text
@@ -290,7 +290,7 @@
         <combo_box.item
          label="PG"
          value="13" />
-    </combo_box>
+    </combo_box> 
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -311,7 +311,7 @@
      name="apply_btn"
      top="320"
      width="100" />
-    <button
+   <button
      follows="left|top"
      height="20"
      label="Teleport Home One User..."
@@ -343,8 +343,8 @@
      height="20"
      label="Manage Telehub..."
      layout="topleft"
-     left="250"
+     left_delta="0"
      name="manage_telehub_btn"
-     top="70"
-     width="150" />
+     top_pad="20"
+     width="150" /> 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index ae3b650774..bdf74c5621 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="340"
  label="Terrain"
  layout="topleft"
  left="0"
  name="Terrain"
  top="320"
- width="480">
+ width="280">
     <text
      type="string"
      length="1"
@@ -32,7 +32,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="400">
+     width="200">
         unknown
     </text>
     <spinner
@@ -105,9 +105,9 @@
      height="20"
      label="Use Estate Sun"
      layout="topleft"
-     left="250"
+     left="15"
      name="use_estate_sun_check"
-     top="35"
+     top="105"
      width="100" />
     <button
      follows="left|top"
@@ -115,7 +115,7 @@
      height="18"
      label="?"
      layout="topleft"
-     left_pad="70"
+     left_pad="85"
      name="use_estate_sun_help"
      top_delta="2"
      width="18" />
@@ -123,9 +123,9 @@
      height="20"
      label="Fixed Sun"
      layout="topleft"
-     left="250"
+     left="15"
      name="fixed_sun_check"
-     top="55"
+     top_pad="0"
      width="100" />
     <button
      follows="left|top"
@@ -133,7 +133,7 @@
      height="18"
      label="?"
      layout="topleft"
-     left_pad="70"
+     left_pad="85"
      name="fixed_sun_help"
      top_delta="2"
      width="18" />
@@ -141,9 +141,9 @@
      height="20"
      image_name="icon_day_cycle.tga"
      layout="topleft"
-     left="285"
+     left="50"
      name="daycycle"
-     top="80"
+     top_delta="25"
      width="165" />
     <slider
      follows="left|top"
@@ -151,12 +151,12 @@
      increment="0.001"
      label="Phase"
      layout="topleft"
-     left="250"
+     left="15"
      max_val="30"
      min_val="6"
      name="sun_hour_slider"
      show_text="false"
-     top="105"
+     top_delta="30"
      width="200" />
     <button
      enabled="false"
@@ -164,18 +164,18 @@
      height="20"
      label="Apply"
      layout="topleft"
-     left="350"
+     left="130"
      name="apply_btn"
-     top="135"
+     top_delta="30"
      width="90" />
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="130"
+     height="210"
      layout="topleft"
      left="8"
      top="30"
-     width="460" />
+     width="240" />
     <button
      follows="left|top"
      height="20"
@@ -184,7 +184,7 @@
      left_delta="2"
      name="download_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top_pad="60"
+     top_pad="15"
      width="170" />
     <button
      follows="left|top"
@@ -204,7 +204,7 @@
      left="10"
      name="upload_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top="243"
+     top_pad="0"
      width="170" />
     <button
      follows="left|top"
@@ -224,7 +224,7 @@
      left="10"
      name="bake_terrain_btn"
      tool_tip="Set current terrain as mid-point for raise/lower limits"
-     top="283"
+     top_pad="15"
      width="100" />
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index f24630f4e3..bf63bb0cb6 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="575"
  label="Ground Textures"
  layout="topleft"
  left="0"
  name="Textures"
  top="320"
- width="480">
+ width="280">
     <text
      type="string"
      length="1"
@@ -32,7 +32,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="400">
+     width="200">
         unknown
     </text>
     <text
@@ -45,7 +45,8 @@
      name="detail_texture_text"
      top="36"
      width="300">
-        Terrain Textures (requires 512x512, 24 bit .tga files)
+        Terrain Textures
+(requires 512x512, 24 bit .tga files)
     </text>
     <texture_picker
      follows="left|top"
@@ -53,7 +54,7 @@
      layout="topleft"
      left_delta="0"
      name="texture_detail_0"
-     top_delta="20"
+     top_delta="30"
      width="100" />
     <texture_picker
      follows="left|top"
@@ -67,9 +68,9 @@
      follows="left|top"
      height="100"
      layout="topleft"
-     left_pad="10"
+     left="10"
      name="texture_detail_2"
-     top_delta="0"
+     top_delta="105"
      width="100" />
     <texture_picker
      follows="left|top"
@@ -87,7 +88,7 @@
      layout="topleft"
      left="10"
      name="height_text_lbl"
-     top="146"
+     top="157"
      width="65">
         1 (Low)
     </text>
@@ -109,9 +110,9 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left="10"
      name="height_text_lbl3"
-     top_delta="0"
+     top_delta="105"
      width="100">
         3
     </text>
@@ -135,7 +136,7 @@
      layout="topleft"
      left="10"
      name="height_text_lbl5"
-     top="186"
+     top_delta="25"
      width="300">
         Texture Elevation Ranges
     </text>
@@ -147,7 +148,7 @@
      layout="topleft"
      left="51"
      name="height_text_lbl6"
-     top="201"
+     top_delta="20"
      width="100">
         Southwest
     </text>
@@ -163,31 +164,7 @@
      width="100">
         Northwest
     </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl8"
-     top_delta="0"
-     width="100">
-        Southeast
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl9"
-     top_delta="0"
-     width="100">
-        Northeast
-    </text>
-    <spinner
+   <spinner
      follows="left|top"
      height="20"
      increment="0.5"
@@ -198,7 +175,7 @@
      max_val="500"
      min_val="-500"
      name="height_start_spin_0"
-     top="221"
+     top_delta="20"
      width="100" />
     <spinner
      follows="left|top"
@@ -217,52 +194,76 @@
      follows="left|top"
      height="20"
      increment="0.5"
-     label="Low"
+     label="High"
      label_width="37"
      layout="topleft"
-     left_pad="10"
+     left="10"
      max_val="500"
      min_val="-500"
-     name="height_start_spin_2"
-     top_delta="0"
+     name="height_range_spin_0"
+     top_delta="20"
      width="100" />
     <spinner
      follows="left|top"
      height="20"
      increment="0.5"
-     label="Low"
+     label="High"
      label_width="37"
      layout="topleft"
      left_pad="10"
      max_val="500"
      min_val="-500"
-     name="height_start_spin_3"
+     name="height_range_spin_1"
      top_delta="0"
      width="100" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="51"
+     name="height_text_lbl8"
+     top_delta="30"
+     width="100">
+        Southeast
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl9"
+     top_delta="0"
+     width="100">
+        Northeast
+    </text>
     <spinner
      follows="left|top"
      height="20"
      increment="0.5"
-     label="High"
+     label="Low"
      label_width="37"
      layout="topleft"
      left="10"
      max_val="500"
      min_val="-500"
-     name="height_range_spin_0"
-     top="241"
+     name="height_start_spin_2"
+     top_delta="20"
      width="100" />
     <spinner
      follows="left|top"
      height="20"
      increment="0.5"
-     label="High"
+     label="Low"
      label_width="37"
      layout="topleft"
      left_pad="10"
      max_val="500"
      min_val="-500"
-     name="height_range_spin_1"
+     name="height_start_spin_3"
      top_delta="0"
      width="100" />
     <spinner
@@ -272,11 +273,11 @@
      label="High"
      label_width="37"
      layout="topleft"
-     left_pad="10"
+     left="10"
      max_val="500"
      min_val="-500"
      name="height_range_spin_2"
-     top_delta="0"
+     top_delta="20"
      width="100" />
     <spinner
      follows="left|top"
@@ -297,11 +298,12 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left="25"
+     left="10"
      name="height_text_lbl10"
-     top="281"
-     width="480">
-        These values represent the blend range for the textures above.
+     top_delta="30"
+     width="270">
+        These values represent the blend range
+for the textures above.
     </text>
     <text
      type="string"
@@ -311,30 +313,22 @@
      layout="topleft"
      left_delta="0"
      name="height_text_lbl11"
-     top_delta="16"
-     width="450">
-        Measured in meters, the LOW value is the MAXIMUM height of Texture #1,
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="height_text_lbl12"
-     top_delta="16"
-     width="480">
-        and the HIGH value is the MINIMUM height of Texture #4.
+     top_delta="32"
+     width="270">
+         Measured in meters, the LOW value
+is the MAXIMUM height of Texture #1,
+and the HIGH value is the MINIMUM
+height of Texture #4.
     </text>
+    
     <button
      enabled="false"
      follows="left|bottom"
      height="20"
      label="Apply"
      layout="topleft"
-     left="350"
+     left="120"
      name="apply_btn"
-     top="290"
-     width="100" />
+     top_delta="60"
+     width="100" /> 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 2805ace906..21ecd01839 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -49,10 +49,10 @@
     <button
      enabled="false"
      height="132"
-     image_disabled="square_btn_32x128.tga"
-     image_disabled_selected="square_btn_selected_32x128.tga"
-     image_selected="square_btn_selected_32x128.tga"
-     image_unselected="square_btn_32x128.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled_Selected"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
      layout="topleft"
      left="2"
      name="less"
@@ -63,10 +63,10 @@
     <button
      enabled="false"
      height="132"
-     image_disabled="square_btn_32x128.tga"
-     image_disabled_selected="square_btn_selected_32x128.tga"
-     image_selected="square_btn_selected_32x128.tga"
-     image_unselected="square_btn_32x128.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled_Selected"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
      layout="topleft"
      left_pad="2"
      name="more"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index ce8cb97f56..5ede1c2e9e 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -90,6 +90,576 @@
         border="true"
       />
     </collapsible_ctrl>
+  </sidetray_tab>
+  
+  <!--
+  <sidetray_tab 
+    name="sidebar_group"
+    mouse_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Groups"
+    description="Manage Groups."
+  >
+    <collapsible_ctrl 
+      name="group_accordion" 
+      title="Group General"
+      expanded="true"
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_group_general" 
+        name="panel_group_general" 
+        filename="panel_group_general.xml" 
+        label="Group" 
+        border="true"
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="groupland_accordion" 
+      title="Group Land and Money"
+      expanded="false"
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_group_land" 
+        name="panel_group_land" 
+        filename="panel_group_land_money.xml" 
+        label="Group" 
+        border="true"
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="groupnotices_accordion" 
+      title="Group Notices"
+      expanded="false"
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_group_roles" 
+        name="panel_group_roles" 
+        filename="panel_group_roles.xml" 
+        label="Group" 
+        border="true"
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="grouproles_accordion" 
+      title="Group Roles"
+      expanded="false"
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_group_roles" 
+        name="panel_group_roles" 
+        filename="panel_group_roles.xml" 
+        label="Group" 
+        border="true"
+      />
+    </collapsible_ctrl>
   </sidetray_tab>  
+  
+
+ <sidetray_tab 	
+    name="sidebar_previews" 
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Previews"
+    description="Previews."
+  >
+    <collapsible_ctrl 
+      name="floater_preview_animation" 
+      title="Preview Animation" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_animation" 
+        name="floater_preview_animation" 
+        filename="floater_preview_animation.xml" 
+        width="280" 
+        height="85" 
+        label="Preview_Animation" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_preview_gesture" 
+      title="Preview Gesture" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_gesture" 
+        name="floater_preview_gesture" 
+        filename="floater_preview_gesture.xml" 
+        width="280" 
+        height="400" 
+        label="Preview_Gesture" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_preview_existing_landmark" 
+      title="Preview Existing Landmark" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_existing_landmark" 
+        name="floater_preview_existing_landmark" 
+        filename="floater_preview_existing_landmark.xml" 
+        width="280" 
+        height="495" 
+        label="Preview_Existing_Landmark" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_preview_sound" 
+      title="Preview Sound" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_sound" 
+        name="floater_preview_sound" 
+        filename="floater_preview_sound.xml" 
+        width="280" 
+        height="85" 
+        label="Preview_Sound" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_preview_url" 
+      title="Preview URL" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_url" 
+        name="floater_preview_url" 
+        filename="floater_preview_url.xml" 
+        width="280" 
+        height="465" 
+        label="Preview_URL" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_URL_entry" 
+      title="URL Entry" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_URL_entry" 
+        name="floater_URL_entry" 
+        filename="floater_URL_entry.xml" 
+        width="280" 
+        height="87" 
+        label="URL_entry" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  </sidetray_tab>
+
+  <sidetray_tab 	
+    name="sidebar_region" 
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Region"
+    description="Region."
+  >
+    <collapsible_ctrl 
+      name="panel_region_covenant" 
+      title="Region Covenant" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_covenant" 
+        name="panel_region_covenant" 
+        filename="panel_region_covenant.xml" 
+        width="280" 
+        height="350" 
+        label="Panel_Region_Covenant" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="panel_region_debug" 
+      title="Region Debug" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_debug" 
+        name="panel_region_debug" 
+        filename="panel_region_debug.xml" 
+        width="280" 
+        height="500" 
+        label="Panel_Region_Debug" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="panel_region_estate" 
+      title="Region Estate" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_estate" 
+        name="panel_region_estate" 
+        filename="panel_region_estate.xml" 
+        width="280" 
+        height="950" 
+        label="Panel_Region_Estate" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="panel_region_general" 
+      title="Region General" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_general" 
+        name="panel_region_general" 
+        filename="panel_region_general.xml" 
+        width="280" 
+        height="500" 
+        label="Panel_Region_General" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="panel_region_terrain" 
+      title="Region Terrain" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_terrain" 
+        name="panel_region_terrain" 
+        filename="panel_region_terrain.xml" 
+        width="280" 
+        height="340" 
+        label="Panel_Region_Terrain" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="panel_region_texture" 
+      title="Region Texture" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_texture" 
+        name="panel_region_texture" 
+        filename="panel_region_texture.xml" 
+        width="280" 
+        height="575" 
+        label="Panel_Region_Texture" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="floater_region_info" 
+      title="Region Info" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_region_info" 
+        name="floater_region_info" 
+        filename="floater_region_info.xml" 
+        width="280" 
+        height="512" 
+        label="Floater_Region_Info" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  </sidetray_tab>
+ 
+  <sidetray_tab 	
+    name="Build" 
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Build"
+    description="Build"
+  >
+    <collapsible_ctrl 
+      name="floater_tools" 
+      title="Tools" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_tools" 
+        name="floater_tools" 
+        filename="floater_tools.xml" 
+        width="280" 
+        height="550" 
+        label="Tools" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_bulk_perms" 
+      title="Bulk Perms" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_bulk_perms" 
+        name="floater_bulk_perms" 
+        filename="floater_bulk_perms.xml" 
+        width="280" 
+        height="360" 
+        label="Tools" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_build_options" 
+      title="Build Options" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_build_options" 
+        name="floater_build_options" 
+        filename="floater_build_options.xml" 
+        width="280" 
+        height="151" 
+        label="Tools" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    
+  </sidetray_tab>
+
+ <sidetray_tab 	
+    name="othertools" 
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Other Tools"
+    description="Other Tools"
+  >
+    <collapsible_ctrl 
+      name="floater_gesture" 
+      title="Gestures" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_gesture" 
+        name="floater_gesture" 
+        filename="floater_gesture.xml" 
+        width="280" 
+        height="465" 
+        label="Gesture" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    
+    <collapsible_ctrl 
+      name="floater_buy_contents" 
+      title="Buy Contents" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_buy_contents" 
+        name="floater_buy_contents" 
+        filename="floater_buy_contents.xml" 
+        width="280" 
+        height="250" 
+        label="buy_contents" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_buy_object" 
+      title="Buy Object" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_buy_object" 
+        name="floater_buy_object" 
+        filename="floater_buy_object.xml" 
+        width="280" 
+        height="250" 
+        label="buy_object" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_inventory_view_finder" 
+      title="Inventory View Finder" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_inventory_view_finder" 
+        name="floater_inventory_view_finder" 
+        filename="floater_inventory_view_finder.xml" 
+        width="280" 
+        height="408" 
+        label="view_finder" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_mute" 
+      title="Mute" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_mute" 
+        name="floater_mute" 
+        filename="floater_mute.xml" 
+        width="280" 
+        height="300" 
+        label="mute" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="floater_sell_land" 
+      title="Sell Land" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_sell_land" 
+        name="floater_sell_land" 
+        filename="floater_sell_land.xml" 
+        width="280" 
+        height="600" 
+        label="sell_land" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="floater_telehub" 
+      title="Telehub" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_telehub" 
+        name="floater_telehub" 
+        filename="floater_telehub.xml" 
+        width="280" 
+        height="250" 
+        label="telehub" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    
+  </sidetray_tab>
+ --> 
 </side_tray>
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 58bb16581a..c21c691680 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -152,7 +152,7 @@
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
 	<string name="AvatarAway">Away</string>
 	<string name="AvatarBusy">Busy</string>
-	<string name="AvatarMuted">Muted</string>
+	<string name="AvatarMuted">Blocked</string>
 
 	<!-- animations -->
 	<string name="anim_express_afraid">Afraid</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index a1e074fae2..3e7e07749a 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<button image_unselected="button_enabled_32x128.tga"
-        image_selected="button_enabled_selected_32x128.tga"
-        image_disabled_selected="button_disabled_32x128.tga"
-        image_disabled="button_disabled_32x128.tga"
+<button image_unselected="PushButton_Off"
+        image_selected="PushButton_Selected"
+        image_disabled_selected="PushButton_Selected_Disabled"
+        image_disabled="PushButton_Disabled"
         label_color="ButtonLabelColor"
         label_color_selected="ButtonLabelSelectedColor"
         label_color_disabled="ButtonLabelDisabledColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index ff01dcebd8..97060fb161 100644
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
@@ -3,16 +3,15 @@
            text_disabled_color="LabelDisabledColor"
            font="SansSerifSmall"
            follows="left|top">
-  <check_box.label_text name="checkbox label"/>
+  <check_box.label_text name="checkbox label" />
   <check_box.check_button name="CheckboxCtrl Button"
-                          commit_on_return="false" 
+                          commit_on_return="false"
                           label=""
                           is_toggle="true"
-                          hover_glow_amount="0.35"
                           font="SansSerif"
                           scale_image="false"
-                          image_unselected="checkbox_enabled_false.tga"
-                          image_selected="checkbox_enabled_true.tga"
-                          image_disabled="checkbox_disabled_false.tga"
-                          image_disabled_selected="checkbox_disabled_true.tga"/>
+                          image_unselected="Checkbox_Off"
+                          image_selected="Checkbox_On"
+                          image_disabled="Checkbox_Off_Disabled"
+                          image_disabled_selected="Checkbox_On_Disabled" />
 </check_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index 304eda2d97..178c890c61 100644
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@@ -5,6 +5,4 @@
   <color_swatch.caption_text name="caption"
                              font="SansSerifSmall"
                              follows="left|right|bottom"/>
-  <color_swatch.border name="border"
-                       bevel_type="in"/>
 </color_swatch>
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index 8a8f3f7f2c..45b1e1eb9f 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <combo_box font="SansSerifSmall"
-           arrow_image="combobox_arrow.tga" 
-           list_position="below" 
-           max_chars="20" 
-           follows="left|top">
+           list_position="below"
+           max_chars="20"
+           follows="right|top">
   <combo_box.combo_button name="Combobox Button"
+                          label=""
                           hover_glow_amount="0.15"
                           font="SansSerifSmall"
-                          halign="left" 
                           scale_image="true"
-                          image_unselected="square_btn_32x128.tga"
-                          image_selected="square_btn_selected_32x128.tga"
-                          image_disabled="square_btn_32x128.tga"
-                          image_disabled_selected="square_btn_selected_32x128.tga"
-                          image_overlay="combobox_arrow.tga"
-                          image_overlay_alignment="right"/>
-  <combo_box.combo_list bg_writeable_color="white"/>
+                          image_unselected="ComboButton_Off"
+                          image_selected="ComboButton_Selected"
+                          image_disabled="ComboButton_Disabled"
+                          image_disabled_selected="ComboButton_Disabled_Selected" />
+  <combo_box.drop_down_button name="Drop Down Button"
+                              label=""
+                              hover_glow_amount="0.15"
+                              font="SansSerifSmall"
+                              scale_image="true"
+                              pad_right="24"
+                              image_unselected="DropDown_Off"
+                              image_selected="DropDown_Selected"
+                              image_disabled="DropDown_Disabled"
+                              image_disabled_selected="DropDown_Disabled_Selected" />
+  <combo_box.combo_list bg_writeable_color="white" />
   <combo_box.combo_editor name="Combo Text Entry"
                           select_on_focus="true"
-                          font="SansSerifSmall"/>
+                          font="SansSerifSmall" />
 </combo_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
index c35d15ec92..602250ace6 100644
--- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml
+++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
@@ -2,19 +2,19 @@
 <drop_down text_enabled_color="LabelTextColor"
            text_disabled_color="LabelDisabledColor"
            font="SansSerifSmall"
-           allow_text_entry="false" 
+           allow_text_entry="false"
            follows="left|top">
   <drop_down.combo_button name="Combobox Button"
                           hover_glow_amount="0.15"
                           font="SansSerifSmall"
                           halign="left"
                           scale_image="true"
-                          image_unselected="square_btn_32x128.tga"
-                          image_selected="square_btn_selected_32x128.tga"
-                          image_disabled="square_btn_32x128.tga"
-                          image_disabled_selected="square_btn_selected_32x128.tga"
-                          image_overlay="combobox_arrow.tga"
-                          image_overlay_alignment="right"/>
-  <drop_down.combo_list bg_writeable_color="white"/>
-  <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true"/>
+                          image_unselected="PushButton_Off"
+                          image_selected="PushButton_Selected"
+                          image_disabled="PushButton_Disabled"
+                          image_disabled_selected="PushButton_Disabled_Selected"
+                          image_overlay="Combobox_Over"
+                          image_overlay_alignment="right" />
+  <drop_down.combo_list bg_writeable_color="white" />
+  <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true" />
 </drop_down>
diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
index e0033058c8..a5043c5c14 100644
--- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <flyout_button list_position="below">
   <action_button scale_image="true"
-                image_selected="flyout_btn_left_selected.tga"
-                image_unselected="flyout_btn_left.tga"
-                image_disabled="flyout_btn_left_disabled.tga"/>
-  <combo_button image_selected="flyout_btn_right_selected.tga"
-                image_unselected="flyout_btn_right.tga"
-                image_disabled="flyout_btn_right_disabled.tga"
+                image_selected="SegmentedBtn_Left_Selected"
+                image_unselected="SegmentedBtn_Left_Off"
+                image_disabled="SegmentedBtn_Left_Disabled"/>
+  <combo_button image_selected="ComboButton_Selected"
+                image_unselected="ComboButton_Off"
+                image_disabled="ComboButton_Disabled"
                 pad_right="6"
                 tab_stop="false"/>
-</flyout_button>
-
+</flyout_button>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index 11081ae308..3ab9379705 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<line_editor background_image="sm_rounded_corners_simple.tga"
+<line_editor background_image="TextField_Off"
              select_on_focus="false"
              handle_edit_keys_directly="false"
              commit_on_focus_lost="true"
@@ -14,5 +14,4 @@
              mouse_opaque="true"
              name="line_editor"
              font="SansSerifSmall">
-  <line_editor.border bevel_style="in"/>
 </line_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 32f5a18d1c..07980a9d09 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -3,64 +3,50 @@
 *TODO: Replace hardcoded buttons width/height with getting this info from the button images.
        Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
 -->
+
+
+
 <location_input font="SansSerifSmall"
-           add_landmark_image_enabled="icon_event_adult.tga"
-           add_landmark_image_disabled="icon_event.tga"
-           add_landmark_hpad="4"
-           allow_text_entry="true"
-           arrow_image="combobox_arrow.tga"
-           list_position="below"
-           show_text_as_tentative="false"
-           max_chars="20"
-           follows="left|top">
-  <location_input.background name="Background"
-                          visible="true"
-                          label=""
-                          follows="left|top|right"
-                          image_unselected="navbar_bg_center.tga"
-                          image_selected="navbar_bg_center.tga"
-                          image_disabled="navbar_bg_center.tga"
-                          image_disabled_selected="navbar_bg_center.tga"
-                          image_hover_selected="navbar_bg_center.tga"
-                          image_hover_unselected="navbar_bg_center.tga" />
-  <location_input.info_button name="Place Information"
+                add_landmark_image_enabled="icon_event_adult.tga"
+                add_landmark_image_disabled="icon_event.tga"
+                add_landmark_width="20"
+                add_landmark_height="20"
+                add_landmark_hpad="2"
+                allow_text_entry="true"
+                arrow_image="Combobox_Selected"
+                list_position="below"
+      	        show_text_as_tentative="false"
+                max_chars="20"
+                follows="left|top"
+                background="TextField_Off">
+  <info_button name="Place Information"
                           label=""
                           tool_tip="About current location"
-                          width="20"
-                          height="20"
+                          width="16"
+                          height="16"
                           follows="left|top"
-                          image_overlay="map_infohub.tga"
-                          image_unselected="navbar_bg_left.tga"
-                          image_selected="navbar_bg_left.tga"
-                          image_hover_selected="navbar_bg_left.tga"
-                          image_hover_unselected="navbar_bg_left.tga"
-                          image_disabled_selected="navbar_bg_left.tga"
-                          image_disabled="navbar_bg_left.tga" />
-  <location_input.add_landmark_button name="Add Landmark"
+                          hover_glow_amount="0.15"
+                          image_unselected="Info_Off"
+                          image_selected="Info_Off"
+                          image_disabled_selected="Info_Off"
+                          image_disabled="Info_Off" />
+  <add_landmark_button name="Add Landmark"
                           label=""
                           width="16"
                           height="16"
                           tool_tip="Add to My Landmarks"
                           follows="right|top"
                           scale_image="false" />
-  <location_input.combo_button name="Location History"
+  <combo_button name="Location History"
                           label=""
-                          tool_tip="My Location History"
-                          width="20"
-                          height="20"
-                          image_overlay="navbar_history.tga"
-                          image_overlay_alignment="center"
-                          image_unselected="navbar_bg_right.tga"
-                          image_selected="navbar_bg_right.tga"
-                          image_disabled="navbar_bg_right.tga"
-                          image_disabled_selected="navbar_bg_right.tga"
-                          image_hover_selected="navbar_bg_right.tga"
-                          image_hover_unselected="navbar_bg_right.tga" />
-  <location_input.combo_list bg_writeable_color="white"/>
-  <location_input.combo_editor name="Combo Text Entry"
-                          select_on_focus="true"
-                          font="SansSerifSmall"
-                          bevel_style="none"
-                          border_style="line"
-                          border_thickness="0" />
+                          pad_right="0"
+                          tool_tip="My Location History"/>
+  <combo_list bg_writeable_color="white"/>
+  <combo_editor name="Combo Text Entry"
+                text_pad_left="20"
+                select_on_focus="true"
+                font="SansSerifSmall"
+                bevel_style="none"
+                border_style="line"
+                border.border_thickness="0"/>
 </location_input>
diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
index 3344de06b0..39cd464872 100644
--- a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<progress_bar image_bar="rounded_square.tga"
-              image_fill="progressbar_fill.tga"
+<progress_bar image_bar="ProgressTrack"
+              image_fill="ProgressBar"
               image_shadow="rounded_square_soft.tga"
               color_bar.red="0.5764"
               color_bar.green="0.6627"
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
index 2d851042a5..ad7ef5bffc 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<radio_group draw_border="true"
+<radio_group draw_border="false"
              name="radio_group"
-             mouse_opaque="true"
+             mouse_opaque="false"
              follows="left|top"
              font="SansSerifSmall"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
index 0a27ca509b..281a55d5e2 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
@@ -2,8 +2,9 @@
 <radio_item follows="left|top">
   <radio_item.label_text name="Radio Item label"/>
   <radio_item.check_button name="Radio control button"
-                          image_unselected="radio_active_false.tga"
-                          image_selected="radio_active_true.tga"
-                          image_disabled="radio_inactive_false.tga"
-                          image_disabled_selected="radio_inactive_true.tga"/>
+                          image_unselected="RadioButton_Off"
+                          image_selected="RadioButton_On"
+                          image_disabled="RadioButton_Disabled"
+                          image_disabled_selected="RadioButton_On_Disabled"/>
 </radio_item>
+
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
index a6c9a56dfd..3b195c6b33 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<scroll_bar thumb_image="rounded_square.tga"
-            track_image="rounded_square.tga"
-            track_color="ScrollbarTrackColor"
+<scroll_bar thumb_image="ScrollThumb_Vert"
+            track_image="ScrollTrack_Vert"
+	    track_color="ScrollbarTrackColor"
             thumb_color="ScrollbarThumbColor"
-            thickness="16">
-  <up_button image_unselected="scrollbutton_up_out_blue.tga"
-             image_selected="scrollbutton_up_in_blue.tga"
-             scale_image="true"/>
-  <down_button image_unselected="scrollbutton_down_out_blue.tga"
-               image_selected="scrollbutton_down_in_blue.tga"
-               scale_image="true"/>
-  <left_button image_unselected="scrollbutton_left_out_blue.tga"
-               image_selected="scrollbutton_left_in_blue.tga"
-               scale_image="true"/>
-  <right_button image_unselected="scrollbutton_right_out_blue.tga"
-               image_selected="scrollbutton_right_in_blue.tga"
-               scale_image="true"/>
+            thickness="15">
+  <up_button image_unselected="ScrollArrow_Up"
+             image_selected="ScrollArrow_Up"
+             scale_image="true" thickness="15"
+             hover_glow_amount="0.15"/>
+  <down_button image_unselected="ScrollArrow_Down"
+               image_selected="ScrollArrow_Down"
+               scale_image="true" thickness="15"
+               hover_glow_amount="0.15"/>
+  <left_button image_unselected="ScrollArrow_Left"
+               image_selected="ScrollArrow_Left"
+               scale_image="true" thickness="15"
+               hover_glow_amount="0.15"/>
+  <right_button image_unselected="ScrollArrow_Right"
+               image_selected="ScrollArrow_Right"
+               scale_image="true" thickness="15"
+               hover_glow_amount="0.15"/>
 </scroll_bar>
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 10080e5e39..67588d76ca 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <search_editor select_on_focus="true">
-  <clear_search_button image_unselected="icn_clear_lineeditor.tga"
-                       image_selected="close_inactive_blue.tga"
+  <clear_search_button image_unselected="TextField_Search_Off"
+                       image_selected="TextField_Search_Active"
+                       image_disabled="TextField_Search_Disabled"
                        image_color="TextFgTentativeColor"/>
 </search_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
index 55ec18f292..8b4a5afbe9 100644
--- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml
+++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<side_tray tab_btn_image="sidebar_tab_left.tga"
-        tab_btn_image_selected="sidebar_tab_left_selected.tga"
-		tab_btn_width = "32"
-		tab_btn_height = "32"
-		tab_btn_margin = "0"
+<side_tray tab_btn_image="TaskPanel_Tab_Off"
+        tab_btn_image_selected="TaskPanel_Tab_Selected"
+		tab_btn_width="32"
+		tab_btn_height="40"
+		tab_btn_margin="1"
         >
 </side_tray>
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index 20af3bb58f..b39c2991a0 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -6,6 +6,6 @@
                     bg_readonly_color="TextBgReadOnlyColor"
                     bg_writeable_color="TextBgWriteableColor"
                     bg_focus_color="TextBgFocusColor"
-                    hide_border="false" 
-                    hide_scrollbar="false" 
+                    hide_border="true"
+                    hide_scrollbar="false"
                     font="SansSerif"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index ba9ad21cc0..7004de8475 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -2,6 +2,7 @@
 <slider_bar track_color="SliderTrackColor"
             thumb_outline_color="SliderThumbOutlineColor"
             thumb_center_color="SliderThumbCenterColor"
-            thumb_image="icn_slide-thumb_dark.tga"
-            track_image="icn_slide-groove_dark.tga"
-            track_highlight_image="icn_slide-highlight.tga"/>
+            thumb_image="SliderThumb_Off"
+            hover_glow_amount="0.15"
+            track_image="SliderTrack_Horiz"
+            track_highlight_image="SliderTrack_Horiz" />
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 8245e5ff23..7aad55fb37 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <tab_container tab_min_width="60"
                tab_max_width="150"
-               tab_top_image_unselected="tab_top_blue.tga"
-               tab_top_image_selected="tab_top_selected_blue.tga"
+               tab_top_image_unselected="TabTop_Middle_Off"
+               tab_top_image_selected="TabTop_Middle_Selected"
                tab_bottom_image_unselected="tab_bottom_blue.tga"
                tab_bottom_image_selected="tab_bottom_selected_blue.tga"
-               tab_left_image_unselected="tab_left.tga"
-               tab_left_image_selected="tab_left_selected.tga"/>
\ No newline at end of file
+               tab_left_image_unselected="TabTop_Left_Off"
+               tab_left_image_selected="TabTop_Left_Selected"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
index dc4c430546..a613c43f90 100644
--- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<line_editor background_image="sm_rounded_corners_simple.tga"
+<line_editor background_image="TextField_Off"
              select_on_focus="false"
              handle_edit_keys_directly="false"
              commit_on_focus_lost="true"
@@ -15,5 +15,5 @@
              name="line_editor"
              font="SansSerifSmall">
   <line_editor.border bevel_style="in"
-                      follows="all"/>
+                      follows="all" />
 </line_editor>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 2838ff6335..5dc8efba4a 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -77,6 +77,10 @@ class ViewerManifest(LLManifest):
                 self.path("paths.xml")
                 # include the entire textures directory recursively
                 if self.prefix(src="*/textures"):
+                        self.path("*/*.tga")
+                        self.path("*/*.j2c")
+                        self.path("*/*.jpg")
+                        self.path("*/*.png")
                         self.path("*.tga")
                         self.path("*.j2c")
                         self.path("*.jpg")
diff --git a/install.xml b/install.xml
index 1b3c34737c..77279c57c1 100644
--- a/install.xml
+++ b/install.xml
@@ -435,9 +435,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>eeffb03bd6672b6e7751448e5306d874</string>
+            <string>978ad7c67fe4a2419bfc841e2956ff9f</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux-20081201.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-20090521c.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
-- 
cgit v1.3


From 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 7 Jul 2009 00:53:05 +0000
Subject: Merge skinning-14 to viewer-2, including refactoring many floaters to
 register them with LLFloaterReg, support for introspection of ParamBlock
 based UI widgets to dump XML schema, splitting llfolderview.cpp into three
 separate files to unravel dependencies and skeleton for for LLListView
 widget.  Resolved conflicts in these files: lldraghandle.h, lluictrl.h,
 llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp,
 llviewermenu.cpp, floater_mute.xml, floater_preferences.xml,
 notifications.xml, panel_preferences_audio.xml,
 panel_preferences_graphics1.xml, panel_region_general.xml svn merge
 -r124961:126284
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14

---
 .../llui_libtest/llui_libtest.cpp                  |   60 +-
 .../integration_tests/llui_libtest/llwidgetreg.cpp |   76 +-
 indra/integration_tests/llui_libtest/llwidgetreg.h |    2 +-
 indra/llinventory/llpermissionsflags.h             |    3 -
 indra/llrender/llfontgl.h                          |    6 +-
 indra/llrender/llfontregistry.cpp                  |    2 +-
 indra/llui/llbutton.cpp                            |   85 +-
 indra/llui/llbutton.h                              |    6 -
 indra/llui/llcheckboxctrl.cpp                      |    6 +-
 indra/llui/llcheckboxctrl.h                        |    7 -
 indra/llui/llcombobox.cpp                          |    6 +-
 indra/llui/llcombobox.h                            |    8 -
 indra/llui/llcontainerview.cpp                     |    2 +-
 indra/llui/lldraghandle.h                          |    4 +-
 indra/llui/llfloater.cpp                           |   44 +-
 indra/llui/llfloater.h                             |   43 +-
 indra/llui/llflyoutbutton.cpp                      |    2 +-
 indra/llui/lliconctrl.cpp                          |    2 +-
 indra/llui/lllayoutstack.cpp                       |    8 +-
 indra/llui/lllineeditor.cpp                        |    8 +-
 indra/llui/lllineeditor.h                          |    6 -
 indra/llui/llmenugl.cpp                            |   16 +-
 indra/llui/llmenugl.h                              |   14 +-
 indra/llui/llmultifloater.cpp                      |    3 +-
 indra/llui/llmultislider.cpp                       |    2 +-
 indra/llui/llmultisliderctrl.cpp                   |    2 +-
 indra/llui/llpanel.cpp                             |   18 +-
 indra/llui/llpanel.h                               |    4 +-
 indra/llui/llprogressbar.cpp                       |    2 +-
 indra/llui/llradiogroup.cpp                        |   11 +-
 indra/llui/llradiogroup.h                          |    9 +-
 indra/llui/llresizebar.h                           |    6 +-
 indra/llui/llscrollbar.cpp                         |    2 +-
 indra/llui/llscrollcontainer.cpp                   |   10 +-
 indra/llui/llscrollcontainer.h                     |    5 +-
 indra/llui/llscrollingpanellist.cpp                |    2 +-
 indra/llui/llscrolllistcolumn.cpp                  |    2 +-
 indra/llui/llscrolllistctrl.cpp                    |    8 +-
 indra/llui/llscrolllistctrl.h                      |    7 -
 indra/llui/llsearcheditor.cpp                      |    2 +-
 indra/llui/llslider.cpp                            |    2 +-
 indra/llui/llsliderctrl.cpp                        |    2 +-
 indra/llui/llspinctrl.cpp                          |    2 +-
 indra/llui/llstatview.cpp                          |   10 -
 indra/llui/llstatview.h                            |   10 +-
 indra/llui/lltabcontainer.cpp                      |    4 +-
 indra/llui/lltextbox.cpp                           |    6 +-
 indra/llui/lltextbox.h                             |    7 -
 indra/llui/lltexteditor.cpp                        |    4 +-
 indra/llui/llui.cpp                                |   22 +-
 indra/llui/llui.h                                  |    6 +-
 indra/llui/lluictrl.cpp                            |    4 +-
 indra/llui/lluictrl.h                              |    8 +-
 indra/llui/lluictrlfactory.cpp                     |  503 +-
 indra/llui/lluictrlfactory.h                       |  171 +-
 indra/llui/lluiimage.h                             |    4 +-
 indra/llui/llview.cpp                              |   20 +-
 indra/llui/llview.h                                |   27 +-
 indra/llui/llviewborder.cpp                        |    8 +-
 indra/llui/llviewborder.h                          |    2 +-
 indra/llxml/llxmlnode.cpp                          |   18 +-
 indra/newview/CMakeLists.txt                       |   17 +-
 indra/newview/app_settings/settings.xml            |   11 +
 indra/newview/llagent.cpp                          |   40 +-
 indra/newview/llagent.h                            |    3 -
 indra/newview/llagentwearables.cpp                 |    4 +-
 indra/newview/llappviewer.cpp                      |   37 +-
 indra/newview/llappviewer.h                        |    3 -
 indra/newview/llassetuploadresponders.cpp          |    6 +-
 indra/newview/llavatariconctrl.cpp                 |    4 +-
 indra/newview/llavatarlist.cpp                     |    2 +-
 indra/newview/llbreadcrumbview.cpp                 |   37 +
 indra/newview/llbreadcrumbview.h                   |   36 +
 indra/newview/llchiclet.cpp                        |   43 +-
 indra/newview/llchiclet.h                          |    5 +-
 indra/newview/llcolorswatch.cpp                    |    2 +-
 indra/newview/llcolorswatch.h                      |   14 +-
 indra/newview/lleventnotifier.cpp                  |    9 +-
 indra/newview/llfavoritesbar.cpp                   |    6 +-
 indra/newview/llfloaterabout.cpp                   |    2 +-
 indra/newview/llfloaterabout.h                     |    7 +-
 indra/newview/llfloaterauction.cpp                 |    2 +-
 indra/newview/llfloaterauction.h                   |    8 +-
 indra/newview/llfloateravatarpicker.cpp            |   17 +-
 indra/newview/llfloateravatarpicker.h              |    1 +
 indra/newview/llfloaterbeacons.cpp                 |   33 +-
 indra/newview/llfloaterbeacons.h                   |    8 +-
 indra/newview/llfloaterbuildoptions.cpp            |    2 +-
 indra/newview/llfloaterbuildoptions.h              |    6 +-
 indra/newview/llfloaterbulkpermission.cpp          |   42 +-
 indra/newview/llfloaterbulkpermission.h            |   18 +-
 indra/newview/llfloaterbump.cpp                    |    4 +-
 indra/newview/llfloaterbump.h                      |    7 +-
 indra/newview/llfloaterbuy.cpp                     |    2 +-
 indra/newview/llfloaterbuycontents.cpp             |    4 +-
 indra/newview/llfloatercamera.cpp                  |    8 +-
 indra/newview/llfloatercamera.h                    |    7 +-
 indra/newview/llfloaterchat.cpp                    |    6 +-
 indra/newview/llfloaterchatterbox.cpp              |   43 +-
 indra/newview/llfloaterfonttest.cpp                |   16 +-
 indra/newview/llfloaterfonttest.h                  |    8 +-
 indra/newview/llfloatergesture.cpp                 |    4 +-
 indra/newview/llfloatergodtools.cpp                |  302 +-
 indra/newview/llfloatergodtools.h                  |   55 +-
 indra/newview/llfloaterhud.cpp                     |   59 +-
 indra/newview/llfloaterhud.h                       |   10 +-
 indra/newview/llfloaterinspect.cpp                 |   90 +-
 indra/newview/llfloaterinspect.h                   |   23 +-
 indra/newview/llfloaterinventory.cpp               | 1941 +++++++
 indra/newview/llfloaterinventory.h                 |  369 ++
 indra/newview/llfloaterjoystick.cpp                |    2 +-
 indra/newview/llfloaterjoystick.h                  |   10 +-
 indra/newview/llfloaterlagmeter.cpp                |    2 +-
 indra/newview/llfloaterlagmeter.h                  |   11 +-
 indra/newview/llfloaterland.cpp                    |   37 +-
 indra/newview/llfloaterland.h                      |    9 +-
 indra/newview/llfloaterlandholdings.cpp            |    5 +-
 indra/newview/llfloatermap.cpp                     |    2 +-
 indra/newview/llfloatermemleak.cpp                 |  162 +-
 indra/newview/llfloatermemleak.h                   |   31 +-
 indra/newview/llfloaternotificationsconsole.cpp    |    2 +-
 indra/newview/llfloaternotificationsconsole.h      |    7 +-
 indra/newview/llfloateropenobject.cpp              |   83 +-
 indra/newview/llfloateropenobject.h                |   20 +-
 indra/newview/llfloaterperms.cpp                   |   41 +-
 indra/newview/llfloaterperms.h                     |   13 +-
 indra/newview/llfloaterregioninfo.cpp              |   45 +-
 indra/newview/llfloaterregioninfo.h                |   14 +-
 indra/newview/llfloaterreporter.cpp                |    2 +-
 indra/newview/llfloatersettingsdebug.h             |   15 +-
 indra/newview/llfloatertestlistview.cpp            |   77 +
 indra/newview/llfloatertestlistview.h              |   64 +
 indra/newview/llfloatertools.cpp                   |    3 +-
 indra/newview/llfloatertopobjects.cpp              |  145 +-
 indra/newview/llfloatertopobjects.h                |   31 +-
 indra/newview/llfloateruipreview.cpp               |   36 +-
 indra/newview/llfloateruipreview.h                 |    1 +
 indra/newview/llfloaterurldisplay.cpp              |    5 +-
 indra/newview/llfloaterurldisplay.h                |    8 +-
 indra/newview/llfloatervoicedevicesettings.cpp     |    2 +-
 indra/newview/llfloatervoicedevicesettings.h       |   10 +-
 indra/newview/llfloaterworldmap.cpp                |  117 +-
 indra/newview/llfloaterworldmap.h                  |   26 +-
 indra/newview/llfolderview.cpp                     | 5975 +++++---------------
 indra/newview/llfolderview.h                       |  684 +--
 indra/newview/llfoldervieweventlistener.h          |  100 +
 indra/newview/llfolderviewitem.cpp                 | 2474 ++++++++
 indra/newview/llfolderviewitem.h                   |  528 ++
 indra/newview/llgrouplist.cpp                      |    2 +-
 indra/newview/llimpanel.cpp                        |  389 +-
 indra/newview/llimpanel.h                          |   22 +-
 indra/newview/llimview.cpp                         |  519 +-
 indra/newview/llimview.h                           |   45 +
 indra/newview/llinventorybridge.cpp                |   74 +-
 indra/newview/llinventorybridge.h                  |    4 +-
 indra/newview/llinventoryfilter.cpp                |  631 +++
 indra/newview/llinventoryfilter.h                  |  150 +
 indra/newview/llinventorymodel.cpp                 |   79 +-
 indra/newview/llinventorymodel.h                   |   31 +-
 indra/newview/lljoystickbutton.cpp                 |   10 +-
 indra/newview/lljoystickbutton.h                   |    2 +-
 indra/newview/lllistbrowser.cpp                    |   37 +
 indra/newview/lllistbrowser.h                      |   36 +
 indra/newview/lllistview.cpp                       |   73 +
 indra/newview/lllistview.h                         |   66 +
 indra/newview/lllocationinputctrl.cpp              |    4 +-
 indra/newview/llmenucommands.cpp                   |    2 +-
 indra/newview/llmoveview.cpp                       |   25 +-
 indra/newview/llmoveview.h                         |   11 +-
 indra/newview/llnamebox.cpp                        |    2 +-
 indra/newview/llnameeditor.cpp                     |    2 +-
 indra/newview/llnamelistctrl.cpp                   |    2 +-
 indra/newview/llnavigationbar.cpp                  |    2 +-
 indra/newview/llnetmap.cpp                         |    2 +-
 indra/newview/lloutputmonitorctrl.cpp              |    2 +-
 indra/newview/llpanelavatar.cpp                    |    2 +-
 indra/newview/llpanelclassified.cpp                |   19 +-
 indra/newview/llpanelcontents.cpp                  |    2 +-
 indra/newview/llpanelgrouplandmoney.cpp            |    9 +-
 indra/newview/llpanelgroupnotices.cpp              |    4 +-
 indra/newview/llpanelland.cpp                      |    3 +-
 indra/newview/llpanellandmarks.cpp                 |    9 +-
 indra/newview/llpanellandmarks.h                   |    2 +-
 indra/newview/llpanelpeople.cpp                    |    4 +-
 indra/newview/llpanelpicks.cpp                     |    2 +-
 indra/newview/llpanelplace.cpp                     |   15 +-
 indra/newview/llpanelplaces.cpp                    |    9 +-
 indra/newview/llpreview.cpp                        |    2 +-
 indra/newview/llpreviewanim.cpp                    |    2 +-
 indra/newview/llpreviewgesture.cpp                 |    4 +-
 indra/newview/llpreviewscript.cpp                  |    2 +-
 indra/newview/llpreviewsound.cpp                   |    2 +-
 indra/newview/llpreviewtexture.cpp                 |    2 +-
 indra/newview/llrootview.h                         |   10 +-
 indra/newview/llselectmgr.cpp                      |   15 +-
 indra/newview/llsidetray.cpp                       |   16 +-
 indra/newview/llstartup.cpp                        |   43 +-
 indra/newview/llstatusbar.cpp                      |    2 +-
 indra/newview/lltexturectrl.cpp                    |    7 +-
 indra/newview/lltoolbar.cpp                        |   43 +-
 indra/newview/lltooldraganddrop.cpp                |    2 +-
 indra/newview/lltoolpie.cpp                        |    5 +-
 indra/newview/llurldispatcher.cpp                  |   32 +-
 indra/newview/llviewerfloaterreg.cpp               |   58 +-
 indra/newview/llviewerinventory.cpp                |    4 +-
 indra/newview/llviewermenu.cpp                     |  216 +-
 indra/newview/llviewermenu.h                       |    1 -
 indra/newview/llviewermessage.cpp                  |   33 +-
 indra/newview/llviewertexteditor.cpp               |    4 +-
 indra/newview/llviewerwindow.cpp                   |    3 +-
 indra/newview/llvoavatar.cpp                       |    2 +-
 indra/newview/llvoavatarself.cpp                   |    2 +-
 indra/newview/llvoiceclient.cpp                    |   40 +-
 indra/newview/llweb.cpp                            |    3 +-
 .../skins/default/xui/en/floater_auction.xml       |    2 +-
 .../skins/default/xui/en/floater_beacons.xml       |   35 +-
 .../skins/default/xui/en/floater_bulk_perms.xml    |   29 +-
 .../skins/default/xui/en/floater_god_tools.xml     |  189 +-
 .../skins/default/xui/en/floater_im_session.xml    |   25 +
 .../skins/default/xui/en/floater_inspect.xml       |   12 +-
 .../skins/default/xui/en/floater_lagmeter.xml      |    8 +-
 .../skins/default/xui/en/floater_media_browser.xml |   40 +-
 .../skins/default/xui/en/floater_mem_leaking.xml   |   30 +-
 .../skins/default/xui/en/floater_openobject.xml    |   10 +-
 .../skins/default/xui/en/floater_perm_prefs.xml    |   22 +-
 .../default/xui/en/floater_test_list_view.xml      |   31 +
 .../skins/default/xui/en/floater_top_objects.xml   |   42 +-
 .../skins/default/xui/en/floater_world_map.xml     |   56 +-
 indra/newview/skins/default/xui/en/menu_login.xml  |    8 +
 indra/newview/skins/default/xui/en/menu_viewer.xml |  105 +-
 .../newview/skins/default/xui/en/notifications.xml |  445 +-
 .../default/xui/en/panel_preferences_graphics1.xml |    4 +-
 .../skins/default/xui/en/panel_region_general.xml  |    5 +-
 indra/newview/skins/default/xui/en/strings.xml     |   69 +-
 .../skins/default/xui/en/widgets/list_view.xml     |    6 +
 235 files changed, 11929 insertions(+), 7636 deletions(-)
 create mode 100644 indra/newview/llbreadcrumbview.cpp
 create mode 100644 indra/newview/llbreadcrumbview.h
 create mode 100644 indra/newview/llfloaterinventory.cpp
 create mode 100644 indra/newview/llfloaterinventory.h
 create mode 100644 indra/newview/llfloatertestlistview.cpp
 create mode 100644 indra/newview/llfloatertestlistview.h
 create mode 100644 indra/newview/llfoldervieweventlistener.h
 create mode 100644 indra/newview/llfolderviewitem.cpp
 create mode 100644 indra/newview/llfolderviewitem.h
 create mode 100644 indra/newview/llinventoryfilter.cpp
 create mode 100644 indra/newview/llinventoryfilter.h
 create mode 100644 indra/newview/lllistbrowser.cpp
 create mode 100644 indra/newview/lllistbrowser.h
 create mode 100644 indra/newview/lllistview.cpp
 create mode 100644 indra/newview/lllistview.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_im_session.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_test_list_view.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/list_view.xml

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp
index f8caa7990b..1e5de74e92 100644
--- a/indra/integration_tests/llui_libtest/llui_libtest.cpp
+++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp
@@ -104,25 +104,27 @@ static std::string get_xui_dir()
 	return gDirUtilp->getAppRODataDir() + delim + std::string("skins") + delim + "default" + delim + "xui" + delim;
 }
 
-int main(int argc, char** argv)
+void init_llui()
 {
-	// Must init LLError for llerrs to actually cause errors.
-	LLError::initForApplication(".");
-
 	// Font lookup needs directory support
-	gDirUtilp->initAppDirs("SecondLife", "../../../newview");
+#if LL_DARWIN
+	const char* newview_path = "../../../../newview";
+#else
+	const char* newview_path = "../../../newview";
+#endif
+	gDirUtilp->initAppDirs("SecondLife", newview_path);
 	gDirUtilp->setSkinFolder("default");
-
+	
 	std::string config_filename = gDirUtilp->getExpandedFilename(
-		LL_PATH_APP_SETTINGS, "settings.xml");
+																 LL_PATH_APP_SETTINGS, "settings.xml");
 	LLControlGroup config_group("config");
 	config_group.loadFromFile(config_filename);
-
+	
 	std::string color_filename = gDirUtilp->getExpandedFilename(
-		LL_PATH_DEFAULT_SKIN, "colors.xml");
+																LL_PATH_DEFAULT_SKIN, "colors.xml");
 	LLControlGroup color_group("color");
 	color_group.loadFromFile(color_filename);
-
+	
 	LLControlGroup floater_group("floater");
 	LLControlGroup ignores_group("ignores");
 	LLUI::settings_map_t settings;
@@ -130,14 +132,14 @@ int main(int argc, char** argv)
 	settings["color"] = &color_group;
 	settings["floater"] = &floater_group;
 	settings["ignores"] = &ignores_group;
-
+	
 	// Don't use real images as we don't have a GL context
 	TestImageProvider image_provider;
 	LLUI::initClass(settings, &image_provider);
-
+	
 	const bool no_register_widgets = false;
 	LLWidgetReg::initClass( no_register_widgets );
-
+	
 	// Unclear if this is needed
 	LLUI::setupPaths();
 	// Otherwise we get translation warnings when setting up floaters
@@ -146,14 +148,14 @@ int main(int argc, char** argv)
 	LLTrans::parseStrings("strings.xml", default_args);
     
 	LLFontManager::initClass();
-
+	
 	// Creating widgets apparently requires fonts to be initialized,
 	// otherwise it crashes.
 	LLFontGL::initClass(96.f, 1.f, 1.f,
-		gDirUtilp->getAppRODataDir(),
-		LLUI::getXUIPaths(),
-		false );	// don't create gl textures
-
+						gDirUtilp->getAppRODataDir(),
+						LLUI::getXUIPaths(),
+						false );	// don't create gl textures
+	
 	LLFloaterView::Params fvparams;
 	fvparams.name("Floater View");
 	fvparams.rect( LLRect(0,480,640,0) );
@@ -161,7 +163,10 @@ int main(int argc, char** argv)
 	fvparams.follows.flags(FOLLOWS_ALL);
 	fvparams.tab_stop(false);
 	gFloaterView = LLUICtrlFactory::create<LLFloaterView> (fvparams);
+}
 
+void export_test_floaters()
+{
 	// Convert all test floaters to new XML format
 	std::string delim = gDirUtilp->getDirDelimiter();
 	std::string xui_dir = get_xui_dir() + "en" + delim;
@@ -178,19 +183,30 @@ int main(int argc, char** argv)
 		LLXMLNodePtr output_node = new LLXMLNode();
 		LLFloater* floater = new LLFloater();
 		LLUICtrlFactory::getInstance()->buildFloater(floater,
-			filename,
-			FALSE,	// don't open floater
-			output_node);
+													 filename,
+													 FALSE,	// don't open floater
+													 output_node);
 		std::string out_filename = xui_dir + filename;
 		std::string::size_type extension_pos = out_filename.rfind(".xml");
 		out_filename.resize(extension_pos);
 		out_filename += "_new.xml";
-
+		
 		llinfos << "Output: " << out_filename << llendl;
 		LLFILE* floater_file = LLFile::fopen(out_filename.c_str(), "w");
 		LLXMLNode::writeHeaderToFile(floater_file);
 		output_node->writeToFile(floater_file);
 		fclose(floater_file);
 	}
+}
+
+int main(int argc, char** argv)
+{
+	// Must init LLError for llerrs to actually cause errors.
+	LLError::initForApplication(".");
+
+	init_llui();
+	
+	export_test_floaters();
+	
 	return 0;
 }
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.cpp b/indra/integration_tests/llui_libtest/llwidgetreg.cpp
index 417f3059d6..4e59971f29 100644
--- a/indra/integration_tests/llui_libtest/llwidgetreg.cpp
+++ b/indra/integration_tests/llui_libtest/llwidgetreg.cpp
@@ -62,45 +62,45 @@ void LLWidgetReg::initClass(bool register_widgets)
 	// references to the object files.
 	if (register_widgets)
 	{
-		LLDefaultWidgetRegistry::Register<LLButton> button("button");
-		LLDefaultWidgetRegistry::Register<LLCheckBoxCtrl> check_box("check_box");
-		LLDefaultWidgetRegistry::Register<LLComboBox> combo_box("combo_box");
-		LLDefaultWidgetRegistry::Register<LLFlyoutButton> flyout_button("flyout_button");
-		LLDefaultWidgetRegistry::Register<LLContainerView> container_view("container_view");
-		LLDefaultWidgetRegistry::Register<LLIconCtrl> icon("icon");
-		LLDefaultWidgetRegistry::Register<LLLineEditor> line_editor("line_editor");
-		LLDefaultWidgetRegistry::Register<LLSearchEditor> search_editor("search_editor");
-		LLDefaultWidgetRegistry::Register<LLMenuItemSeparatorGL> menu_item_separator("menu_item_separator");
-		LLDefaultWidgetRegistry::Register<LLMenuItemCallGL> menu_item_call_gl("menu_item_call");
-		LLDefaultWidgetRegistry::Register<LLMenuItemCheckGL> menu_item_check_gl("menu_item_check");
-		LLDefaultWidgetRegistry::Register<LLMenuGL> menu("menu");
-		LLDefaultWidgetRegistry::Register<LLMenuBarGL> menu_bar("menu_bar");
-		LLDefaultWidgetRegistry::Register<LLContextMenu> context_menu("context_menu");
-		LLDefaultWidgetRegistry::Register<LLMultiSlider> multi_slider_bar("multi_slider_bar");
-		LLDefaultWidgetRegistry::Register<LLMultiSliderCtrl> multi_slider("multi_slider");
-		LLDefaultWidgetRegistry::Register<LLPanel> panel("panel", &LLPanel::fromXML);
-		LLDefaultWidgetRegistry::Register<LLLayoutStack> layout_stack("layout_stack", &LLLayoutStack::fromXML);
-		LLDefaultWidgetRegistry::Register<LLProgressBar> progress_bar("progress_bar");
-		LLDefaultWidgetRegistry::Register<LLRadioGroup> radio_group("radio_group");
-		LLDefaultWidgetRegistry::Register<LLRadioCtrl> radio_item("radio_item");
-		LLDefaultWidgetRegistry::Register<LLScrollContainer> scroll_container("scroll_container");
-		LLDefaultWidgetRegistry::Register<LLScrollingPanelList> scrolling_panel_list("scrolling_panel_list");
-		LLDefaultWidgetRegistry::Register<LLScrollListCtrl> scroll_list("scroll_list");
-		LLDefaultWidgetRegistry::Register<LLSlider> slider_bar("slider_bar");
-		LLDefaultWidgetRegistry::Register<LLSliderCtrl> slider("slider");
-		LLDefaultWidgetRegistry::Register<LLSpinCtrl> spinner("spinner");
-		LLDefaultWidgetRegistry::Register<LLStatBar> stat_bar("stat_bar");
-		//LLDefaultWidgetRegistry::Register<LLPlaceHolderPanel> placeholder("placeholder");
-		LLDefaultWidgetRegistry::Register<LLTabContainer> tab_container("tab_container");
-		LLDefaultWidgetRegistry::Register<LLTextBox> text("text");
-		LLDefaultWidgetRegistry::Register<LLTextEditor> simple_text_editor("simple_text_editor");
-		LLDefaultWidgetRegistry::Register<LLUICtrl> ui_ctrl("ui_ctrl");
-		LLDefaultWidgetRegistry::Register<LLStatView> stat_view("stat_view");
-		//LLDefaultWidgetRegistry::Register<LLUICtrlLocate> locate("locate");
-		//LLDefaultWidgetRegistry::Register<LLUICtrlLocate> pad("pad");
-		LLDefaultWidgetRegistry::Register<LLViewBorder> view_border("view_border");
+		LLDefaultChildRegistry::Register<LLButton> button("button");
+		LLDefaultChildRegistry::Register<LLCheckBoxCtrl> check_box("check_box");
+		LLDefaultChildRegistry::Register<LLComboBox> combo_box("combo_box");
+		LLDefaultChildRegistry::Register<LLFlyoutButton> flyout_button("flyout_button");
+		LLDefaultChildRegistry::Register<LLContainerView> container_view("container_view");
+		LLDefaultChildRegistry::Register<LLIconCtrl> icon("icon");
+		LLDefaultChildRegistry::Register<LLLineEditor> line_editor("line_editor");
+		LLDefaultChildRegistry::Register<LLSearchEditor> search_editor("search_editor");
+		LLDefaultChildRegistry::Register<LLMenuItemSeparatorGL> menu_item_separator("menu_item_separator");
+		LLDefaultChildRegistry::Register<LLMenuItemCallGL> menu_item_call_gl("menu_item_call");
+		LLDefaultChildRegistry::Register<LLMenuItemCheckGL> menu_item_check_gl("menu_item_check");
+		LLDefaultChildRegistry::Register<LLMenuGL> menu("menu");
+		LLDefaultChildRegistry::Register<LLMenuBarGL> menu_bar("menu_bar");
+		LLDefaultChildRegistry::Register<LLContextMenu> context_menu("context_menu");
+		LLDefaultChildRegistry::Register<LLMultiSlider> multi_slider_bar("multi_slider_bar");
+		LLDefaultChildRegistry::Register<LLMultiSliderCtrl> multi_slider("multi_slider");
+		LLDefaultChildRegistry::Register<LLPanel> panel("panel", &LLPanel::fromXML);
+		LLDefaultChildRegistry::Register<LLLayoutStack> layout_stack("layout_stack", &LLLayoutStack::fromXML);
+		LLDefaultChildRegistry::Register<LLProgressBar> progress_bar("progress_bar");
+		LLDefaultChildRegistry::Register<LLRadioGroup> radio_group("radio_group");
+		LLDefaultChildRegistry::Register<LLRadioCtrl> radio_item("radio_item");
+		LLDefaultChildRegistry::Register<LLScrollContainer> scroll_container("scroll_container");
+		LLDefaultChildRegistry::Register<LLScrollingPanelList> scrolling_panel_list("scrolling_panel_list");
+		LLDefaultChildRegistry::Register<LLScrollListCtrl> scroll_list("scroll_list");
+		LLDefaultChildRegistry::Register<LLSlider> slider_bar("slider_bar");
+		LLDefaultChildRegistry::Register<LLSliderCtrl> slider("slider");
+		LLDefaultChildRegistry::Register<LLSpinCtrl> spinner("spinner");
+		LLDefaultChildRegistry::Register<LLStatBar> stat_bar("stat_bar");
+		//LLDefaultChildRegistry::Register<LLPlaceHolderPanel> placeholder("placeholder");
+		LLDefaultChildRegistry::Register<LLTabContainer> tab_container("tab_container");
+		LLDefaultChildRegistry::Register<LLTextBox> text("text");
+		LLDefaultChildRegistry::Register<LLTextEditor> simple_text_editor("simple_text_editor");
+		LLDefaultChildRegistry::Register<LLUICtrl> ui_ctrl("ui_ctrl");
+		LLDefaultChildRegistry::Register<LLStatView> stat_view("stat_view");
+		//LLDefaultChildRegistry::Register<LLUICtrlLocate> locate("locate");
+		//LLDefaultChildRegistry::Register<LLUICtrlLocate> pad("pad");
+		LLDefaultChildRegistry::Register<LLViewBorder> view_border("view_border");
 	}
 
 	// *HACK: Usually this is registered as a viewer text editor
-	LLDefaultWidgetRegistry::Register<LLTextEditor> text_editor("text_editor");
+	LLDefaultChildRegistry::Register<LLTextEditor> text_editor("text_editor");
 }
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.h b/indra/integration_tests/llui_libtest/llwidgetreg.h
index eac818608d..4e0bc5377a 100644
--- a/indra/integration_tests/llui_libtest/llwidgetreg.h
+++ b/indra/integration_tests/llui_libtest/llwidgetreg.h
@@ -33,7 +33,7 @@
 
 // Register all widgets with the builder registry.
 // Useful on Windows where linker discards all references to the 
-// static LLDefaultWidgetRegistry::Register<> calls.
+// static LLDefaultChildRegistry::Register<> calls.
 class LLWidgetReg
 {
 public:
diff --git a/indra/llinventory/llpermissionsflags.h b/indra/llinventory/llpermissionsflags.h
index afa2adbd90..f810929d68 100644
--- a/indra/llinventory/llpermissionsflags.h
+++ b/indra/llinventory/llpermissionsflags.h
@@ -32,9 +32,6 @@
 #ifndef LL_LLPERMISSIONSFLAGS_H
 #define LL_LLPERMISSIONSFLAGS_H
 
-// llpermissionsflags.h
-// Copyright 2002, Linden Research, Inc.
-//
 // Flags for various permissions bits.
 // Shared between viewer and simulator.
 
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 204c6908af..77cd12250c 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -264,7 +264,7 @@ protected:
 	typedef std::map<llwchar,embedded_data_t*> embedded_map_t;
 	mutable embedded_map_t mEmbeddedChars;
 	
-	LLFontDescriptor mFontDesc;
+	LLFontDescriptor mFontDescriptor;
 
 	// Registry holds all instantiated fonts.
 	static LLFontRegistry* sFontRegistry;
@@ -276,8 +276,8 @@ public:
 	static LLCoordFont sCurOrigin;
 	static std::vector<LLCoordFont> sOriginStack;
 
-	const LLFontDescriptor &getFontDesc() const { return mFontDesc; }
-	void setFontDesc(const LLFontDescriptor& font_desc) { mFontDesc = font_desc; }
+	const LLFontDescriptor &getFontDesc() const { return mFontDescriptor; }
+	void setFontDesc(const LLFontDescriptor& font_desc) { mFontDescriptor = font_desc; }
 };
 
 #endif
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 18e4a6915d..3b5c62a5ea 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -104,7 +104,7 @@ bool removeSubString(std::string& str, const std::string& substr)
 	size_t pos = str.find(substr);
 	if (pos != string::npos)
 	{
-		str.replace(pos,substr.length(),(const char *)NULL, 0);
+		str.erase(pos);
 		return true;
 	}
 	return false;
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index f2aa9c0d4c..9ad27e7c41 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -32,7 +32,6 @@
 
 #include "linden_common.h"
 
-#define INSTANTIATE_GETCHILD_BUTTON
 #include "llbutton.h"
 
 // Linden library includes
@@ -53,7 +52,7 @@
 #include "llrender.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultWidgetRegistry::Register<LLButton> r("button");
+static LLDefaultChildRegistry::Register<LLButton> r("button");
 
 // globals loaded from settings.xml
 S32	LLBUTTON_H_PAD	= 0;
@@ -61,8 +60,6 @@ S32	LLBUTTON_V_PAD	= 0;
 S32 BTN_HEIGHT_SMALL= 0;
 S32 BTN_HEIGHT		= 0;
 
-template LLButton* LLView::getChild<LLButton>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-
 LLButton::Params::Params()
 :	label_selected("label_selected"),				// requires is_toggle true
 	label_dropshadow("label_shadow", true),
@@ -146,7 +143,7 @@ LLButton::LLButton(const LLButton::Params& p)
 	mFadeWhenDisabled(FALSE)
 {
 	static LLUICachedControl<S32> llbutton_orig_h_pad ("UIButtonOrigHPad", 0);
-	static Params default_params(LLUICtrlFactory::getDefaultParams<Params>());
+	static Params default_params(LLUICtrlFactory::getDefaultParams<LLButton>());
 
 	//if we aren't a picture_style button set label as name if not provided
 	if (!p.picture_style.isProvided() || !p.picture_style)
@@ -328,25 +325,27 @@ BOOL LLButton::handleKeyHere(KEY key, MASK mask )
 
 BOOL LLButton::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	// Route future Mouse messages here preemptively.  (Release on mouse up.)
-	gFocusMgr.setMouseCapture( this );
-
-	if (hasTabStop() && !getIsChrome())
+	if (!childrenHandleMouseDown(x, y, mask))
 	{
-		setFocus(TRUE);
-	}
+		// Route future Mouse messages here preemptively.  (Release on mouse up.)
+		gFocusMgr.setMouseCapture( this );
 
-	mMouseDownSignal(this, LLSD());
+		if (hasTabStop() && !getIsChrome())
+		{
+			setFocus(TRUE);
+		}
 
-	mMouseDownTimer.start();
-	mMouseDownFrame = (S32) LLFrameTimer::getFrameCount();
-	mMouseHeldDownCount = 0;
-	
-	if (getSoundFlags() & MOUSE_DOWN)
-	{
-		make_ui_sound("UISndClick");
-	}
+		mMouseDownSignal(this, LLSD());
 
+		mMouseDownTimer.start();
+		mMouseDownFrame = (S32) LLFrameTimer::getFrameCount();
+		mMouseHeldDownCount = 0;
+		
+		if (getSoundFlags() & MOUSE_DOWN)
+		{
+			make_ui_sound("UISndClick");
+		}
+	}
 	return TRUE;
 }
 
@@ -381,20 +380,26 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
 			LLUICtrl::onCommit();
 		}
 	}
+	else
+	{
+		childrenHandleMouseUp(x, y, mask);
+	}
 
 	return TRUE;
 }
 
 BOOL	LLButton::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-	// Route future Mouse messages here preemptively.  (Release on mouse up.)
-	gFocusMgr.setMouseCapture( this );
-
-	if (hasTabStop() && !getIsChrome())
+	if (!childrenHandleRightMouseDown(x, y, mask))
 	{
-		setFocus(TRUE);
-	}
+		// Route future Mouse messages here preemptively.  (Release on mouse up.)
+		gFocusMgr.setMouseCapture( this );
 
+		if (hasTabStop() && !getIsChrome())
+		{
+			setFocus(TRUE);
+		}
+	}
 
 	return TRUE;
 }
@@ -412,6 +417,10 @@ BOOL	LLButton::handleRightMouseUp(S32 x, S32 y, MASK mask)
 			mRightClickSignal(this, getValue());
 		}
 	}
+	else 
+	{
+		childrenHandleRightMouseUp(x, y, mask);
+	}
 	return TRUE;
 }
 
@@ -429,21 +438,23 @@ void LLButton::onMouseLeave(S32 x, S32 y, MASK mask)
 
 BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
 {
-	if (mMouseDownTimer.getStarted())
+	if (!childrenHandleHover(x, y, mask))
 	{
-		F32 elapsed = getHeldDownTime();
-		if( mHeldDownDelay <= elapsed && mHeldDownFrameDelay <= (S32)LLFrameTimer::getFrameCount() - mMouseDownFrame)
+		if (mMouseDownTimer.getStarted())
 		{
-			LLSD param;
-			param["count"] = mMouseHeldDownCount++;
-			mHeldDownSignal(this, param);
+			F32 elapsed = getHeldDownTime();
+			if( mHeldDownDelay <= elapsed && mHeldDownFrameDelay <= (S32)LLFrameTimer::getFrameCount() - mMouseDownFrame)
+			{
+				LLSD param;
+				param["count"] = mMouseHeldDownCount++;
+				mHeldDownSignal(this, param);
+			}
 		}
-	}
-
-	// We only handle the click if the click both started and ended within us
-	getWindow()->setCursor(UI_CURSOR_ARROW);
-	lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
 
+		// We only handle the click if the click both started and ended within us
+		getWindow()->setCursor(UI_CURSOR_ARROW);
+		lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
+	}
 	return TRUE;
 }
 
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 1398e5c14b..3fa62cc351 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -352,11 +352,5 @@ private:
 	LLFrameTimer	mFlashingTimer;
 };
 
-#ifdef LL_WINDOWS
-#ifndef INSTANTIATE_GETCHILD_BUTTON
-#pragma warning (disable : 4231)
-extern template LLButton* LLView::getChild<LLButton>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-#endif
-#endif
 
 #endif  // LL_LLBUTTON_H
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp
index 932a1b6297..b43f91e766 100644
--- a/indra/llui/llcheckboxctrl.cpp
+++ b/indra/llui/llcheckboxctrl.cpp
@@ -31,8 +31,6 @@
  */
 
 // The mutants are coming!
-#define INSTANTIATE_GETCHILD_CHECKBOX
-
 #include "linden_common.h"
 
 #include "llcheckboxctrl.h"
@@ -50,9 +48,7 @@
 
 const U32 MAX_STRING_LENGTH = 10;
 
-template LLCheckBoxCtrl* LLView::getChild<LLCheckBoxCtrl>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-
-static LLDefaultWidgetRegistry::Register<LLCheckBoxCtrl> r("check_box");
+static LLDefaultChildRegistry::Register<LLCheckBoxCtrl> r("check_box");
 
 LLCheckBoxCtrl::Params::Params()
 :	text_enabled_color("text_enabled_color"),
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index 2f8f088a3e..2f8e8fdd23 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -126,11 +126,4 @@ protected:
 };
 
 
-#ifdef LL_WINDOWS
-#ifndef INSTANTIATE_GETCHILD_CHECKBOX
-#pragma warning (disable : 4231)
-extern template LLCheckBoxCtrl* LLView::getChild<LLCheckBoxCtrl>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-#endif
-#endif
-
 #endif  // LL_LLCHECKBOXCTRL_H
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index e19eacb774..5dfca4be16 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -33,8 +33,6 @@
 // A control that displays the name of the chosen item, which when
 // clicked shows a scrolling box of options.
 
-#define INSTANTIATE_GETCHILD_COMBOBOX
-
 #include "linden_common.h"
 
 // file includes
@@ -63,9 +61,7 @@ S32 LLCOMBOBOX_HEIGHT = 0;
 S32 LLCOMBOBOX_WIDTH = 0;
 S32 MAX_COMBO_WIDTH = 500;
 
-template LLComboBox* LLView::getChild<LLComboBox>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-
-static LLDefaultWidgetRegistry::Register<LLComboBox> register_combo_box("combo_box");
+static LLDefaultChildRegistry::Register<LLComboBox> register_combo_box("combo_box");
 
 void LLComboBox::PreferredPositionValues::declareValues()
 {
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index cb5f72dcbe..4c0d10dc40 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -234,12 +234,4 @@ private:
 	commit_callback_t	mTextEntryCallback;
 	commit_callback_t	mSelectionCallback;
 };
-
-#ifdef LL_WINDOWS
-#ifndef INSTANTIATE_GETCHILD_COMBOBOX
-#pragma warning (disable : 4231)
-extern template LLComboBox* LLView::getChild<LLComboBox>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-#endif
-#endif
-
 #endif
diff --git a/indra/llui/llcontainerview.cpp b/indra/llui/llcontainerview.cpp
index 40cc430e25..96948b659f 100644
--- a/indra/llui/llcontainerview.cpp
+++ b/indra/llui/llcontainerview.cpp
@@ -42,7 +42,7 @@
 #include "llscrollcontainer.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultWidgetRegistry::Register<LLContainerView> r("container_view");
+static LLDefaultChildRegistry::Register<LLContainerView> r("container_view");
 
 LLContainerView::LLContainerView(const LLContainerView::Params& p)
 :	LLView(p),
diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h
index 0448c20068..86eef7c42c 100644
--- a/indra/llui/lldraghandle.h
+++ b/indra/llui/lldraghandle.h
@@ -53,8 +53,8 @@ public:
 		Optional<LLUIColor> drag_shadow_color;
 		
 		Params() 
-		:	drag_highlight_color("", LLUIColorTable::instance().getColor("DefaultHighlightLight")),
-			drag_shadow_color("", LLUIColorTable::instance().getColor("DefaultShadowDark"))
+		:	drag_highlight_color("drag_highlight_color", LLUIColorTable::instance().getColor("DefaultHighlightLight")),
+			drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark"))
 		{
 			mouse_opaque(true);
 			follows.flags(FOLLOWS_ALL);
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index d37459c040..c8bbdb0a56 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -191,7 +191,7 @@ bool LLFloater::KeyCompare::equate(const LLSD& a, const LLSD& b)
 //static 
 const LLFloater::Params& LLFloater::getDefaultParams()
 {
-	return LLUICtrlFactory::getDefaultParams<LLFloater::Params>();
+	return LLUICtrlFactory::getDefaultParams<LLFloater>();
 }
 
 
@@ -560,6 +560,7 @@ void LLFloater::openFloater(const LLSD& key)
 		setVisibleAndFrontmost(mAutoFocus);
 	}
 
+	mOpenSignal(this, getValue());
 	onOpen(key);
 }
 
@@ -623,6 +624,7 @@ void LLFloater::closeFloater(bool app_quitting)
 		}
 		
 		// Let floater do cleanup.
+		mCloseSignal(this, getValue());
 		onClose(app_quitting);
 	}
 }
@@ -1709,6 +1711,33 @@ void LLFloater::buildButtons()
 	updateButtons();
 }
 
+void LLFloater::initOpenCallback(const OpenCallbackParam& cb, open_signal_t& sig)
+{
+	if (cb.function.isProvided())
+	{
+		if (cb.parameter.isProvided())
+			sig.connect(boost::bind(cb.function(), _1, cb.parameter));
+		else
+			sig.connect(cb.function());
+	}
+	else
+	{
+		std::string function_name = cb.function_name;
+		open_callback_t* func = (CallbackRegistry<open_callback_t>::getValue(function_name));
+		if (func)
+		{
+			if (cb.parameter.isProvided())
+				sig.connect(boost::bind((*func), _1, cb.parameter));
+			else
+				sig.connect(*func);
+		}
+		else if (!function_name.empty())
+		{
+			llwarns << "No callback found for: '" << function_name << "' in control: " << getName() << llendl;
+		}			
+	}
+}
+
 /////////////////////////////////////////////////////
 // LLFloaterView
 
@@ -2462,18 +2491,25 @@ void LLFloater::initFromParams(const LLFloater::Params& p)
 	{
 		mVisibilityControl = "t"; // flag to build mVisibilityControl name once mInstanceName is set
 	}
+	
+	// open callback 
+	if (p.open_callback.isProvided())
+		initOpenCallback(p.open_callback, mOpenSignal);
+	// close callback 
+	if (p.close_callback.isProvided())
+		initOpenCallback(p.close_callback, mCloseSignal);
 }
 
 void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, BOOL open_floater, LLXMLNodePtr output_node)
 {
-	Params params(LLUICtrlFactory::getDefaultParams<LLFloater::Params>());
+	Params params(LLUICtrlFactory::getDefaultParams<LLFloater>());
 	LLXUIParser::instance().readXUI(node, params);
 
 	if (output_node)
 	{
 		Params output_params(params);
 		setupParamsForExport(output_params, parent);
-        Params default_params(LLUICtrlFactory::getDefaultParams<LLFloater::Params>());
+        Params default_params(LLUICtrlFactory::getDefaultParams<LLFloater>());
 		output_node->setName(node->getName()->mString);
 		LLXUIParser::instance().writeXUI(
 			output_node, output_params, &default_params);
@@ -2490,7 +2526,7 @@ void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, BOOL open_floa
 		LLFloater::setFloaterHost((LLMultiFloater*) this);
 	}
 
-	LLUICtrlFactory::createChildren(this, node, output_node);
+	LLUICtrlFactory::createChildren(this, node, child_registry_t::instance(), output_node);
 
 	if (node->hasName("multi_floater"))
 	{
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 3e80f1b284..c639f90390 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -105,6 +105,17 @@ public:
 		BUTTON_COUNT
 	};
 	
+	typedef boost::function<void (LLUICtrl* ctrl, const LLSD& param)> open_callback_t;
+	typedef boost::signals2::signal<void (LLUICtrl* ctrl, const LLSD& param)> open_signal_t;
+	
+	typedef boost::function<void (LLUICtrl* ctrl, const LLSD& param)> close_callback_t;
+	typedef boost::signals2::signal<void (LLUICtrl* ctrl, const LLSD& param)> close_signal_t;
+	
+	struct OpenCallbackParam : public LLInitParam::Block<OpenCallbackParam, CallbackParam >
+	{
+		Optional<open_callback_t> function;
+	};
+	
 	struct Params 
 	:	public LLInitParam::Block<Params, LLPanel::Params>
 	{
@@ -120,7 +131,10 @@ public:
 								can_tear_off,
 								save_rect,
 								save_visibility;
-
+		
+		Optional<OpenCallbackParam> open_callback,
+									close_callback;
+		
 		Params() :
 			title("title"),
 			short_title("short_title"),
@@ -132,7 +146,9 @@ public:
 			can_drag_on_left("can_drag_on_left", false),
 			can_tear_off("can_tear_off", true),
 			save_rect("save_rect", false),
-			save_visibility("save_visibility", false)
+			save_visibility("save_visibility", false),
+		    open_callback("open_callback"),
+			close_callback("close_callback")
 		{
 			name = "floater";
 			// defaults that differ from LLPanel:
@@ -289,8 +305,9 @@ protected:
 
 	void			destroy() { die(); } // Don't call this directly.  You probably want to call close(). JC
 
+	void			initOpenCallback(const OpenCallbackParam& cb, open_signal_t& sig);
+
 private:
-	
 	void			setForeground(BOOL b);	// called only by floaterview
 	void			cleanupHandles(); // remove handles to dead floaters
 	void			createMinimizeButton();
@@ -299,11 +316,15 @@ private:
 	BOOL			offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButtons index);
 	void			addResizeCtrls();
 	void 			addDragHandle();
-	
+
+public:
+	typedef CallbackRegistry<open_callback_t> OpenCallbackRegistry;
+
 protected:
 	std::string		mRectControl;
 	std::string		mVisibilityControl;
-	
+	open_signal_t   mOpenSignal;
+	open_signal_t   mCloseSignal;
 	LLSD			mKey;				// Key used for retrieving instances; set (for now) by LLFLoaterReg
 	
 private:
@@ -378,6 +399,7 @@ private:
 	LLRootHandle<LLFloater>		mHandle;	
 };
 
+
 /////////////////////////////////////////////////////////////
 // LLFloaterView
 // Parent of all floating panels
@@ -441,9 +463,6 @@ private:
 	S32				mSnapOffsetRight;
 };
 
-// singleton implementation for floaters
-// https://wiki.lindenlab.com/mediawiki/index.php?title=LLFloaterSingleton&oldid=164990
-
 //*******************************************************
 //* TO BE DEPRECATED
 //*******************************************************
@@ -460,14 +479,6 @@ public:
 	static void hide(LLFloater* instance, const LLSD& key);
 };
 
-
-// singleton implementation for floaters (provides visibility policy)
-// https://wiki.lindenlab.com/mediawiki/index.php?title=LLFloaterSingleton&oldid=164990
-
-template <class T> class LLFloaterSingleton : public LLUISingleton<T, VisibilityPolicy<LLFloater> >
-{
-};
-
 //
 // Globals
 //
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp
index a99c3a4fe6..536919c072 100644
--- a/indra/llui/llflyoutbutton.cpp
+++ b/indra/llui/llflyoutbutton.cpp
@@ -35,7 +35,7 @@
 // file includes
 #include "llflyoutbutton.h"
 
-//static LLDefaultWidgetRegistry::Register<LLFlyoutButton> r2("flyout_button");
+//static LLDefaultChildRegistry::Register<LLFlyoutButton> r2("flyout_button");
 
 const S32 FLYOUT_BUTTON_ARROW_WIDTH = 24;
 
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp
index eddfc71284..5c6ea663f3 100644
--- a/indra/llui/lliconctrl.cpp
+++ b/indra/llui/lliconctrl.cpp
@@ -42,7 +42,7 @@
 #include "lluictrlfactory.h"
 #include "lluiimage.h"
 
-static LLDefaultWidgetRegistry::Register<LLIconCtrl> r("icon");
+static LLDefaultChildRegistry::Register<LLIconCtrl> r("icon");
 
 LLIconCtrl::Params::Params()
 :	image("image_name"),
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 39dac296ea..f1e7d791d4 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -38,7 +38,7 @@
 #include "llresizebar.h"
 #include "llcriticaldamp.h"
 
-static LLDefaultWidgetRegistry::Register<LLLayoutStack> register_layout_stack("layout_stack", &LLLayoutStack::fromXML);
+static LLDefaultChildRegistry::Register<LLLayoutStack> register_layout_stack("layout_stack", &LLLayoutStack::fromXML);
 
 
 //
@@ -223,7 +223,7 @@ static void get_attribute_bool_and_write(LLXMLNodePtr node,
 //static 
 LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)
 {
-	LLLayoutStack::Params p(LLUICtrlFactory::getDefaultParams<LLLayoutStack::Params>());
+	LLLayoutStack::Params p(LLUICtrlFactory::getDefaultParams<LLLayoutStack>());
 	LLXUIParser::instance().readXUI(node, p);
 
 	// Export must happen before setupParams() mungles rectangles and before
@@ -233,7 +233,7 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o
 	{
 		Params output_params(p);
 		setupParamsForExport(output_params, parent);
-		LLLayoutStack::Params default_params(LLUICtrlFactory::getDefaultParams<LLLayoutStack::Params>());
+		LLLayoutStack::Params default_params(LLUICtrlFactory::getDefaultParams<LLLayoutStack>());
 		output_node->setName(node->getName()->mString);
 		LLXUIParser::instance().writeXUI(
 			output_node, output_params, &default_params);
@@ -296,7 +296,7 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o
 
 			LLPanel::Params p;
 			LLPanel* panelp = LLUICtrlFactory::create<LLPanel>(p);
-			LLView* new_child = LLUICtrlFactory::getInstance()->createFromXML(child_node, panelp, LLStringUtil::null, output_child, parent ? parent->getChildRegistry() : LLDefaultWidgetRegistry::instance());
+			LLView* new_child = LLUICtrlFactory::getInstance()->createFromXML(child_node, panelp, LLStringUtil::null, LLPanel::child_registry_t::instance(), output_child);
 			if (new_child)
 			{
 				// put child in new embedded panel
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 925f22d94e..f3afadca15 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -34,8 +34,6 @@
 
 #include "linden_common.h"
  
-#define INSTANTIATE_GETCHILD_LINEEDITOR
-
 #include "lllineeditor.h"
 
 #include "lltexteditor.h"
@@ -72,9 +70,7 @@ const S32   SCROLL_INCREMENT_DEL = 4;	// make space for baskspacing
 const F32   AUTO_SCROLL_TIME = 0.05f;
 const F32	TRIPLE_CLICK_INTERVAL = 0.3f;	// delay between double and triple click. *TODO: make this equal to the double click interval?
 
-static LLDefaultWidgetRegistry::Register<LLLineEditor> r1("line_editor");
-
-template LLLineEditor* LLView::getChild<LLLineEditor>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
+static LLDefaultChildRegistry::Register<LLLineEditor> r1("line_editor");
 
 //
 // Member functions
@@ -180,7 +176,7 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
 	LLViewBorder::Params border_p(p.border);
 	border_p.rect = border_rect;
 	border_p.follows.flags = FOLLOWS_ALL;
-	border_p.bevel_type = LLViewBorder::BEVEL_IN;
+	border_p.bevel_style = LLViewBorder::BEVEL_IN;
 	mBorder = LLUICtrlFactory::create<LLViewBorder>(border_p);
 	addChild( mBorder );
 
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index eb021bace9..4362cff2fe 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -392,12 +392,6 @@ private:
 
 }; // end class LLLineEditor
 
-#ifdef LL_WINDOWS
-#ifndef INSTANTIATE_GETCHILD_LINEEDITOR
-#pragma warning (disable : 4231)
-extern template LLLineEditor* LLView::getChild<LLLineEditor>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-#endif
-#endif
 
 namespace LLInitParam
 {
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index e79afe76d8..4d2374a7e8 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -119,16 +119,12 @@ const F32 PIE_SHRINK_TIME = 0.2f; // time of transition between unbounded and bo
 
 const F32 ACTIVATE_HIGHLIGHT_TIME = 0.3f;
 
-// widget registrars
-struct MenuRegistry : public LLWidgetRegistry<MenuRegistry>
-{};
-
 static MenuRegistry::Register<LLMenuItemSeparatorGL> register_separator("menu_item_separator");
 static MenuRegistry::Register<LLMenuItemCallGL> register_menu_item_call("menu_item_call");
 static MenuRegistry::Register<LLMenuItemCheckGL> register_menu_item_check("menu_item_check");
 static MenuRegistry::Register<LLMenuGL> register_menu("menu");
 
-static LLDefaultWidgetRegistry::Register<LLMenuGL> register_menu_default("menu");
+static LLDefaultChildRegistry::Register<LLMenuGL> register_menu_default("menu");
 
 
 
@@ -1666,12 +1662,6 @@ BOOL LLMenuGL::postBuild()
 	return LLUICtrl::postBuild();
 }
 
-const widget_registry_t& LLMenuGL::getChildRegistry() const
-{
-	return MenuRegistry::instance();
-}
-
-
 // are we the childmost active menu and hence our jump keys should be enabled?
 // or are we a free-standing torn-off menu (which uses jump keys too)
 BOOL LLMenuGL::jumpKeysActive()
@@ -2885,7 +2875,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
 /// Class LLMenuBarGL
 ///============================================================================
 
-static LLDefaultWidgetRegistry::Register<LLMenuBarGL> r2("menu_bar");
+static LLDefaultChildRegistry::Register<LLMenuBarGL> r2("menu_bar");
 
 LLMenuBarGL::LLMenuBarGL( const Params& p )
 :	LLMenuGL(p),
@@ -3571,7 +3561,7 @@ void LLContextMenuBranch::setHighlight( BOOL highlight )
 // class LLContextMenu
 // A context menu
 //-----------------------------------------------------------------------------
-static LLDefaultWidgetRegistry::Register<LLContextMenu> context_menu_register("context_menu");
+static LLDefaultChildRegistry::Register<LLContextMenu> context_menu_register("context_menu");
 static MenuRegistry::Register<LLContextMenu> context_menu_register2("context_menu");
 
 
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index ad257f46c2..ef27c2c9c8 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -81,7 +81,7 @@ public:
 
 		Params()
 		:	shortcut("shortcut"),
-			jump_key("", KEY_NONE),
+			jump_key("jump_key", KEY_NONE),
 			use_mac_ctrl("use_mac_ctrl", false),
 			rect("rect"),
 			left("left"),
@@ -356,6 +356,11 @@ private:
 // it in the appendMenu() method.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+// child widget registry
+struct MenuRegistry : public LLChildRegistry<MenuRegistry>
+{};
+
+
 class LLMenuGL 
 :	public LLUICtrl
 {
@@ -374,7 +379,7 @@ public:
 		Optional<LLUIColor>				bg_color;
 
 		Params()
-		:	jump_key("", KEY_NONE),
+		:	jump_key("jump_key", KEY_NONE),
 			can_tear_off("tear_off", false),
 			drop_shadow("drop_shadow", true),
 			bg_visible("bg_visible", true),
@@ -388,6 +393,10 @@ public:
 			name = "menu";
 		}
 	};
+
+	// my valid children are contained in MenuRegistry
+	typedef MenuRegistry child_registry_t;
+
 	void initFromParams(const Params&);
 
 protected:
@@ -410,7 +419,6 @@ public:
 	/*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
 	/*virtual*/ void removeChild( LLView* ctrl);
 	/*virtual*/ BOOL postBuild();
-	/*virtual*/ const widget_registry_t& getChildRegistry() const;
 
 	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp
index c0fe7ff32d..22683d7950 100644
--- a/indra/llui/llmultifloater.cpp
+++ b/indra/llui/llmultifloater.cpp
@@ -275,6 +275,7 @@ void LLMultiFloater::selectPrevFloater()
 
 void LLMultiFloater::showFloater(LLFloater* floaterp, LLTabContainer::eInsertionPoint insertion_point)
 {
+	if(!floaterp) return;
 	// we won't select a panel that already is selected
 	// it is hard to do this internally to tab container
 	// as tab selection is handled via index and the tab at a given
@@ -288,7 +289,7 @@ void LLMultiFloater::showFloater(LLFloater* floaterp, LLTabContainer::eInsertion
 
 void LLMultiFloater::removeFloater(LLFloater* floaterp)
 {
-	if ( floaterp->getHost() != this )
+	if (!floaterp || floaterp->getHost() != this )
 		return;
 
 	floater_data_map_t::iterator found_data_it = mFloaterDataMap.find(floaterp->getHandle());
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index 099a79278a..0454771511 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -45,7 +45,7 @@
 
 #include <sstream>
 
-static LLDefaultWidgetRegistry::Register<LLMultiSlider> r("multi_slider_bar");
+static LLDefaultChildRegistry::Register<LLMultiSlider> r("multi_slider_bar");
 
 const F32 FLOAT_THRESHOLD = 0.00001f;
 
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp
index 312aceaaa2..1523d5d527 100644
--- a/indra/llui/llmultisliderctrl.cpp
+++ b/indra/llui/llmultisliderctrl.cpp
@@ -52,7 +52,7 @@
 #include "llresmgr.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultWidgetRegistry::Register<LLMultiSliderCtrl> r("multi_slider");
+static LLDefaultChildRegistry::Register<LLMultiSliderCtrl> r("multi_slider");
 
 const U32 MAX_STRING_LENGTH = 10;
 LLMultiSliderCtrl::Params::Params()
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 6a6e15867b..2119ed4daf 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -56,11 +56,11 @@
 #include "llbutton.h"
 #include "lltabcontainer.h"
 
-static LLDefaultWidgetRegistry::Register<LLPanel> r1("panel", &LLPanel::fromXML);
+static LLDefaultChildRegistry::Register<LLPanel> r1("panel", &LLPanel::fromXML);
 
 const LLPanel::Params& LLPanel::getDefaultParams() 
 { 
-	return LLUICtrlFactory::getDefaultParams<LLPanel::Params>(); 
+	return LLUICtrlFactory::getDefaultParams<LLPanel>(); 
 }
 
 LLPanel::Params::Params()
@@ -433,7 +433,7 @@ void LLPanel::initFromParams(const LLPanel::Params& p)
 	parseFollowsFlags(p);
 
 	setToolTip(p.tool_tip());
-	setSaveToXML(p.serializable);
+	setSaveToXML(p.from_xui);
 	
 	mHoverCursor = getCursorFromString(p.hover_cursor);
 	
@@ -462,7 +462,7 @@ static LLFastTimer::DeclareTimer FTM_PANEL_POSTBUILD("Panel PostBuild");
 
 BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)
 {
-	const LLPanel::Params& default_params(LLUICtrlFactory::getDefaultParams<LLPanel::Params>());
+	const LLPanel::Params& default_params(LLUICtrlFactory::getDefaultParams<LLPanel>());
 	Params params(default_params);
 
 	{
@@ -499,7 +499,7 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu
 
 			// add children using dimensions from referenced xml for consistent layout
 			setShape(params.rect);
-			LLUICtrlFactory::createChildren(this, referenced_xml);
+			LLUICtrlFactory::createChildren(this, referenced_xml, child_registry_t::instance());
 		}
 
 		LLXUIParser::instance().readXUI(node, params);
@@ -520,7 +520,7 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu
 		}
 
 		// add children
-		LLUICtrlFactory::createChildren(this, node, output_node);
+		LLUICtrlFactory::createChildren(this, node, child_registry_t::instance(), output_node);
 
 		// Connect to parent after children are built, because tab containers
 		// do a reshape() on their child panels, which requires that the children
@@ -539,12 +539,6 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu
 	return TRUE;
 }
 
-const widget_registry_t& LLPanel::getChildRegistry() const
-{
-	// use default widget registry
-	return LLDefaultWidgetRegistry::instance();
-}
-
 bool LLPanel::hasString(const std::string& name)
 {
 	return mUIStrings.find(name) != mUIStrings.end();
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
index c38e9df53b..ca3b2e7e23 100644
--- a/indra/llui/llpanel.h
+++ b/indra/llui/llpanel.h
@@ -93,6 +93,9 @@ public:
 		Params();
 	};
 
+	// valid children for LLPanel are stored in this registry
+	typedef LLDefaultChildRegistry child_registry_t;
+
 protected:
 	friend class LLUICtrlFactory;
 	// RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8
@@ -165,7 +168,6 @@ public:
 	
 	void initFromParams(const Params& p);
 	BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL);
-	/*virtual*/ const widget_registry_t& getChildRegistry() const;
 	
 	bool hasString(const std::string& name);
 	std::string getString(const std::string& name, const LLStringUtil::format_map_t& args) const;
diff --git a/indra/llui/llprogressbar.cpp b/indra/llui/llprogressbar.cpp
index 779967940a..12353e4c3e 100644
--- a/indra/llui/llprogressbar.cpp
+++ b/indra/llui/llprogressbar.cpp
@@ -46,7 +46,7 @@
 #include "llfocusmgr.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultWidgetRegistry::Register<LLProgressBar> r("progress_bar");
+static LLDefaultChildRegistry::Register<LLProgressBar> r("progress_bar");
 
 LLProgressBar::Params::Params()
 :	image_bar("image_bar"),
diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp
index 70f98bd908..30adbb023c 100644
--- a/indra/llui/llradiogroup.cpp
+++ b/indra/llui/llradiogroup.cpp
@@ -44,10 +44,8 @@
 #include "llfocusmgr.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultWidgetRegistry::Register<LLRadioGroup> r1("radio_group");
+static LLDefaultChildRegistry::Register<LLRadioGroup> r1("radio_group");
 
-struct RadioGroupRegistry : public LLWidgetRegistry<RadioGroupRegistry>
-{};
 
 static RadioGroupRegistry::Register<LLRadioCtrl> register_radio_ctrl("radio_item");
 
@@ -72,7 +70,7 @@ LLRadioGroup::LLRadioGroup(const LLRadioGroup::Params& p)
 		LLViewBorder::Params params;
 		params.name("radio group border");
 		params.rect(LLRect(0, getRect().getHeight(), getRect().getWidth(), 0));
-		params.bevel_type(LLViewBorder::BEVEL_NONE);
+		params.bevel_style(LLViewBorder::BEVEL_NONE);
 		LLViewBorder * vb = LLUICtrlFactory::create<LLViewBorder> (params);
 		addChild (vb);
 	}
@@ -82,11 +80,6 @@ LLRadioGroup::~LLRadioGroup()
 {
 }
 
-const widget_registry_t& LLRadioGroup::getChildRegistry() const
-{
-	return RadioGroupRegistry::instance();
-}
-
 // virtual
 BOOL LLRadioGroup::postBuild()
 {
diff --git a/indra/llui/llradiogroup.h b/indra/llui/llradiogroup.h
index 850d896e29..d04473fa44 100644
--- a/indra/llui/llradiogroup.h
+++ b/indra/llui/llradiogroup.h
@@ -70,6 +70,10 @@ protected:
 	friend class LLUICtrlFactory;
 };
 
+
+struct RadioGroupRegistry : public LLChildRegistry<RadioGroupRegistry>
+{};
+
 /*
  * An invisible view containing multiple mutually exclusive toggling 
  * buttons (usually radio buttons).  Automatically handles the mutex
@@ -86,6 +90,9 @@ public:
 		Params();
 	};
 
+	// my valid children are stored in this registry
+	typedef RadioGroupRegistry child_registry_t;
+
 protected:
 	LLRadioGroup(const Params&);
 	friend class LLUICtrlFactory;
@@ -118,8 +125,6 @@ public:
 	// Update the control as needed.  Userdata must be a pointer to the button.
 	void onClickButton(LLUICtrl* clicked_radio);
 	
-	virtual const widget_registry_t& getChildRegistry() const;
-
 	//========================================================================
 	LLCtrlSelectionInterface* getSelectionInterface()	{ return (LLCtrlSelectionInterface*)this; };
 
diff --git a/indra/llui/llresizebar.h b/indra/llui/llresizebar.h
index 4ad3d5035a..a7bc3c60f5 100644
--- a/indra/llui/llresizebar.h
+++ b/indra/llui/llresizebar.h
@@ -52,11 +52,11 @@ public:
 		Optional<bool>	allow_double_click_snapping;
 
 		Params()
-		:	max_size("", S32_MAX),
-			snapping_enabled("", true),
+		:	max_size("max_size", S32_MAX),
+			snapping_enabled("snapping_enabled", true),
 			resizing_view("resizing_view"),
 			side("side"),
-			allow_double_click_snapping("", true)
+			allow_double_click_snapping("allow_double_click_snapping", true)
 		{
 			name = "resize_bar";
 		}
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index 3f1ff34419..3312064131 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -48,7 +48,7 @@
 #include "llrender.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultWidgetRegistry::Register<LLScrollbar> register_scrollbar("scroll_bar");
+static LLDefaultChildRegistry::Register<LLScrollbar> register_scrollbar("scroll_bar");
 
 LLScrollbar::Params::Params()
 :	orientation ("orientation", HORIZONTAL),
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index 2a2e56a92c..ea4bd2526e 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -63,7 +63,7 @@ static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
 /// Class LLScrollContainer
 ///----------------------------------------------------------------------------
 
-static LLDefaultWidgetRegistry::Register<LLScrollContainer> r("scroll_container");
+static LLDefaultChildRegistry::Register<LLScrollContainer> r("scroll_container");
 
 LLScrollContainer::Params::Params()
 :	is_opaque("opaque"),
@@ -91,7 +91,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	LLViewBorder::Params params;
 	params.name("scroll border");
 	params.rect(border_rect);
-	params.bevel_type(LLViewBorder::BEVEL_IN);
+	params.bevel_style(LLViewBorder::BEVEL_IN);
 	mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
 	LLView::addChild( mBorder );
 
@@ -517,12 +517,6 @@ bool LLScrollContainer::addChild(LLView* view, S32 tab_group)
 	return ret_val;
 }
 
-const widget_registry_t& LLScrollContainer::getChildRegistry() const
-{
-	// a scroll container can contain any default widget
-	return LLDefaultWidgetRegistry::instance();
-}
-
 void LLScrollContainer::updateScroll()
 {
 	if (!mScrolledView)
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index 26d8cc824e..9cbfbc94a1 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -68,6 +68,10 @@ public:
 		
 		Params();
 	};
+
+	// my valid children are stored in this registry
+	typedef LLDefaultChildRegistry child_registry_t;
+
 protected:
 	LLScrollContainer(const Params&);
 	friend class LLUICtrlFactory;
@@ -104,7 +108,6 @@ public:
 	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
 	virtual void	draw();
 	virtual bool	addChild(LLView* view, S32 tab_group = 0);
-	virtual const widget_registry_t& getChildRegistry() const;
 
 private:
 	// internal scrollbar handlers
diff --git a/indra/llui/llscrollingpanellist.cpp b/indra/llui/llscrollingpanellist.cpp
index 1f3a7f9fcf..0159cdd12c 100644
--- a/indra/llui/llscrollingpanellist.cpp
+++ b/indra/llui/llscrollingpanellist.cpp
@@ -35,7 +35,7 @@
 
 #include "llscrollingpanellist.h"
 
-static LLDefaultWidgetRegistry::Register<LLScrollingPanelList> r("scrolling_panel_list");
+static LLDefaultChildRegistry::Register<LLScrollingPanelList> r("scrolling_panel_list");
 
 
 /////////////////////////////////////////////////////////////////////
diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp
index 02f09bd9b4..686e0b6cb7 100644
--- a/indra/llui/llscrolllistcolumn.cpp
+++ b/indra/llui/llscrolllistcolumn.cpp
@@ -291,7 +291,7 @@ void LLScrollListColumn::SortNames::declareValues()
 //static 
 const LLScrollListColumn::Params& LLScrollListColumn::getDefaultParams()
 {
-	return LLUICtrlFactory::getDefaultParams<LLScrollListColumn::Params>();
+	return LLUICtrlFactory::getDefaultParams<LLScrollListColumn>();
 }
 
 
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 6d91c784f7..75afbffc11 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -31,8 +31,6 @@
  * $/LicenseInfo$
  */
 
-#define INSTANTIATE_GETCHILD_SCROLLLIST
-
 #include "linden_common.h"
 
 #include "llscrolllistctrl.h"
@@ -60,9 +58,7 @@
 #include "lltextbox.h"
 #include "llsdparam.h"
 
-template LLScrollListCtrl* LLView::getChild<LLScrollListCtrl>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-
-static LLDefaultWidgetRegistry::Register<LLScrollListCtrl> r("scroll_list");
+static LLDefaultChildRegistry::Register<LLScrollListCtrl> r("scroll_list");
 
 // local structures & classes.
 struct SortScrollListItem
@@ -225,7 +221,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p)
 		LLViewBorder::Params params;
 		params.name("dig border");
 		params.rect(border_rect);
-		params.bevel_type(LLViewBorder::BEVEL_IN);
+		params.bevel_style(LLViewBorder::BEVEL_IN);
 		mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
 		addChild(mBorder);
 	}
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 8d200fb73f..63d07cecfd 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -453,11 +453,4 @@ private:
 	LLTextBox*		mCommentTextBox;
 }; // end class LLScrollListCtrl
 
-#ifdef LL_WINDOWS
-#ifndef INSTANTIATE_GETCHILD_SCROLLLIST
-#pragma warning (disable : 4231)
-extern template LLScrollListCtrl* LLView::getChild<LLScrollListCtrl>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-#endif
-#endif
-
 #endif  // LL_SCROLLLISTCTRL_H
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
index 9522d32a8b..64583071a6 100644
--- a/indra/llui/llsearcheditor.cpp
+++ b/indra/llui/llsearcheditor.cpp
@@ -36,7 +36,7 @@
  
 #include "llsearcheditor.h"
 
-//static LLDefaultWidgetRegistry::Register<LLSearchEditor> r2("search_editor");
+//static LLDefaultChildRegistry::Register<LLSearchEditor> r2("search_editor");
 
 LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p)
 :	LLUICtrl(p)
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp
index 66ed0d4e88..fa782a1063 100644
--- a/indra/llui/llslider.cpp
+++ b/indra/llui/llslider.cpp
@@ -43,7 +43,7 @@
 #include "llimagegl.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultWidgetRegistry::Register<LLSlider> r1("slider_bar");
+static LLDefaultChildRegistry::Register<LLSlider> r1("slider_bar");
 
 LLSlider::Params::Params()
 :	track_color("track_color"),
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp
index 3abd960792..12953fc261 100644
--- a/indra/llui/llsliderctrl.cpp
+++ b/indra/llui/llsliderctrl.cpp
@@ -53,7 +53,7 @@
 
 const U32 MAX_STRING_LENGTH = 10;
 
-static LLDefaultWidgetRegistry::Register<LLSliderCtrl> r("slider");
+static LLDefaultChildRegistry::Register<LLSliderCtrl> r("slider");
 
 LLSliderCtrl::LLSliderCtrl(const LLSliderCtrl::Params& p)
 :	LLF32UICtrl(p),
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
index 943891c572..5893fcd64b 100644
--- a/indra/llui/llspinctrl.cpp
+++ b/indra/llui/llspinctrl.cpp
@@ -53,7 +53,7 @@
 
 const U32 MAX_STRING_LENGTH = 32;
 
-static LLDefaultWidgetRegistry::Register<LLSpinCtrl> r2("spinner");
+static LLDefaultChildRegistry::Register<LLSpinCtrl> r2("spinner");
 
 LLSpinCtrl::Params::Params()
 :	label_width("label_width"),
diff --git a/indra/llui/llstatview.cpp b/indra/llui/llstatview.cpp
index 6691f16c1e..ab4b0be97a 100644
--- a/indra/llui/llstatview.cpp
+++ b/indra/llui/llstatview.cpp
@@ -65,16 +65,6 @@ LLStatView::~LLStatView()
 }
 
 
-// widget registrars
-struct StatViewRegistry : public LLWidgetRegistry<StatViewRegistry>
-{};
-
 static StatViewRegistry::Register<LLStatBar> r1("stat_bar");
 
 
-const widget_registry_t& LLStatView::getChildRegistry() const
-{
-	return StatViewRegistry::instance();
-}
-
-
diff --git a/indra/llui/llstatview.h b/indra/llui/llstatview.h
index 20aba7782b..eee4e2b7e4 100644
--- a/indra/llui/llstatview.h
+++ b/indra/llui/llstatview.h
@@ -39,6 +39,10 @@
 
 class LLStatBar;
 
+// widget registrars
+struct StatViewRegistry : public LLChildRegistry<StatViewRegistry>
+{};
+
 class LLStatView : public LLContainerView
 {
 public:
@@ -51,9 +55,11 @@ public:
 			follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT);
 		}
 	};
-	~LLStatView();
 
-	virtual const widget_registry_t& getChildRegistry() const;
+	// my valid children are stored in this registry
+	typedef StatViewRegistry child_registry_t;
+
+	~LLStatView();
 
 protected:
 	LLStatView(const Params&);
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 3391b1275c..3d5b5caead 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -99,8 +99,8 @@ struct LLPlaceHolderPanel : public LLPanel
 	LLPlaceHolderPanel(const Params& p) : LLPanel(p)
 	{}
 };
-static LLDefaultWidgetRegistry::Register<LLPlaceHolderPanel> r1("placeholder");
-static LLDefaultWidgetRegistry::Register<LLTabContainer> r2("tab_container");
+static LLDefaultChildRegistry::Register<LLPlaceHolderPanel> r1("placeholder");
+static LLDefaultChildRegistry::Register<LLTabContainer> r2("tab_container");
 
 LLTabContainer::Params::Params()
 :	tab_width("tab_width"),
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index b812e876ef..56019171e1 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -30,17 +30,13 @@
  * $/LicenseInfo$
  */
 
-#define INSTANTIATE_GETCHILD_TEXTBOX
-
 #include "linden_common.h"
 #include "lltextbox.h"
 #include "lluictrlfactory.h"
 #include "llfocusmgr.h"
 #include "llwindow.h"
 
-template LLTextBox* LLView::getChild<LLTextBox>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-
-static LLDefaultWidgetRegistry::Register<LLTextBox> r("text");
+static LLDefaultChildRegistry::Register<LLTextBox> r("text");
 
 LLTextBox::Params::Params()
 :	text_color("text_color"),
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index dca906decc..53d57ff785 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -159,11 +159,4 @@ private:
 	callback_t		mClickedCallback;
 };
 
-#ifdef LL_WINDOWS
-#ifndef INSTANTIATE_GETCHILD_TEXTBOX
-#pragma warning (disable : 4231)
-extern template LLTextBox* LLView::getChild<LLTextBox>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-#endif
-#endif
-
 #endif
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 6649264d9a..ce16f11d33 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -63,7 +63,7 @@
 // 
 // Globals
 //
-static LLDefaultWidgetRegistry::Register<LLTextEditor> r("simple_text_editor");
+static LLDefaultChildRegistry::Register<LLTextEditor> r("simple_text_editor");
 
 //
 // Constants
@@ -304,7 +304,7 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p)
 	LLViewBorder::Params params;
 	params.name("text ed border");
 	params.rect(getLocalRect());
-	params.bevel_type(LLViewBorder::BEVEL_IN);
+	params.bevel_style(LLViewBorder::BEVEL_IN);
 	params.border_thickness(text_editor_border);
 	mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
 	addChild( mBorder );
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 12875b4ed1..c08abf3caf 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -90,8 +90,8 @@ std::list<std::string> gUntranslated;
 /*static*/ std::vector<std::string> LLUI::sXUIPaths;
 
 // register searcheditor here
-static LLDefaultWidgetRegistry::Register<LLSearchEditor> register_search_editor("search_editor");
-static LLDefaultWidgetRegistry::Register<LLFlyoutButton> register_flyout_button("flyout_button");
+static LLDefaultChildRegistry::Register<LLSearchEditor> register_search_editor("search_editor");
+static LLDefaultChildRegistry::Register<LLFlyoutButton> register_flyout_button("flyout_button");
 
 
 //
@@ -1934,8 +1934,8 @@ LLLocalClipRect::LLLocalClipRect(const LLRect &rect, BOOL enabled)
 
 namespace LLInitParam
 {
-	TypedParam<LLUIColor >::TypedParam(BlockDescriptor& descriptor, const char* name, const LLUIColor& value, ParamDescriptor::validation_func_t func)
-	:	super_t(descriptor, name, value, func),
+	TypedParam<LLUIColor >::TypedParam(BlockDescriptor& descriptor, const char* name, const LLUIColor& value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count)
+	:	super_t(descriptor, name, value, func, min_count, max_count),
 		red("red"),
 		green("green"),
 		blue("blue"),
@@ -1964,11 +1964,11 @@ namespace LLInitParam
 		declare("blue", LLColor4::blue);
 	}
 
-	TypedParam<const LLFontGL*>::TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL*const value, ParamDescriptor::validation_func_t func)
-	:	super_t(descriptor, name, value, func),
-		name("", std::string("")),
-		size("size", std::string("")),
-		style("style", std::string(""))
+	TypedParam<const LLFontGL*>::TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL*const value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count)
+	:	super_t(descriptor, name, value, func, min_count, max_count),
+		name(""),
+		size("size"),
+		style("style")
 	{}
 
 	const LLFontGL* TypedParam<const LLFontGL*>::getValueFromBlock() const
@@ -1995,8 +1995,8 @@ namespace LLInitParam
 		return mData.mValue;
 	}
 
-	TypedParam<LLRect>::TypedParam(BlockDescriptor& descriptor, const char* name, const LLRect& value, ParamDescriptor::validation_func_t func)
-	:	super_t(descriptor, name, value, func),
+	TypedParam<LLRect>::TypedParam(BlockDescriptor& descriptor, const char* name, const LLRect& value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count)
+	:	super_t(descriptor, name, value, func, min_count, max_count),
 		left("left"),
 		top("top"),
 		right("right"),
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index c0873247c0..c4cdbf2c14 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -706,7 +706,7 @@ namespace LLInitParam
 						width,
 						height;
 
-		TypedParam(BlockDescriptor& descriptor, const char* name, const LLRect& value, ParamDescriptor::validation_func_t func);
+		TypedParam(BlockDescriptor& descriptor, const char* name, const LLRect& value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count);
 
 		LLRect getValueFromBlock() const;
 	};
@@ -729,7 +729,7 @@ namespace LLInitParam
 		Optional<F32> alpha;
 		Optional<std::string> control;
 
-		TypedParam(BlockDescriptor& descriptor, const char* name, const LLUIColor& value, ParamDescriptor::validation_func_t func);
+		TypedParam(BlockDescriptor& descriptor, const char* name, const LLUIColor& value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count);
 		LLUIColor getValueFromBlock() const;
 	};
 
@@ -743,7 +743,7 @@ namespace LLInitParam
 		Optional<std::string> size;
 		Optional<std::string> style;
 
-		TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL* const value, ParamDescriptor::validation_func_t func);
+		TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL* const value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count);
 		const LLFontGL* getValueFromBlock() const;
 	};
 
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 395bed7959..43430cba24 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -38,7 +38,7 @@
 #include "llpanel.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultWidgetRegistry::Register<LLUICtrl> r("ui_ctrl");
+static LLDefaultChildRegistry::Register<LLUICtrl> r("ui_ctrl");
 
 LLUICtrl::Params::Params()
 :	tab_stop("tab_stop", true),
@@ -116,7 +116,7 @@ void LLFocusableElement::setFocus(BOOL b)
 //static 
 const LLUICtrl::Params& LLUICtrl::getDefaultParams()
 {
-	return LLUICtrlFactory::getDefaultParams<LLUICtrl::Params>();
+	return LLUICtrlFactory::getDefaultParams<LLUICtrl>();
 }
 
 
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 2b9caa2a82..f4c7cf36f2 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -130,8 +130,8 @@ public:
 		Alternative<std::string> invisible;
 
 		ControlVisibility()
-			: visible("make_visible_control"),
-			invisible("make_invisible_control")
+			: visible("visiblity_control"),
+			invisible("invisiblity_control")
 		{}
 	};	
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
@@ -324,6 +324,10 @@ namespace LLInitParam
 	bool ParamCompare<LLUICtrl::focus_callback_t>::equals(
 		const LLUICtrl::focus_callback_t &a, 
 		const LLUICtrl::focus_callback_t &b); 
+	
+    template<>
+	bool ParamCompare<LLLazyValue<LLColor4> >::equals(
+		const LLLazyValue<LLColor4> &a, const LLLazyValue<LLColor4> &b); 
 }
 
 #endif  // LL_LLUICTRL_H
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 24caf51159..9df22e39b4 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -85,7 +85,8 @@ LLFastTimer::DeclareTimer FTM_WIDGET_SETUP("Widget Setup");
 //-----------------------------------------------------------------------------
 // Register widgets that are purely data driven here so they get linked in
 #include "llstatview.h"
-static LLDefaultWidgetRegistry::Register<LLStatView> register_stat_view("stat_view");
+static LLDefaultChildRegistry::Register<LLStatView>
+	register_stat_view("stat_view");
 
 //-----------------------------------------------------------------------------
 
@@ -107,7 +108,7 @@ public:
 
 };
 
-static LLDefaultWidgetRegistry::Register<LLUICtrlLocate> r1("locate");
+static LLDefaultChildRegistry::Register<LLUICtrlLocate> r1("locate");
 
 //-----------------------------------------------------------------------------
 // LLUICtrlFactory()
@@ -135,7 +136,7 @@ void LLUICtrlFactory::loadWidgetTemplate(const std::string& widget_tag, LLInitPa
 }
 
 //static 
-void LLUICtrlFactory::createChildren(LLView* viewp, LLXMLNodePtr node, LLXMLNodePtr output_node)
+void LLUICtrlFactory::createChildren(LLView* viewp, LLXMLNodePtr node, const widget_registry_t& registry, LLXMLNodePtr output_node)
 {
 	if (node.isNull()) return;
 
@@ -147,7 +148,7 @@ void LLUICtrlFactory::createChildren(LLView* viewp, LLXMLNodePtr node, LLXMLNode
 			outputChild = output_node->createChild("", FALSE);
 		}
 
-		if (!instance().createFromXML(child_node, viewp, LLStringUtil::null, outputChild, viewp->getChildRegistry()))
+		if (!instance().createFromXML(child_node, viewp, LLStringUtil::null, registry, outputChild))
 		{
 			std::string child_name = std::string(child_node->getName()->mString);
 			llwarns << "Could not create widget named " << child_node->getName()->mString << llendl;
@@ -338,12 +339,12 @@ BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename, L
 
 LLFastTimer::DeclareTimer FTM_CREATE_FROM_XML("Create child widget");
 
-LLView *LLUICtrlFactory::createFromXML(LLXMLNodePtr node, LLView* parent, const std::string& filename,  LLXMLNodePtr output_node, const widget_registry_t& registry)
+LLView *LLUICtrlFactory::createFromXML(LLXMLNodePtr node, LLView* parent, const std::string& filename, const widget_registry_t& registry, LLXMLNodePtr output_node)
 {
 	LLFastTimer timer(FTM_CREATE_FROM_XML);
 	std::string ctrl_type = node->getName()->mString;
 	LLStringUtil::toLower(ctrl_type);
-	
+
 	const LLWidgetCreatorFunc* funcp = registry.getValue(ctrl_type);
 	if (funcp == NULL)
 	{
@@ -448,11 +449,497 @@ void LLUICtrlFactory::popFactoryFunctions()
 	}
 }
 
-const widget_registry_t& LLUICtrlFactory::getWidgetRegistry(LLView* viewp)
+
+//
+// LLRNGWriter - writes Relax NG schema files based on a param block
+//
+LLRNGWriter::LLRNGWriter()
+{
+	// register various callbacks for inspecting the contents of a param block
+	registerInspectFunc<bool>(boost::bind(&LLRNGWriter::writeAttribute, this, "boolean", _1, _2, _3, _4));
+	registerInspectFunc<std::string>(boost::bind(&LLRNGWriter::writeAttribute, this, "string", _1, _2, _3, _4));
+	registerInspectFunc<U8>(boost::bind(&LLRNGWriter::writeAttribute, this, "unsignedByte", _1, _2, _3, _4));
+	registerInspectFunc<S8>(boost::bind(&LLRNGWriter::writeAttribute, this, "signedByte", _1, _2, _3, _4));
+	registerInspectFunc<U16>(boost::bind(&LLRNGWriter::writeAttribute, this, "unsignedShort", _1, _2, _3, _4));
+	registerInspectFunc<S16>(boost::bind(&LLRNGWriter::writeAttribute, this, "signedShort", _1, _2, _3, _4));
+	registerInspectFunc<U32>(boost::bind(&LLRNGWriter::writeAttribute, this, "unsignedInt", _1, _2, _3, _4));
+	registerInspectFunc<S32>(boost::bind(&LLRNGWriter::writeAttribute, this, "integer", _1, _2, _3, _4));
+	registerInspectFunc<F32>(boost::bind(&LLRNGWriter::writeAttribute, this, "float", _1, _2, _3, _4));
+	registerInspectFunc<F64>(boost::bind(&LLRNGWriter::writeAttribute, this, "double", _1, _2, _3, _4));
+	registerInspectFunc<LLColor4>(boost::bind(&LLRNGWriter::writeAttribute, this, "string", _1, _2, _3, _4));
+	registerInspectFunc<LLUIColor>(boost::bind(&LLRNGWriter::writeAttribute, this, "string", _1, _2, _3, _4));
+	registerInspectFunc<LLUUID>(boost::bind(&LLRNGWriter::writeAttribute, this, "string", _1, _2, _3, _4));
+	registerInspectFunc<LLSD>(boost::bind(&LLRNGWriter::writeAttribute, this, "string", _1, _2, _3, _4));
+}
+
+void LLRNGWriter::writeRNG(const std::string& type_name, LLXMLNodePtr node, const LLInitParam::BaseBlock& block, const std::string& xml_namespace)
+{
+	mGrammarNode = node;
+	mGrammarNode->setName("grammar");
+	mGrammarNode->createChild("xmlns", true)->setStringValue("http://relaxng/ns/structure/1.0");
+	mGrammarNode->createChild("datatypeLibrary", true)->setStringValue("http://www.w3.org/2001/XMLSchema-datatypes");
+	mGrammarNode->createChild("ns", true)->setStringValue(xml_namespace);
+
+	node = mGrammarNode->createChild("start", false);
+	node = node->createChild("ref", false);
+	node->createChild("name", true)->setStringValue(type_name);
+	
+	node = mGrammarNode->createChild("define", false);
+	node->createChild("name", true)->setStringValue(type_name);
+
+	mElementNode = node->createChild("element", false);
+	mElementNode->createChild("name", true)->setStringValue(type_name);
+
+	block.inspectBlock(*this);
+}
+
+void LLRNGWriter::writeAttribute(const std::string& type, const Parser::name_stack_t& stack, S32 min_count, S32 max_count, const std::vector<std::string>* possible_values)
+{
+	name_stack_t non_empty_names;
+	std::string attribute_name;
+	for (name_stack_t::const_iterator it = stack.begin();
+		it != stack.end();
+		++it)
+	{
+		const std::string& name = it->first;
+		if (!name.empty())
+		{
+			non_empty_names.push_back(*it);
+		}
+	}
+
+	if (non_empty_names.empty()) return;
+
+	for (name_stack_t::const_iterator it = non_empty_names.begin();
+		it != non_empty_names.end();
+		++it)
+	{
+		if (!attribute_name.empty())
+		{
+			attribute_name += ".";
+		}
+		attribute_name += it->first;
+	}
+
+	// singular attribute
+	if (non_empty_names.size() == 1)
+	{
+		if (max_count == 1)
+		{
+			LLXMLNodePtr node = getCardinalityNode(mElementNode, min_count, max_count)->createChild("attribute", false);
+			node->createChild("name", true)->setStringValue(attribute_name);
+			node->createChild("data", false)->createChild("type", true)->setStringValue(type);
+		}
+	}
+	// compound attribute
+	else
+	{
+		std::string element_name;
+
+		// traverse all but last element, leaving that as an attribute name
+		name_stack_t::const_iterator end_it = non_empty_names.end();
+		end_it--;
+
+		for (name_stack_t::const_iterator it = non_empty_names.begin();
+			it != end_it;
+			++it)
+		{
+			if (it != non_empty_names.begin())
+			{
+				element_name += ".";
+			}
+			element_name += it->first;
+		}
+
+		elements_map_t::iterator found_it = mElementsWritten.find(element_name);
+		if (found_it != mElementsWritten.end())
+		{
+			// reuse existing element
+			LLXMLNodePtr choice_node = found_it->second;
+
+			LLXMLNodePtr node = choice_node->mChildren->head;
+			node = getCardinalityNode(node, min_count, max_count)->createChild("attribute", false);
+			node->createChild("name", true)->setStringValue(attribute_name);
+			node->createChild("data", false)->createChild("type", true)->setStringValue(type);
+
+			node = choice_node->mChildren->head->mNext->mChildren->head;
+			node = getCardinalityNode(node, min_count, max_count)->createChild("attribute", false);
+			node->createChild("name", true)->setStringValue(non_empty_names.back().first);
+			node->createChild("data", false)->createChild("type", true)->setStringValue(type);
+		}
+		else
+		{
+			LLXMLNodePtr choice_node = mElementNode->createChild("choice", false);
+
+			LLXMLNodePtr node = choice_node->createChild("group", false);
+			node = getCardinalityNode(node, min_count, max_count)->createChild("attribute", false);
+			node->createChild("name", true)->setStringValue(attribute_name);
+			node->createChild("data", false)->createChild("type", true)->setStringValue(type);
+
+			node = choice_node->createChild("element", false);
+			node->createChild("name", true)->setStringValue(element_name);
+			node = getCardinalityNode(node, min_count, max_count)->createChild("attribute", false);
+			node->createChild("name", true)->setStringValue(non_empty_names.back().first);
+			node->createChild("data", false)->createChild("type", true)->setStringValue(type);
+			
+			node = choice_node->createChild("element", false);
+			node->createChild("name", true)->setStringValue(type + "." + element_name);
+			node->createChild("ref", true)->createChild("name", true)->setStringValue(element_name);
+
+			mElementsWritten[element_name] = choice_node;
+		}
+	}
+}
+
+LLXMLNodePtr LLRNGWriter::getCardinalityNode(LLXMLNodePtr parent_node, S32 min_count, S32 max_count)
+{
+	// unlinked by default, meaning this attribute is forbidden
+	LLXMLNodePtr count_node = new LLXMLNode();
+	if (min_count >= 1)
+	{
+		if (max_count == 1 && min_count == 1)
+		{
+			// just add raw element, will count as 1 and only 1
+			count_node = mElementNode;
+		}
+		else
+		{
+			count_node = mElementNode->createChild("oneOrMore", false);
+		}
+	}
+	else
+	{
+		if (max_count == 1)
+		{
+			count_node = mElementNode->createChild("optional", false);
+		}
+		else if (max_count > 1)
+		{
+			count_node = mElementNode->createChild("zeroOrMore", false);
+		}
+	}
+	return count_node;
+}
+//
+// LLXSDWriter
+//
+LLXSDWriter::LLXSDWriter()
+{
+	registerInspectFunc<bool>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:boolean", _1, _2, _3, _4));
+	registerInspectFunc<std::string>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:string", _1, _2, _3, _4));
+	registerInspectFunc<U8>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:unsignedByte", _1, _2, _3, _4));
+	registerInspectFunc<S8>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:signedByte", _1, _2, _3, _4));
+	registerInspectFunc<U16>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:unsignedShort", _1, _2, _3, _4));
+	registerInspectFunc<S16>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:signedShort", _1, _2, _3, _4));
+	registerInspectFunc<U32>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:unsignedInt", _1, _2, _3, _4));
+	registerInspectFunc<S32>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:integer", _1, _2, _3, _4));
+	registerInspectFunc<F32>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:float", _1, _2, _3, _4));
+	registerInspectFunc<F64>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:double", _1, _2, _3, _4));
+	registerInspectFunc<LLColor4>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:string", _1, _2, _3, _4));
+	registerInspectFunc<LLUIColor>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:string", _1, _2, _3, _4));
+	registerInspectFunc<LLUUID>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:string", _1, _2, _3, _4));
+	registerInspectFunc<LLSD>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:string", _1, _2, _3, _4));
+}
+
+void LLXSDWriter::writeXSD(const std::string& type_name, LLXMLNodePtr node, const LLInitParam::BaseBlock& block, const std::string& xml_namespace)
+{
+	mSchemaNode = node;
+	node->setName("xs:schema");
+	node->createChild("attributeFormDefault", true)->setStringValue("unqualified");
+	node->createChild("elementFormDefault", true)->setStringValue("qualified");
+	node->createChild("targetNamespace", true)->setStringValue(xml_namespace);
+	node->createChild("xmlns:xs", true)->setStringValue("http://www.w3.org/2001/XMLSchema");
+	node->createChild("xmlns", true)->setStringValue(xml_namespace);
+
+	node = node->createChild("xs:complexType", false);
+	node->createChild("name", true)->setStringValue(type_name);
+	node->createChild("mixed", true)->setStringValue("true");
+
+	mAttributeNode = node;
+	mElementNode = node->createChild("xs:choice", false);
+	mElementNode->createChild("minOccurs", true)->setStringValue("0");
+	mElementNode->createChild("maxOccurs", true)->setStringValue("unbounded");
+	block.inspectBlock(*this);
+
+	// duplicate element choices
+	LLXMLNodeList children;
+	mElementNode->getChildren("xs:element", children, FALSE);
+	for (LLXMLNodeList::iterator child_it = children.begin(); child_it != children.end(); ++child_it)
+	{
+		LLXMLNodePtr child_copy = child_it->second->deepCopy();
+		std::string child_name;
+		child_copy->getAttributeString("name", child_name);
+		child_copy->setAttributeString("name", type_name + "." + child_name);
+		mElementNode->addChild(child_copy);
+	}
+
+	LLXMLNodePtr element_declaration_node = mSchemaNode->createChild("xs:element", false);
+	element_declaration_node->createChild("name", true)->setStringValue(type_name);
+	element_declaration_node->createChild("type", true)->setStringValue(type_name);
+}
+
+void LLXSDWriter::writeAttribute(const std::string& type, const Parser::name_stack_t& stack, S32 min_count, S32 max_count, const std::vector<std::string>* possible_values)
+{
+	name_stack_t non_empty_names;
+	std::string attribute_name;
+	for (name_stack_t::const_iterator it = stack.begin();
+		it != stack.end();
+		++it)
+	{
+		const std::string& name = it->first;
+		if (!name.empty())
+		{
+			non_empty_names.push_back(*it);
+		}
+	}
+
+	for (name_stack_t::const_iterator it = non_empty_names.begin();
+		it != non_empty_names.end();
+		++it)
+	{
+		if (!attribute_name.empty())
+		{
+			attribute_name += ".";
+		}
+		attribute_name += it->first;
+	}
+
+	// only flag non-nested attributes as mandatory, nested attributes have variant syntax
+	// that can't be properly constrained in XSD
+	// e.g. <foo mandatory.value="bar"/> vs <foo><mandatory value="bar"/></foo>
+	bool attribute_mandatory = min_count == 1 && max_count == 1 && non_empty_names.size() == 1;
+
+	// don't bother supporting "Multiple" params as xml attributes
+	if (max_count <= 1)
+	{
+		// add compound attribute to root node
+		addAttributeToSchema(mAttributeNode, attribute_name, type, attribute_mandatory, possible_values);
+	}
+
+	// now generated nested elements for compound attributes
+	if (non_empty_names.size() > 1 && !attribute_mandatory)
+	{
+		std::string element_name;
+
+		// traverse all but last element, leaving that as an attribute name
+		name_stack_t::const_iterator end_it = non_empty_names.end();
+		end_it--;
+
+		for (name_stack_t::const_iterator it = non_empty_names.begin();
+			it != end_it;
+			++it)
+		{
+			if (it != non_empty_names.begin())
+			{
+				element_name += ".";
+			}
+			element_name += it->first;
+		}
+
+		std::string short_attribute_name = non_empty_names.back().first;
+
+		LLXMLNodePtr complex_type_node;
+
+		// find existing element node here, starting at tail of child list
+		if (mElementNode->mChildren.notNull())
+		{
+			for(LLXMLNodePtr element = mElementNode->mChildren->tail;
+				element.notNull(); 
+				element = element->mPrev)
+			{
+				std::string name;
+				if(element->getAttributeString("name", name) && name == element_name)
+				{
+					complex_type_node = element->mChildren->head;
+					break;
+				}
+			}
+		}
+		//create complex_type node
+		//
+		//<xs:element
+        //    maxOccurs="1"
+        //    minOccurs="0"
+        //    name="name">
+        //       <xs:complexType>
+        //       </xs:complexType>
+        //</xs:element>
+		if(complex_type_node.isNull())
+		{
+			complex_type_node = mElementNode->createChild("xs:element", false);
+
+			complex_type_node->createChild("minOccurs", true)->setIntValue(min_count);
+			complex_type_node->createChild("maxOccurs", true)->setIntValue(max_count);
+			complex_type_node->createChild("name",		true)->setStringValue(element_name);
+			complex_type_node = complex_type_node->createChild("xs:complexType", false);
+		}
+
+		addAttributeToSchema(complex_type_node, short_attribute_name, type, false, possible_values);
+	}
+}
+
+void LLXSDWriter::addAttributeToSchema(LLXMLNodePtr type_declaration_node, const std::string& attribute_name, const std::string& type, bool mandatory, const std::vector<std::string>* possible_values)
 {
-	return viewp->getChildRegistry();
+	if (!attribute_name.empty())
+	{
+		LLXMLNodePtr new_enum_type_node;
+		if (possible_values != NULL)
+		{
+			// custom attribute type, for example
+			//<xs:simpleType>
+			 // <xs:restriction
+			 //    base="xs:string">
+			 //     <xs:enumeration
+			 //      value="a" />
+			 //     <xs:enumeration
+			 //      value="b" />
+			 //   </xs:restriction>
+			 // </xs:simpleType>
+			new_enum_type_node = new LLXMLNode("xs:simpleType", false);
+
+			LLXMLNodePtr restriction_node = new_enum_type_node->createChild("xs:restriction", false);
+			restriction_node->createChild("base", true)->setStringValue("xs:string");
+
+			for (std::vector<std::string>::const_iterator it = possible_values->begin();
+				it != possible_values->end();
+				++it)
+			{
+				LLXMLNodePtr enum_node = restriction_node->createChild("xs:enumeration", false);
+				enum_node->createChild("value", true)->setStringValue(*it);
+			}
+		}
+
+		string_set_t& attributes_written = mAttributesWritten[type_declaration_node];
+
+		string_set_t::iterator found_it = std::lower_bound(attributes_written.begin(), attributes_written.end(), attribute_name);
+
+		// attribute not yet declared
+		if (found_it == attributes_written.end() || attributes_written.key_comp()(attribute_name, *found_it))
+		{
+			attributes_written.insert(found_it, attribute_name);
+
+			LLXMLNodePtr attribute_node = type_declaration_node->createChild("xs:attribute", false);
+
+			// attribute name
+			attribute_node->createChild("name", true)->setStringValue(attribute_name);
+
+			if (new_enum_type_node.notNull())
+			{
+				attribute_node->addChild(new_enum_type_node);
+			}
+			else
+			{
+				// simple attribute type
+				attribute_node->createChild("type", true)->setStringValue(type);
+			}
+
+			// required or optional
+			attribute_node->createChild("use", true)->setStringValue(mandatory ? "required" : "optional");
+		}
+		 // attribute exists...handle collision of same name attributes with potentially different types
+		else
+		{
+			LLXMLNodePtr attribute_declaration;
+			if (type_declaration_node.notNull())
+			{
+				for(LLXMLNodePtr node = type_declaration_node->mChildren->tail; 
+					node.notNull(); 
+					node = node->mPrev)
+				{
+					std::string name;
+					if (node->getAttributeString("name", name) && name == attribute_name)
+					{
+						attribute_declaration = node;
+						break;
+					}
+				}
+			}
+
+			bool new_type_is_enum = new_enum_type_node.notNull();
+			bool existing_type_is_enum = !attribute_declaration->hasAttribute("type");
+
+			// either type is enum, revert to string in collision
+			// don't bother to check for enum equivalence
+			if (new_type_is_enum || existing_type_is_enum)
+			{
+				if (attribute_declaration->hasAttribute("type"))
+				{
+					attribute_declaration->setAttributeString("type", "xs:string");
+				}
+				else
+				{
+					attribute_declaration->createChild("type", true)->setStringValue("xs:string");
+				}
+				attribute_declaration->deleteChildren("xs:simpleType");
+			}
+			else 
+			{
+				// check for collision of different standard types
+				std::string existing_type;
+				attribute_declaration->getAttributeString("type", existing_type);
+				// if current type is not the same as the new type, revert to strnig
+				if (existing_type != type)
+				{
+					// ...than use most general type, string
+					attribute_declaration->setAttributeString("type", "string");
+				}
+			}
+		}
+	}
 }
 
+//
+// LLXUIXSDWriter
+//
+void LLXUIXSDWriter::writeXSD(const std::string& type_name, const std::string& path, const LLInitParam::BaseBlock& block)
+{
+	std::string file_name(path);
+	file_name += type_name + ".xsd";
+	LLXMLNodePtr root_nodep = new LLXMLNode();
+
+	LLXSDWriter::writeXSD(type_name, root_nodep, block, "http://www.lindenlab.com/xui");
+
+	// add includes for all possible children
+	const std::type_info* type = *LLWidgetTypeRegistry::instance().getValue(type_name);
+	const widget_registry_t* widget_registryp = LLChildRegistryRegistry::instance().getValue(type);
+	
+	// add include declarations for all valid children
+	for (widget_registry_t::Registrar::registry_map_t::const_iterator it = widget_registryp->currentRegistrar().beginItems();
+		it != widget_registryp->currentRegistrar().endItems();
+		++it)
+	{
+		std::string widget_name = it->first;
+		if (widget_name == type_name)
+		{
+			continue;
+		}
+		LLXMLNodePtr nodep = new LLXMLNode("xs:include", false);
+		nodep->createChild("schemaLocation", true)->setStringValue(widget_name + ".xsd");
+
+		// add to front of schema
+		mSchemaNode->addChild(nodep, mSchemaNode);
+	}
+
+	// add choices for valid children
+	if (widget_registryp)
+	{
+		for (widget_registry_t::Registrar::registry_map_t::const_iterator it = widget_registryp->currentRegistrar().beginItems();
+			it != widget_registryp->currentRegistrar().endItems();
+			++it)
+		{
+			std::string widget_name = it->first;
+            //<xs:element name="widget_name" type="widget_name">
+			LLXMLNodePtr widget_node = mElementNode->createChild("xs:element", false);
+			widget_node->createChild("name", true)->setStringValue(widget_name);
+			widget_node->createChild("type", true)->setStringValue(widget_name);
+		}
+	}
+
+	LLFILE* xsd_file = LLFile::fopen(file_name.c_str(), "w");
+	LLXMLNode::writeHeaderToFile(xsd_file);
+	root_nodep->writeToFile(xsd_file);
+	fclose(xsd_file);
+}
 
 //
 // LLXUIParser
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index f8d584bc75..894c77888c 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -41,11 +41,64 @@
 #include <boost/function.hpp>
 #include <iosfwd>
 #include <stack>
+#include <set>
 
 class LLPanel;
 class LLFloater;
 class LLView;
 
+class LLRNGWriter : public LLInitParam::Parser
+{
+	LOG_CLASS(LLRNGWriter);
+public:
+	void writeRNG(const std::string& name, LLXMLNodePtr node, const LLInitParam::BaseBlock& block, const std::string& xml_namespace);
+
+	/*virtual*/ std::string getCurrentElementName() { return LLStringUtil::null; }
+
+	LLRNGWriter();
+
+private:
+	LLXMLNodePtr getCardinalityNode(LLXMLNodePtr parent_node, S32 min_count, S32 max_count);
+
+	void writeAttribute(const std::string& type, const Parser::name_stack_t&, S32 min_count, S32 max_count, const std::vector<std::string>* possible_values);
+	LLXMLNodePtr mElementNode;
+	LLXMLNodePtr mGrammarNode;
+
+	typedef std::map<std::string, LLXMLNodePtr> elements_map_t;
+	elements_map_t	mElementsWritten;
+};
+
+
+class LLXSDWriter : public LLInitParam::Parser
+{
+	LOG_CLASS(LLXSDWriter);
+public:
+	void writeXSD(const std::string& name, LLXMLNodePtr node, const LLInitParam::BaseBlock& block, const std::string& xml_namespace);
+
+	/*virtual*/ std::string getCurrentElementName() { return LLStringUtil::null; }
+
+	LLXSDWriter();
+
+protected:
+	void writeAttribute(const std::string& type, const Parser::name_stack_t&, S32 min_count, S32 max_count, const std::vector<std::string>* possible_values);
+	void addAttributeToSchema(LLXMLNodePtr nodep, const std::string& attribute_name, const std::string& type, bool mandatory, const std::vector<std::string>* possible_values);
+	LLXMLNodePtr mAttributeNode;
+	LLXMLNodePtr mElementNode;
+	LLXMLNodePtr mSchemaNode;
+
+	typedef std::set<std::string> string_set_t;
+	typedef std::map<LLXMLNodePtr, string_set_t> attributes_map_t;
+	attributes_map_t	mAttributesWritten;
+};
+
+// NOTE: DOES NOT WORK YET
+// should support child widgets for XUI
+class LLXUIXSDWriter : public LLXSDWriter
+{
+public:
+	void writeXSD(const std::string& name, const std::string& path, const LLInitParam::BaseBlock& block);
+};
+
 class LLXUIParser : public LLInitParam::Parser, public LLSingleton<LLXUIParser>
 {
 LOG_CLASS(LLXUIParser);
@@ -118,13 +171,23 @@ typedef boost::function<LLView* (LLXMLNodePtr node, LLView *parent, LLXMLNodePtr
 
 typedef LLRegistry<std::string, LLWidgetCreatorFunc> widget_registry_t;
 
+// sort functor for typeid maps
+struct LLCompareTypeID
+{
+	bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
+	{
+		return lhs->before(*rhs);
+	}
+};
+
+// lookup widget constructor funcs by widget name
 template <typename DERIVED_TYPE>
-class LLWidgetRegistry : public LLRegistrySingleton<std::string, LLWidgetCreatorFunc, DERIVED_TYPE>
+class LLChildRegistry : public LLRegistrySingleton<std::string, LLWidgetCreatorFunc, DERIVED_TYPE>
 {
 public:
 	typedef LLRegistrySingleton<std::string, LLWidgetCreatorFunc, DERIVED_TYPE> super_t;
 	// local static instance for registering a particular widget
-	template<typename T, typename PARAM_BLOCK = typename T::Params>
+	template<typename T>
 	class Register : public super_t::StaticRegistrar
 	{
 	public:
@@ -133,35 +196,40 @@ public:
 	};
 
 protected:
-	LLWidgetRegistry() {}
+	LLChildRegistry() {}
 };
 
-class LLDefaultWidgetRegistry : public LLWidgetRegistry<LLDefaultWidgetRegistry>
+class LLDefaultChildRegistry : public LLChildRegistry<LLDefaultChildRegistry>
 {
 protected:
-	LLDefaultWidgetRegistry() {}
-	friend class LLSingleton<LLDefaultWidgetRegistry>;
-};
-
-struct LLCompareTypeID
-{
-	bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
-	{
-		return lhs->before(*rhs);
-	}
+	LLDefaultChildRegistry(){}
+	friend class LLSingleton<LLDefaultChildRegistry>;
 };
 
+// lookup widget name by type
+class LLWidgetNameRegistry 
+:	public LLRegistrySingleton<const std::type_info*, std::string, LLWidgetNameRegistry , LLCompareTypeID>
+{};
 
-class LLWidgetTemplateRegistry 
-:	public LLRegistrySingleton<const std::type_info*, std::string, LLWidgetTemplateRegistry, LLCompareTypeID>
+// lookup widget type by name
+class LLWidgetTypeRegistry
+:	public LLRegistrySingleton<std::string, const std::type_info*, LLWidgetTypeRegistry>
 {};
 
-// function used to create new default widgets via LLView::getChild<T>
+// lookup factory functions for default widget instances by widget type
 typedef LLView* (*dummy_widget_creator_func_t)(const std::string&);
+class LLDefaultWidgetRegistry
+:	public LLRegistrySingleton<const std::type_info*, dummy_widget_creator_func_t, LLDefaultWidgetRegistry, LLCompareTypeID>
+{};
 
-// used to register factory functions for default widget instances
-class LLDummyWidgetRegistry
-:	public LLRegistrySingleton<const std::type_info*, dummy_widget_creator_func_t, LLDummyWidgetRegistry, LLCompareTypeID>
+// lookup function for generating empty param block by widget type
+typedef const LLInitParam::BaseBlock& (*empty_param_block_func_t)();
+class LLDefaultParamBlockRegistry
+:	public LLRegistrySingleton<const std::type_info*, empty_param_block_func_t, LLDefaultParamBlockRegistry, LLCompareTypeID>
+{};
+
+class LLChildRegistryRegistry
+: public LLRegistrySingleton<const std::type_info*, widget_registry_t, LLChildRegistryRegistry>
 {};
 
 extern LLFastTimer::DeclareTimer FTM_WIDGET_SETUP;
@@ -176,26 +244,26 @@ private:
 	~LLUICtrlFactory();
 
 	// only partial specialization allowed in inner classes, so use extra dummy parameter
-	template <typename T, int DUMMY>
-	class ParamDefaults : public LLSingleton<ParamDefaults<T, DUMMY> > 
+	template <typename PARAM_BLOCK, int DUMMY>
+	class ParamDefaults : public LLSingleton<ParamDefaults<PARAM_BLOCK, DUMMY> > 
 	{
 	public:
 		ParamDefaults()
 		{
 			// recursively initialize from base class param block
-			((typename T::base_block_t&)mPrototype).fillFrom(ParamDefaults<typename T::base_block_t, DUMMY>::instance().get());
+			((typename PARAM_BLOCK::base_block_t&)mPrototype).fillFrom(ParamDefaults<typename PARAM_BLOCK::base_block_t, DUMMY>::instance().get());
 			// after initializing base classes, look up template file for this param block
-			std::string* param_block_tag = LLWidgetTemplateRegistry::instance().getValue(&typeid(T));
+			std::string* param_block_tag = LLWidgetNameRegistry::instance().getValue(&typeid(PARAM_BLOCK));
 			if (param_block_tag)
 			{
 				LLUICtrlFactory::loadWidgetTemplate(*param_block_tag, mPrototype);
 			}
 		}
 
-		const T& get() { return mPrototype; }
+		const PARAM_BLOCK& get() { return mPrototype; }
 
 	private:
-		T mPrototype;
+		PARAM_BLOCK mPrototype;
 	};
 
 	// base case for recursion, there are NO base classes of LLInitParam::BaseBlock
@@ -210,11 +278,12 @@ private:
 
 public:
 
+	// get default parameter block for widget of a specific type
 	template<typename T>
-	static const T& getDefaultParams()
+	static const typename T::Params& getDefaultParams()
 	{
 		//#pragma message("Generating ParamDefaults")
-		return ParamDefaults<T, 0>::instance().get();
+		return ParamDefaults<typename T::Params, 0>::instance().get();
 	}
 
 	void buildFloater(LLFloater* floaterp, const std::string &filename, BOOL open_floater = TRUE, LLXMLNodePtr output_node = NULL);
@@ -252,12 +321,10 @@ public:
 		return widget;
 	}
 
-	LLView* createFromXML(LLXMLNodePtr node, LLView* parent, const std::string& filename,  LLXMLNodePtr output_node, const widget_registry_t&  );
+	LLView* createFromXML(LLXMLNodePtr node, LLView* parent, const std::string& filename, const widget_registry_t&, LLXMLNodePtr output_node );
 
-	static const widget_registry_t& getWidgetRegistry(LLView*);
-	
 	template<typename T>
-	static T* createFromFile(const std::string &filename, LLView *parent, LLXMLNodePtr output_node = NULL)
+	static T* createFromFile(const std::string &filename, LLView *parent, const widget_registry_t& registry, LLXMLNodePtr output_node = NULL)
 	{
 		//#pragma message("Generating LLUICtrlFactory::createFromFile")
 		T* widget = NULL;
@@ -283,7 +350,7 @@ public:
 				goto fail;
 			}
 			
-			LLView* view = getInstance()->createFromXML(root_node, parent, filename, output_node, getWidgetRegistry(parent));
+			LLView* view = getInstance()->createFromXML(root_node, parent, filename, registry, output_node);
 			if (view)
 			{
 				widget = dynamic_cast<T*>(view);
@@ -304,7 +371,7 @@ fail:
 	template<class T>
 	static T* getDefaultWidget(const std::string& name)
 	{
-		dummy_widget_creator_func_t* dummy_func = LLDummyWidgetRegistry::instance().getValue(&typeid(T));
+		dummy_widget_creator_func_t* dummy_func = LLDefaultWidgetRegistry::instance().getValue(&typeid(T));
 		return dummy_func ? dynamic_cast<T*>((*dummy_func)(name)) : NULL;
 	}
 
@@ -317,23 +384,23 @@ fail:
 		return create<T>(params);
 	}
 
-	template<typename T, typename PARAM_BLOCK>
+	template<typename T>
 	static T* defaultBuilder(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)
 	{
 		LLFastTimer timer(FTM_WIDGET_SETUP);
 
 		//#pragma message("Generating LLUICtrlFactory::defaultBuilder")
-		PARAM_BLOCK params(getDefaultParams<PARAM_BLOCK>());
+		typename T::Params params(getDefaultParams<T>());
 
 		LLXUIParser::instance().readXUI(node, params);
 
 		if (output_node)
 		{
 			// We always want to output top-left coordinates
-			PARAM_BLOCK output_params(params);
+			typename T::Params output_params(params);
 			T::setupParamsForExport(output_params, parent);
 			// Export only the differences between this any default params
-			PARAM_BLOCK default_params(getDefaultParams<PARAM_BLOCK>());
+			typename T::Params default_params(getDefaultParams<T>());
 			output_node->setName(node->getName()->mString);
 			LLXUIParser::instance().writeXUI(
 				output_node, output_params, &default_params);
@@ -361,8 +428,10 @@ fail:
 			S32 tab_group = params.tab_group.isProvided() ? params.tab_group() : -1;
 			setCtrlParent(widget, parent, tab_group);
 		}
+		
+		typedef typename T::child_registry_t registry_t;
 
-		createChildren(widget, node, output_node);
+		createChildren(widget, node, registry_t::instance(), output_node);
 
 		if (!widget->postBuild())
 		{
@@ -373,7 +442,7 @@ fail:
 		return widget;
 	}
 
-	static void createChildren(LLView* viewp, LLXMLNodePtr node, LLXMLNodePtr output_node = NULL);
+	static void createChildren(LLView* viewp, LLXMLNodePtr node, const widget_registry_t&, LLXMLNodePtr output_node = NULL);
 
 	static bool getLayeredXMLNode(const std::string &filename, LLXMLNodePtr& root);
 	
@@ -395,16 +464,28 @@ private:
 	std::vector<std::string>	mFileNames;
 };
 
+template<typename T>
+const LLInitParam::BaseBlock& getEmptyParamBlock()
+{
+	static typename T::Params params;
+	return params;
+}
+
 // this is here to make gcc happy with reference to LLUICtrlFactory
 template<typename DERIVED>
-template<typename T, typename PARAM_BLOCK> 
-LLWidgetRegistry<DERIVED>::Register<T, PARAM_BLOCK>::Register(const char* tag, LLWidgetCreatorFunc func)
-:	LLWidgetRegistry<DERIVED>::StaticRegistrar(tag, func.empty() ? (LLWidgetCreatorFunc)&LLUICtrlFactory::defaultBuilder<T, PARAM_BLOCK> : func)
+template<typename T> 
+LLChildRegistry<DERIVED>::Register<T>::Register(const char* tag, LLWidgetCreatorFunc func)
+:	LLChildRegistry<DERIVED>::StaticRegistrar(tag, func.empty() ? (LLWidgetCreatorFunc)&LLUICtrlFactory::defaultBuilder<T> : func)
 {
+	const std::type_info* widget_type_infop = &typeid(T);
 	// associate parameter block type with template .xml file
-	LLWidgetTemplateRegistry::instance().defaultRegistrar().add(&typeid(PARAM_BLOCK), tag);
+	LLWidgetNameRegistry ::instance().defaultRegistrar().add(&typeid(typename T::Params), tag);
 	// associate widget type with factory function
-	LLDummyWidgetRegistry::instance().defaultRegistrar().add(&typeid(T), &LLUICtrlFactory::createDefaultWidget<T>);
+	LLDefaultWidgetRegistry::instance().defaultRegistrar().add(widget_type_infop, &LLUICtrlFactory::createDefaultWidget<T>);
+	LLWidgetTypeRegistry::instance().defaultRegistrar().add(tag, widget_type_infop);
+	LLDefaultParamBlockRegistry::instance().defaultRegistrar().add(widget_type_infop, &getEmptyParamBlock<T>);
+	typedef typename T::child_registry_t registry_t;
+	LLChildRegistryRegistry::instance().defaultRegistrar().add(widget_type_infop, registry_t::instance());
 }
 
 
diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h
index e3b473b5f6..0fb16876bf 100644
--- a/indra/llui/lluiimage.h
+++ b/indra/llui/lluiimage.h
@@ -95,8 +95,8 @@ namespace LLInitParam
 	public:
 		Optional<std::string> name;
 
-		TypedParam(BlockDescriptor& descriptor, const char* name, super_t::value_assignment_t value, ParamDescriptor::validation_func_t func)
-		:	super_t(descriptor, name, value, func)
+		TypedParam(BlockDescriptor& descriptor, const char* name, super_t::value_assignment_t value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count)
+		:	super_t(descriptor, name, value, func, min_count, max_count)
 		{
 		}
 
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 29d0f6a168..777cf096ac 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -99,10 +99,15 @@ LLView::Params::Params()
 	left_delta("left_delta", S32_MAX),
 	center_horiz("center_horiz", false),
 	center_vert("center_vert", false),
-	serializable("", false),
+	from_xui("from_xui", false),
 	user_resize("user_resize"),
 	auto_resize("auto_resize"),
-	needs_translate("translate")
+	needs_translate("translate"),
+	xmlns("xmlns"),
+	xmlns_xsi("xmlns:xsi"),
+	xsi_schemaLocation("xsi:schemaLocation"),
+	xsi_type("xsi:type")
+
 {
 	addSynonym(rect, "");
 }
@@ -111,7 +116,7 @@ LLView::LLView(const LLView::Params& p)
 :	mName(p.name),
 	mParentView(NULL),
 	mReshapeFlags(FOLLOWS_NONE),
-	mSaveToXML(p.serializable),
+	mSaveToXML(p.from_xui),
 	mIsFocusRoot(FALSE),
 	mLastVisible(FALSE),
 	mNextInsertionOrdinal(0),
@@ -2291,13 +2296,6 @@ LLControlVariable *LLView::findControl(const std::string& name)
 	return control_group.getControl(name);	
 }
 
-const widget_registry_t& LLView::getChildRegistry() const
-{
-	static widget_registry_t empty_registry;
-	return empty_registry;
-}
-
-
 const S32 FLOATER_H_MARGIN = 15;
 const S32 MIN_WIDGET_HEIGHT = 10;
 const S32 VPAD = 4;
@@ -2418,7 +2416,7 @@ void LLView::setupParams(LLView::Params& p, LLView* parent)
 	const S32 VPAD = 4;
 	const S32 MIN_WIDGET_HEIGHT = 10;
 	
-	p.serializable(true);
+	p.from_xui(true);
 
 	// *NOTE:  This will confuse export of floater/panel coordinates unless
 	// the default is also "topleft".  JC
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 422f62f602..5f6341daa6 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -138,6 +138,9 @@ virtual BOOL	handleUnicodeCharHere(llwchar uni_char);
 		*
 */
 
+class LLViewWidgetRegistry : public LLChildRegistry<LLViewWidgetRegistry>
+{};
+
 class LLView : public LLMouseHandler, public LLMortician
 {
 public:
@@ -157,15 +160,16 @@ public:
 		Mandatory<std::string>		name;
 
 		Optional<bool>				enabled,
-									visible;
-		Optional<bool>				mouse_opaque;
-		Optional<bool>				use_bounding_rect;
+									visible,
+									mouse_opaque,
+									use_bounding_rect;
+
 		Optional<S32>				tab_group,
 									default_tab_group;
 		Optional<std::string>		tool_tip;
 
 		Optional<S32>				sound_flags;
-		Optional<bool>				serializable;
+		Optional<bool>				from_xui;
 		Optional<Follows>			follows;
 		Optional<std::string>		hover_cursor;
 		
@@ -192,10 +196,17 @@ public:
 		//FIXME: get parent context involved in parsing traversal
 		Ignored						user_resize,
 									auto_resize,
-									needs_translate;
+									needs_translate,
+									xmlns,
+									xmlns_xsi,
+									xsi_schemaLocation,
+									xsi_type;
 
 		Params();
 	};
+
+	typedef LLViewWidgetRegistry child_registry_t;
+
 	void initFromParams(const LLView::Params&);
 
 protected:
@@ -496,9 +507,6 @@ public:
 		return dynamic_cast<T*>(found_it->second);
 	}
 
-	// determines allowable children when parsing XUI
-	virtual const widget_registry_t& getChildRegistry() const;
-
 	//////////////////////////////////////////////
 	// statics
 	//////////////////////////////////////////////
@@ -647,6 +655,9 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse, BO
 
 				if (result)
 				{
+					// *NOTE: You cannot call mFoo = getChild<LLFoo>("bar")
+					// in a floater or panel constructor.  The widgets will not
+					// be ready.  Instead, put it in postBuild().
 					llwarns << "Making dummy " << typeid(T).name() << " named \"" << name << "\" in " << getName() << llendl;
 				}
 				else
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
index a5b09671bb..860aa3302e 100644
--- a/indra/llui/llviewborder.cpp
+++ b/indra/llui/llviewborder.cpp
@@ -35,7 +35,7 @@
 #include "llfocusmgr.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultWidgetRegistry::Register<LLViewBorder> r("view_border");
+static LLDefaultChildRegistry::Register<LLViewBorder> r("view_border");
 
 void LLViewBorder::BevelValues::declareValues()
 {
@@ -52,7 +52,7 @@ void LLViewBorder::StyleValues::declareValues()
 }
 
 LLViewBorder::Params::Params()
-:	bevel_type("bevel_style", BEVEL_OUT),
+:	bevel_style("bevel_style", BEVEL_OUT),
 	render_style("border_style", STYLE_LINE),
 	border_thickness("border_thickness"),
 	highlight_light_color("highlight_light_color"),
@@ -60,6 +60,8 @@ LLViewBorder::Params::Params()
 	shadow_light_color("shadow_light_color"),
 	shadow_dark_color("shadow_dark_color")
 {
+	addSynonym(border_thickness, "thickness");
+	addSynonym(render_style, "style");
 	name = "view_border";
 	mouse_opaque = false;
 	follows.flags = FOLLOWS_ALL;
@@ -75,7 +77,7 @@ LLViewBorder::LLViewBorder(const LLViewBorder::Params& p)
 	mHighlightDark(p.highlight_dark_color()),
 	mShadowLight(p.shadow_light_color()),
 	mShadowDark(p.shadow_dark_color()),
-	mBevel(p.bevel_type),
+	mBevel(p.bevel_style),
 	mStyle(p.render_style)
 {}
 
diff --git a/indra/llui/llviewborder.h b/indra/llui/llviewborder.h
index 37e13fb181..92fd569325 100644
--- a/indra/llui/llviewborder.h
+++ b/indra/llui/llviewborder.h
@@ -55,7 +55,7 @@ public:
 
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
 	{
-		Optional<EBevel, BevelValues>	bevel_type;
+		Optional<EBevel, BevelValues>	bevel_style;
 		Optional<EStyle, StyleValues>	render_style;	
 		Optional<S32>					border_thickness;
 
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index e97aa55190..5d43ac11e4 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -149,7 +149,7 @@ LLXMLNodePtr LLXMLNode::deepCopy()
 	if (mChildren.notNull())
 	{
 		for (LLXMLChildList::iterator iter = mChildren->map.begin();
-			 iter != mChildren->map.end(); ++iter)
+			 iter != mChildren->map.end(); ++iter)	
 		{
 			newnode->addChild(iter->second->deepCopy());
 		}
@@ -302,6 +302,22 @@ void LLXMLNode::addChild(LLXMLNodePtr new_child, LLXMLNodePtr after_child)
 				mChildren->tail = new_child;
 			}
 		}
+		// if after_child == parent, then put new_child at beginning
+		else if (after_child == this)
+		{
+			// add to front of list
+			new_child->mNext = mChildren->head;
+			if (mChildren->head)
+			{
+				mChildren->head->mPrev = new_child;
+				mChildren->head = new_child;
+			}
+			else // no children
+			{
+				mChildren->head = new_child;
+				mChildren->tail = new_child;
+			}
+		}
 		else
 		{
 			if (after_child->mNext.notNull())
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f96c8fdca0..6ec4fbbcd5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -82,6 +82,7 @@ set(viewer_SOURCE_FILES
     llbbox.cpp
     llbottomtray.cpp
     llbox.cpp
+    llbreadcrumbview.cpp
     llcallbacklist.cpp
     llcallingcard.cpp
     llcapabilitylistener.cpp
@@ -173,6 +174,7 @@ set(viewer_SOURCE_FILES
     llfloaterhud.cpp
     llfloaterimagepreview.cpp
     llfloaterinspect.cpp
+    llfloaterinventory.cpp
     llfloaterjoystick.cpp
     llfloaterlagmeter.cpp
     llfloaterland.cpp
@@ -198,6 +200,7 @@ set(viewer_SOURCE_FILES
     llfloatersettingsdebug.cpp
     llfloatersnapshot.cpp
     llfloatertelehub.cpp
+    llfloatertestlistview.cpp
     llfloatertools.cpp
     llfloatertopobjects.cpp
     llfloatertos.cpp
@@ -209,6 +212,7 @@ set(viewer_SOURCE_FILES
     llfloaterwindlight.cpp
     llfloaterworldmap.cpp
     llfolderview.cpp
+    llfolderviewitem.cpp
     llfollowcam.cpp
     llfriendactions.cpp
     llgesturemgr.cpp
@@ -236,10 +240,12 @@ set(viewer_SOURCE_FILES
     llimcontrolpanel.cpp
     llinventorybridge.cpp
     llinventoryclipboard.cpp
+    llinventoryfilter.cpp
     llinventorymodel.cpp
-    llinventoryview.cpp
     lljoystickbutton.cpp
     lllandmarklist.cpp
+    lllistbrowser.cpp
+    lllistview.cpp
     lllocationhistory.cpp
     lllocationinputctrl.cpp
     lllogchat.cpp
@@ -495,6 +501,7 @@ set(viewer_HEADER_FILES
     llbbox.h
     llbottomtray.h
     llbox.h
+    llbreadcrumbview.h
     llcallbacklist.h
     llcallingcard.h
     llcapabilitylistener.h
@@ -588,6 +595,7 @@ set(viewer_HEADER_FILES
     llfloaterhud.h
     llfloaterimagepreview.h
     llfloaterinspect.h
+    llfloaterinventory.h
     llfloaterjoystick.h
     llfloaterlagmeter.h
     llfloaterland.h
@@ -613,6 +621,7 @@ set(viewer_HEADER_FILES
     llfloatersettingsdebug.h
     llfloatersnapshot.h
     llfloatertelehub.h
+    llfloatertestlistview.h
     llfloatertools.h
     llfloatertopobjects.h
     llfloatertos.h
@@ -624,6 +633,8 @@ set(viewer_HEADER_FILES
     llfloaterwindlight.h
     llfloaterworldmap.h
     llfolderview.h
+    llfoldervieweventlistener.h
+    llfolderviewitem.h
     llfollowcam.h
     llfriendactions.h
     llgesturemgr.h
@@ -650,11 +661,13 @@ set(viewer_HEADER_FILES
     llimcontrolpanel.h
     llinventorybridge.h
     llinventoryclipboard.h
+    llinventoryfilter.h
     llinventorymodel.h
-    llinventoryview.h
     lljoystickbutton.h
     lllandmarklist.h
     lllightconstants.h
+    lllistbrowser.h
+    lllistview.h
     lllocationhistory.h
     lllocationinputctrl.h
     lllogchat.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 567fda0034..38eeca2bf8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9425,6 +9425,17 @@
       <key>Value</key>
       <real>150000.0</real>
     </map>
+    <key>XUIEditor</key>
+    <map>
+      <key>Comment</key>
+      <string>Path to program used to edit XUI files</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <real>150000.0</real>
+    </map>
     <key>YawFromMousePosition</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 22d54fe627..c8240de0a7 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -2153,7 +2153,6 @@ void LLAgent::setBusy()
 	{
 		gBusyMenu->setLabel(LLTrans::getString("AvatarSetNotBusy"));
 	}
-	LLFloaterReg::getTypedInstance<LLFloaterMute>("mute")->updateButtons();
 }
 
 //-----------------------------------------------------------------------------
@@ -2167,7 +2166,6 @@ void LLAgent::clearBusy()
 	{
 		gBusyMenu->setLabel(LLTrans::getString("AvatarSetBusy"));
 	}
-	LLFloaterReg::getTypedInstance<LLFloaterMute>("mute")->updateButtons();
 }
 
 //-----------------------------------------------------------------------------
@@ -2490,7 +2488,7 @@ void LLAgent::autoPilot(F32 *delta_yaw)
 void LLAgent::propagate(const F32 dt)
 {
 	// Update UI based on agent motion
-	LLFloaterMove *floater_move = LLFloaterMove::getInstance();
+	LLFloaterMove *floater_move = LLFloaterReg::getTypedInstance<LLFloaterMove>("moveview");
 	if (floater_move)
 	{
 		floater_move->mForwardButton   ->setToggleState( mAtKey > 0 || mWalkKey > 0 );
@@ -3056,21 +3054,25 @@ void LLAgent::updateCamera()
 	}
 
 	// Update UI with our camera inputs
-	LLFloaterCamera::getInstance()->mRotate->setToggleState(
-		mOrbitRightKey > 0.f,	// left
-		mOrbitUpKey > 0.f,		// top
-		mOrbitLeftKey > 0.f,	// right
-		mOrbitDownKey > 0.f);	// bottom
-
-	LLFloaterCamera::getInstance()->mZoom->setToggleState( 
-		mOrbitInKey > 0.f,		// top
-		mOrbitOutKey > 0.f);	// bottom
-
-	LLFloaterCamera::getInstance()->mTrack->setToggleState(
-		mPanLeftKey > 0.f,		// left
-		mPanUpKey > 0.f,		// top
-		mPanRightKey > 0.f,		// right
-		mPanDownKey > 0.f);		// bottom
+	LLFloaterCamera* camera_instance = LLFloaterReg::getTypedInstance<LLFloaterCamera>("camera");
+	if(camera_instance)
+	{
+		camera_instance->mRotate->setToggleState(
+												 mOrbitRightKey > 0.f,	// left
+												 mOrbitUpKey > 0.f,		// top
+												 mOrbitLeftKey > 0.f,	// right
+												 mOrbitDownKey > 0.f);	// bottom
+
+	    camera_instance->mZoom->setToggleState( 
+											   mOrbitInKey > 0.f,		// top
+											   mOrbitOutKey > 0.f);	// bottom
+
+		camera_instance->mTrack->setToggleState(
+												mPanLeftKey > 0.f,		// left
+												mPanUpKey > 0.f,		// top
+												mPanRightKey > 0.f,		// right
+												mPanDownKey > 0.f);		// bottom
+	}
 
 	// Handle camera movement based on keyboard.
 	const F32 ORBIT_OVER_RATE = 90.f * DEG_TO_RAD;			// radians per second
@@ -6074,7 +6076,7 @@ bool LLAgent::teleportCore(bool is_local)
 	LLFloaterReg::hideInstance("search");
 
 	// hide land floater too - it'll be out of date
-	LLFloaterLand::hideInstance();
+	LLFloaterReg::hideInstance("about_land");
 
 	LLViewerParcelMgr::getInstance()->deselectLand();
 
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 743784b2ef..22b3790c6b 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -182,10 +182,7 @@ private:
 
 public:
  	LLVOAvatarSelf* getAvatarObject() const		{ return mAvatarObject; }
-	const LLUUID&	getInventoryRootID() const 	{ return mInventoryRootID; }
-	LLUUID&			getInventoryRootID() 		{ return mInventoryRootID; }
 private:
-	LLUUID			mInventoryRootID;
 	LLPointer<LLVOAvatarSelf> mAvatarObject; 	// NULL until avatar object sent down from simulator
 
 /**                    General Accessors
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 1da54ad08c..f053bfe118 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -36,7 +36,7 @@
 #include "llagentwearables.h"
 
 #include "llfloatercustomize.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llinventorymodel.h"
 #include "llnotify.h"
 #include "llviewerregion.h"
@@ -1076,7 +1076,7 @@ void LLAgentWearables::makeNewOutfitDone(S32 type, U32 index)
 	// Open the inventory and select the first item we added.
 	if (first_item_id.notNull())
 	{
-		LLInventoryView* view = LLInventoryView::getActiveInventory();
+		LLFloaterInventory* view = LLFloaterInventory::getActiveInventory();
 		if (view)
 		{
 			view->getPanel()->setSelection(first_item_id, TAKE_FOCUS_NO);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0253d9e8d5..de3cf1a81b 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -152,8 +152,9 @@
 #include "llviewerfloaterreg.h"
 #include "llcommandlineparser.h"
 #include "llfloatermemleak.h"
+#include "llfloaterreg.h"
 #include "llfloatersnapshot.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 
 // includes for idle() idleShutdown()
 #include "llviewercontrol.h"
@@ -235,9 +236,6 @@ LLTimer gLogoutTimer;
 static const F32 LOGOUT_REQUEST_TIME = 6.f;  // this will be cut short by the LogoutReply msg.
 F32 gLogoutMaxTime = LOGOUT_REQUEST_TIME;
 
-LLUUID gInventoryLibraryOwner;
-LLUUID gInventoryLibraryRoot;
-
 BOOL				gDisconnected = FALSE;
 
 // Map scale in pixels per region
@@ -930,9 +928,10 @@ bool LLAppViewer::mainLoop()
 			
 #endif
 			//memory leaking simulation
-			if(LLFloaterMemLeak::getInstance())
+			LLFloaterMemLeak* mem_leak_instance = LLFloaterReg::getTypedInstance<LLFloaterMemLeak>("mem_leaking");
+			if(mem_leak_instance)
 			{
-				LLFloaterMemLeak::getInstance()->idle() ;				
+				mem_leak_instance->idle() ;				
 			}			
 
             // canonical per-frame event
@@ -1099,9 +1098,10 @@ bool LLAppViewer::mainLoop()
 		catch(std::bad_alloc)
 		{			
 			//stop memory leaking simulation
-			if(LLFloaterMemLeak::getInstance())
+			LLFloaterMemLeak* mem_leak_instance = LLFloaterReg::getTypedInstance<LLFloaterMemLeak>("mem_leaking");
+			if(mem_leak_instance)
 			{
-				LLFloaterMemLeak::getInstance()->stop() ;				
+				mem_leak_instance->stop() ;				
 				llwarns << "Bad memory allocation in LLAppViewer::mainLoop()!" << llendl ;
 			}
 			else
@@ -1126,9 +1126,10 @@ bool LLAppViewer::mainLoop()
 			llwarns << "Bad memory allocation when saveFinalSnapshot() is called!" << llendl ;
 
 			//stop memory leaking simulation
-			if(LLFloaterMemLeak::getInstance())
+			LLFloaterMemLeak* mem_leak_instance = LLFloaterReg::getTypedInstance<LLFloaterMemLeak>("mem_leaking");
+			if(mem_leak_instance)
 			{
-				LLFloaterMemLeak::getInstance()->stop() ;				
+				mem_leak_instance->stop() ;				
 			}	
 		}
 	}
@@ -3864,20 +3865,20 @@ void LLAppViewer::disconnectViewer()
 		LLSelectMgr::getInstance()->deselectAll();
 	}
 
-	if (!gNoRender)
+	// save inventory if appropriate
+	gInventory.cache(gInventory.getRootFolderID(), gAgent.getID());
+	if (gInventory.getLibraryRootFolderID().notNull()
+		&& gInventory.getLibraryOwnerID().notNull())
 	{
-		// save inventory if appropriate
-		gInventory.cache(gAgent.getInventoryRootID(), gAgent.getID());
-		if(gInventoryLibraryRoot.notNull() && gInventoryLibraryOwner.notNull())
-		{
-			gInventory.cache(gInventoryLibraryRoot, gInventoryLibraryOwner);
-		}
+		gInventory.cache(
+			gInventory.getLibraryRootFolderID(),
+			gInventory.getLibraryOwnerID());
 	}
 
 	saveNameCache();
 
 	// close inventory interface, close all windows
-	LLInventoryView::cleanup();
+	LLFloaterInventory::cleanup();
 
 	gAgentWearables.cleanup();
 
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 3e3b523169..7bda16d256 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -313,9 +313,6 @@ extern LLTimer gLogoutTimer;
 extern F32 gSimLastTime; 
 extern F32 gSimFrames;
 
-extern LLUUID gInventoryLibraryOwner;
-extern LLUUID gInventoryLibraryRoot;
-
 extern BOOL		gDisconnected;
 
 // Map scale in pixels per region
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 1379073bba..802c90f531 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -41,7 +41,7 @@
 #include "llfilepicker.h"
 #include "llnotify.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llpermissionsflags.h"
 #include "llpreviewnotecard.h"
 #include "llpreviewscript.h"
@@ -285,7 +285,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
 
 		// Show the preview panel for textures and sounds to let
 		// user know that the image (or snapshot) arrived intact.
-		LLInventoryView* view = LLInventoryView::getActiveInventory();
+		LLFloaterInventory* view = LLFloaterInventory::getActiveInventory();
 		if(view)
 		{
 			LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
@@ -295,7 +295,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
 			{
 				view->getPanel()->openSelected();
 			}
-			//LLInventoryView::dumpSelectionInformation((void*)view);
+			//LLFloaterInventory::dumpSelectionInformation((void*)view);
 			// restore keyboard focus
 			gFocusMgr.setKeyboardFocus(focus_ctrl);
 		}
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index 3cd6126739..bf18abfdb3 100644
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -46,7 +46,7 @@
 #define MENU_ITEM_VIEW_PROFILE 0
 #define MENU_ITEM_SEND_IM 1
 
-static LLDefaultWidgetRegistry::Register<LLAvatarIconCtrl> r("avatar_icon");
+static LLDefaultChildRegistry::Register<LLAvatarIconCtrl> r("avatar_icon");
 
 LLAvatarIconCtrl::LLAvatarIconCtrl(const LLAvatarIconCtrl::Params& p)
 :	LLIconCtrl(p),
@@ -106,7 +106,7 @@ LLAvatarIconCtrl::LLAvatarIconCtrl(const LLAvatarIconCtrl::Params& p)
 
 	registrar.add("AvatarIcon.Action", boost::bind(&LLAvatarIconCtrl::onAvatarIconContextMenuItemClicked, this, _2));
 
-	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_avatar_icon.xml", gMenuHolder);
+	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_avatar_icon.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 
 	mPopupMenuHandle = menu->getHandle();
 }
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 449bcc4f0b..7b5ce765d3 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -38,7 +38,7 @@
 #include "llcallingcard.h" // for LLAvatarTracker
 #include "llcachename.h"
 
-static LLDefaultWidgetRegistry::Register<LLAvatarList> r("avatar_list");
+static LLDefaultChildRegistry::Register<LLAvatarList> r("avatar_list");
 
 LLAvatarList::Params::Params()
 {
diff --git a/indra/newview/llbreadcrumbview.cpp b/indra/newview/llbreadcrumbview.cpp
new file mode 100644
index 0000000000..342994ee30
--- /dev/null
+++ b/indra/newview/llbreadcrumbview.cpp
@@ -0,0 +1,37 @@
+/** 
+ * @file llbreadcrumbview.cpp
+ * @brief UI widget for displaying position in a folder hierarchy and allowing
+ * the user to click on a location in the hierarchy.
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+
+#include "llbreadcrumbview.h"
+
+// TODO
diff --git a/indra/newview/llbreadcrumbview.h b/indra/newview/llbreadcrumbview.h
new file mode 100644
index 0000000000..ca6fbe7fb2
--- /dev/null
+++ b/indra/newview/llbreadcrumbview.h
@@ -0,0 +1,36 @@
+/** 
+ * @file llbreadcrumbview.h
+ * @brief UI widget for displaying position in a folder hierarchy and allowing
+ * the user to click on a location in the hierarchy.
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLBREADCRUMBVIEW_H
+#define LLBREADCRUMBVIEW_H
+
+#endif // LLBREADCRUMBVIEW_H
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index a97e56d60b..29845fff5e 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -41,6 +41,7 @@
 #include "lloutputmonitorctrl.h"
 #include "llimview.h"
 #include "llbottomtray.h"
+#include "llimpanel.h"
 
 static const S32 CHICLET_HEIGHT = 25;
 static const S32 CHICLET_SPACING = 0;
@@ -52,10 +53,10 @@ static const S32 SCROLL_BUTTON_WIDTH = 19;
 static const S32 SCROLL_BUTTON_HEIGHT = 20;
 static const S32 NOTIFICATION_TEXT_TOP_PAD = 5;
 
-static LLDefaultWidgetRegistry::Register<LLChicletPanel> t1("chiclet_panel");
-static LLDefaultWidgetRegistry::Register<LLTalkButton> t2("chiclet_talk");
-static LLDefaultWidgetRegistry::Register<LLNotificationChiclet> t3("chiclet_notification");
-static LLDefaultWidgetRegistry::Register<LLChicletPanel> t4("chiclet_panel");
+static LLDefaultChildRegistry::Register<LLChicletPanel> t1("chiclet_panel");
+static LLDefaultChildRegistry::Register<LLTalkButton> t2("chiclet_talk");
+static LLDefaultChildRegistry::Register<LLNotificationChiclet> t3("chiclet_notification");
+static LLDefaultChildRegistry::Register<LLChicletPanel> t4("chiclet_panel");
 
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
@@ -317,6 +318,29 @@ LLChicletPanel::~LLChicletPanel()
 
 }
 
+void im_chiclet_callback(LLChicletPanel* panel, const LLSD& data){
+
+	LLChiclet* chiclet = panel->findIMChiclet(&data["session_id"]);
+
+	if (chiclet)
+	{
+		chiclet->setCounter(data["num_unread"].asInteger());
+	}
+    else
+    {
+    	llwarns << "Unable to set counter for chiclet " << data["session_id"].asUUID() << llendl;
+    }
+}
+
+
+BOOL LLChicletPanel::postBuild()
+{
+	LLPanel::postBuild();
+	LLIMModel::instance().addChangedCallback(boost::bind(im_chiclet_callback, this, _1));
+
+	return TRUE;
+}
+
 LLChiclet* LLChicletPanel::createChiclet(LLSD* imSessionId, S32 pos)
 {
 	LLChiclet* chiclet = LLIMChiclet::create(imSessionId);
@@ -366,11 +390,18 @@ void LLChicletPanel::onChicletClick(LLUICtrl*ctrl,const LLSD&param)
 	{
 		LLFloaterReg::showInstance("communicate", chiclet->getIMSessionId().asUUID());
 	}
+    
+	S32 x, y;
+   	LLRect rect = chiclet->getRect();
+
+	localPointToScreen(rect.getCenterX(), 0, &x, &y);
+	LLIMFloater::show(chiclet->getIMSessionId().asUUID(), x);
 
 	mCommitSignal(ctrl,param);
 }
 
-LLChiclet* LLChicletPanel::findIMChiclet(LLSD* imSessionId)
+
+LLChiclet* LLChicletPanel::findIMChiclet(const LLSD* imSessionId)
 {
 	chiclet_list_t::const_iterator it = mChicletList.begin();
 	for( ; mChicletList.end() != it; ++it)
@@ -441,7 +472,7 @@ void LLChicletPanel::removeChiclet(LLChiclet*chiclet)
 	}
 }
 
-void LLChicletPanel::removeIMChiclet(LLSD* imSessionId)
+void LLChicletPanel::removeIMChiclet(const LLSD* imSessionId)
 {
 	chiclet_list_t::iterator it = mChicletList.begin();
 	for( ; mChicletList.end() != it; ++it)
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 65be9e183a..d861a528b5 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -188,7 +188,7 @@ public:
 
 	LLChiclet* getChiclet(S32 pos);
 
-	LLChiclet* findIMChiclet(LLSD* imSessionId);
+	LLChiclet* findIMChiclet(const LLSD* imSessionId);
 
 	S32 getChicletCount() {return mChicletList.size();};
 
@@ -196,7 +196,7 @@ public:
 
 	void removeChiclet(LLChiclet*);
 
-	void removeIMChiclet(LLSD* imSessionId);
+	void removeIMChiclet(const LLSD* imSessionId);
 
 	void removeAll();
 
@@ -215,6 +215,7 @@ public:
 
 	//overrides
 public:
+	/*virtual*/ BOOL postBuild();
 
 	void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE );
 
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp
index 33aaac542b..531e6d709a 100644
--- a/indra/newview/llcolorswatch.cpp
+++ b/indra/newview/llcolorswatch.cpp
@@ -51,7 +51,7 @@
 #include "llviewerimagelist.h"
 #include "llfocusmgr.h"
 
-static LLDefaultWidgetRegistry::Register<LLColorSwatchCtrl> r("color_swatch");
+static LLDefaultChildRegistry::Register<LLColorSwatchCtrl> r("color_swatch");
 
 LLColorSwatchCtrl::Params::Params()
 :	color("color", LLColor4::white),
diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h
index a05926c2f5..db771df6b3 100644
--- a/indra/newview/llcolorswatch.h
+++ b/indra/newview/llcolorswatch.h
@@ -60,13 +60,13 @@ public:
 
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
 	{
-		Optional<LLColor4>			color;
-		Optional<bool>				can_apply_immediately;
-		Optional<LLUIImage*>		alpha_background_image;
-		Optional<commit_callback_t> cancel_callback;
-		Optional<commit_callback_t> select_callback;
-		Optional<LLUIColor>			border_color;
-		Optional<S32>				label_width;
+		Optional<LLColor4>				color;
+		Optional<bool>					can_apply_immediately;
+		Optional<LLUIImage*>			alpha_background_image;
+		Optional<commit_callback_t> 	cancel_callback;
+		Optional<commit_callback_t> 	select_callback;
+		Optional<LLUIColor>				border_color;
+		Optional<S32>					label_width;
 		
 		Optional<LLTextBox::Params>		caption_text;
 		Optional<LLViewBorder::Params>	border;
diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp
index c0fe327815..2c52cf9565 100644
--- a/indra/newview/lleventnotifier.cpp
+++ b/indra/newview/lleventnotifier.cpp
@@ -192,9 +192,12 @@ bool LLEventNotification::handleResponse(const LLSD& notification, const LLSD& r
 	switch (option)
 	{
 	case 0:
-		gAgent.teleportViaLocation(getEventPosGlobal());
-		LLFloaterWorldMap::getInstance()->trackLocation(getEventPosGlobal());
-		break;
+		{
+			gAgent.teleportViaLocation(getEventPosGlobal());
+			LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance();
+			if(floater_world_map) floater_world_map->trackLocation(getEventPosGlobal());
+			break;
+		}
 	case 1:
 		gDisplayEventHack = TRUE;
 		LLFloaterReg::showInstance("search", LLSD().insert("panel", "event").insert("id", S32(getEventID())));
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index f43b625d17..92e2d3563a 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -47,7 +47,7 @@
 #include "llviewermenu.h"
 #include "llviewermenu.h"
 
-static LLDefaultWidgetRegistry::Register<LLFavoritesBarCtrl> r("favorites_bar");
+static LLDefaultChildRegistry::Register<LLFavoritesBarCtrl> r("favorites_bar");
 
 // updateButtons's helper
 struct LLFavoritesSort
@@ -213,7 +213,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 	const S32 buttonHPad = LLUI::sSettingGroups["config"]->getS32("ButtonHPad");
 	const S32 buttonHGap = 2;
 	const S32 buttonVGap = 2;
-	static LLButton::Params default_button_params(LLUICtrlFactory::getDefaultParams<LLButton::Params>());
+	static LLButton::Params default_button_params(LLUICtrlFactory::getDefaultParams<LLButton>());
 	std::string flat_icon			= "transparent.j2c";
 	std::string hover_icon			= default_button_params.image_unselected.name;
 	std::string hover_icon_selected	= default_button_params.image_selected.name;
@@ -364,7 +364,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 BOOL LLFavoritesBarCtrl::postBuild()
 {
 	// make the popup menu available
-	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_favorites.xml", gMenuHolder);
+	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_favorites.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	if (!menu)
 	{
 		menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu");
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index bdd34dfca8..7332ca4b5c 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -78,7 +78,7 @@ static std::string get_viewer_release_notes_url();
 
 // Default constructor
 LLFloaterAbout::LLFloaterAbout(const LLSD& key) 
-:	LLFloater()
+:	LLFloater(key)
 {
 	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about.xml");
 	
diff --git a/indra/newview/llfloaterabout.h b/indra/newview/llfloaterabout.h
index 1b0f3cddd3..c15a20d549 100644
--- a/indra/newview/llfloaterabout.h
+++ b/indra/newview/llfloaterabout.h
@@ -36,12 +36,11 @@
 #include "llfloater.h"
 
 class LLFloaterAbout 
-	: public LLFloater, public LLFloaterSingleton<LLFloaterAbout>
+	: public LLFloater
 {
-	friend class LLUISingleton<LLFloaterAbout, VisibilityPolicy<LLFloater> >;
-public:	
+	friend class LLFloaterReg;
+private:
 	LLFloaterAbout(const LLSD& key);
-protected:
 	virtual ~LLFloaterAbout();
 
 public:
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index 8ad5a19d02..f5d950a9a5 100644
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -72,7 +72,7 @@ void auction_tga_upload_done(const LLUUID& asset_id,
 
 // Default constructor
 LLFloaterAuction::LLFloaterAuction(const LLSD& key)
-  : LLFloater(),
+  : LLFloater(key),
 	mParcelID(-1)
 {
 //	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml");
diff --git a/indra/newview/llfloaterauction.h b/indra/newview/llfloaterauction.h
index b018316c64..ebb1a0d1ae 100644
--- a/indra/newview/llfloaterauction.h
+++ b/indra/newview/llfloaterauction.h
@@ -46,18 +46,20 @@
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 class LLParcelSelection;
 
-class LLFloaterAuction : public LLFloater, public LLFloaterSingleton<LLFloaterAuction>
+class LLFloaterAuction : public LLFloater
 {
-	friend class LLUISingleton<LLFloaterAuction, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 public:
 	// LLFloater interface
 	/*virtual*/ void onClose(bool app_quitting) { setVisible(FALSE); }
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void draw();
+
+private:
 	
 	LLFloaterAuction(const LLSD& key);
 	~LLFloaterAuction();
-private:
+	
 	void initialize();
 
 	static void onClickSnapshot(void* data);
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 2c2dcda633..92ce44fa42 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -33,22 +33,25 @@
 
 #include "llfloateravatarpicker.h"
 
-#include "message.h"
-
+// Viewer includes
 #include "llagent.h"
-#include "llbutton.h"
 #include "llfocusmgr.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
+#include "llfoldervieweventlistener.h"
 #include "llinventorymodel.h"
+#include "llviewercontrol.h"
+#include "llworld.h"
+
+// Linden libraries
+#include "llbutton.h"
 #include "lllineeditor.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
 #include "llscrolllistcell.h"
+#include "lltabcontainer.h"
 #include "lltextbox.h"
 #include "lluictrlfactory.h"
-#include "llviewercontrol.h"
-#include "llworld.h"
-#include "lltabcontainer.h"
+#include "message.h"
 
 // static
 LLFloaterAvatarPicker* LLFloaterAvatarPicker::sInstance = NULL;
diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h
index 0f47401f23..0f28d8250b 100644
--- a/indra/newview/llfloateravatarpicker.h
+++ b/indra/newview/llfloateravatarpicker.h
@@ -87,6 +87,7 @@ private:
 
 	static LLFloaterAvatarPicker* sInstance;
 
+private:	
 	// do not call these directly
 	LLFloaterAvatarPicker();
 	virtual ~LLFloaterAvatarPicker();
diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp
index 052f334285..1c7ef77718 100644
--- a/indra/newview/llfloaterbeacons.cpp
+++ b/indra/newview/llfloaterbeacons.cpp
@@ -40,9 +40,9 @@
 
 
 LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
-:	LLFloater()
+:	LLFloater(seed)
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_beacons.xml");
+//	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_beacons.xml");
 
 	// Initialize pipeline states from saved settings.
 	// OK to do at floater constructor time because beacons do not display unless the floater is open
@@ -56,17 +56,11 @@ LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
 	LLPipeline::setRenderParticleBeacons(     gSavedSettings.getBOOL("particlesbeacon"));
 	LLPipeline::setRenderHighlights(          gSavedSettings.getBOOL("renderhighlights"));
 	LLPipeline::setRenderBeacons(             gSavedSettings.getBOOL("renderbeacons"));
+	mCommitCallbackRegistrar.add("Beacons.UICheck",	boost::bind(&LLFloaterBeacons::onClickUICheck, this,_1));
 }
 
 BOOL LLFloaterBeacons::postBuild()
 {
-	childSetCommitCallback("touch_only",      onClickUICheck, this);
-	childSetCommitCallback("scripted",        onClickUICheck, this);
-	childSetCommitCallback("physical",        onClickUICheck, this);
-	childSetCommitCallback("sounds",          onClickUICheck, this);
-	childSetCommitCallback("particles",       onClickUICheck, this);
-	childSetCommitCallback("highlights",      onClickUICheck, this);
-	childSetCommitCallback("beacons",         onClickUICheck, this);
 	return TRUE;
 }
 
@@ -87,12 +81,11 @@ void LLFloaterBeacons::onClose(bool app_quitting)
 
 // Callback attached to each check box control to both affect their main purpose
 // and to implement the couple screwy interdependency rules that some have.
-//static 
-void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl, void* data)
+
+void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl)
 {
 	LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
 	std::string name = check->getName();
-	LLFloaterBeacons* view = (LLFloaterBeacons*)data;
 	if(     name == "touch_only")
 	{
 		LLPipeline::toggleRenderScriptedTouchBeacons(NULL);
@@ -102,8 +95,8 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl, void* data)
 			LLPipeline::getRenderScriptedBeacons(NULL) )
 		{
 			LLPipeline::setRenderScriptedBeacons(FALSE);
-			view->getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(FALSE));
-			view->getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline
+			getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(FALSE));
+			getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline
 		}
 	}
 	else if(name == "scripted")
@@ -115,8 +108,8 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl, void* data)
 			LLPipeline::getRenderScriptedBeacons(NULL) )
 		{
 			LLPipeline::setRenderScriptedTouchBeacons(FALSE);
-			view->getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(FALSE));
-			view->getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline
+			getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(FALSE));
+			getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline
 		}
 	}
 	else if(name == "physical")       LLPipeline::setRenderPhysicalBeacons(check->get());
@@ -131,8 +124,8 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl, void* data)
 			!LLPipeline::getRenderHighlights(NULL) )
 		{
 			LLPipeline::setRenderBeacons(TRUE);
-			view->getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(TRUE));
-			view->getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
+			getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(TRUE));
+			getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
 		}
 	}
 	else if(name == "beacons")
@@ -144,8 +137,8 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl, void* data)
 			!LLPipeline::getRenderHighlights(NULL) )
 		{
 			LLPipeline::setRenderHighlights(TRUE);
-			view->getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(TRUE));
-			view->getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
+			getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(TRUE));
+			getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
 		}
 	}
 }
diff --git a/indra/newview/llfloaterbeacons.h b/indra/newview/llfloaterbeacons.h
index 8156e82ac3..94f853978a 100644
--- a/indra/newview/llfloaterbeacons.h
+++ b/indra/newview/llfloaterbeacons.h
@@ -36,22 +36,22 @@
 
 #include "llfloater.h"
 
-class LLFloaterBeacons : public LLFloater, public LLFloaterSingleton<LLFloaterBeacons>
+class LLFloaterBeacons : public LLFloater
 {
-	friend class LLUISingleton<LLFloaterBeacons, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 	
 public:
+
 	/*virtual*/ BOOL postBuild();
 	
 	// Needed to make the floater visibility toggle the beacons.
 	// Too bad we can't just add control_name="BeaconAlwaysOn" to the XML.
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void onClose(bool app_quitting);
+	void onClickUICheck(LLUICtrl *ctrl);
 
 private:
 	LLFloaterBeacons(const LLSD& seed);
-
-	static void onClickUICheck(LLUICtrl *ctrl, void* data);
 };
 
 #endif
diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp
index 9dbd1db38e..30e9428df9 100644
--- a/indra/newview/llfloaterbuildoptions.cpp
+++ b/indra/newview/llfloaterbuildoptions.cpp
@@ -44,7 +44,7 @@
 // Methods
 //
 LLFloaterBuildOptions::LLFloaterBuildOptions(const LLSD& key)
-  : LLFloater()
+  : LLFloater(key)
 {
 	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_build_options.xml");
 }
diff --git a/indra/newview/llfloaterbuildoptions.h b/indra/newview/llfloaterbuildoptions.h
index 61db303ba2..43cbb201c2 100644
--- a/indra/newview/llfloaterbuildoptions.h
+++ b/indra/newview/llfloaterbuildoptions.h
@@ -42,10 +42,10 @@
 
 
 class LLFloaterBuildOptions
-	:	public LLFloater, public LLFloaterSingleton<LLFloaterBuildOptions>
+	:	public LLFloater
 {
-	friend class LLUISingleton<LLFloaterBuildOptions, VisibilityPolicy<LLFloater> >;
-public:
+	friend class LLFloaterReg;
+private:
 	LLFloaterBuildOptions(const LLSD& key);
 	~LLFloaterBuildOptions();
 };
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index 65dc3cd9f0..efaebe311a 100644
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -58,22 +58,22 @@
 
 
 LLFloaterBulkPermission::LLFloaterBulkPermission(const LLSD& seed) 
-:	LLFloater(),
+:	LLFloater(seed),
 	mDone(FALSE)
 {
 	mID.generate();
-	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_bulk_perms.xml");
+//	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_bulk_perms.xml");
+	mCommitCallbackRegistrar.add("BulkPermission.Apply",	boost::bind(&LLFloaterBulkPermission::onApplyBtn, this));
+	mCommitCallbackRegistrar.add("BulkPermission.Close",	boost::bind(&LLFloaterBulkPermission::onCloseBtn, this));
+	mCommitCallbackRegistrar.add("BulkPermission.CheckAll",	boost::bind(&LLFloaterBulkPermission::onCheckAll, this));
+	mCommitCallbackRegistrar.add("BulkPermission.UncheckAll",	boost::bind(&LLFloaterBulkPermission::onUncheckAll, this));
+	mCommitCallbackRegistrar.add("BulkPermission.CommitCopy",	boost::bind(&LLFloaterBulkPermission::onCommitCopy, this));
 }
 
 BOOL LLFloaterBulkPermission::postBuild()
 {
-	childSetEnabled("next_owner_transfer", gSavedSettings.getBOOL("BulkChangeNextOwnerCopy"));
-	childSetAction("help", onHelpBtn, this);
-	childSetAction("apply", onApplyBtn, this);
-	childSetAction("close", onCloseBtn, this);
-	childSetAction("check_all", onCheckAll, this);
-	childSetAction("check_none", onUncheckAll, this);
-	childSetCommitCallback("next_owner_copy", &onCommitCopy, this);
+//	childSetAction("help", onHelpBtn, this);  // this is not in use
+
 	return TRUE;
 }
 
@@ -152,34 +152,32 @@ void LLFloaterBulkPermission::inventoryChanged(LLViewerObject* viewer_object,
 	}
 }
 
-void LLFloaterBulkPermission::onApplyBtn(void* user_data)
+void LLFloaterBulkPermission::onApplyBtn()
 {
-	LLFloaterBulkPermission* self = static_cast<LLFloaterBulkPermission*>(user_data);
-	self->doApply();
+	doApply();
 }
 
-void LLFloaterBulkPermission::onHelpBtn(void* user_data)
-{
-	LLNotifications::instance().add("HelpBulkPermission");
-}
+// angela -- this is not in use
+//void LLFloaterBulkPermission::onHelpBtn(void* user_data)
+//{
+//	LLNotifications::instance().add("HelpBulkPermission");
+//}
 
-void LLFloaterBulkPermission::onCloseBtn(void* user_data)
+void LLFloaterBulkPermission::onCloseBtn()
 {
-	LLFloaterBulkPermission* self = static_cast<LLFloaterBulkPermission*>(user_data);
-	self->onClose(false);
+	onClose(false);
 }
 
 //static 
-void LLFloaterBulkPermission::onCommitCopy(LLUICtrl* ctrl, void* data)
+void LLFloaterBulkPermission::onCommitCopy()
 {
-	LLFloaterBulkPermission* self = static_cast<LLFloaterBulkPermission*>(data);
 	// Implements fair use
 	BOOL copyable = gSavedSettings.getBOOL("BulkChangeNextOwnerCopy");
 	if(!copyable)
 	{
 		gSavedSettings.setBOOL("BulkChangeNextOwnerTransfer", TRUE);
 	}
-	LLCheckBoxCtrl* xfer = self->getChild<LLCheckBoxCtrl>("next_owner_transfer");
+	LLCheckBoxCtrl* xfer =getChild<LLCheckBoxCtrl>("next_owner_transfer");
 	xfer->setEnabled(copyable);
 }
 
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index 2ea12fbe69..c34e4413cc 100644
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -46,14 +46,16 @@
 
 #include "llviewerinventory.h"
 
-class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener, public LLFloaterSingleton<LLFloaterBulkPermission>
+class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener
 {
+	friend class LLFloaterReg;
 public:
 
-	LLFloaterBulkPermission(const LLSD& seed);
 	BOOL postBuild();
 
 private:
+	
+	LLFloaterBulkPermission(const LLSD& seed);	
 	virtual ~LLFloaterBulkPermission() {}
 
 	BOOL start(); // returns TRUE if the queue has started, otherwise FALSE.
@@ -77,12 +79,12 @@ private:
 								U8 key,
 								bool is_new);
 
-	static void onHelpBtn(void* user_data);
-	static void onCloseBtn(void* user_data);
-	static void onApplyBtn(void* user_data);
-	static void onCommitCopy(LLUICtrl* ctrl, void* data);
-	static void onCheckAll(  void* user_data) { ((LLFloaterBulkPermission*)user_data)->doCheckUncheckAll(TRUE); }
-	static void onUncheckAll(void* user_data) { ((LLFloaterBulkPermission*)user_data)->doCheckUncheckAll(FALSE); }
+//	static void onHelpBtn(void* user_data);
+	void onCloseBtn();
+	void onApplyBtn();
+	void onCommitCopy();
+	void onCheckAll() { doCheckUncheckAll(TRUE); }
+	void onUncheckAll() { doCheckUncheckAll(FALSE); }
 	
 	// returns true if this is done
 	BOOL isDone() const { return (mCurrentObjectID.isNull() || (mObjectIDs.count() == 0)); }
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
index e4e1c7efa2..8b64f913e0 100644
--- a/indra/newview/llfloaterbump.cpp
+++ b/indra/newview/llfloaterbump.cpp
@@ -45,11 +45,13 @@
 ///----------------------------------------------------------------------------
 /// Class LLFloaterBump
 ///----------------------------------------------------------------------------
+extern BOOL gNoRender;
 
 // Default constructor
 LLFloaterBump::LLFloaterBump(const LLSD& key) 
-:	LLFloater()
+:	LLFloater(key)
 {
+	if(gNoRender) return;
 	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_bumps.xml");
 }
 
diff --git a/indra/newview/llfloaterbump.h b/indra/newview/llfloaterbump.h
index b56817436c..1f2cb6d6ab 100644
--- a/indra/newview/llfloaterbump.h
+++ b/indra/newview/llfloaterbump.h
@@ -40,14 +40,17 @@ class LLMeanCollisionData;
 class LLScrollListCtrl;
 
 class LLFloaterBump 
-: public LLFloater, public LLFloaterSingleton<LLFloaterBump>
+: public LLFloater
 {
-	friend class LLUISingleton<LLFloaterBump, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 protected:
 	void add(LLScrollListCtrl* list, LLMeanCollisionData *mcd);
 
 public:
 	/*virtual*/ void onOpen(const LLSD& key);
+	
+private:
+	
 	LLFloaterBump(const LLSD& key);
 	virtual ~LLFloaterBump();
 };
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
index 9c523522fd..aba2402b0c 100644
--- a/indra/newview/llfloaterbuy.cpp
+++ b/indra/newview/llfloaterbuy.cpp
@@ -43,7 +43,7 @@
 #include "llagent.h"			// for agent id
 #include "llalertdialog.h"
 #include "llinventorymodel.h"	// for gInventory
-#include "llinventoryview.h"	// for get_item_icon
+#include "llfloaterinventory.h"	// for get_item_icon
 #include "llselectmgr.h"
 #include "llscrolllistctrl.h"
 #include "llviewerobject.h"
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index 7a90275201..db4547e5bc 100644
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -46,7 +46,7 @@
 #include "llalertdialog.h"
 #include "llcheckboxctrl.h"
 #include "llinventorymodel.h"	// for gInventory
-#include "llinventoryview.h"	// for get_item_icon
+#include "llfloaterinventory.h"	// for get_item_icon
 #include "llselectmgr.h"
 #include "llscrolllistctrl.h"
 #include "llviewerobject.h"
@@ -287,7 +287,7 @@ void LLFloaterBuyContents::onClickBuy(void*)
 	// We may want to wear this item
 	if (sInstance->childGetValue("wear_check"))
 	{
-		LLInventoryView::sWearNewClothing = TRUE;
+		LLFloaterInventory::sWearNewClothing = TRUE;
 	}
 
 	// Put the items where we put new folders.
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index e79142513b..1c99776c11 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -48,11 +48,11 @@ const F32 CAMERA_BUTTON_DELAY = 0.0f;
 // Member functions
 //
 LLFloaterCamera::LLFloaterCamera(const LLSD& val)
-:	LLFloater()
+:	LLFloater(val)
 {
-	// For now, only used for size and tooltip strings
-	const BOOL DONT_OPEN = FALSE;
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_camera.xml", DONT_OPEN);
+	//// For now, only used for size and tooltip strings
+	//const BOOL DONT_OPEN = FALSE;
+	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_camera.xml", DONT_OPEN);
 }
 
 // virtual
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index f954e329eb..daea9ecee1 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -40,12 +40,12 @@ class LLJoystickCameraZoom;
 class LLJoystickCameraTrack;
 
 class LLFloaterCamera
-	:	public LLFloater,
-		public LLFloaterSingleton<LLFloaterCamera>
+	:	public LLFloater
 {
-	friend class LLUISingleton<LLFloaterCamera, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 	
 private:
+
 	LLFloaterCamera(const LLSD& val);
 	~LLFloaterCamera() {};
 	
@@ -53,6 +53,7 @@ private:
 	/*virtual*/ void onClose(bool app_quitting);
 	/*virtual*/ BOOL postBuild();
 public:
+	
 	LLJoystickCameraRotate* mRotate;
 	LLJoystickCameraZoom*	mZoom;
 	LLJoystickCameraTrack*	mTrack;
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 5250c798f9..1bfb11e3ae 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -96,7 +96,7 @@ LLColor4 get_text_color(const LLChat& chat);
 // Member Functions
 //
 LLFloaterChat::LLFloaterChat(const LLSD& seed)
-	: LLFloater(),
+	: LLFloater(seed),
 	  mPanel(NULL)
 {
 	mFactoryMap["chat_panel"] = LLCallbackMap(createChatPanel, NULL);
@@ -558,6 +558,6 @@ void LLFloaterChat::onClickToggleActiveSpeakers(void* userdata)
 //static
  LLFloaterChat* LLFloaterChat::getInstance()
  {
-	 LLFloater* inst = LLFloaterReg::getInstance("chat", LLSD()) ;
-	 return dynamic_cast<LLFloaterChat*>(inst);
+	 return LLFloaterReg::getTypedInstance<LLFloaterChat>("chat", LLSD()) ;
+	 
  }
diff --git a/indra/newview/llfloaterchatterbox.cpp b/indra/newview/llfloaterchatterbox.cpp
index a283b445f5..3389770b2f 100644
--- a/indra/newview/llfloaterchatterbox.cpp
+++ b/indra/newview/llfloaterchatterbox.cpp
@@ -98,8 +98,7 @@ void* LLFloaterMyFriends::createGroupsPanel(void* data)
 //static
 LLFloaterMyFriends* LLFloaterMyFriends::getInstance()
 {
-	LLFloater* inst = LLFloaterReg::getInstance("contacts", "friends") ;
-	return dynamic_cast<LLFloaterMyFriends*>(inst);
+	return LLFloaterReg::getTypedInstance<LLFloaterMyFriends>("contacts", "friends") ;
 }
 
 //
@@ -123,11 +122,14 @@ BOOL LLFloaterChatterBox::postBuild()
 	if (gSavedSettings.getBOOL("ContactsTornOff"))
 	{
 		LLFloaterMyFriends* floater_contacts = LLFloaterMyFriends::getInstance();
-		// add then remove to set up relationship for re-attach
-		addFloater(floater_contacts, FALSE);
-		removeFloater(floater_contacts);
-		// reparent to floater view
-		gFloaterView->addChild(floater_contacts);
+		if(floater_contacts)
+		{
+			// add then remove to set up relationship for re-attach
+			addFloater(floater_contacts, FALSE);
+			removeFloater(floater_contacts);
+			// reparent to floater view
+			gFloaterView->addChild(floater_contacts);
+		}
 	}
 	else
 	{
@@ -137,11 +139,14 @@ BOOL LLFloaterChatterBox::postBuild()
 	if (gSavedSettings.getBOOL("ChatHistoryTornOff"))
 	{
 		LLFloaterChat* floater_chat = LLFloaterChat::getInstance();
-		// add then remove to set up relationship for re-attach
-		addFloater(floater_chat, FALSE);
-		removeFloater(floater_chat);
-		// reparent to floater view
-		gFloaterView->addChild(floater_chat);
+		if(floater_chat)
+		{
+			// add then remove to set up relationship for re-attach
+			addFloater(floater_chat, FALSE);
+			removeFloater(floater_chat);
+			// reparent to floater view
+			gFloaterView->addChild(floater_chat);
+		}
 	}
 	else
 	{
@@ -249,11 +254,17 @@ void LLFloaterChatterBox::setMinimized(BOOL minimized)
 {
 	LLFloater::setMinimized(minimized);
 	// HACK: potentially need to toggle console
-	LLFloaterChat::getInstance()->updateConsoleVisibility();
+	LLFloaterChat* instance = LLFloaterChat::getInstance();
+	if(instance)
+	{
+		instance->updateConsoleVisibility();
+	}
 }
 
 void LLFloaterChatterBox::removeFloater(LLFloater* floaterp)
 {
+	if(!floaterp) return;
+		
 	if (floaterp->getName() == "chat floater")
 	{
 		// only my friends floater now locked
@@ -275,6 +286,8 @@ void LLFloaterChatterBox::addFloater(LLFloater* floaterp,
 									BOOL select_added_floater, 
 									LLTabContainer::eInsertionPoint insertion_point)
 {
+	if(!floaterp) return;
+	
 	S32 num_locked_tabs = mTabContainer->getNumLockedTabs();
 
 	// already here
@@ -332,8 +345,7 @@ void LLFloaterChatterBox::addFloater(LLFloater* floaterp,
 //static
 LLFloaterChatterBox* LLFloaterChatterBox::getInstance()
 {
-	LLFloater* inst = LLFloaterReg::getInstance("communicate", LLSD()) ;
-	return dynamic_cast<LLFloaterChatterBox*>(inst);
+	return LLFloaterReg::getTypedInstance<LLFloaterChatterBox>("communicate", LLSD()) ; 
 }
 
 //static 
@@ -351,6 +363,7 @@ LLFloater* LLFloaterChatterBox::getCurrentVoiceFloater()
 	else
 	{
 		LLFloaterChatterBox* floater = LLFloaterChatterBox::getInstance();
+		if(!floater) return NULL;
 		// iterator over all IM tabs (skip friends and near me)
 		for (S32 i = 0; i < floater->getFloaterCount(); i++)
 		{
diff --git a/indra/newview/llfloaterfonttest.cpp b/indra/newview/llfloaterfonttest.cpp
index 02791b711e..413992910e 100644
--- a/indra/newview/llfloaterfonttest.cpp
+++ b/indra/newview/llfloaterfonttest.cpp
@@ -42,25 +42,11 @@
 #include "lluictrlfactory.h"
 
 
-LLFloaterFontTest* LLFloaterFontTest::sInstance = NULL;
-
-LLFloaterFontTest::LLFloaterFontTest()
+LLFloaterFontTest::LLFloaterFontTest(const LLSD& key)
 	:	LLFloater("floater_font_test")
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_font_test.xml");
 }
 
 LLFloaterFontTest::~LLFloaterFontTest()
 {
-	sInstance = NULL;
-}
-
-// static
-void LLFloaterFontTest::show(void *unused)
-{
-	if (!sInstance)
-		sInstance = new LLFloaterFontTest();
-
-	sInstance->openFloater();
-	sInstance->setFocus(TRUE);
 }
diff --git a/indra/newview/llfloaterfonttest.h b/indra/newview/llfloaterfonttest.h
index eb2d410387..4406a9f36a 100644
--- a/indra/newview/llfloaterfonttest.h
+++ b/indra/newview/llfloaterfonttest.h
@@ -39,14 +39,10 @@
 class LLFloaterFontTest:
 	public LLFloater
 {
-public:
-	static void show(void* unused);
-
+	friend class LLFloaterReg;
 private:
-	LLFloaterFontTest();
+	LLFloaterFontTest(const LLSD& key);
 	~LLFloaterFontTest();
-
-	static LLFloaterFontTest* sInstance;
 };
 
 #endif
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index c3448d52c9..9999b58e5b 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -44,7 +44,7 @@
 #include "llcombobox.h"
 #include "llgesturemgr.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
 #include "llpreviewgesture.h"
@@ -322,7 +322,7 @@ void LLFloaterGesture::onClickInventory(void* data)
 	if (!list) return;
 	const LLUUID& item_id = list->getCurrentID();
 
-	LLInventoryView* inv = LLInventoryView::showAgentInventory();
+	LLFloaterInventory* inv = LLFloaterInventory::showAgentInventory();
 	if (!inv) return;
 	inv->getPanel()->setSelection(item_id, TRUE);
 }
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index 58cbe02d6d..6d603fa5c8 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -50,6 +50,7 @@
 #include "llcombobox.h"
 #include "lldraghandle.h"
 #include "llfloater.h"
+#include "llfloaterreg.h"
 #include "llfocusmgr.h"
 #include "llfloatertopobjects.h"
 #include "lllineeditor.h"
@@ -105,7 +106,7 @@ void LLFloaterGodTools::onOpen(const LLSD& key)
 // static
 void LLFloaterGodTools::refreshAll()
 {
-	LLFloaterGodTools* god_tools = getInstance();
+	LLFloaterGodTools* god_tools = LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools");
 	if (god_tools)
 	{
 		if (gAgent.getRegionHost() != god_tools->mCurrentHost)
@@ -119,7 +120,7 @@ void LLFloaterGodTools::refreshAll()
 
 
 LLFloaterGodTools::LLFloaterGodTools(const LLSD& key)
-:	LLFloater(),
+:	LLFloater(key),
 	mCurrentHost(LLHost::invalid),
 	mUpdateTimer()
 {
@@ -127,13 +128,16 @@ LLFloaterGodTools::LLFloaterGodTools(const LLSD& key)
 	mFactoryMap["region"] = LLCallbackMap(createPanelRegion, this);
 	mFactoryMap["objects"] = LLCallbackMap(createPanelObjects, this);
 	mFactoryMap["request"] = LLCallbackMap(createPanelRequest, this);
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_god_tools.xml");
+//	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_god_tools.xml");
 
-	sendRegionInfoRequest();
+}
 
+BOOL LLFloaterGodTools::postBuild()
+{
+	sendRegionInfoRequest();
 	childShowTab("GodTools Tabs", "region");
+	return TRUE;
 }
-
 // static
 void* LLFloaterGodTools::createPanelGrid(void *userdata)
 {
@@ -166,10 +170,7 @@ LLFloaterGodTools::~LLFloaterGodTools()
 {
 	// children automatically deleted
 }
-BOOL LLFloaterGodTools::postBuild()
-{
-	return TRUE;
-}
+
 
 U32 LLFloaterGodTools::computeRegionFlags() const
 {
@@ -187,10 +188,10 @@ void LLFloaterGodTools::updatePopup(LLCoordGL center, MASK mask)
 // virtual
 void LLFloaterGodTools::onClose(bool app_quitting)
 {
-	if (getInstance())
-	{
-		getInstance()->setVisible(FALSE);
-	}
+	LLFloaterGodTools* god_tools = LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools");
+	if(!god_tools) return;
+	god_tools->setVisible(FALSE);
+	
 }
 
 // virtual
@@ -271,16 +272,19 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
 		regionp->setWaterHeight(water_height);
 		regionp->setBillableFactor(billable_factor);
 	}
+	
+	LLFloaterGodTools* god_tools = LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools");
+	if (!god_tools) return;
 
 	// push values to god tools, if available
 	if ( gAgent.isGodlike()
-		&& instanceVisible()
-		&& getInstance()->mPanelRegionTools
-		&& getInstance()->mPanelObjectTools
+		&& LLFloaterReg::instanceVisible("god_tools")
+		&& god_tools->mPanelRegionTools
+		&& god_tools->mPanelObjectTools
 		&& msg )
 	{
-		LLPanelRegionTools* rtool = getInstance()->mPanelRegionTools;
-		getInstance()->mCurrentHost = host;
+		LLPanelRegionTools* rtool = god_tools->mPanelRegionTools;
+		god_tools->mCurrentHost = host;
 
 		// store locally
 		rtool->setSimName(sim_name);
@@ -293,7 +297,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
 		rtool->setRedirectGridY(redirect_grid_y);
 		rtool->enableAllWidgets();
 
-		LLPanelObjectTools *otool = getInstance()->mPanelObjectTools;
+		LLPanelObjectTools *otool = god_tools->mPanelObjectTools;
 		otool->setCheckFlags(region_flags);
 		otool->enableAllWidgets();
 
@@ -336,14 +340,17 @@ void LLFloaterGodTools::sendRegionInfoRequest()
 
 void LLFloaterGodTools::sendGodUpdateRegionInfo()
 {
+	LLFloaterGodTools* god_tools = LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools");
+	if (!god_tools) return;
+
 	LLViewerRegion *regionp = gAgent.getRegion();
 	if (gAgent.isGodlike()
-		&& getInstance()->mPanelRegionTools
+		&& god_tools->mPanelRegionTools
 		&& regionp
 		&& gAgent.getRegionHost() == mCurrentHost)
 	{
 		LLMessageSystem *msg = gMessageSystem;
-		LLPanelRegionTools *rtool = getInstance()->mPanelRegionTools;
+		LLPanelRegionTools *rtool = god_tools->mPanelRegionTools;
 
 		msg->newMessage("GodUpdateRegionInfo");
 		msg->nextBlockFast(_PREHASH_AgentData);
@@ -403,58 +410,31 @@ const F32 PRICE_PER_METER_MAX = 100.f;
 LLPanelRegionTools::LLPanelRegionTools()
 : 	LLPanel()
 {
+	mCommitCallbackRegistrar.add("RegionTools.ChangeAnything",	boost::bind(&LLPanelRegionTools::onChangeAnything, this));
+	mCommitCallbackRegistrar.add("RegionTools.ChangePrelude",	boost::bind(&LLPanelRegionTools::onChangePrelude, this));
+	mCommitCallbackRegistrar.add("RegionTools.BakeTerrain",		boost::bind(&LLPanelRegionTools::onBakeTerrain, this));
+	mCommitCallbackRegistrar.add("RegionTools.RevertTerrain",	boost::bind(&LLPanelRegionTools::onRevertTerrain, this));	
+	mCommitCallbackRegistrar.add("RegionTools.SwapTerrain",		boost::bind(&LLPanelRegionTools::onSwapTerrain, this));		
+	mCommitCallbackRegistrar.add("RegionTools.Refresh",			boost::bind(&LLPanelRegionTools::onRefresh, this));		
+	mCommitCallbackRegistrar.add("RegionTools.ApplyChanges",	boost::bind(&LLPanelRegionTools::onApplyChanges, this));	
+	mCommitCallbackRegistrar.add("RegionTools.SelectRegion",	boost::bind(&LLPanelRegionTools::onSelectRegion, this));
+	mCommitCallbackRegistrar.add("RegionTools.SaveState",		boost::bind(&LLPanelRegionTools::onSaveState, this));	
 }
 
 BOOL LLPanelRegionTools::postBuild()
 {
-	childSetCommitCallback("region name", onChangeAnything, this);
 	getChild<LLLineEditor>("region name")->setKeystrokeCallback(onChangeSimName, this);
 	childSetPrevalidate("region name", &LLLineEditor::prevalidatePrintableNotPipe);
-
-	childSetCommitCallback("check prelude", onChangePrelude, this);
-	childSetCommitCallback("check fixed sun", onChangeAnything, this);
-	childSetCommitCallback("check reset home", onChangeAnything, this);
-	childSetCommitCallback("check visible", onChangeAnything, this);
-	childSetCommitCallback("check damage", onChangeAnything, this);
-	childSetCommitCallback("block dwell", onChangeAnything, this);
-	childSetCommitCallback("block terraform", onChangeAnything, this);
-	childSetCommitCallback("allow transfer", onChangeAnything, this);
-	childSetCommitCallback("is sandbox", onChangeAnything, this);
-
-	childSetAction("Bake Terrain", onBakeTerrain, this);
-	childSetAction("Revert Terrain", onRevertTerrain, this);
-	childSetAction("Swap Terrain", onSwapTerrain, this);
-
-	childSetCommitCallback("estate", onChangeAnything, this);
 	childSetPrevalidate("estate", &LLLineEditor::prevalidatePositiveS32);
-
-	childSetCommitCallback("parentestate", onChangeAnything, this);
 	childSetPrevalidate("parentestate", &LLLineEditor::prevalidatePositiveS32);
 	childDisable("parentestate");
-
-	childSetCommitCallback("gridposx", onChangeAnything, this);
 	childSetPrevalidate("gridposx", &LLLineEditor::prevalidatePositiveS32);
 	childDisable("gridposx");
-
-	childSetCommitCallback("gridposy", onChangeAnything, this);
 	childSetPrevalidate("gridposy", &LLLineEditor::prevalidatePositiveS32);
 	childDisable("gridposy");
-
-	childSetCommitCallback("redirectx", onChangeAnything, this);
+	
 	childSetPrevalidate("redirectx", &LLLineEditor::prevalidatePositiveS32);
-
-	childSetCommitCallback("redirecty", onChangeAnything, this);
 	childSetPrevalidate("redirecty", &LLLineEditor::prevalidatePositiveS32);
-
-	childSetCommitCallback("billable factor", onChangeAnything, this);
-
-	childSetCommitCallback("land cost", onChangeAnything, this);
-
-	childSetAction("Refresh", onRefresh, this);
-	childSetAction("Apply", onApplyChanges, this);
-
-	childSetAction("Select Region", onSelectRegion, this);
-	childSetAction("Autosave now", onSaveState, this);
 			 
 	return TRUE;
 }
@@ -541,8 +521,6 @@ void LLPanelRegionTools::enableAllWidgets()
 	childEnable("Autosave now");
 }
 
-
-// static
 void LLPanelRegionTools::onSaveState(void* userdata)
 {
 	if (gAgent.isGodlike())
@@ -739,28 +717,25 @@ void LLPanelRegionTools::setPricePerMeter(S32 price)
 	childSetValue("land cost", price);
 }
 
-// static
-void LLPanelRegionTools::onChangeAnything(LLUICtrl* ctrl, void* userdata)
+void LLPanelRegionTools::onChangeAnything()
 {
-	if (userdata && gAgent.isGodlike())
+	if (gAgent.isGodlike())
 	{
-		LLPanelRegionTools* region_tools = (LLPanelRegionTools*) userdata;
-		region_tools->childEnable("Apply");
+		childEnable("Apply");
 	}
 }
 
-// static
-void LLPanelRegionTools::onChangePrelude(LLUICtrl* ctrl, void* data)
+void LLPanelRegionTools::onChangePrelude()
 {
 	// checking prelude auto-checks fixed sun
-	LLPanelRegionTools* self = (LLPanelRegionTools*)data;
-	if (self->childGetValue("check prelude").asBoolean())
+	if (childGetValue("check prelude").asBoolean())
 	{
-		self->childSetValue("check fixed sun", TRUE);
-		self->childSetValue("check reset home", TRUE);
+		childSetValue("check fixed sun", TRUE);
+		childSetValue("check reset home", TRUE);
+		onChangeAnything();
 	}
 	// pass on to default onChange handler
-	onChangeAnything(ctrl, data);
+
 }
 
 // static
@@ -773,49 +748,50 @@ void LLPanelRegionTools::onChangeSimName(LLLineEditor* caller, void* userdata )
 	}
 }
 
-//static
-void LLPanelRegionTools::onRefresh(void* userdata)
+
+void LLPanelRegionTools::onRefresh()
 {
+	LLFloaterGodTools* god_tools = LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools");
+	if(!god_tools) return;
 	LLViewerRegion *region = gAgent.getRegion();
 	if (region && gAgent.isGodlike())
 	{
-		LLFloaterGodTools::getInstance()->sendRegionInfoRequest();
+		god_tools->sendRegionInfoRequest();
+		//LLFloaterGodTools::getInstance()->sendRegionInfoRequest();
+		//LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools")->sendRegionInfoRequest();
 	}
 }
 
-// static
-void LLPanelRegionTools::onApplyChanges(void* userdata)
+void LLPanelRegionTools::onApplyChanges()
 {
+	LLFloaterGodTools* god_tools = LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools");
+	if(!god_tools) return;
 	LLViewerRegion *region = gAgent.getRegion();
-	if (region && userdata && gAgent.isGodlike())
+	if (region && gAgent.isGodlike())
 	{
-		LLPanelRegionTools* region_tools = (LLPanelRegionTools*) userdata;
-
-		region_tools->childDisable("Apply");
-		LLFloaterGodTools::getInstance()->sendGodUpdateRegionInfo();
+		childDisable("Apply");
+		god_tools->sendGodUpdateRegionInfo();
+		//LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools")->sendGodUpdateRegionInfo();
 	}
 }
 
-// static 
-void LLPanelRegionTools::onBakeTerrain(void *userdata)
+void LLPanelRegionTools::onBakeTerrain()
 {
 	LLPanelRequestTools::sendRequest("terrain", "bake", gAgent.getRegionHost());
 }
 
-// static 
-void LLPanelRegionTools::onRevertTerrain(void *userdata)
+void LLPanelRegionTools::onRevertTerrain()
 {
 	LLPanelRequestTools::sendRequest("terrain", "revert", gAgent.getRegionHost());
 }
 
-// static 
-void LLPanelRegionTools::onSwapTerrain(void *userdata)
+
+void LLPanelRegionTools::onSwapTerrain()
 {
 	LLPanelRequestTools::sendRequest("terrain", "swap", gAgent.getRegionHost());
 }
 
-// static
-void LLPanelRegionTools::onSelectRegion(void* userdata)
+void LLPanelRegionTools::onSelectRegion()
 {
 	llinfos << "LLPanelRegionTools::onSelectRegion" << llendl;
 
@@ -860,6 +836,8 @@ const F32 HOURS_TO_RADIANS = (2.f*F_PI)/24.f;
 LLPanelGridTools::LLPanelGridTools() :
 	LLPanel()
 {
+	mCommitCallbackRegistrar.add("GridTools.KickAll",		boost::bind(&LLPanelGridTools::onClickKickAll, this));	
+	mCommitCallbackRegistrar.add("GridTools.FlushMapVisibilityCaches",		boost::bind(&LLPanelGridTools::onClickFlushMapVisibilityCaches, this));	
 }
 
 // Destroys the object
@@ -869,9 +847,6 @@ LLPanelGridTools::~LLPanelGridTools()
 
 BOOL LLPanelGridTools::postBuild()
 {
-	childSetAction("Kick all users", onClickKickAll, this);
-	childSetAction("Flush This Region's Map Visibility Caches", onClickFlushMapVisibilityCaches, this);
-
 	return TRUE;
 }
 
@@ -879,9 +854,7 @@ void LLPanelGridTools::refresh()
 {
 }
 
-
-// static
-void LLPanelGridTools::onClickKickAll(void* userdata)
+void LLPanelGridTools::onClickKickAll()
 {
 	LLNotifications::instance().add("KickAllUsers", LLSD(), LLSD(), LLPanelGridTools::confirmKick);
 }
@@ -921,9 +894,7 @@ bool LLPanelGridTools::finishKick(const LLSD& notification, const LLSD& response
 	return false;
 }
 
-
-// static
-void LLPanelGridTools::onClickFlushMapVisibilityCaches(void* data)
+void LLPanelGridTools::onClickFlushMapVisibilityCaches()
 {
 	LLNotifications::instance().add("FlushMapVisibilityCaches", LLSD(), LLSD(), flushMapVisibilityCachesConfirm);
 }
@@ -981,6 +952,15 @@ LLPanelObjectTools::LLPanelObjectTools()
 	: 	LLPanel(),
 		mTargetAvatar()
 {
+	mCommitCallbackRegistrar.add("ObjectTools.ChangeAnything",		boost::bind(&LLPanelObjectTools::onChangeAnything, this));
+	mCommitCallbackRegistrar.add("ObjectTools.DeletePublicOwnedBy",	boost::bind(&LLPanelObjectTools::onClickDeletePublicOwnedBy, this));
+	mCommitCallbackRegistrar.add("ObjectTools.DeleteAllScriptedOwnedBy",		boost::bind(&LLPanelObjectTools::onClickDeleteAllScriptedOwnedBy, this));
+	mCommitCallbackRegistrar.add("ObjectTools.DeleteAllOwnedBy",		boost::bind(&LLPanelObjectTools::onClickDeleteAllOwnedBy, this));
+	mCommitCallbackRegistrar.add("ObjectTools.ApplyChanges",		boost::bind(&LLPanelObjectTools::onApplyChanges, this));
+	mCommitCallbackRegistrar.add("ObjectTools.Set",		boost::bind(&LLPanelObjectTools::onClickSet, this));
+	mCommitCallbackRegistrar.add("ObjectTools.GetTopColliders",		boost::bind(&LLPanelObjectTools::onGetTopColliders, this));
+	mCommitCallbackRegistrar.add("ObjectTools.GetTopScripts",		boost::bind(&LLPanelObjectTools::onGetTopScripts, this));
+	mCommitCallbackRegistrar.add("ObjectTools.GetScriptDigest",		boost::bind(&LLPanelObjectTools::onGetScriptDigest, this));
 }
 
 // Destroys the object
@@ -991,22 +971,6 @@ LLPanelObjectTools::~LLPanelObjectTools()
 
 BOOL LLPanelObjectTools::postBuild()
 {
-	childSetCommitCallback("disable scripts", onChangeAnything, this);
-	childSetCommitCallback("disable collisions", onChangeAnything, this);
-	childSetCommitCallback("disable physics", onChangeAnything, this);
-
-	childSetAction("Apply", onApplyChanges, this);
-
-	childSetAction("Set Target", onClickSet, this);
-
-	childSetAction("Delete Target's Scripted Objects On Others Land", onClickDeletePublicOwnedBy, this);
-	childSetAction("Delete Target's Scripted Objects On *Any* Land", onClickDeleteAllScriptedOwnedBy, this);
-	childSetAction("Delete *ALL* Of Target's Objects", onClickDeleteAllOwnedBy, this);
-
-	childSetAction("Get Top Colliders", onGetTopColliders, this);
-	childSetAction("Get Top Scripts", onGetTopScripts, this);
-	childSetAction("Scripts digest", onGetScriptDigest, this);
-
 	return TRUE;
 }
 
@@ -1095,30 +1059,33 @@ void LLPanelObjectTools::enableAllWidgets()
 }
 
 
-// static
-void LLPanelObjectTools::onGetTopColliders(void* userdata)
+void LLPanelObjectTools::onGetTopColliders()
 {
+	LLFloaterTopObjects* instance = LLFloaterReg::getTypedInstance<LLFloaterTopObjects>("top_objects");
+	if(!instance) return;
+	
 	if (gAgent.isGodlike())
 	{
-		LLFloaterTopObjects::show();
+		LLFloaterReg::showInstance("top_objects");
 		LLFloaterTopObjects::setMode(STAT_REPORT_TOP_COLLIDERS);
-		LLFloaterTopObjects::onRefresh(NULL);
+		instance->onRefresh();
 	}
 }
 
-// static
-void LLPanelObjectTools::onGetTopScripts(void* userdata)
+void LLPanelObjectTools::onGetTopScripts()
 {
+	LLFloaterTopObjects* instance = LLFloaterReg::getTypedInstance<LLFloaterTopObjects>("top_objects");
+	if(!instance) return;
+	
 	if (gAgent.isGodlike()) 
 	{
-		LLFloaterTopObjects::show();
+		LLFloaterReg::showInstance("top_objects");
 		LLFloaterTopObjects::setMode(STAT_REPORT_TOP_SCRIPTS);
-		LLFloaterTopObjects::onRefresh(NULL);
+		instance->onRefresh();
 	}
 }
 
-// static
-void LLPanelObjectTools::onGetScriptDigest(void* userdata)
+void LLPanelObjectTools::onGetScriptDigest()
 {
 	if (gAgent.isGodlike())
 	{
@@ -1128,20 +1095,20 @@ void LLPanelObjectTools::onGetScriptDigest(void* userdata)
 	}
 }
 
-void LLPanelObjectTools::onClickDeletePublicOwnedBy(void* userdata)
+void LLPanelObjectTools::onClickDeletePublicOwnedBy()
 {
 	// Bring up view-modal dialog
-	LLPanelObjectTools* panelp = (LLPanelObjectTools*)userdata;
-	if (!panelp->mTargetAvatar.isNull())
+
+	if (!mTargetAvatar.isNull())
 	{
-		panelp->mSimWideDeletesFlags = 
+		mSimWideDeletesFlags = 
 			SWD_SCRIPTED_ONLY | SWD_OTHERS_LAND_ONLY;
 
 		LLSD args;
-		args["AVATAR_NAME"] = panelp->childGetValue("target_avatar_name").asString();
+		args["AVATAR_NAME"] = childGetValue("target_avatar_name").asString();
 		LLSD payload;
-		payload["avatar_id"] = panelp->mTargetAvatar;
-		payload["flags"] = (S32)panelp->mSimWideDeletesFlags;
+		payload["avatar_id"] = mTargetAvatar;
+		payload["flags"] = (S32)mSimWideDeletesFlags;
 
 		LLNotifications::instance().add( "GodDeleteAllScriptedPublicObjectsByUser",
 								args,
@@ -1150,20 +1117,18 @@ void LLPanelObjectTools::onClickDeletePublicOwnedBy(void* userdata)
 	}
 }
 
-// static
-void LLPanelObjectTools::onClickDeleteAllScriptedOwnedBy(void* userdata)
+void LLPanelObjectTools::onClickDeleteAllScriptedOwnedBy()
 {
 	// Bring up view-modal dialog
-	LLPanelObjectTools* panelp = (LLPanelObjectTools*)userdata;
-	if (!panelp->mTargetAvatar.isNull())
+	if (!mTargetAvatar.isNull())
 	{
-		panelp->mSimWideDeletesFlags = SWD_SCRIPTED_ONLY;
+		mSimWideDeletesFlags = SWD_SCRIPTED_ONLY;
 
 		LLSD args;
-		args["AVATAR_NAME"] = panelp->childGetValue("target_avatar_name").asString();
+		args["AVATAR_NAME"] = childGetValue("target_avatar_name").asString();
 		LLSD payload;
-		payload["avatar_id"] = panelp->mTargetAvatar;
-		payload["flags"] = (S32)panelp->mSimWideDeletesFlags;
+		payload["avatar_id"] = mTargetAvatar;
+		payload["flags"] = (S32)mSimWideDeletesFlags;
 
 		LLNotifications::instance().add( "GodDeleteAllScriptedObjectsByUser",
 								args,
@@ -1172,20 +1137,18 @@ void LLPanelObjectTools::onClickDeleteAllScriptedOwnedBy(void* userdata)
 	}
 }
 
-// static
-void LLPanelObjectTools::onClickDeleteAllOwnedBy(void* userdata)
+void LLPanelObjectTools::onClickDeleteAllOwnedBy()
 {
 	// Bring up view-modal dialog
-	LLPanelObjectTools* panelp = (LLPanelObjectTools*)userdata;
-	if (!panelp->mTargetAvatar.isNull())
+	if (!mTargetAvatar.isNull())
 	{
-		panelp->mSimWideDeletesFlags = 0;
+		mSimWideDeletesFlags = 0;
 
 		LLSD args;
-		args["AVATAR_NAME"] = panelp->childGetValue("target_avatar_name").asString();
+		args["AVATAR_NAME"] = childGetValue("target_avatar_name").asString();
 		LLSD payload;
-		payload["avatar_id"] = panelp->mTargetAvatar;
-		payload["flags"] = (S32)panelp->mSimWideDeletesFlags;
+		payload["avatar_id"] = mTargetAvatar;
+		payload["flags"] = (S32)mSimWideDeletesFlags;
 
 		LLNotifications::instance().add( "GodDeleteAllObjectsByUser",
 								args,
@@ -1209,11 +1172,10 @@ bool LLPanelObjectTools::callbackSimWideDeletes( const LLSD& notification, const
 	return false;
 }
 
-void LLPanelObjectTools::onClickSet(void* data)
+void LLPanelObjectTools::onClickSet()
 {
-	LLPanelObjectTools* panelp = (LLPanelObjectTools*) data;
 	// grandparent is a floater, which can have a dependent
-	gFloaterView->getParentFloater(panelp)->addDependentFloater(LLFloaterAvatarPicker::show(callbackAvatarID, data));
+	gFloaterView->getParentFloater(this)->addDependentFloater(LLFloaterAvatarPicker::show(callbackAvatarID, this));
 }
 
 void LLPanelObjectTools::onClickSetBySelection(void* data)
@@ -1247,28 +1209,25 @@ void LLPanelObjectTools::callbackAvatarID(const std::vector<std::string>& names,
 	object_tools->refresh();
 }
 
-
-// static
-void LLPanelObjectTools::onChangeAnything(LLUICtrl* ctrl, void* userdata)
+void LLPanelObjectTools::onChangeAnything()
 {
-	if (userdata && gAgent.isGodlike())
+	if (gAgent.isGodlike())
 	{
-		LLPanelObjectTools* object_tools = (LLPanelObjectTools*) userdata;
-		object_tools->childEnable("Apply");
+		childEnable("Apply");
 	}
 }
 
-// static
-void LLPanelObjectTools::onApplyChanges(void* userdata)
+void LLPanelObjectTools::onApplyChanges()
 {
+	LLFloaterGodTools* god_tools = LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools");
+	if(!god_tools) return;
 	LLViewerRegion *region = gAgent.getRegion();
 	if (region && gAgent.isGodlike())
 	{
-		LLPanelObjectTools* object_tools = (LLPanelObjectTools*) userdata;
 		// TODO -- implement this
-
-		object_tools->childDisable("Apply");
-		LLFloaterGodTools::getInstance()->sendGodUpdateRegionInfo();
+		childDisable("Apply");
+		god_tools->sendGodUpdateRegionInfo();
+		//LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools")->sendGodUpdateRegionInfo();
 	}
 }
 
@@ -1283,6 +1242,7 @@ const std::string AGENT_REGION = "Agent Region";
 LLPanelRequestTools::LLPanelRequestTools():
 	LLPanel()
 {
+	mCommitCallbackRegistrar.add("GodTools.Request",		boost::bind(&LLPanelRequestTools::onClickRequest, this));
 }
 
 LLPanelRequestTools::~LLPanelRequestTools()
@@ -1291,8 +1251,6 @@ LLPanelRequestTools::~LLPanelRequestTools()
 
 BOOL LLPanelRequestTools::postBuild()
 {
-	childSetAction("Make Request", onClickRequest, this);
-
 	refresh();
 
 	return TRUE;
@@ -1353,21 +1311,19 @@ void LLPanelRequestTools::sendRequest(const std::string& request,
 	msg->sendReliable(host);
 }
 
-// static
-void LLPanelRequestTools::onClickRequest(void* data)
+void LLPanelRequestTools::onClickRequest()
 {
-	LLPanelRequestTools* self = (LLPanelRequestTools*)data;
-	const std::string dest = self->childGetValue("destination").asString();
+	const std::string dest = childGetValue("destination").asString();
 	if(dest == SELECTION)
 	{
-		std::string req = self->childGetValue("request");
+		std::string req =childGetValue("request");
 		req = req.substr(0, req.find_first_of(" "));
-		std::string param = self->childGetValue("parameter");
+		std::string param = childGetValue("parameter");
 		LLSelectMgr::getInstance()->sendGodlikeRequest(req, param);
 	}
 	else if(dest == AGENT_REGION)
 	{
-		self->sendRequest(gAgent.getRegionHost());
+		sendRequest(gAgent.getRegionHost());
 	}
 	else
 	{
@@ -1379,7 +1335,7 @@ void LLPanelRequestTools::onClickRequest(void* data)
 			if(dest == regionp->getName())
 			{
 				// found it
-				self->sendRequest(regionp->getHost());
+				sendRequest(regionp->getHost());
 			}
 		}
 	}
diff --git a/indra/newview/llfloatergodtools.h b/indra/newview/llfloatergodtools.h
index 6c4b438808..2564b15b37 100644
--- a/indra/newview/llfloatergodtools.h
+++ b/indra/newview/llfloatergodtools.h
@@ -57,9 +57,9 @@ class LLTextBox;
 class LLMessageSystem;
 
 class LLFloaterGodTools
-	: public LLFloater, public LLFloaterSingleton<LLFloaterGodTools>
+	: public LLFloater
 {
-	friend class LLUISingleton<LLFloaterGodTools, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 public:
 
 	enum EGodPanel
@@ -98,12 +98,16 @@ public:
 	// Send possibly changed values to simulator.
 	void sendGodUpdateRegionInfo();
 
+private:
+	
+	LLFloaterGodTools(const LLSD& key);
+	~LLFloaterGodTools();
+	
 protected:
 	U32 computeRegionFlags() const;
 
 protected:
-	LLFloaterGodTools(const LLSD& key);
-	~LLFloaterGodTools();
+
 	/*virtual*/	BOOL	postBuild();
 	// When the floater is going away, reset any options that need to be 
 	// cleared.
@@ -133,16 +137,17 @@ public:
 
 	/*virtual*/ void refresh();
 
-	static void onSaveState(void* data);
-	static void onChangeAnything(LLUICtrl* ctrl, void* userdata);
-	static void onChangePrelude(LLUICtrl* ctrl, void* data);
+	static void onSaveState(void* userdata);
 	static void onChangeSimName(LLLineEditor* caller, void* userdata);
-	static void onApplyChanges(void* userdata);
-	static void onBakeTerrain(void *userdata);
-	static void onRevertTerrain(void *userdata);
-	static void onSwapTerrain(void *userdata);
-	static void onSelectRegion(void *userdata);
-	static void onRefresh(void* userdata);
+	
+	void onChangeAnything();
+	void onChangePrelude();
+	void onApplyChanges();
+	void onBakeTerrain();
+	void onRevertTerrain();
+	void onSwapTerrain();
+	void onSelectRegion();
+	void onRefresh();
 
 	// set internal checkboxes/spinners/combos 
 	const std::string getSimName() const;
@@ -194,11 +199,11 @@ public:
 
 	void refresh();
 
-	static void onClickKickAll(void *data);
+	void onClickKickAll();
 	static bool confirmKick(const LLSD& notification, const LLSD& response);
 	static bool finishKick(const LLSD& notification, const LLSD& response);
 	static void onDragSunPhase(LLUICtrl *ctrl, void *userdata);
-	static void onClickFlushMapVisibilityCaches(void* data);
+	void onClickFlushMapVisibilityCaches();
 	static bool flushMapVisibilityCachesConfirm(const LLSD& notification, const LLSD& response);
 
 protected:
@@ -227,17 +232,17 @@ public:
 	void enableAllWidgets();
 	void setCheckFlags(U32 flags);
 
-	static void onChangeAnything(LLUICtrl* ctrl, void* data);
-	static void onApplyChanges(void* data);
-	static void onClickSet(void* data);
+	void onChangeAnything();
+	void onApplyChanges();
+	void onClickSet();
 	static void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data);
-	static void onClickDeletePublicOwnedBy(void* data);
-	static void onClickDeleteAllScriptedOwnedBy(void* data);
-	static void onClickDeleteAllOwnedBy(void* data);
+	void onClickDeletePublicOwnedBy();
+	void onClickDeleteAllScriptedOwnedBy();
+	void onClickDeleteAllOwnedBy();
 	static bool callbackSimWideDeletes(const LLSD& notification, const LLSD& response);
-	static void onGetTopColliders(void* data);
-	static void onGetTopScripts(void* data);
-	static void onGetScriptDigest(void* data);
+	void onGetTopColliders();
+	void onGetTopScripts();
+	void onGetScriptDigest();
 	static void onClickSetBySelection(void* data);
 
 protected:
@@ -267,7 +272,7 @@ public:
 							const LLHost& host);
 
 protected:
-	static void onClickRequest(void *data);
+	void onClickRequest();
 	void sendRequest(const LLHost& host);
 };
 
diff --git a/indra/newview/llfloaterhud.cpp b/indra/newview/llfloaterhud.cpp
index 4379d25a66..dd70560bb7 100644
--- a/indra/newview/llfloaterhud.cpp
+++ b/indra/newview/llfloaterhud.cpp
@@ -42,8 +42,6 @@
 // Linden libs
 #include "lluictrlfactory.h"
 
-// statics 
-LLFloaterHUD* LLFloaterHUD::sInstance = 0; 
 
 ///----------------------------------------------------------------------------
 /// Class LLFloaterHUD
@@ -51,12 +49,18 @@ LLFloaterHUD* LLFloaterHUD::sInstance = 0;
 #define super LLFloater	/* superclass */
 
 // Default constructor
-LLFloaterHUD::LLFloaterHUD()
-:	LLFloater(),
+LLFloaterHUD::LLFloaterHUD(const LLSD& key)
+:	LLFloater(key),
 	mWebBrowser(0)
 {
-	// Create floater from its XML definition
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hud.xml");
+	// do not build the floater if there the url is empty
+	if (gSavedSettings.getString("TutorialURL") == "")
+	{
+		LLNotifications::instance().add("TutorialNotFound");
+		return;
+	}
+	
+	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hud.xml");
 	
 	// Don't grab the focus as it will impede performing in-world actions
 	// while using the HUD
@@ -68,62 +72,35 @@ LLFloaterHUD::LLFloaterHUD()
 	
 	// Opaque background since we never get the focus
 	setBackgroundOpaque(TRUE);
+}
 
+BOOL LLFloaterHUD::postBuild()
+{
 	mWebBrowser = getChild<LLWebBrowserCtrl>("floater_hud_browser" );
 	if (mWebBrowser)
 	{
 		// Open links in internal browser
 		mWebBrowser->setOpenInExternalBrowser(false);
-
+		
 		// This is a "chrome" floater, so we don't want anything to
 		// take focus (as the user needs to be able to walk with 
 		// arrow keys during tutorial).
 		mWebBrowser->setTakeFocusOnClick(false);
-
+		
 		std::string language = LLUI::getLanguage();
 		std::string base_url = gSavedSettings.getString("TutorialURL");
-
+		
 		std::string url = base_url + language + "/";
 		mWebBrowser->navigateTo(url);
 	}
-}
-
-// Get the instance
-LLFloaterHUD* LLFloaterHUD::getInstance()
-{
-	if (!sInstance)
-	{
-		sInstance = new LLFloaterHUD();
-	}
-	return sInstance;
+	
+	return TRUE;
 }
 
 // Destructor
 LLFloaterHUD::~LLFloaterHUD()
 {
-	// Clear out the one instance if it's ours
-	if (sInstance == this)
-	{
-		sInstance = NULL;
-	}
 }
-
-// Show the HUD
-void LLFloaterHUD::showHUD()
-{
-	// do not build the floater if there the url is empty
-	if (gSavedSettings.getString("TutorialURL") == "")
-	{
-		LLNotifications::instance().add("TutorialNotFound");
-		return;
-	}
-
-	// Create the instance if necessary
-	LLFloaterHUD* hud = getInstance();
-	hud->openFloater();
-	hud->setFrontmost(FALSE);
-}
-
 // Save our visibility state on close in case the user accidentally
 // quit the application while the tutorial was visible.
 // virtual
diff --git a/indra/newview/llfloaterhud.h b/indra/newview/llfloaterhud.h
index 2d58685b58..33ed9faa67 100644
--- a/indra/newview/llfloaterhud.h
+++ b/indra/newview/llfloaterhud.h
@@ -39,22 +39,20 @@ class LLWebBrowserCtrl;
 
 class LLFloaterHUD : public LLFloater
 {
+	friend class LLFloaterReg;
 public:
-	static LLFloaterHUD* getInstance(); ///< get instance creating if necessary
-
-	static void showHUD(); ///< show the HUD
 
 	// Save our visibility state during close
 	/*virtual*/ void onClose(bool app_quitting);
-
+	BOOL postBuild();
+	
 private:
 	// Handles its own construction and destruction, so private.
-	LLFloaterHUD();
+	LLFloaterHUD(const LLSD& key);
 	/*virtual*/ ~LLFloaterHUD();
 
 private:
 	LLWebBrowserCtrl* mWebBrowser; ///< the actual web browser control
-	static LLFloaterHUD* sInstance;
 };
 
 #endif // LL_LLFLOATERHUD_H
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index 4b29a304ac..aa615ef342 100644
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -47,13 +47,32 @@
 #include "llviewerobject.h"
 #include "lluictrlfactory.h"
 
-LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
+//LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
 
-LLFloaterInspect::LLFloaterInspect(void)
-  : LLFloater(),
+LLFloaterInspect::LLFloaterInspect(const LLSD& key)
+  : LLFloater(key),
 	mDirty(FALSE)
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inspect.xml");
+	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inspect.xml");
+	mCommitCallbackRegistrar.add("Inspect.OwnerProfile",	boost::bind(&LLFloaterInspect::onClickOwnerProfile, this));
+	mCommitCallbackRegistrar.add("Inspect.CreatorProfile",	boost::bind(&LLFloaterInspect::onClickCreatorProfile, this));
+	mCommitCallbackRegistrar.add("Inspect.SelectObject",	boost::bind(&LLFloaterInspect::onSelectObject, this));
+}
+
+BOOL LLFloaterInspect::postBuild()
+{
+	mObjectList = getChild<LLScrollListCtrl>("object_list");
+//	childSetAction("button owner",onClickOwnerProfile, this);
+//	childSetAction("button creator",onClickCreatorProfile, this);
+//	childSetCommitCallback("object_list", onSelectObject, NULL);
+	
+	BOOL forcesel = LLSelectMgr::getInstance()->setForceSelection(TRUE);
+	LLToolMgr::getInstance()->setTransientTool(LLToolCompInspect::getInstance());
+	LLSelectMgr::getInstance()->setForceSelection(forcesel);	// restore previouis value
+	mObjectSelection = LLSelectMgr::getInstance()->getSelection();
+	refresh();
+	
+	return TRUE;
 }
 
 LLFloaterInspect::~LLFloaterInspect(void)
@@ -71,14 +90,14 @@ LLFloaterInspect::~LLFloaterInspect(void)
 	{
 		LLFloaterReg::showInstance("build", LLSD(), TRUE);
 	}
-	sInstance = NULL;
+	//sInstance = NULL;
 }
-
+/*
 BOOL LLFloaterInspect::isVisible()
 {
 	return (!!sInstance);
-}
-
+}*/
+/*
 void LLFloaterInspect::show(void* ignored)
 {
 	// setForceSelection ensures that the pie menu does not deselect things when it 
@@ -98,15 +117,14 @@ void LLFloaterInspect::show(void* ignored)
 	sInstance->mObjectSelection = LLSelectMgr::getInstance()->getSelection();
 	sInstance->refresh();
 }
-
-void LLFloaterInspect::onClickCreatorProfile(void* ctrl)
+*/
+void LLFloaterInspect::onClickCreatorProfile()
 {
-	if(sInstance->mObjectList->getAllSelected().size() == 0)
+	if(mObjectList->getAllSelected().size() == 0)
 	{
 		return;
 	}
-	LLScrollListItem* first_selected =
-		sInstance->mObjectList->getFirstSelected();
+	LLScrollListItem* first_selected =mObjectList->getFirstSelected();
 
 	if (first_selected)
 	{
@@ -119,7 +137,7 @@ void LLFloaterInspect::onClickCreatorProfile(void* ctrl)
 				return (obj_id == node->getObject()->getID());
 			}
 		} func(first_selected->getUUID());
-		LLSelectNode* node = sInstance->mObjectSelection->getFirstNode(&func);
+		LLSelectNode* node = mObjectSelection->getFirstNode(&func);
 		if(node)
 		{
 			LLFriendActions::showProfile(node->mPermissions->getCreator());
@@ -127,11 +145,10 @@ void LLFloaterInspect::onClickCreatorProfile(void* ctrl)
 	}
 }
 
-void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
+void LLFloaterInspect::onClickOwnerProfile()
 {
-	if(sInstance->mObjectList->getAllSelected().size() == 0) return;
-	LLScrollListItem* first_selected =
-		sInstance->mObjectList->getFirstSelected();
+	if(mObjectList->getAllSelected().size() == 0) return;
+	LLScrollListItem* first_selected =mObjectList->getFirstSelected();
 
 	if (first_selected)
 	{
@@ -145,7 +162,7 @@ void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
 				return (obj_id == node->getObject()->getID());
 			}
 		} func(selected_id);
-		LLSelectNode* node = sInstance->mObjectSelection->getFirstNode(&func);
+		LLSelectNode* node = mObjectSelection->getFirstNode(&func);
 		if(node)
 		{
 			const LLUUID& owner_id = node->mPermissions->getOwner();
@@ -154,37 +171,25 @@ void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
 	}
 }
 
-BOOL LLFloaterInspect::postBuild()
-{
-	mObjectList = getChild<LLScrollListCtrl>("object_list");
-	childSetAction("button owner",onClickOwnerProfile, this);
-	childSetAction("button creator",onClickCreatorProfile, this);
-	childSetCommitCallback("object_list", onSelectObject, NULL);
-	return TRUE;
-}
-
-void LLFloaterInspect::onSelectObject(LLUICtrl* ctrl, void* user_data)
+void LLFloaterInspect::onSelectObject()
 {
 	if(LLFloaterInspect::getSelectedUUID() != LLUUID::null)
 	{
-		sInstance->childSetEnabled("button owner", true);
-		sInstance->childSetEnabled("button creator", true);
+		childSetEnabled("button owner", true);
+		childSetEnabled("button creator", true);
 	}
 }
 
 LLUUID LLFloaterInspect::getSelectedUUID()
 {
-	if(sInstance)
+	if(mObjectList->getAllSelected().size() > 0)
 	{
-		if(sInstance->mObjectList->getAllSelected().size() > 0)
+		LLScrollListItem* first_selected =mObjectList->getFirstSelected();
+		if (first_selected)
 		{
-			LLScrollListItem* first_selected =
-				sInstance->mObjectList->getFirstSelected();
-			if (first_selected)
-			{
-				return first_selected->getUUID();
-			}
+			return first_selected->getUUID();
 		}
+		
 	}
 	return LLUUID::null;
 }
@@ -262,7 +267,7 @@ void LLFloaterInspect::refresh()
 	{
 		mObjectList->selectNthItem(0);
 	}
-	onSelectObject(this, NULL);
+	onSelectObject();
 	mObjectList->setScrollPos(pos);
 }
 
@@ -274,10 +279,7 @@ void LLFloaterInspect::onFocusReceived()
 
 void LLFloaterInspect::dirty()
 {
-	if(sInstance)
-	{
-		sInstance->setDirty();
-	}
+	setDirty();
 }
 
 void LLFloaterInspect::draw()
diff --git a/indra/newview/llfloaterinspect.h b/indra/newview/llfloaterinspect.h
index 57bba6864f..a65ccaa66e 100644
--- a/indra/newview/llfloaterinspect.h
+++ b/indra/newview/llfloaterinspect.h
@@ -44,29 +44,32 @@ class LLUICtrl;
 
 class LLFloaterInspect : public LLFloater
 {
+	friend class LLFloaterReg;
 public:
-	virtual ~LLFloaterInspect(void);
-	static void show(void* ignored = NULL);
+
+//	static void show(void* ignored = NULL);
 	virtual BOOL postBuild();
-	static void dirty();
-	static LLUUID getSelectedUUID();
+	void dirty();
+	LLUUID getSelectedUUID();
 	virtual void draw();
 	virtual void refresh();
-	static BOOL isVisible();
+//	static BOOL isVisible();
 	virtual void onFocusReceived();
-	static void onClickCreatorProfile(void* ctrl);
-	static void onClickOwnerProfile(void* ctrl);
-	static void onSelectObject(LLUICtrl* ctrl, void* user_data);
+	void onClickCreatorProfile();
+	void onClickOwnerProfile();
+	void onSelectObject();
 	LLScrollListCtrl* mObjectList;
 protected:
 	// protected members
-	LLFloaterInspect();
 	void setDirty() { mDirty = TRUE; }
 	bool mDirty;
 
 private:
+	
+	LLFloaterInspect(const LLSD& key);
+	virtual ~LLFloaterInspect(void);
 	// static data
-	static LLFloaterInspect* sInstance;
+//	static LLFloaterInspect* sInstance;
 
 	LLSafeHandle<LLObjectSelection> mObjectSelection;
 };
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp
new file mode 100644
index 0000000000..0dd1d6adcd
--- /dev/null
+++ b/indra/newview/llfloaterinventory.cpp
@@ -0,0 +1,1941 @@
+/** 
+ * @file llfloaterinventory.cpp
+ * @brief Implementation of the inventory view and associated stuff.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include <utility> // for std::pair<>
+
+#include "llfloaterinventory.h"
+
+// library includes
+#include "llagent.h"
+#include "llagentwearables.h"
+#include "llcallingcard.h"
+#include "llfloaterreg.h"
+#include "llsdserialize.h"
+#include "llsearcheditor.h"
+#include "llspinctrl.h"
+#include "llui.h"
+#include "message.h"
+
+// newview includes
+#include "llappviewer.h"
+#include "llfirstuse.h"
+#include "llfloateravatarinfo.h"
+#include "llfloaterchat.h"
+#include "llfloatercustomize.h"
+#include "llfocusmgr.h"
+#include "llfolderview.h"
+#include "llgesturemgr.h"
+#include "lliconctrl.h"
+#include "llimview.h"
+#include "llinventorybridge.h"
+#include "llinventoryclipboard.h"
+#include "llinventorymodel.h"
+#include "lllineeditor.h"
+#include "llmenugl.h"
+#include "llpreviewanim.h"
+#include "llpreviewgesture.h"
+#include "llpreviewlandmark.h"
+#include "llpreviewnotecard.h"
+#include "llpreviewscript.h"
+#include "llpreviewsound.h"
+#include "llpreviewtexture.h"
+#include "llresmgr.h"
+#include "llscrollbar.h"
+#include "llscrollcontainer.h"
+#include "llselectmgr.h"
+#include "lltabcontainer.h"
+#include "lltooldraganddrop.h"
+#include "lluictrlfactory.h"
+#include "llviewerimagelist.h"
+#include "llviewerinventory.h"
+#include "llviewermessage.h"
+#include "llviewerobjectlist.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "llvoavatarself.h"
+#include "llwearablelist.h"
+
+static LLDefaultChildRegistry::Register<LLInventoryPanel> r("inventory_panel");
+
+//BOOL LLFloaterInventory::sOpenNextNewItem = FALSE;
+BOOL LLFloaterInventory::sWearNewClothing = FALSE;
+LLUUID LLFloaterInventory::sWearNewClothingTransactionID;
+
+///----------------------------------------------------------------------------
+/// LLFloaterInventoryFinder
+///----------------------------------------------------------------------------
+
+LLFloaterInventoryFinder::LLFloaterInventoryFinder(LLFloaterInventory* inventory_view)
+:	LLFloater(),
+	mFloaterInventory(inventory_view),
+	mFilter(inventory_view->mActivePanel->getFilter())
+{
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory_view_finder.xml");
+	updateElementsFromFilter();
+}
+
+
+void LLFloaterInventoryFinder::onCheckSinceLogoff(LLUICtrl *ctrl, void *user_data)
+{
+	LLFloaterInventoryFinder *self = (LLFloaterInventoryFinder *)user_data;
+	if (!self) return;
+
+	bool since_logoff= self->childGetValue("check_since_logoff");
+	
+	if (!since_logoff && 
+	    !(  self->mSpinSinceDays->get() ||  self->mSpinSinceHours->get() ) )
+	{
+		self->mSpinSinceHours->set(1.0f);
+	}	
+}
+BOOL LLFloaterInventoryFinder::postBuild()
+{
+	const LLRect& viewrect = mFloaterInventory->getRect();
+	setRect(LLRect(viewrect.mLeft - getRect().getWidth(), viewrect.mTop, viewrect.mLeft, viewrect.mTop - getRect().getHeight()));
+
+	childSetAction("All", selectAllTypes, this);
+	childSetAction("None", selectNoTypes, this);
+
+	mSpinSinceHours = getChild<LLSpinCtrl>("spin_hours_ago");
+	childSetCommitCallback("spin_hours_ago", onTimeAgo, this);
+
+	mSpinSinceDays = getChild<LLSpinCtrl>("spin_days_ago");
+	childSetCommitCallback("spin_days_ago", onTimeAgo, this);
+
+	//	mCheckSinceLogoff   = getChild<LLSpinCtrl>("check_since_logoff");
+	childSetCommitCallback("check_since_logoff", onCheckSinceLogoff, this);
+
+	childSetAction("Close", onCloseBtn, this);
+
+	updateElementsFromFilter();
+	return TRUE;
+}
+void LLFloaterInventoryFinder::onTimeAgo(LLUICtrl *ctrl, void *user_data)
+{
+	LLFloaterInventoryFinder *self = (LLFloaterInventoryFinder *)user_data;
+	if (!self) return;
+	
+	bool since_logoff=true;
+	if ( self->mSpinSinceDays->get() ||  self->mSpinSinceHours->get() )
+	{
+		since_logoff = false;
+	}
+	self->childSetValue("check_since_logoff", since_logoff);
+}
+
+void LLFloaterInventoryFinder::changeFilter(LLInventoryFilter* filter)
+{
+	mFilter = filter;
+	updateElementsFromFilter();
+}
+
+void LLFloaterInventoryFinder::updateElementsFromFilter()
+{
+	if (!mFilter)
+		return;
+
+	// Get data needed for filter display
+	U32 filter_types = mFilter->getFilterTypes();
+	std::string filter_string = mFilter->getFilterSubString();
+	LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState();
+	U32 hours = mFilter->getHoursAgo();
+
+	// update the ui elements
+	LLFloater::setTitle(mFilter->getName());
+	childSetValue("check_animation", (S32) (filter_types & 0x1 << LLInventoryType::IT_ANIMATION));
+
+	childSetValue("check_calling_card", (S32) (filter_types & 0x1 << LLInventoryType::IT_CALLINGCARD));
+	childSetValue("check_clothing", (S32) (filter_types & 0x1 << LLInventoryType::IT_WEARABLE));
+	childSetValue("check_gesture", (S32) (filter_types & 0x1 << LLInventoryType::IT_GESTURE));
+	childSetValue("check_landmark", (S32) (filter_types & 0x1 << LLInventoryType::IT_LANDMARK));
+	childSetValue("check_notecard", (S32) (filter_types & 0x1 << LLInventoryType::IT_NOTECARD));
+	childSetValue("check_object", (S32) (filter_types & 0x1 << LLInventoryType::IT_OBJECT));
+	childSetValue("check_script", (S32) (filter_types & 0x1 << LLInventoryType::IT_LSL));
+	childSetValue("check_sound", (S32) (filter_types & 0x1 << LLInventoryType::IT_SOUND));
+	childSetValue("check_texture", (S32) (filter_types & 0x1 << LLInventoryType::IT_TEXTURE));
+	childSetValue("check_snapshot", (S32) (filter_types & 0x1 << LLInventoryType::IT_SNAPSHOT));
+	childSetValue("check_show_empty", show_folders == LLInventoryFilter::SHOW_ALL_FOLDERS);
+	childSetValue("check_since_logoff", mFilter->isSinceLogoff());
+	mSpinSinceHours->set((F32)(hours % 24));
+	mSpinSinceDays->set((F32)(hours / 24));
+}
+
+void LLFloaterInventoryFinder::draw()
+{
+	LLMemType mt(LLMemType::MTYPE_INVENTORY_DRAW);
+	U32 filter = 0xffffffff;
+	BOOL filtered_by_all_types = TRUE;
+
+	if (!childGetValue("check_animation"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_ANIMATION);
+		filtered_by_all_types = FALSE;
+	}
+
+
+	if (!childGetValue("check_calling_card"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_CALLINGCARD);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!childGetValue("check_clothing"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_WEARABLE);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!childGetValue("check_gesture"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_GESTURE);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!childGetValue("check_landmark"))
+
+
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_LANDMARK);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!childGetValue("check_notecard"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_NOTECARD);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!childGetValue("check_object"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_OBJECT);
+		filter &= ~(0x1 << LLInventoryType::IT_ATTACHMENT);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!childGetValue("check_script"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_LSL);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!childGetValue("check_sound"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_SOUND);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!childGetValue("check_texture"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_TEXTURE);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!childGetValue("check_snapshot"))
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_SNAPSHOT);
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!filtered_by_all_types)
+	{
+		// don't include folders in filter, unless I've selected everything
+		filter &= ~(0x1 << LLInventoryType::IT_CATEGORY);
+	}
+
+	// update the panel, panel will update the filter
+	mFloaterInventory->mActivePanel->setShowFolderState(getCheckShowEmpty() ?
+		LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
+	mFloaterInventory->mActivePanel->setFilterTypes(filter);
+	if (getCheckSinceLogoff())
+	{
+		mSpinSinceDays->set(0);
+		mSpinSinceHours->set(0);
+	}
+	U32 days = (U32)mSpinSinceDays->get();
+	U32 hours = (U32)mSpinSinceHours->get();
+	if (hours > 24)
+	{
+		days += hours / 24;
+		hours = (U32)hours % 24;
+		mSpinSinceDays->set((F32)days);
+		mSpinSinceHours->set((F32)hours);
+	}
+	hours += days * 24;
+	mFloaterInventory->mActivePanel->setHoursAgo(hours);
+	mFloaterInventory->mActivePanel->setSinceLogoff(getCheckSinceLogoff());
+	mFloaterInventory->setFilterTextFromFilter();
+
+	LLFloater::draw();
+}
+
+void  LLFloaterInventoryFinder::onClose(bool app_quitting)
+{
+	gSavedSettings.setBOOL("Inventory.ShowFilters", FALSE);
+	// If you want to reset the filter on close, do it here.  This functionality was
+	// hotly debated - Paulm
+#if 0
+	if (mFloaterInventory)
+	{
+		LLFloaterInventory::onResetFilter((void *)mFloaterInventory);
+	}
+#endif
+	destroy();
+}
+
+
+BOOL LLFloaterInventoryFinder::getCheckShowEmpty()
+{
+	return childGetValue("check_show_empty");
+}
+
+BOOL LLFloaterInventoryFinder::getCheckSinceLogoff()
+{
+	return childGetValue("check_since_logoff");
+}
+
+void LLFloaterInventoryFinder::onCloseBtn(void* user_data)
+{
+	LLFloaterInventoryFinder* finderp = (LLFloaterInventoryFinder*)user_data;
+	finderp->closeFloater();
+}
+
+// static
+void LLFloaterInventoryFinder::selectAllTypes(void* user_data)
+{
+	LLFloaterInventoryFinder* self = (LLFloaterInventoryFinder*)user_data;
+	if(!self) return;
+
+	self->childSetValue("check_animation", TRUE);
+	self->childSetValue("check_calling_card", TRUE);
+	self->childSetValue("check_clothing", TRUE);
+	self->childSetValue("check_gesture", TRUE);
+	self->childSetValue("check_landmark", TRUE);
+	self->childSetValue("check_notecard", TRUE);
+	self->childSetValue("check_object", TRUE);
+	self->childSetValue("check_script", TRUE);
+	self->childSetValue("check_sound", TRUE);
+	self->childSetValue("check_texture", TRUE);
+	self->childSetValue("check_snapshot", TRUE);
+
+/*
+	self->mCheckCallingCard->set(TRUE);
+	self->mCheckClothing->set(TRUE);
+	self->mCheckGesture->set(TRUE);
+	self->mCheckLandmark->set(TRUE);
+	self->mCheckNotecard->set(TRUE);
+	self->mCheckObject->set(TRUE);
+	self->mCheckScript->set(TRUE);
+	self->mCheckSound->set(TRUE);
+	self->mCheckTexture->set(TRUE);
+	self->mCheckSnapshot->set(TRUE);*/
+}
+
+//static
+void LLFloaterInventoryFinder::selectNoTypes(void* user_data)
+{
+	LLFloaterInventoryFinder* self = (LLFloaterInventoryFinder*)user_data;
+	if(!self) return;
+
+	/*
+	self->childSetValue("check_animation", FALSE);
+	self->mCheckCallingCard->set(FALSE);
+	self->mCheckClothing->set(FALSE);
+	self->mCheckGesture->set(FALSE);
+	self->mCheckLandmark->set(FALSE);
+	self->mCheckNotecard->set(FALSE);
+	self->mCheckObject->set(FALSE);
+	self->mCheckScript->set(FALSE);
+	self->mCheckSound->set(FALSE);
+	self->mCheckTexture->set(FALSE);
+	self->mCheckSnapshot->set(FALSE);*/
+
+
+	self->childSetValue("check_animation", FALSE);
+	self->childSetValue("check_calling_card", FALSE);
+	self->childSetValue("check_clothing", FALSE);
+	self->childSetValue("check_gesture", FALSE);
+	self->childSetValue("check_landmark", FALSE);
+	self->childSetValue("check_notecard", FALSE);
+	self->childSetValue("check_object", FALSE);
+	self->childSetValue("check_script", FALSE);
+	self->childSetValue("check_sound", FALSE);
+	self->childSetValue("check_texture", FALSE);
+	self->childSetValue("check_snapshot", FALSE);
+}
+
+
+///----------------------------------------------------------------------------
+/// LLFloaterInventory
+///----------------------------------------------------------------------------
+void LLSaveFolderState::setApply(BOOL apply)
+{
+	mApply = apply; 
+	// before generating new list of open folders, clear the old one
+	if(!apply) 
+	{
+		clearOpenFolders(); 
+	}
+}
+
+void LLSaveFolderState::doFolder(LLFolderViewFolder* folder)
+{
+	LLMemType mt(LLMemType::MTYPE_INVENTORY_DO_FOLDER);
+	if(mApply)
+	{
+		// we're applying the open state
+		LLInvFVBridge* bridge = (LLInvFVBridge*)folder->getListener();
+		if(!bridge) return;
+		LLUUID id(bridge->getUUID());
+		if(mOpenFolders.find(id) != mOpenFolders.end())
+		{
+			folder->setOpen(TRUE);
+		}
+		else
+		{
+			// keep selected filter in its current state, this is less jarring to user
+			if (!folder->isSelected())
+			{
+				folder->setOpen(FALSE);
+			}
+		}
+	}
+	else
+	{
+		// we're recording state at this point
+		if(folder->isOpen())
+		{
+			LLInvFVBridge* bridge = (LLInvFVBridge*)folder->getListener();
+			if(!bridge) return;
+			mOpenFolders.insert(bridge->getUUID());
+		}
+	}
+}
+
+LLFloaterInventory::LLFloaterInventory(const LLSD& key)
+	: LLFloater(key)
+{
+	LLMemType mt(LLMemType::MTYPE_INVENTORY_VIEW_INIT);
+	// Menu Callbacks (non contex menus)
+	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLFloaterInventory::doToSelected, this, _2));
+	mCommitCallbackRegistrar.add("Inventory.CloseAllFolders", boost::bind(&LLFloaterInventory::closeAllFolders, this));
+	mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLAssetType::AT_TRASH));
+	mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLAssetType::AT_LOST_AND_FOUND));
+	mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&LLFloaterInventory::doCreate, this, _2));
+	mCommitCallbackRegistrar.add("Inventory.NewWindow", boost::bind(&LLFloaterInventory::newWindow, this));
+	mCommitCallbackRegistrar.add("Inventory.ShowFilters", boost::bind(&LLFloaterInventory::toggleFindOptions, this));
+	mCommitCallbackRegistrar.add("Inventory.ResetFilters", boost::bind(&LLFloaterInventory::resetFilters, this));
+	mCommitCallbackRegistrar.add("Inventory.SetSortBy", boost::bind(&LLFloaterInventory::setSortBy, this, _2));
+
+	// Controls
+	// *TODO: Just use persistant settings for each of these
+	U32 sort_order = gSavedSettings.getU32("InventorySortOrder");
+	BOOL sort_by_name = ! ( sort_order & LLInventoryFilter::SO_DATE );
+	BOOL sort_folders_by_name = ( sort_order & LLInventoryFilter::SO_FOLDERS_BY_NAME );
+	BOOL sort_system_folders_to_top = ( sort_order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP );
+	
+	gSavedSettings.declareBOOL("Inventory.ShowFilters", FALSE, "Declared in code", FALSE);
+	gSavedSettings.declareBOOL("Inventory.SortByName", sort_by_name, "Declared in code", FALSE);
+	gSavedSettings.declareBOOL("Inventory.SortByDate", !sort_by_name, "Declared in code", FALSE);
+	gSavedSettings.declareBOOL("Inventory.FoldersAlwaysByName", sort_folders_by_name, "Declared in code", FALSE);
+	gSavedSettings.declareBOOL("Inventory.SystemFoldersToTop", sort_system_folders_to_top, "Declared in code", FALSE);
+	
+	mSavedFolderState = new LLSaveFolderState();
+	mSavedFolderState->setApply(FALSE);
+
+	//Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory.xml");
+}
+
+BOOL LLFloaterInventory::postBuild()
+{
+	gInventory.addObserver(this);
+	
+	mFilterTabs = getChild<LLTabContainer>("inventory filter tabs");
+	mFilterTabs->setCommitCallback(boost::bind(&LLFloaterInventory::onFilterSelected, this));
+	
+	//panel->getFilter()->markDefault();
+
+	// Set up the default inv. panel/filter settings.
+	mActivePanel = getChild<LLInventoryPanel>("All Items");
+	if (mActivePanel)
+	{
+		// "All Items" is the previous only view, so it gets the InventorySortOrder
+		mActivePanel->setSortOrder(gSavedSettings.getU32("InventorySortOrder"));
+		mActivePanel->getFilter()->markDefault();
+		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
+		mActivePanel->setSelectCallback(boost::bind(&LLInventoryPanel::onSelectionChange, mActivePanel, _1, _2));
+	}
+	LLInventoryPanel* recent_items_panel = getChild<LLInventoryPanel>("Recent Items");
+	if (recent_items_panel)
+	{
+		recent_items_panel->setSinceLogoff(TRUE);
+		recent_items_panel->setSortOrder(LLInventoryFilter::SO_DATE);
+		recent_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
+		recent_items_panel->getFilter()->markDefault();
+		recent_items_panel->setSelectCallback(boost::bind(&LLInventoryPanel::onSelectionChange, recent_items_panel, _1, _2));
+	}
+
+	// Now load the stored settings from disk, if available.
+	std::ostringstream filterSaveName;
+	filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");
+	llinfos << "LLFloaterInventory::init: reading from " << filterSaveName << llendl;
+	llifstream file(filterSaveName.str());
+	LLSD savedFilterState;
+	if (file.is_open())
+	{
+		LLSDSerialize::fromXML(savedFilterState, file);
+		file.close();
+
+		// Load the persistent "Recent Items" settings.
+		// Note that the "All Items" settings do not persist.
+		if(recent_items_panel)
+		{
+			if(savedFilterState.has(recent_items_panel->getFilter()->getName()))
+			{
+				LLSD recent_items = savedFilterState.get(
+					recent_items_panel->getFilter()->getName());
+				recent_items_panel->getFilter()->fromLLSD(recent_items);
+			}
+		}
+
+	}
+
+
+	mSearchEditor = getChild<LLSearchEditor>("inventory search editor");
+	if (mSearchEditor)
+	{
+		mSearchEditor->setSearchCallback(boost::bind(&LLFloaterInventory::onSearchEdit, this, _1));
+	}
+
+	// *TODO:Get the cost info from the server
+	const std::string upload_cost("10");
+	childSetLabelArg("Upload Image", "[COST]", upload_cost);
+	childSetLabelArg("Upload Sound", "[COST]", upload_cost);
+	childSetLabelArg("Upload Animation", "[COST]", upload_cost);
+	childSetLabelArg("Bulk Upload", "[COST]", upload_cost);
+	
+	return TRUE;
+}
+
+// Destroys the object
+LLFloaterInventory::~LLFloaterInventory( void )
+{
+	// Save the filters state.
+	LLSD filterRoot;
+	LLInventoryPanel* all_items_panel = getChild<LLInventoryPanel>("All Items");
+	if (all_items_panel)
+	{
+		LLInventoryFilter* filter = all_items_panel->getFilter();
+		LLSD filterState;
+		filter->toLLSD(filterState);
+		filterRoot[filter->getName()] = filterState;
+	}
+
+	LLInventoryPanel* recent_items_panel = getChild<LLInventoryPanel>("Recent Items");
+	if (recent_items_panel)
+	{
+		LLInventoryFilter* filter = recent_items_panel->getFilter();
+		LLSD filterState;
+		filter->toLLSD(filterState);
+		filterRoot[filter->getName()] = filterState;
+	}
+
+	std::ostringstream filterSaveName;
+	filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");
+	llofstream filtersFile(filterSaveName.str());
+	if(!LLSDSerialize::toPrettyXML(filterRoot, filtersFile))
+	{
+		llwarns << "Could not write to filters save file " << filterSaveName << llendl;
+	}
+	else
+		filtersFile.close();
+
+	gInventory.removeObserver(this);
+	delete mSavedFolderState;
+}
+
+void LLFloaterInventory::draw()
+{
+ 	if (LLInventoryModel::isEverythingFetched())
+	{
+		LLLocale locale(LLLocale::USER_LOCALE);
+		std::ostringstream title;
+		//title << "Inventory";
+		title<<getString("Title");
+		std::string item_count_string;
+		LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount());
+		title << " (" << item_count_string << getString("Items")<<")";
+		//TODO:: Translate mFilterText
+		title << mFilterText;
+		setTitle(title.str());
+	}
+	if (mActivePanel && mSearchEditor)
+	{
+		mSearchEditor->setText(mActivePanel->getFilterSubString());
+	}
+	LLFloater::draw();
+}
+
+void LLOpenFilteredFolders::doItem(LLFolderViewItem *item)
+{
+	if (item->getFiltered())
+	{
+		item->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
+	}
+}
+
+void LLOpenFilteredFolders::doFolder(LLFolderViewFolder* folder)
+{
+	if (folder->getFiltered() && folder->getParentFolder())
+	{
+		folder->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
+	}
+	// if this folder didn't pass the filter, and none of its descendants did
+	else if (!folder->getFiltered() && !folder->hasFilteredDescendants())
+	{
+		folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_NO);
+	}
+}
+
+void LLSelectFirstFilteredItem::doItem(LLFolderViewItem *item)
+{
+	if (item->getFiltered() && !mItemSelected)
+	{
+		item->getRoot()->setSelection(item, FALSE, FALSE);
+		if (item->getParentFolder())
+		{
+			item->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
+		}
+		item->getRoot()->scrollToShowSelection();
+		mItemSelected = TRUE;
+	}
+}
+
+void LLSelectFirstFilteredItem::doFolder(LLFolderViewFolder* folder)
+{
+	if (folder->getFiltered() && !mItemSelected)
+	{
+		folder->getRoot()->setSelection(folder, FALSE, FALSE);
+		if (folder->getParentFolder())
+		{
+			folder->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
+		}
+		folder->getRoot()->scrollToShowSelection();
+		mItemSelected = TRUE;
+	}
+}
+
+void LLOpenFoldersWithSelection::doItem(LLFolderViewItem *item)
+{
+	if (item->getParentFolder() && item->isSelected())
+	{
+		item->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
+	}
+}
+
+void LLOpenFoldersWithSelection::doFolder(LLFolderViewFolder* folder)
+{
+	if (folder->getParentFolder() && folder->isSelected())
+	{
+		folder->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
+	}
+}
+
+void LLFloaterInventory::startSearch()
+{
+	// this forces focus to line editor portion of search editor
+	if (mSearchEditor)
+	{
+		mSearchEditor->focusFirstItem(TRUE);
+	}
+}
+
+// virtual, from LLView
+void LLFloaterInventory::setVisible( BOOL visible )
+{
+	LLFloater::setVisible(visible);
+}
+
+void LLFloaterInventory::onOpen(const LLSD& key)
+{
+	LLFirstUse::useInventory();
+}
+
+// Destroy all but the last floater, which is made invisible.
+void LLFloaterInventory::onClose(bool app_quitting)
+{
+	if (getKey().asInteger() != 0)
+	{
+		destroy();
+	}
+	else
+	{
+		// clear filters, but save user's folder state first
+		if (!mActivePanel->getRootFolder()->isFilterModified())
+		{
+			mSavedFolderState->setApply(FALSE);
+			mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
+		}
+		setVisible(FALSE);
+	}
+}
+
+BOOL LLFloaterInventory::handleKeyHere(KEY key, MASK mask)
+{
+	LLFolderView* root_folder = mActivePanel ? mActivePanel->getRootFolder() : NULL;
+	if (root_folder)
+	{
+		// first check for user accepting current search results
+		if (mSearchEditor 
+			&& mSearchEditor->hasFocus()
+		    && (key == KEY_RETURN 
+		    	|| key == KEY_DOWN)
+		    && mask == MASK_NONE)
+		{
+			// move focus to inventory proper
+			mActivePanel->setFocus(TRUE);
+			root_folder->scrollToShowSelection();
+			return TRUE;
+		}
+
+		if (mActivePanel->hasFocus() && key == KEY_UP)
+		{
+			startSearch();
+		}
+	}
+
+	return LLFloater::handleKeyHere(key, mask);
+
+}
+
+void LLFloaterInventory::changed(U32 mask)
+{
+	std::ostringstream title;
+	//title << "Inventory";
+ 	title<<getString("Title");
+	if (LLInventoryModel::backgroundFetchActive())
+	{
+		LLLocale locale(LLLocale::USER_LOCALE);
+		std::string item_count_string;
+		LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount());
+		title << " ( "<< getString("Fetched") << item_count_string << getString("Items")<<")";
+	}
+	//TODO:: Translate mFilterText
+	title << mFilterText;
+	setTitle(title.str());
+
+}
+
+//static
+LLFloaterInventory* LLFloaterInventory::newInstance()
+{
+	LLMemType mt(LLMemType::MTYPE_INVENTORY_VIEW_SHOW);
+	static S32 inst_count = 1;
+	return LLFloaterReg::getTypedInstance<LLFloaterInventory>("inventory", LLSD(inst_count++));
+}
+
+//----------------------------------------------------------------------------
+// menu callbacks
+
+void LLFloaterInventory::doToSelected(const LLSD& userdata)
+{
+	getPanel()->getRootFolder()->doToSelected(&gInventory, userdata);
+}
+
+void LLFloaterInventory::closeAllFolders()
+{
+	getPanel()->getRootFolder()->closeAllFolders();
+}
+
+void LLFloaterInventory::doCreate(const LLSD& userdata)
+{
+	menu_create_inventory_item(getPanel()->getRootFolder(), NULL, userdata);
+}
+
+void LLFloaterInventory::newWindow()
+{
+	LLFloaterInventory* iv = newInstance();
+	iv->getActivePanel()->setFilterTypes(getActivePanel()->getFilterTypes());
+	iv->getActivePanel()->setFilterSubString(getActivePanel()->getFilterSubString());
+	iv->openFloater();
+
+	// force onscreen
+	gFloaterView->adjustToFitScreen(iv, FALSE);
+}
+
+void LLFloaterInventory::resetFilters()
+{
+	LLFloaterInventoryFinder *finder = getFinder();
+	getActivePanel()->getFilter()->resetDefault();
+	if (finder)
+	{
+		finder->updateElementsFromFilter();
+	}
+
+	setFilterTextFromFilter();
+}
+
+void LLFloaterInventory::setSortBy(const LLSD& userdata)
+{
+	std::string sort_field = userdata.asString();
+	if (sort_field == "name")
+	{
+		U32 order = getActivePanel()->getSortOrder();
+		getActivePanel()->setSortOrder( order & ~LLInventoryFilter::SO_DATE );
+			
+		gSavedSettings.setBOOL("Inventory.SortByName", TRUE );
+		gSavedSettings.setBOOL("Inventory.SortByDate", FALSE );
+	}
+	else if (sort_field == "date")
+	{
+		U32 order = getActivePanel()->getSortOrder();
+		getActivePanel()->setSortOrder( order | LLInventoryFilter::SO_DATE );
+
+		gSavedSettings.setBOOL("Inventory.SortByName", FALSE );
+		gSavedSettings.setBOOL("Inventory.SortByDate", TRUE );
+	}
+	else if (sort_field == "foldersalwaysbyname")
+	{
+		U32 order = getActivePanel()->getSortOrder();
+		if ( order & LLInventoryFilter::SO_FOLDERS_BY_NAME )
+		{
+			order &= ~LLInventoryFilter::SO_FOLDERS_BY_NAME;
+
+			gSavedSettings.setBOOL("Inventory.FoldersAlwaysByName", FALSE );
+		}
+		else
+		{
+			order |= LLInventoryFilter::SO_FOLDERS_BY_NAME;
+
+			gSavedSettings.setBOOL("Inventory.FoldersAlwaysByName", TRUE );
+		}
+		getActivePanel()->setSortOrder( order );
+	}
+	else if (sort_field == "systemfolderstotop")
+	{
+		U32 order = getActivePanel()->getSortOrder();
+		if ( order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP )
+		{
+			order &= ~LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;
+
+			gSavedSettings.setBOOL("Inventory.SystemFoldersToTop", FALSE );
+		}
+		else
+		{
+			order |= LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;
+
+			gSavedSettings.setBOOL("Inventory.SystemFoldersToTop", TRUE );
+		}
+		getActivePanel()->setSortOrder( order );
+	}
+}
+
+//----------------------------------------------------------------------------
+
+// static
+LLFloaterInventory* LLFloaterInventory::showAgentInventory()
+{
+	LLFloaterInventory* iv = NULL;
+	if (!gAgent.cameraMouselook())
+	{
+		iv = LLFloaterReg::showTypedInstance<LLFloaterInventory>("inventory", LLSD());
+	}
+	return iv;
+}
+
+// static
+LLFloaterInventory* LLFloaterInventory::getActiveInventory()
+{
+	LLFloaterInventory* res = NULL;
+	LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+	S32 z_min = S32_MAX;
+	for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
+	{
+		LLFloaterInventory* iv = dynamic_cast<LLFloaterInventory*>(*iter);
+		if (iv)
+		{
+			S32 z_order = gFloaterView->getZOrder(iv);
+			if (z_order < z_min)
+			{
+				res = iv;
+				z_min = z_order;
+			}
+		}
+	}
+	return res;
+}
+
+// static
+void LLFloaterInventory::cleanup()
+{
+	LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+	for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end();)
+	{
+		LLFloaterInventory* iv = dynamic_cast<LLFloaterInventory*>(*iter++);
+		if (iv)
+		{
+			iv->destroy();
+		}
+	}
+}
+
+void LLFloaterInventory::toggleFindOptions()
+{
+	LLMemType mt(LLMemType::MTYPE_INVENTORY_VIEW_TOGGLE);
+	LLFloater *floater = getFinder();
+	if (!floater)
+	{
+		LLFloaterInventoryFinder * finder = new LLFloaterInventoryFinder(this);
+		mFinderHandle = finder->getHandle();
+		finder->openFloater();
+		addDependentFloater(mFinderHandle);
+
+		// start background fetch of folders
+		gInventory.startBackgroundFetch();
+
+		gSavedSettings.setBOOL("Inventory.ShowFilters", TRUE);
+	}
+	else
+	{
+		floater->closeFloater();
+
+		gSavedSettings.setBOOL("Inventory.ShowFilters", FALSE);
+	}
+}
+
+// static
+BOOL LLFloaterInventory::filtersVisible(void* user_data)
+{
+	LLFloaterInventory* self = (LLFloaterInventory*)user_data;
+	if(!self) return FALSE;
+
+	return self->getFinder() != NULL;
+}
+
+void LLFloaterInventory::onClearSearch()
+{
+	LLFloater *finder = getFinder();
+	if (mActivePanel)
+	{
+		mActivePanel->setFilterSubString(LLStringUtil::null);
+		mActivePanel->setFilterTypes(0xffffffff);
+	}
+
+	if (finder)
+	{
+		LLFloaterInventoryFinder::selectAllTypes(finder);
+	}
+
+	// re-open folders that were initially open
+	if (mActivePanel)
+	{
+		mSavedFolderState->setApply(TRUE);
+		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
+		LLOpenFoldersWithSelection opener;
+		mActivePanel->getRootFolder()->applyFunctorRecursively(opener);
+		mActivePanel->getRootFolder()->scrollToShowSelection();
+	}
+}
+
+void LLFloaterInventory::onSearchEdit(const std::string& search_string )
+{
+	if (search_string == "")
+	{
+		onClearSearch();
+	}
+	if (!mActivePanel)
+	{
+		return;
+	}
+
+	gInventory.startBackgroundFetch();
+
+	std::string filter_text = search_string;
+	std::string uppercase_search_string = filter_text;
+	LLStringUtil::toUpper(uppercase_search_string);
+	if (mActivePanel->getFilterSubString().empty() && uppercase_search_string.empty())
+	{
+			// current filter and new filter empty, do nothing
+			return;
+	}
+
+	// save current folder open state if no filter currently applied
+	if (!mActivePanel->getRootFolder()->isFilterModified())
+	{
+		mSavedFolderState->setApply(FALSE);
+		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
+	}
+
+	// set new filter string
+	mActivePanel->setFilterSubString(uppercase_search_string);
+}
+
+
+ //static
+ BOOL LLFloaterInventory::incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward)
+ {
+ 	LLFloaterInventory* active_view = NULL;
+	
+	LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+	for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
+	{
+		LLFloaterInventory* iv = dynamic_cast<LLFloaterInventory*>(*iter);
+		if (iv)
+		{
+			if (gFocusMgr.childHasKeyboardFocus(iv))
+			{
+				active_view = iv;
+				break;
+			}
+ 		}
+ 	}
+
+ 	if (!active_view)
+ 	{
+ 		return FALSE;
+ 	}
+
+ 	std::string search_string(find_text);
+
+ 	if (search_string.empty())
+ 	{
+ 		return FALSE;
+ 	}
+
+ 	if (active_view->mActivePanel &&
+ 		active_view->mActivePanel->getRootFolder()->search(first_item, search_string, backward))
+ 	{
+ 		return TRUE;
+ 	}
+
+ 	return FALSE;
+ }
+
+void LLFloaterInventory::onFilterSelected()
+{
+	// Find my index
+	mActivePanel = (LLInventoryPanel*)childGetVisibleTab("inventory filter tabs");
+
+	if (!mActivePanel)
+	{
+		return;
+	}
+	LLInventoryFilter* filter = mActivePanel->getFilter();
+	LLFloaterInventoryFinder *finder = getFinder();
+	if (finder)
+	{
+		finder->changeFilter(filter);
+	}
+	if (filter->isActive())
+	{
+		// If our filter is active we may be the first thing requiring a fetch so we better start it here.
+		gInventory.startBackgroundFetch();
+	}
+	setFilterTextFromFilter();
+}
+
+BOOL LLFloaterInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+										 EDragAndDropType cargo_type,
+										 void* cargo_data,
+										 EAcceptance* accept,
+										 std::string& tooltip_msg)
+{
+	// Check to see if we are auto scrolling from the last frame
+	LLInventoryPanel* panel = (LLInventoryPanel*)this->getActivePanel();
+	BOOL needsToScroll = panel->getScrollableContainer()->needsToScroll(x, y, LLScrollContainer::VERTICAL);
+	if(mFilterTabs)
+	{
+		if(needsToScroll)
+		{
+			mFilterTabs->startDragAndDropDelayTimer();
+		}
+	}
+	
+	BOOL handled = LLFloater::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+
+	return handled;
+}
+const std::string& get_item_icon_name(LLAssetType::EType asset_type,
+							 LLInventoryType::EType inventory_type,
+							 U32 attachment_point,
+							 BOOL item_is_multi )
+{
+	EInventoryIcon idx = OBJECT_ICON_NAME;
+	if ( item_is_multi )
+	{
+		idx = OBJECT_MULTI_ICON_NAME;
+	}
+	
+	switch(asset_type)
+	{
+	case LLAssetType::AT_TEXTURE:
+		if(LLInventoryType::IT_SNAPSHOT == inventory_type)
+		{
+			idx = SNAPSHOT_ICON_NAME;
+		}
+		else
+		{
+			idx = TEXTURE_ICON_NAME;
+		}
+		break;
+
+	case LLAssetType::AT_SOUND:
+		idx = SOUND_ICON_NAME;
+		break;
+	case LLAssetType::AT_CALLINGCARD:
+		if(attachment_point!= 0)
+		{
+			idx = CALLINGCARD_ONLINE_ICON_NAME;
+		}
+		else
+		{
+			idx = CALLINGCARD_OFFLINE_ICON_NAME;
+		}
+		break;
+	case LLAssetType::AT_LANDMARK:
+		if(attachment_point!= 0)
+		{
+			idx = LANDMARK_VISITED_ICON_NAME;
+		}
+		else
+		{
+			idx = LANDMARK_ICON_NAME;
+		}
+		break;
+	case LLAssetType::AT_SCRIPT:
+	case LLAssetType::AT_LSL_TEXT:
+	case LLAssetType::AT_LSL_BYTECODE:
+		idx = SCRIPT_ICON_NAME;
+		break;
+	case LLAssetType::AT_CLOTHING:
+		idx = CLOTHING_ICON_NAME;
+	case LLAssetType::AT_BODYPART :
+		if(LLAssetType::AT_BODYPART == asset_type)
+		{
+			idx = BODYPART_ICON_NAME;
+		}
+		switch(LLInventoryItem::II_FLAGS_WEARABLES_MASK & attachment_point)
+		{
+		case WT_SHAPE:
+			idx = BODYPART_SHAPE_ICON_NAME;
+			break;
+		case WT_SKIN:
+			idx = BODYPART_SKIN_ICON_NAME;
+			break;
+		case WT_HAIR:
+			idx = BODYPART_HAIR_ICON_NAME;
+			break;
+		case WT_EYES:
+			idx = BODYPART_EYES_ICON_NAME;
+			break;
+		case WT_SHIRT:
+			idx = CLOTHING_SHIRT_ICON_NAME;
+			break;
+		case WT_PANTS:
+			idx = CLOTHING_PANTS_ICON_NAME;
+			break;
+		case WT_SHOES:
+			idx = CLOTHING_SHOES_ICON_NAME;
+			break;
+		case WT_SOCKS:
+			idx = CLOTHING_SOCKS_ICON_NAME;
+			break;
+		case WT_JACKET:
+			idx = CLOTHING_JACKET_ICON_NAME;
+			break;
+		case WT_GLOVES:
+			idx = CLOTHING_GLOVES_ICON_NAME;
+			break;
+		case WT_UNDERSHIRT:
+			idx = CLOTHING_UNDERSHIRT_ICON_NAME;
+			break;
+		case WT_UNDERPANTS:
+			idx = CLOTHING_UNDERPANTS_ICON_NAME;
+			break;
+		case WT_SKIRT:
+			idx = CLOTHING_SKIRT_ICON_NAME;
+			break;
+		case WT_ALPHA:
+			idx = CLOTHING_ALPHA_ICON_NAME;
+			break;
+		case WT_TATTOO:
+			idx = CLOTHING_TATTOO_ICON_NAME;
+			break;
+		default:
+			// no-op, go with choice above
+			break;
+		}
+		break;
+	case LLAssetType::AT_NOTECARD:
+		idx = NOTECARD_ICON_NAME;
+		break;
+	case LLAssetType::AT_ANIMATION:
+		idx = ANIMATION_ICON_NAME;
+		break;
+	case LLAssetType::AT_GESTURE:
+		idx = GESTURE_ICON_NAME;
+		break;
+	case LLAssetType::AT_FAVORITE:
+		//TODO - need bette idx
+		idx = LANDMARK_ICON_NAME;
+		break;
+	default:
+		break;
+	}
+	
+	return ICON_NAME[idx];
+}
+
+LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
+							 LLInventoryType::EType inventory_type,
+							 U32 attachment_point,
+							 BOOL item_is_multi)
+{
+	const std::string& icon_name = get_item_icon_name(asset_type, inventory_type, attachment_point, item_is_multi );
+	return LLUI::getUIImage(icon_name);
+}
+
+const std::string LLInventoryPanel::DEFAULT_SORT_ORDER = std::string("InventorySortOrder");
+const std::string LLInventoryPanel::RECENTITEMS_SORT_ORDER = std::string("RecentItemsSortOrder");
+const std::string LLInventoryPanel::INHERIT_SORT_ORDER = std::string("");
+
+LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p)
+:	LLPanel(p),
+	mInventoryObserver(NULL),
+	mFolders(NULL),
+	mScroller(NULL),
+	mSortOrderSetting(p.sort_order_setting),
+	mInventory(p.inventory),
+	mAllowMultiSelect(p.allow_multi_select)
+{
+	// contex menu callbacks
+	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLInventoryPanel::doToSelected, this, _2));
+	mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLAssetType::AT_TRASH));
+	mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLAssetType::AT_LOST_AND_FOUND));
+	mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&LLInventoryPanel::doCreate, this, _2));
+	mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&LLInventoryPanel::attachObject, this, _2));
+	mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&LLInventoryPanel::beginIMSession, this));
+	
+	setBackgroundColor(LLUIColorTable::instance().getColor("InventoryBackgroundColor"));
+	setBackgroundVisible(TRUE);
+	setBackgroundOpaque(TRUE);
+}
+
+BOOL LLInventoryPanel::postBuild()
+{
+	LLMemType mt(LLMemType::MTYPE_INVENTORY_POST_BUILD);
+
+	mCommitCallbackRegistrar.pushScope(); // registered as a widget; need to push callback scope ourselves
+	
+	// create root folder
+	{
+		LLRect folder_rect(0,
+						   0,
+						   getRect().getWidth(),
+						   0);
+		LLFolderView::Params p;
+		p.name = getName();
+		p.rect = folder_rect;
+		p.parent_panel = this;
+		mFolders = LLUICtrlFactory::create<LLFolderView>(p);
+		mFolders->setAllowMultiSelect(mAllowMultiSelect);
+	}
+
+	mCommitCallbackRegistrar.popScope();
+	
+	mFolders->setCallbackRegistrar(&mCommitCallbackRegistrar);
+	
+	// scroller
+	{
+		LLRect scroller_view_rect = getRect();
+		scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
+		LLScrollContainer::Params p;
+		p.name("Inventory Scroller");
+		p.rect(scroller_view_rect);
+		p.follows.flags(FOLLOWS_ALL);
+		p.reserve_scroll_corner(true);
+		p.tab_stop(true);
+		mScroller = LLUICtrlFactory::create<LLScrollContainer>(p);
+	}
+	addChild(mScroller);
+	mScroller->addChild(mFolders);
+	
+	mFolders->setScrollContainer(mScroller);
+
+	// set up the callbacks from the inventory we're viewing, and then
+	// build everything.
+	mInventoryObserver = new LLInventoryPanelObserver(this);
+	mInventory->addObserver(mInventoryObserver);
+	rebuildViewsFor(LLUUID::null, LLInventoryObserver::ADD);
+
+	// bit of a hack to make sure the inventory is open.
+	mFolders->openFolder(std::string("My Inventory"));
+
+	if (mSortOrderSetting != INHERIT_SORT_ORDER)
+	{
+		setSortOrder(gSavedSettings.getU32(mSortOrderSetting));
+	}
+	else
+	{
+		setSortOrder(gSavedSettings.getU32(DEFAULT_SORT_ORDER));
+	}
+	mFolders->setSortOrder(mFolders->getFilter()->getSortOrder());
+
+	return TRUE;
+}
+
+LLInventoryPanel::~LLInventoryPanel()
+{
+	// should this be a global setting?
+	U32 sort_order = mFolders->getSortOrder();
+	if (mSortOrderSetting != INHERIT_SORT_ORDER)
+	{
+		gSavedSettings.setU32(mSortOrderSetting, sort_order);
+	}
+
+	// LLView destructor will take care of the sub-views.
+	mInventory->removeObserver(mInventoryObserver);
+	delete mInventoryObserver;
+	mScroller = NULL;
+}
+
+	LLMemType mt(LLMemType::MTYPE_INVENTORY_FROM_XML);
+void LLInventoryPanel::draw()
+{
+	// select the desired item (in case it wasn't loaded when the selection was requested)
+	mFolders->updateSelection();
+	LLPanel::draw();
+}
+
+void LLInventoryPanel::setFilterTypes(U32 filter_types)
+{
+	mFolders->getFilter()->setFilterTypes(filter_types);
+}	
+
+void LLInventoryPanel::setFilterPermMask(PermissionMask filter_perm_mask)
+{
+	mFolders->getFilter()->setFilterPermissions(filter_perm_mask);
+}
+
+void LLInventoryPanel::setFilterSubString(const std::string& string)
+{
+	mFolders->getFilter()->setFilterSubString(string);
+}
+
+void LLInventoryPanel::setSortOrder(U32 order)
+{
+	mFolders->getFilter()->setSortOrder(order);
+	if (mFolders->getFilter()->isModified())
+	{
+		mFolders->setSortOrder(order);
+		// try to keep selection onscreen, even if it wasn't to start with
+		mFolders->scrollToShowSelection();
+	}
+}
+
+void LLInventoryPanel::setSinceLogoff(BOOL sl)
+{
+	mFolders->getFilter()->setDateRangeLastLogoff(sl);
+}
+
+void LLInventoryPanel::setHoursAgo(U32 hours)
+{
+	mFolders->getFilter()->setHoursAgo(hours);
+}
+
+void LLInventoryPanel::setShowFolderState(LLInventoryFilter::EFolderShow show)
+{
+	mFolders->getFilter()->setShowFolderState(show);
+}
+
+LLInventoryFilter::EFolderShow LLInventoryPanel::getShowFolderState()
+{
+	return mFolders->getFilter()->getShowFolderState();
+}
+
+void LLInventoryPanel::modelChanged(U32 mask)
+{
+	LLFastTimer t2(LLFastTimer::FTM_REFRESH);
+
+	bool handled = false;
+	if(mask & LLInventoryObserver::LABEL)
+	{
+		handled = true;
+		// label change - empty out the display name for each object
+		// in this change set.
+		const std::set<LLUUID>& changed_items = gInventory.getChangedIDs();
+		std::set<LLUUID>::const_iterator id_it = changed_items.begin();
+		std::set<LLUUID>::const_iterator id_end = changed_items.end();
+		LLFolderViewItem* view = NULL;
+		LLInvFVBridge* bridge = NULL;
+		for (;id_it != id_end; ++id_it)
+		{
+			view = mFolders->getItemByID(*id_it);
+			if(view)
+			{
+				// request refresh on this item (also flags for filtering)
+				bridge = (LLInvFVBridge*)view->getListener();
+				if(bridge)
+				{	// Clear the display name first, so it gets properly re-built during refresh()
+					bridge->clearDisplayName();
+				}
+				view->refresh();
+			}
+		}
+	}
+	if((mask & (LLInventoryObserver::STRUCTURE
+				| LLInventoryObserver::ADD
+				| LLInventoryObserver::REMOVE)) != 0)
+	{
+		handled = true;
+		// Record which folders are open by uuid.
+		LLInventoryModel* model = getModel();
+		if (model)
+		{
+			const std::set<LLUUID>& changed_items = gInventory.getChangedIDs();
+
+			std::set<LLUUID>::const_iterator id_it = changed_items.begin();
+			std::set<LLUUID>::const_iterator id_end = changed_items.end();
+			for (;id_it != id_end; ++id_it)
+			{
+				// sync view with model
+				LLInventoryObject* model_item = model->getObject(*id_it);
+				LLFolderViewItem* view_item = mFolders->getItemByID(*id_it);
+
+				if (model_item)
+				{
+					if (!view_item)
+					{
+						// this object was just created, need to build a view for it
+						if ((mask & LLInventoryObserver::ADD) != LLInventoryObserver::ADD)
+						{
+							llwarns << *id_it << " is in model but not in view, but ADD flag not set" << llendl;
+						}
+						buildNewViews(*id_it);
+						
+						// select any newly created object
+						// that has the auto rename at top of folder
+						// root set
+						if(mFolders->getRoot()->needsAutoRename())
+						{
+							setSelection(*id_it, FALSE);
+						}
+					}
+					else
+					{
+						// this object was probably moved, check its parent
+						if ((mask & LLInventoryObserver::STRUCTURE) != LLInventoryObserver::STRUCTURE)
+						{
+							llwarns << *id_it << " is in model and in view, but STRUCTURE flag not set" << llendl;
+						}
+
+						LLFolderViewFolder* new_parent = (LLFolderViewFolder*)mFolders->getItemByID(model_item->getParentUUID());
+						if (view_item->getParentFolder() != new_parent)
+						{
+							view_item->getParentFolder()->extractItem(view_item);
+							view_item->addToFolder(new_parent, mFolders);
+						}
+					}
+				}
+				else
+				{
+					if (view_item)
+					{
+						if ((mask & LLInventoryObserver::REMOVE) != LLInventoryObserver::REMOVE)
+						{
+							llwarns << *id_it << " is not in model but in view, but REMOVE flag not set" << llendl;
+						}
+						// item in view but not model, need to delete view
+						view_item->destroyView();
+					}
+					else
+					{
+						llwarns << *id_it << "Item does not exist in either view or model, but notification triggered" << llendl;
+					}
+				}
+			}
+		}
+	}
+
+	if (!handled)
+	{
+		// it's a small change that only requires a refresh.
+		// *TODO: figure out a more efficient way to do the refresh
+		// since it is expensive on large inventories
+		mFolders->refresh();
+	}
+}
+
+void LLInventoryPanel::rebuildViewsFor(const LLUUID& id, U32 mask)
+{
+	LLFolderViewItem* old_view = NULL;
+
+	// get old LLFolderViewItem
+	old_view = mFolders->getItemByID(id);
+	if (old_view && id.notNull())
+	{
+		old_view->destroyView();
+	}
+
+	buildNewViews(id);
+}
+
+void LLInventoryPanel::buildNewViews(const LLUUID& id)
+{
+	LLMemType mt(LLMemType::MTYPE_INVENTORY_BUILD_NEW_VIEWS);
+	LLFolderViewItem* itemp = NULL;
+	LLInventoryObject* objectp = gInventory.getObject(id);
+
+	if (objectp)
+	{		
+		if (objectp->getType() <= LLAssetType::AT_NONE ||
+			objectp->getType() >= LLAssetType::AT_COUNT)
+		{
+			llwarns << "LLInventoryPanel::buildNewViews called with objectp->mType == " 
+				<< ((S32) objectp->getType())
+				<< " (shouldn't happen)" << llendl;
+		}
+		else if (objectp->getType() == LLAssetType::AT_CATEGORY) // build new view for category
+		{
+			LLInvFVBridge* new_listener = LLInvFVBridge::createBridge(objectp->getType(),
+													LLInventoryType::IT_CATEGORY,
+													this,
+													objectp->getUUID());
+
+			if (new_listener)
+			{
+				LLFolderViewFolder::Params p;
+				p.name = new_listener->getDisplayName();
+				p.icon = new_listener->getIcon();
+				p.root = mFolders;
+				p.listener = new_listener;
+				LLFolderViewFolder* folderp = LLUICtrlFactory::create<LLFolderViewFolder>(p);
+				
+				folderp->setItemSortOrder(mFolders->getSortOrder());
+				itemp = folderp;
+			}
+		}
+		else // build new view for item
+		{
+			LLInventoryItem* item = (LLInventoryItem*)objectp;
+			LLInvFVBridge* new_listener = LLInvFVBridge::createBridge(
+				item->getType(),
+				item->getInventoryType(),
+				this,
+				item->getUUID(),
+				item->getFlags());
+			if (new_listener)
+			{
+				LLFolderViewItem::Params params;
+				params.name(new_listener->getDisplayName());
+				params.icon(new_listener->getIcon());
+				params.creation_date(new_listener->getCreationDate());
+				params.root(mFolders);
+				params.listener(new_listener);
+				params.rect(LLRect (0, 0, 0, 0));
+				itemp = LLUICtrlFactory::create<LLFolderViewItem> (params);
+			}
+		}
+
+		LLFolderViewFolder* parent_folder = (LLFolderViewFolder*)mFolders->getItemByID(objectp->getParentUUID());
+
+		if (itemp)
+		{
+			if (parent_folder)
+			{
+				itemp->addToFolder(parent_folder, mFolders);
+			}
+			else
+			{
+				llwarns << "Couldn't find parent folder for child " << itemp->getLabel() << llendl;
+				delete itemp;
+			}
+		}
+	}
+	if ((id.isNull() ||
+		(objectp && objectp->getType() == LLAssetType::AT_CATEGORY)))
+	{
+		LLViewerInventoryCategory::cat_array_t* categories;
+		LLViewerInventoryItem::item_array_t* items;
+
+		mInventory->lockDirectDescendentArrays(id, categories, items);
+		if(categories)
+		{
+			S32 count = categories->count();
+			for(S32 i = 0; i < count; ++i)
+			{
+				LLInventoryCategory* cat = categories->get(i);
+				buildNewViews(cat->getUUID());
+			}
+		}
+		if(items)
+		{
+			S32 count = items->count();
+			for(S32 i = 0; i < count; ++i)
+			{
+				LLInventoryItem* item = items->get(i);
+				buildNewViews(item->getUUID());
+			}
+		}
+		mInventory->unlockDirectDescendentArrays(id);
+	}
+}
+
+struct LLConfirmPurgeData
+{
+	LLUUID mID;
+	LLInventoryModel* mModel;
+};
+
+class LLIsNotWorn : public LLInventoryCollectFunctor
+{
+public:
+	LLIsNotWorn() {}
+	virtual ~LLIsNotWorn() {}
+	virtual bool operator()(LLInventoryCategory* cat,
+							LLInventoryItem* item)
+	{
+		return !gAgentWearables.isWearingItem(item->getUUID());
+	}
+};
+
+class LLOpenFolderByID : public LLFolderViewFunctor
+{
+public:
+	LLOpenFolderByID(const LLUUID& id) : mID(id) {}
+	virtual ~LLOpenFolderByID() {}
+	virtual void doFolder(LLFolderViewFolder* folder)
+		{
+			if (folder->getListener() && folder->getListener()->getUUID() == mID) folder->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
+		}
+	virtual void doItem(LLFolderViewItem* item) {}
+protected:
+	const LLUUID& mID;
+};
+
+
+void LLInventoryPanel::openSelected()
+{
+	LLFolderViewItem* folder_item = mFolders->getCurSelectedItem();
+	if(!folder_item) return;
+	LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getListener();
+	if(!bridge) return;
+	bridge->openItem();
+}
+
+BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask)
+{
+	BOOL handled = LLView::handleHover(x, y, mask);
+	if(handled)
+	{
+		ECursorType cursor = getWindow()->getCursor();
+		if (LLInventoryModel::backgroundFetchActive() && cursor == UI_CURSOR_ARROW)
+		{
+			// replace arrow cursor with arrow and hourglass cursor
+			getWindow()->setCursor(UI_CURSOR_WORKING);
+		}
+	}
+	else
+	{
+		getWindow()->setCursor(UI_CURSOR_ARROW);
+	}
+	return TRUE;
+}
+
+BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+								   EDragAndDropType cargo_type,
+								   void* cargo_data,
+								   EAcceptance* accept,
+								   std::string& tooltip_msg)
+{
+
+	BOOL handled = LLPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+
+	if (handled)
+	{
+		mFolders->setDragAndDropThisFrame();
+	}
+
+	return handled;
+}
+
+void LLInventoryPanel::onFocusLost()
+{
+	// inventory no longer handles cut/copy/paste/delete
+	if (LLEditMenuHandler::gEditMenuHandler == mFolders)
+	{
+		LLEditMenuHandler::gEditMenuHandler = NULL;
+	}
+
+	LLPanel::onFocusLost();
+}
+
+void LLInventoryPanel::onFocusReceived()
+{
+	// inventory now handles cut/copy/paste/delete
+	LLEditMenuHandler::gEditMenuHandler = mFolders;
+
+	LLPanel::onFocusReceived();
+}
+
+
+void LLInventoryPanel::openAllFolders()
+{
+	mFolders->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN);
+	mFolders->arrangeAll();
+}
+
+void LLInventoryPanel::openDefaultFolderForType(LLAssetType::EType type)
+{
+	LLUUID category_id = mInventory->findCategoryUUIDForType(type);
+	LLOpenFolderByID opener(category_id);
+	mFolders->applyFunctorRecursively(opener);
+}
+
+void LLInventoryPanel::setSelection(const LLUUID& obj_id, BOOL take_keyboard_focus)
+{
+	mFolders->setSelectionByID(obj_id, take_keyboard_focus);
+}
+
+void LLInventoryPanel::clearSelection()
+{
+	mFolders->clearSelection();
+}
+
+void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& items, BOOL user_action)
+{
+	LLFolderView* fv = getRootFolder();
+	if (fv->needsAutoRename()) // auto-selecting a new user-created asset and preparing to rename
+	{
+		fv->setNeedsAutoRename(FALSE);
+		if (items.size()) // new asset is visible and selected
+		{
+			fv->startRenamingSelectedItem();
+		}
+	}
+}
+
+//----------------------------------------------------------------------------
+
+void LLInventoryPanel::doToSelected(const LLSD& userdata)
+{
+	mFolders->doToSelected(&gInventory, userdata);
+}
+
+void LLInventoryPanel::doCreate(const LLSD& userdata)
+{
+	menu_create_inventory_item(mFolders, LLFolderBridge::sSelf, userdata);
+}
+
+bool LLInventoryPanel::beginIMSession()
+{
+	std::set<LLUUID> selected_items;
+	mFolders->getSelectionList(selected_items);
+
+	std::string name;
+	static int session_num = 1;
+
+	LLDynamicArray<LLUUID> members;
+	EInstantMessage type = IM_SESSION_CONFERENCE_START;
+
+	std::set<LLUUID>::const_iterator iter;
+	for (iter = selected_items.begin(); iter != selected_items.end(); iter++)
+	{
+
+		LLUUID item = *iter;
+		LLFolderViewItem* folder_item = mFolders->getItemByID(item);
+			
+		if(folder_item) 
+		{
+			LLFolderViewEventListener* fve_listener = folder_item->getListener();
+			if (fve_listener && (fve_listener->getInventoryType() == LLInventoryType::IT_CATEGORY))
+			{
+
+				LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getListener();
+				if(!bridge) return true;
+				LLViewerInventoryCategory* cat = bridge->getCategory();
+				if(!cat) return true;
+				name = cat->getName();
+				LLUniqueBuddyCollector is_buddy;
+				LLInventoryModel::cat_array_t cat_array;
+				LLInventoryModel::item_array_t item_array;
+				gInventory.collectDescendentsIf(bridge->getUUID(),
+												cat_array,
+												item_array,
+												LLInventoryModel::EXCLUDE_TRASH,
+												is_buddy);
+				S32 count = item_array.count();
+				if(count > 0)
+				{
+					LLFloaterReg::showInstance("communicate");
+					// create the session
+					LLAvatarTracker& at = LLAvatarTracker::instance();
+					LLUUID id;
+					for(S32 i = 0; i < count; ++i)
+					{
+						id = item_array.get(i)->getCreatorUUID();
+						if(at.isBuddyOnline(id))
+						{
+							members.put(id);
+						}
+					}
+				}
+			}
+			else
+			{
+				LLFolderViewItem* folder_item = mFolders->getItemByID(item);
+				if(!folder_item) return true;
+				LLInvFVBridge* listenerp = (LLInvFVBridge*)folder_item->getListener();
+
+				if (listenerp->getInventoryType() == LLInventoryType::IT_CALLINGCARD)
+				{
+					LLInventoryItem* inv_item = gInventory.getItem(listenerp->getUUID());
+
+					if (inv_item)
+					{
+						LLAvatarTracker& at = LLAvatarTracker::instance();
+						LLUUID id = inv_item->getCreatorUUID();
+
+						if(at.isBuddyOnline(id))
+						{
+							members.put(id);
+						}
+					}
+				} //if IT_CALLINGCARD
+			} //if !IT_CATEGORY
+		}
+	} //for selected_items	
+
+	// the session_id is randomly generated UUID which will be replaced later
+	// with a server side generated number
+
+	if (name.empty())
+	{
+		name = llformat("Session %d", session_num++);
+	}
+
+	gIMMgr->addSession(name, type, members[0], members);
+		
+	return true;
+}
+
+bool LLInventoryPanel::attachObject(const LLSD& userdata)
+{
+	std::set<LLUUID> selected_items;
+	mFolders->getSelectionList(selected_items);
+	LLUUID id = *selected_items.begin();
+
+	std::string joint_name = userdata.asString();
+	LLVOAvatar *avatarp = static_cast<LLVOAvatar*>(gAgent.getAvatarObject());
+	LLViewerJointAttachment* attachmentp = NULL;
+	for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); 
+		 iter != avatarp->mAttachmentPoints.end(); )
+	{
+		LLVOAvatar::attachment_map_t::iterator curiter = iter++;
+		LLViewerJointAttachment* attachment = curiter->second;
+		if (attachment->getName() == joint_name)
+		{
+			attachmentp = attachment;
+			break;
+		}
+	}
+	if (attachmentp == NULL)
+	{
+		return true;
+	}
+	LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem(id);
+
+	if(item && gInventory.isObjectDescendentOf(id, gInventory.getRootFolderID()))
+	{
+		rez_attachment(item, attachmentp);
+	}
+	else if(item && item->isComplete())
+	{
+		// must be in library. copy it to our inventory and put it on.
+		LLPointer<LLInventoryCallback> cb = new RezAttachmentCallback(attachmentp);
+		copy_inventory_item(gAgent.getID(),
+							item->getPermissions().getOwner(),
+							item->getUUID(),
+							LLUUID::null,
+							std::string(),
+							cb);
+	}
+	gFocusMgr.setKeyboardFocus(NULL);
+
+	return true;
+}
+
+
+//----------------------------------------------------------------------------
+
+// static DEBUG ONLY:
+void LLInventoryPanel::dumpSelectionInformation(void* user_data)
+{
+	LLInventoryPanel* iv = (LLInventoryPanel*)user_data;
+	iv->mFolders->dumpSelectionInformation();
+}
+
+BOOL LLInventoryPanel::getSinceLogoff()
+{
+	return mFolders->getFilter()->isSinceLogoff();
+}
+
+void example_param_block_usage()
+{
+	LLInventoryPanel::Params param_block;
+	param_block.name(std::string("inventory"));
+
+	param_block.sort_order_setting(LLInventoryPanel::RECENTITEMS_SORT_ORDER);
+	param_block.allow_multi_select(true);
+	param_block.filter(LLInventoryPanel::Filter()
+			.sort_order(1)
+			.types(0xffff0000));
+	param_block.inventory(&gInventory);
+	param_block.has_border(true);
+
+	LLUICtrlFactory::create<LLInventoryPanel>(param_block);
+
+	param_block = LLInventoryPanel::Params();
+	param_block.name(std::string("inventory"));
+
+	//LLSD param_block_sd;
+	//param_block_sd["sort_order_setting"] = LLInventoryPanel::RECENTITEMS_SORT_ORDER;
+	//param_block_sd["allow_multi_select"] = true;
+	//param_block_sd["filter"]["sort_order"] = 1;
+	//param_block_sd["filter"]["types"] = (S32)0xffff0000;
+	//param_block_sd["has_border"] = true;
+
+	//LLInitParam::LLSDParser(param_block_sd).parse(param_block);
+
+	LLUICtrlFactory::create<LLInventoryPanel>(param_block);
+}
diff --git a/indra/newview/llfloaterinventory.h b/indra/newview/llfloaterinventory.h
new file mode 100644
index 0000000000..cd60407507
--- /dev/null
+++ b/indra/newview/llfloaterinventory.h
@@ -0,0 +1,369 @@
+/** 
+ * @file llfloaterinventory.h
+ * @brief LLFloaterInventory, LLInventoryFolder, and LLInventoryItem
+ * class definition
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLINVENTORYVIEW_H
+#define LL_LLINVENTORYVIEW_H
+
+#include "llassetstorage.h"
+#include "lldarray.h"
+#include "llfloater.h"
+#include "llinventory.h"
+#include "llinventoryfilter.h"
+#include "llfolderview.h"
+#include "llinventorymodel.h"
+#include "lluictrlfactory.h"
+#include <set>
+
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLFloaterInventory
+//
+// This is the agent inventory _floater_.
+// It deals with the buttons and views used to navigate as
+// well as controls the behavior of the overall object.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLFolderViewItem;
+class LLInventoryFilter;
+class LLInventoryModel;
+class LLInvFVBridge;
+class LLMenuBarGL;
+class LLCheckBoxCtrl;
+class LLSpinCtrl;
+class LLScrollContainer;
+class LLTextBox;
+class LLIconCtrl;
+class LLSaveFolderState;
+class LLSearchEditor;
+class LLTabContainer;
+
+class LLInventoryPanel : public LLPanel
+{
+public:
+	static const std::string DEFAULT_SORT_ORDER;
+	static const std::string RECENTITEMS_SORT_ORDER;
+	static const std::string INHERIT_SORT_ORDER;
+
+	struct Filter : public LLInitParam::Block<Filter>
+	{
+		Optional<U32>			sort_order;
+		Optional<U32>			types;
+		Optional<std::string>	search_string;
+
+		Filter()
+		:	sort_order("sort_order"),
+			types("types", 0xffffffff),
+			search_string("search_string")
+		{}
+	};
+
+	struct Params 
+	:	public LLInitParam::Block<Params, LLPanel::Params>
+	{
+		Optional<std::string>				sort_order_setting;
+		Optional<LLInventoryModel*>			inventory;
+		Optional<bool>						allow_multi_select;
+		Optional<Filter>					filter;
+
+		Params()
+		:	sort_order_setting("sort_order_setting"),
+			inventory("", &gInventory),
+			allow_multi_select("allow_multi_select", true),
+			filter("filter")
+		{}
+	};
+
+protected:
+	LLInventoryPanel(const Params&);
+	friend class LLUICtrlFactory;
+
+public:
+	~LLInventoryPanel();
+
+	LLInventoryModel* getModel() { return mInventory; }
+
+	BOOL postBuild();
+
+	// LLView methods
+	void draw();
+	BOOL handleHover(S32 x, S32 y, MASK mask);
+	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+								   EDragAndDropType cargo_type,
+								   void* cargo_data,
+								   EAcceptance* accept,
+								   std::string& tooltip_msg);
+	// LLUICtrl methods
+	 /*virtual*/ void onFocusLost();
+	 /*virtual*/ void onFocusReceived();
+
+	// Call this method to set the selection.
+	void openAllFolders();
+	void openDefaultFolderForType(LLAssetType::EType);
+	void setSelection(const LLUUID& obj_id, BOOL take_keyboard_focus);
+	void setSelectCallback(const LLFolderView::signal_t::slot_type& cb) { if (mFolders) mFolders->setSelectCallback(cb); }
+	void clearSelection();
+	LLInventoryFilter* getFilter() { return mFolders->getFilter(); }
+	void setFilterTypes(U32 filter);
+	U32 getFilterTypes() const { return mFolders->getFilterTypes(); }
+	void setFilterPermMask(PermissionMask filter_perm_mask);
+	U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); }
+	void setFilterSubString(const std::string& string);
+	const std::string getFilterSubString() { return mFolders->getFilterSubString(); }
+	void setSortOrder(U32 order);
+	U32 getSortOrder() { return mFolders->getSortOrder(); }
+	void setSinceLogoff(BOOL sl);
+	void setHoursAgo(U32 hours);
+	BOOL getSinceLogoff();
+	
+	void setShowFolderState(LLInventoryFilter::EFolderShow show);
+	LLInventoryFilter::EFolderShow getShowFolderState();
+	void setAllowMultiSelect(BOOL allow) { mFolders->setAllowMultiSelect(allow); }
+	// This method is called when something has changed about the inventory.
+	void modelChanged(U32 mask);
+	LLFolderView* getRootFolder() { return mFolders; }
+	LLScrollContainer* getScrollableContainer() { return mScroller; }
+	
+	void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
+	
+	// Callbacks
+	void doToSelected(const LLSD& userdata);
+	void doCreate(const LLSD& userdata);
+	bool beginIMSession();
+	bool attachObject(const LLSD& userdata);
+	
+	// DEBUG ONLY:
+	static void dumpSelectionInformation(void* user_data);
+
+	void openSelected();
+	void unSelectAll()	{ mFolders->setSelection(NULL, FALSE, FALSE); }
+	
+protected:
+	// Given the id and the parent, build all of the folder views.
+	void rebuildViewsFor(const LLUUID& id, U32 mask);
+	void buildNewViews(const LLUUID& id);
+
+protected:
+	LLInventoryModel*			mInventory;
+	LLInventoryObserver*		mInventoryObserver;
+	LLFolderView*				mFolders;
+	LLScrollContainer*			mScroller;
+	BOOL 						mAllowMultiSelect;
+	std::string					mSortOrderSetting;
+};
+
+class LLFloaterInventory;
+
+class LLFloaterInventoryFinder : public LLFloater
+{
+public:
+	LLFloaterInventoryFinder( LLFloaterInventory* inventory_view);
+	virtual void draw();
+	virtual void onClose(bool app_quitting);
+	/*virtual*/	BOOL	postBuild();
+	void changeFilter(LLInventoryFilter* filter);
+	void updateElementsFromFilter();
+	BOOL getCheckShowEmpty();
+	BOOL getCheckSinceLogoff();
+
+	static void onTimeAgo(LLUICtrl*, void *);
+	static void onCheckSinceLogoff(LLUICtrl*, void *);
+	static void onCloseBtn(void* user_data);
+	static void selectAllTypes(void* user_data);
+	static void selectNoTypes(void* user_data);
+
+protected:
+	LLFloaterInventory*	mFloaterInventory;
+	LLSpinCtrl*			mSpinSinceDays;
+	LLSpinCtrl*			mSpinSinceHours;
+	LLInventoryFilter*	mFilter;
+};
+
+class LLFloaterInventory : public LLFloater, LLInventoryObserver
+{
+friend class LLFloaterInventoryFinder;
+
+public:
+	LLFloaterInventory(const LLSD& key);
+	~LLFloaterInventory();
+
+	/*virtual*/ void changed(U32 mask);
+
+	 BOOL postBuild();
+
+	//
+	// Misc functions
+	//
+	void setFilterTextFromFilter() { mFilterText = mActivePanel->getFilter()->getFilterText(); }
+	void startSearch();
+	
+	// Spawn a new inventory view
+	static LLFloaterInventory* newInstance();
+	
+	// This method makes sure that an inventory view exists, is
+	// visible, and has focus. The view chosen is returned.
+	static LLFloaterInventory* showAgentInventory();
+
+	// Return the active inventory view if there is one. Active is
+	// defined as the inventory that is the closest to the front, and
+	// is visible.
+	static LLFloaterInventory* getActiveInventory();
+
+	// This method calls showAgentInventory() if no views are visible,
+	// or hides/destroyes them all if any are visible.
+	static void toggleVisibility();
+	static void toggleVisibility(void*) { toggleVisibility(); }
+
+	// Final cleanup, destroy all open inventory views.
+	static void cleanup();
+
+	// LLView & LLFloater functionality
+	virtual void onOpen(const LLSD& key);
+	virtual void onClose(bool app_quitting);
+	virtual void setVisible(BOOL visible);
+	virtual void draw();
+	virtual BOOL handleKeyHere(KEY key, MASK mask);
+
+	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+		EDragAndDropType cargo_type,
+		void* cargo_data,
+		EAcceptance* accept,
+		std::string& tooltip_msg);
+
+
+	LLInventoryPanel* getPanel() { return mActivePanel; }
+	LLInventoryPanel* getActivePanel() { return mActivePanel; }
+
+	static BOOL filtersVisible(void* user_data);
+	void onClearSearch();
+	static void onFoldersByName(void *user_data);
+	static BOOL checkFoldersByName(void *user_data);
+	void onSearchEdit(const std::string& search_string );
+	static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward);
+	void onFilterSelected();
+
+	const std::string getFilterSubString() { return mActivePanel->getFilterSubString(); }
+	void setFilterSubString(const std::string& string) { mActivePanel->setFilterSubString(string); }
+	
+	// menu callbacks
+	void doToSelected(const LLSD& userdata);
+	void closeAllFolders();
+	void doCreate(const LLSD& userdata);
+	void newWindow();
+	void resetFilters();
+	void setSortBy(const LLSD& userdata);
+	
+	// HACK: Until we can route this info through the instant message hierarchy
+	static BOOL sWearNewClothing;
+	static LLUUID sWearNewClothingTransactionID;	// wear all clothing in this transaction
+
+	void toggleFindOptions();
+
+	LLFloaterInventoryFinder* getFinder() { return (LLFloaterInventoryFinder*)mFinderHandle.get(); }
+
+protected:
+	LLSearchEditor*				mSearchEditor;
+	LLTabContainer*				mFilterTabs;
+	LLHandle<LLFloater>			mFinderHandle;
+	LLInventoryPanel*			mActivePanel;
+	LLSaveFolderState*			mSavedFolderState;
+
+	std::string					mFilterText;
+};
+
+class LLSelectFirstFilteredItem : public LLFolderViewFunctor
+{
+public:
+	LLSelectFirstFilteredItem() : mItemSelected(FALSE) {}
+	virtual ~LLSelectFirstFilteredItem() {}
+	virtual void doFolder(LLFolderViewFolder* folder);
+	virtual void doItem(LLFolderViewItem* item);
+	BOOL wasItemSelected() { return mItemSelected; }
+protected:
+	BOOL	mItemSelected;
+};
+
+class LLOpenFilteredFolders : public LLFolderViewFunctor
+{
+public:
+	LLOpenFilteredFolders()  {}
+	virtual ~LLOpenFilteredFolders() {}
+	virtual void doFolder(LLFolderViewFolder* folder);
+	virtual void doItem(LLFolderViewItem* item);
+};
+
+class LLSaveFolderState : public LLFolderViewFunctor
+{
+public:
+	LLSaveFolderState() : mApply(FALSE) {}
+	virtual ~LLSaveFolderState() {}
+	virtual void doFolder(LLFolderViewFolder* folder);
+	virtual void doItem(LLFolderViewItem* item) {}
+	void setApply(BOOL apply);
+	void clearOpenFolders() { mOpenFolders.clear(); }
+protected:
+	std::set<LLUUID> mOpenFolders;
+	BOOL mApply;
+};
+
+class LLOpenFoldersWithSelection : public LLFolderViewFunctor
+{
+public:
+	LLOpenFoldersWithSelection() {}
+	virtual ~LLOpenFoldersWithSelection() {}
+	virtual void doFolder(LLFolderViewFolder* folder);
+	virtual void doItem(LLFolderViewItem* item);
+};
+
+///----------------------------------------------------------------------------
+/// Function declarations, constants, enums, and typedefs
+///----------------------------------------------------------------------------
+
+// useful functions with the inventory view
+
+class LLInventoryCategory;
+class LLInventoryItem;
+
+const std::string& get_item_icon_name(LLAssetType::EType asset_type,
+							 LLInventoryType::EType inventory_type,
+							 U32 attachment_point, 
+							 BOOL item_is_multi );
+
+LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
+							 LLInventoryType::EType inventory_type,
+							 U32 attachment_point, 
+							 BOOL item_is_multi );
+
+#endif // LL_LLINVENTORYVIEW_H
+
+
+
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp
index c73218cd0f..06fe2a84c8 100644
--- a/indra/newview/llfloaterjoystick.cpp
+++ b/indra/newview/llfloaterjoystick.cpp
@@ -48,7 +48,7 @@
 #include "llcheckboxctrl.h"
 
 LLFloaterJoystick::LLFloaterJoystick(const LLSD& data)
-	: LLFloater()
+	: LLFloater(data)
 {
 	//Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_joystick.xml");
 
diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h
index 9c66b3a895..f3559c28e9 100644
--- a/indra/newview/llfloaterjoystick.h
+++ b/indra/newview/llfloaterjoystick.h
@@ -38,11 +38,11 @@
 
 class LLCheckBoxCtrl;
 
-class LLFloaterJoystick : public LLFloater, public LLFloaterSingleton<LLFloaterJoystick >
+class LLFloaterJoystick : public LLFloater
 {
+	friend class LLFloaterReg;
+
 public:
-	LLFloaterJoystick(const LLSD& data);
-	virtual ~LLFloaterJoystick();
 
 	virtual BOOL postBuild();
 	virtual void refresh();
@@ -52,6 +52,10 @@ public:
 	static  void setSNDefaults();
 
 private:
+
+	LLFloaterJoystick(const LLSD& data);
+	virtual ~LLFloaterJoystick();
+	
 	static void onCommitJoystickEnabled(LLUICtrl*, void*);
 	static void onClickRestoreSNDefaults(void*);
 	static void onClickCancel(void*);
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp
index 82deaef4a9..262102b820 100644
--- a/indra/newview/llfloaterlagmeter.cpp
+++ b/indra/newview/llfloaterlagmeter.cpp
@@ -51,7 +51,7 @@ const std::string LAG_WARNING_IMAGE_NAME  = "lag_status_warning.tga";
 const std::string LAG_GOOD_IMAGE_NAME     = "lag_status_good.tga";
 
 LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
-	:	LLFloater()
+	:	LLFloater(key)
 {
 //	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_lagmeter.xml");
 	mCommitCallbackRegistrar.add("LagMeter.ClickShrink",  boost::bind(&LLFloaterLagMeter::onClickShrink, this));	
diff --git a/indra/newview/llfloaterlagmeter.h b/indra/newview/llfloaterlagmeter.h
index 6d2086839e..592630636a 100644
--- a/indra/newview/llfloaterlagmeter.h
+++ b/indra/newview/llfloaterlagmeter.h
@@ -37,18 +37,17 @@
 
 class LLTextBox;
 
-class LLFloaterLagMeter : public LLFloater, public LLFloaterSingleton<LLFloaterLagMeter>
+class LLFloaterLagMeter : public LLFloater
 {
-	friend class LLUISingleton<LLFloaterLagMeter, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 	
 public:
-	LLFloaterLagMeter(const LLSD& key);
-	/*virtual*/ ~LLFloaterLagMeter();
-
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL postBuild();	
 private:
-
+	
+	LLFloaterLagMeter(const LLSD& key);
+	/*virtual*/ ~LLFloaterLagMeter();
 	void determineClient();
 	void determineNetwork();
 	void determineServer();
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index f3275913e4..039873691d 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -149,23 +149,50 @@ void send_parcel_select_objects(S32 parcel_local_id, S32 return_type,
 //static
 LLPanelLandObjects* LLFloaterLand::getCurrentPanelLandObjects()
 {
-	return LLFloaterLand::getInstance()->mPanelObjects;
+	LLFloaterLand* land_instance = LLFloaterReg::getTypedInstance<LLFloaterLand>("about_land");
+	if(land_instance)
+	{
+		return land_instance->mPanelObjects;
+	}
+	else
+	{
+		return NULL;
+	}
 }
 
 //static
 LLPanelLandCovenant* LLFloaterLand::getCurrentPanelLandCovenant()
 {
-	return LLFloaterLand::getInstance()->mPanelCovenant;
+	LLFloaterLand* land_instance = LLFloaterReg::getTypedInstance<LLFloaterLand>("about_land");
+	if(land_instance)
+	{
+		return land_instance->mPanelCovenant;
+	}
+	else
+	{
+		return NULL;
+	}
 }
 
 // static
 void LLFloaterLand::refreshAll()
 {
-	LLFloaterLand::getInstance()->refresh();
+	LLFloaterLand* land_instance = LLFloaterReg::getTypedInstance<LLFloaterLand>("about_land");
+	if(land_instance)
+	{
+		land_instance->refresh();
+	}
 }
 
 void LLFloaterLand::onOpen(const LLSD& key)
 {
+	// moved from triggering show instance in llviwermenu.cpp
+	
+	if (LLViewerParcelMgr::getInstance()->selectionEmpty())
+	{
+		LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
+	}
+	
 	// Done automatically when the selected parcel's properties arrive
 	// (and hence we have the local id).
 	// LLViewerParcelMgr::getInstance()->sendParcelAccessListRequest(AL_ACCESS | AL_BAN | AL_RENTER);
@@ -196,7 +223,7 @@ void LLFloaterLand::onClose(bool app_quitting)
 
 
 LLFloaterLand::LLFloaterLand(const LLSD& seed)
-:	LLFloater()
+:	LLFloater(seed)
 {
 	mFactoryMap["land_general_panel"] = LLCallbackMap(createPanelLandGeneral, this);
 	mFactoryMap["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this);
@@ -205,7 +232,7 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed)
 	mFactoryMap["land_media_panel"] =	LLCallbackMap(createPanelLandMedia, this);
 	mFactoryMap["land_access_panel"] =	LLCallbackMap(createPanelLandAccess, this);
 
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about_land.xml", false);
+	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about_land.xml", false);
 
 	sObserver = new LLParcelSelectionObserver();
 	LLViewerParcelMgr::getInstance()->addObserver( sObserver );
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 74c1205e1f..ee49da3f05 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -71,9 +71,9 @@ class LLPanelLandRenters;
 class LLPanelLandCovenant;
 
 class LLFloaterLand
-:	public LLFloater, public LLFloaterSingleton<LLFloaterLand>
+:	public LLFloater
 {
-	friend class LLUISingleton<LLFloaterLand, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 public:
 	static void refreshAll();
 
@@ -85,13 +85,14 @@ public:
 	virtual void onOpen(const LLSD& key);
 	virtual BOOL postBuild();
 
-protected:
-
+private:
 	// Does its own instance management, so clients not allowed
 	// to allocate or destroy.
 	LLFloaterLand(const LLSD& seed);
 	virtual ~LLFloaterLand();
 
+protected:
+
 	/*virtual*/ void refresh();
 
 	static void* createPanelLandGeneral(void* data);
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp
index 223cca50b2..fbefd40c60 100644
--- a/indra/newview/llfloaterlandholdings.cpp
+++ b/indra/newview/llfloaterlandholdings.cpp
@@ -292,15 +292,16 @@ void LLFloaterLandHoldings::buttonCore(S32 which)
 	F64 global_z = gAgent.getPositionGlobal().mdV[VZ];
 
 	LLVector3d pos_global(global_x, global_y, global_z);
+	LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance();
 
 	switch(which)
 	{
 	case 0:
 		gAgent.teleportViaLocation(pos_global);
-		LLFloaterWorldMap::getInstance()->trackLocation(pos_global);
+		if(floater_world_map) floater_world_map->trackLocation(pos_global);
 		break;
 	case 1:
-		LLFloaterWorldMap::getInstance()->trackLocation(pos_global);
+		if(floater_world_map) floater_world_map->trackLocation(pos_global);
 		LLFloaterReg::showInstance("world_map", "center");
 		break;
 	default:
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index 6660650c56..f9fc467c05 100644
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -94,7 +94,7 @@ BOOL LLFloaterMap::postBuild()
 	registrar.add("Minimap.Zoom", boost::bind(&LLFloaterMap::handleZoom, this, _2));
 	registrar.add("Minimap.Tracker", boost::bind(&LLFloaterMap::handleStopTracking, this, _2));
 
-	mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_minimap.xml", gMenuHolder);
+	mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_minimap.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	if (mPopupMenu && !LLTracker::isTracking(0))
 	{
 		mPopupMenu->setItemEnabled ("Stop Tracking", false);
diff --git a/indra/newview/llfloatermemleak.cpp b/indra/newview/llfloatermemleak.cpp
index 3f2fcc26db..529bd68e03 100644
--- a/indra/newview/llfloatermemleak.cpp
+++ b/indra/newview/llfloatermemleak.cpp
@@ -42,26 +42,56 @@
 #include "llmath.h"
 #include "llviewerwindow.h"
 
-LLFloaterMemLeak* LLFloaterMemLeak::sInstance = NULL;
 U32 LLFloaterMemLeak::sMemLeakingSpeed = 0 ; //bytes leaked per frame
 U32 LLFloaterMemLeak::sMaxLeakedMem = 0 ; //maximum allowed leaked memory
 U32 LLFloaterMemLeak::sTotalLeaked = 0 ;
 S32 LLFloaterMemLeak::sStatus = LLFloaterMemLeak::STOP ;
 BOOL LLFloaterMemLeak::sbAllocationFailed = FALSE ;
 
-LLFloaterMemLeak::LLFloaterMemLeak()
-	: LLFloater()
+LLFloaterMemLeak::LLFloaterMemLeak(const LLSD& key)
+	: LLFloater(key)
 {
 	setTitle("Memory Leaking Simulation Floater");
+	mCommitCallbackRegistrar.add("MemLeak.ChangeLeakingSpeed",	boost::bind(&LLFloaterMemLeak::onChangeLeakingSpeed, this));
+	mCommitCallbackRegistrar.add("MemLeak.ChangeMaxMemLeaking",	boost::bind(&LLFloaterMemLeak::onChangeMaxMemLeaking, this));
+	mCommitCallbackRegistrar.add("MemLeak.Start",	boost::bind(&LLFloaterMemLeak::onClickStart, this));
+	mCommitCallbackRegistrar.add("MemLeak.Stop",	boost::bind(&LLFloaterMemLeak::onClickStop, this));
+	mCommitCallbackRegistrar.add("MemLeak.Release",	boost::bind(&LLFloaterMemLeak::onClickRelease, this));
+	mCommitCallbackRegistrar.add("MemLeak.Close",	boost::bind(&LLFloaterMemLeak::onClickClose, this));
 }
+//----------------------------------------------
 
+BOOL LLFloaterMemLeak::postBuild(void) 
+{	
+	F32 a, b ;
+	a = childGetValue("leak_speed").asReal();
+	if(a > (F32)(0xFFFFFFFF))
+	{
+		sMemLeakingSpeed = 0xFFFFFFFF ;
+	}
+	else
+	{
+		sMemLeakingSpeed = (U32)a ;
+	}
+	b = childGetValue("max_leak").asReal();
+	if(b > (F32)0xFFF)
+	{
+		sMaxLeakedMem = 0xFFFFFFFF ;
+	}
+	else
+	{
+		sMaxLeakedMem = ((U32)b) << 20 ;
+	}
+	
+	sbAllocationFailed = FALSE ;
+	return TRUE ;
+}
 LLFloaterMemLeak::~LLFloaterMemLeak()
 {
 	release() ;
 		
 	sMemLeakingSpeed = 0 ; //bytes leaked per frame
 	sMaxLeakedMem = 0 ; //maximum allowed leaked memory	
-	sInstance = NULL ;
 }
 
 void LLFloaterMemLeak::release()
@@ -117,79 +147,56 @@ void LLFloaterMemLeak::idle()
 }
 
 //----------------------
-void LLFloaterMemLeak::onChangeLeakingSpeed(LLUICtrl* ctrl, void* userData)
+void LLFloaterMemLeak::onChangeLeakingSpeed()
 {
-	LLFloaterMemLeak *mem_leak = (LLFloaterMemLeak *)userData;		
-	if (mem_leak)
-	{
-		F32 tmp ;
-		tmp = mem_leak->childGetValue("leak_speed").asReal();
+	F32 tmp ;
+	tmp =childGetValue("leak_speed").asReal();
 
-		if(tmp > (F32)0xFFFFFFFF)
-		{
-			sMemLeakingSpeed = 0xFFFFFFFF ;
-		}
-		else
-		{
-			sMemLeakingSpeed = (U32)tmp ;
-		}
+	if(tmp > (F32)0xFFFFFFFF)
+	{
+		sMemLeakingSpeed = 0xFFFFFFFF ;
 	}
+	else
+	{
+		sMemLeakingSpeed = (U32)tmp ;
+	}
+
 }
 
-void LLFloaterMemLeak::onChangeMaxMemLeaking(LLUICtrl* ctrl, void* userData)
+void LLFloaterMemLeak::onChangeMaxMemLeaking()
 {
-	LLFloaterMemLeak *mem_leak = (LLFloaterMemLeak *)userData;		
-	if (mem_leak)
+
+	F32 tmp ;
+	tmp =childGetValue("max_leak").asReal();
+	if(tmp > (F32)0xFFF)
 	{
-		F32 tmp ;
-		tmp = mem_leak->childGetValue("max_leak").asReal();
-		if(tmp > (F32)0xFFF)
-		{
-			sMaxLeakedMem = 0xFFFFFFFF ;
-		}
-		else
-		{
-			sMaxLeakedMem = ((U32)tmp) << 20 ;
-		}
+		sMaxLeakedMem = 0xFFFFFFFF ;
 	}
+	else
+	{
+		sMaxLeakedMem = ((U32)tmp) << 20 ;
+	}
+	
 }
 
-void LLFloaterMemLeak::onClickStart(void* userData)
+void LLFloaterMemLeak::onClickStart()
 {
 	sStatus = START ;
 }
 
-void LLFloaterMemLeak::onClickStop(void* userData)
+void LLFloaterMemLeak::onClickStop()
 {
 	sStatus = STOP ;
 }
 
-void LLFloaterMemLeak::onClickRelease(void* userData)
+void LLFloaterMemLeak::onClickRelease()
 {
 	sStatus = RELEASE ;
 }
 
-void LLFloaterMemLeak::onClickClose(void* userData)
-{
-	if (sInstance)
-	{
-		sInstance->setVisible(FALSE);
-	}
-}
-
-//----------------------------------------------
-
-BOOL LLFloaterMemLeak::postBuild(void) 
+void LLFloaterMemLeak::onClickClose()
 {
-	childSetCommitCallback("leak_speed", onChangeLeakingSpeed, this);
-	childSetCommitCallback("max_leak", onChangeMaxMemLeaking, this);
-
-	childSetAction("start_btn", onClickStart, this);
-	childSetAction("stop_btn", onClickStop, this);
-	childSetAction("release_btn", onClickRelease, this);
-	childSetAction("close_btn", onClickClose, this);
-
-	return TRUE ;
+	setVisible(FALSE);
 }
 
 void LLFloaterMemLeak::draw()
@@ -219,50 +226,3 @@ void LLFloaterMemLeak::draw()
 
 	LLFloater::draw();
 }
-
-// static instance of it
-LLFloaterMemLeak* LLFloaterMemLeak::instance()
-{
-	if (!sInstance)
-	{
-		sInstance = new LLFloaterMemLeak();
-		LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_mem_leaking.xml", FALSE);
-
-		if(sInstance)
-		{
-			F32 a, b ;
-			a = sInstance->childGetValue("leak_speed").asReal();
-			if(a > (F32)(0xFFFFFFFF))
-			{
-				sMemLeakingSpeed = 0xFFFFFFFF ;
-			}
-			else
-			{
-				sMemLeakingSpeed = (U32)a ;
-			}
-			b = sInstance->childGetValue("max_leak").asReal();
-			if(b > (F32)0xFFF)
-			{
-				sMaxLeakedMem = 0xFFFFFFFF ;
-			}
-			else
-			{
-				sMaxLeakedMem = ((U32)b) << 20 ;
-			}
-
-			sbAllocationFailed = FALSE ;
-		}
-	}
-	return sInstance ;
-}
-
-void LLFloaterMemLeak::show(void*)
-{
-	instance()->openFloater();
-}
-
-LLFloaterMemLeak* LLFloaterMemLeak::getInstance()
-{
-	return sInstance ;
-}
-
diff --git a/indra/newview/llfloatermemleak.h b/indra/newview/llfloatermemleak.h
index 7d9d5f9c5f..763af943ba 100644
--- a/indra/newview/llfloatermemleak.h
+++ b/indra/newview/llfloatermemleak.h
@@ -37,34 +37,28 @@
 
 class LLFloaterMemLeak : public LLFloater
 {
+	friend class LLFloaterReg;
 public:
-    LLFloaterMemLeak();
-	virtual ~LLFloaterMemLeak();
-
 	/// initialize all the callbacks for the menu
-	//void initCallbacks(void);
+
 	virtual BOOL postBuild() ;
 	virtual void draw() ;
-
-	/// one and one instance only
-	static LLFloaterMemLeak* instance();
 	
-	static void onChangeLeakingSpeed(LLUICtrl* ctrl, void* userData);
-	static void onChangeMaxMemLeaking(LLUICtrl* ctrl, void* userData);
-	static void onClickStart(void* userData);
-	static void onClickStop(void* userData);
-	static void onClickRelease(void* userData);
-	static void onClickClose(void* userData);
-		
-	/// show off our menu
-	static void show(void*);
+	void onChangeLeakingSpeed();
+	void onChangeMaxMemLeaking();
+	void onClickStart();
+	void onClickStop();
+	void onClickRelease();
+	void onClickClose();
 
 public:
-	static LLFloaterMemLeak* getInstance() ;
 	void idle() ;
 	void stop() ;
 
 private:
+	
+	LLFloaterMemLeak(const LLSD& key);
+	virtual ~LLFloaterMemLeak();
 	void release() ;
 
 private:
@@ -75,9 +69,6 @@ private:
 		START
 	} ;
 
-	// one instance on the inside
-	static LLFloaterMemLeak* sInstance;
-
 	static U32 sMemLeakingSpeed ; //bytes leaked per frame
 	static U32 sMaxLeakedMem ; //maximum allowed leaked memory
 	static U32 sTotalLeaked ;
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index 3d5d2b733f..f06af5ca1e 100644
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -161,7 +161,7 @@ bool LLNotificationChannelPanel::update(const LLSD& payload, bool passed_filter)
 // LLFloaterNotificationConsole
 //
 LLFloaterNotificationConsole::LLFloaterNotificationConsole(const LLSD& key)
-: LLFloater()
+: LLFloater(key)
 {
 	mCommitCallbackRegistrar.add("ClickAdd",     boost::bind(&LLFloaterNotificationConsole::onClickAdd, this));	
 
diff --git a/indra/newview/llfloaternotificationsconsole.h b/indra/newview/llfloaternotificationsconsole.h
index b85437c3c5..fe161e66f0 100644
--- a/indra/newview/llfloaternotificationsconsole.h
+++ b/indra/newview/llfloaternotificationsconsole.h
@@ -38,11 +38,11 @@
 #include "llnotifications.h"
 
 class LLFloaterNotificationConsole : 
-	public LLFloater, 
-	public LLFloaterSingleton<LLFloaterNotificationConsole>
+	public LLFloater
 {
+	friend class LLFloaterReg;
+
 public:
-	LLFloaterNotificationConsole(const LLSD& key);
 
 	// LLPanel
 	BOOL postBuild();
@@ -55,6 +55,7 @@ public:
 	void updateResizeLimits();
 
 private:
+	LLFloaterNotificationConsole(const LLSD& key);	
 	void onClickAdd();
 };
 
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index 4d782a1814..09460e41ad 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -46,9 +46,10 @@
 #include "llagent.h"			// for agent id
 #include "llalertdialog.h"
 #include "llinventorybridge.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llinventorymodel.h"
 #include "llpanelinventory.h"
+#include "llfloaterreg.h"
 #include "llselectmgr.h"
 #include "lluiconstants.h"
 #include "llviewerobject.h"
@@ -56,29 +57,44 @@
 #include "llviewerwindow.h"
 
 
-LLFloaterOpenObject* LLFloaterOpenObject::sInstance = NULL;
-
-LLFloaterOpenObject::LLFloaterOpenObject()
-:	LLFloater(),
+LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key)
+:	LLFloater(key),
 	mPanelInventory(NULL),
 	mDirty(TRUE)
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_openobject.xml");
+//	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_openobject.xml");
+	mCommitCallbackRegistrar.add("OpenObject.MoveToInventory",	boost::bind(&LLFloaterOpenObject::onClickMoveToInventory, this));
+	mCommitCallbackRegistrar.add("OpenObject.MoveAndWear",		boost::bind(&LLFloaterOpenObject::onClickMoveAndWear, this));
 }
 
 LLFloaterOpenObject::~LLFloaterOpenObject()
 {
-	sInstance = NULL;
+//	sInstance = NULL;
 }
 // virtual
 BOOL LLFloaterOpenObject::postBuild()
 {
-	childSetAction("copy_to_inventory_button", onClickMoveToInventory, this);
-	childSetAction("copy_and_wear_button", onClickMoveAndWear, this);
+	mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
 	childSetTextArg("object_name", "[DESC]", std::string("Object") ); // *Note: probably do not want to translate this
 	mPanelInventory = getChild<LLPanelInventory>("object_contents");
 	return TRUE;
 }
+
+void LLFloaterOpenObject::onOpen(const LLSD& key)
+{
+	LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection();
+	if (object_selection->getRootObjectCount() != 1)
+	{
+		LLNotifications::instance().add("UnableToViewContentsMoreThanOne");
+		closeFloater();
+		return;
+	}
+	if(!(object_selection->getPrimaryObject())) 
+	{
+		closeFloater();
+		return;
+	}
+}
 void LLFloaterOpenObject::refresh()
 {
 	mPanelInventory->refresh();
@@ -99,7 +115,6 @@ void LLFloaterOpenObject::refresh()
 	}
 
 	childSetTextArg("object_name", "[DESC]", name);
-	
 	childSetEnabled("copy_to_inventory_button", enabled);
 	childSetEnabled("copy_and_wear_button", enabled);
 
@@ -115,34 +130,11 @@ void LLFloaterOpenObject::draw()
 	LLFloater::draw();
 }
 
-// static
 void LLFloaterOpenObject::dirty()
 {
-	if (sInstance) sInstance->mDirty = TRUE;
+	mDirty = TRUE;
 }
 
-// static
-void LLFloaterOpenObject::show()
-{
-	LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection();
-	if (object_selection->getRootObjectCount() != 1)
-	{
-		LLNotifications::instance().add("UnableToViewContentsMoreThanOne");
-		return;
-	}
-
-	// Create a new instance only if needed
-	if (!sInstance)
-	{
-		sInstance = new LLFloaterOpenObject();
-		sInstance->center();
-	}
-
-	sInstance->openFloater();
-	sInstance->setFocus(TRUE);
-
-	sInstance->mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
-}
 
 
 void LLFloaterOpenObject::moveToInventory(bool wear)
@@ -170,7 +162,7 @@ void LLFloaterOpenObject::moveToInventory(bool wear)
 	}
 	else
 	{
-		parent_category_id = gAgent.getInventoryRootID();
+		parent_category_id = gInventory.getRootFolderID();
 	}
 	LLUUID category_id = gInventory.createNewCategory(parent_category_id, 
 		LLAssetType::AT_NONE, 
@@ -201,8 +193,8 @@ void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data)
 
 	if (result == 0)
 	{
-		LLInventoryView::showAgentInventory();
-		LLInventoryView* view = LLInventoryView::getActiveInventory();
+		LLFloaterInventory::showAgentInventory();
+		LLFloaterInventory* view = LLFloaterInventory::getActiveInventory();
 		if (view)
 		{
 			view->getPanel()->setSelection(cat->mCatID, TAKE_FOCUS_NO);
@@ -212,20 +204,15 @@ void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data)
 	delete cat;
 }
 
-
-// static
-void LLFloaterOpenObject::onClickMoveToInventory(void* data)
+void LLFloaterOpenObject::onClickMoveToInventory()
 {
-	LLFloaterOpenObject* self = (LLFloaterOpenObject*)data;
-	self->moveToInventory(false);
-	self->closeFloater();
+	moveToInventory(false);
+	closeFloater();
 }
 
-// static
-void LLFloaterOpenObject::onClickMoveAndWear(void* data)
+void LLFloaterOpenObject::onClickMoveAndWear()
 {
-	LLFloaterOpenObject* self = (LLFloaterOpenObject*)data;
-	self->moveToInventory(true);
-	self->closeFloater();
+	moveToInventory(true);
+	closeFloater();
 }
 
diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h
index 0097a85690..0df3780ac4 100644
--- a/indra/newview/llfloateropenobject.h
+++ b/indra/newview/llfloateropenobject.h
@@ -46,9 +46,10 @@ class LLPanelInventory;
 class LLFloaterOpenObject
 : public LLFloater
 {
+	friend class LLFloaterReg;
 public:
-	static void show();
-	static void dirty();
+	
+	void dirty();
 	
 	struct LLCatAndWear
 	{
@@ -57,20 +58,25 @@ public:
 	};
 
 protected:
-	LLFloaterOpenObject();
-	~LLFloaterOpenObject();
+
 	/*virtual*/	BOOL	postBuild();
 	void refresh();
 	void draw();
+	virtual void onOpen(const LLSD& key);
+//	virtual void onClose();
 
 	void moveToInventory(bool wear);
 
-	static void onClickMoveToInventory(void* data);
-	static void onClickMoveAndWear(void* data);
+	void onClickMoveToInventory();
+	void onClickMoveAndWear();
 	static void callbackMoveInventory(S32 result, void* data);
 
+private:
+	
+	LLFloaterOpenObject(const LLSD& key);
+	~LLFloaterOpenObject();
+	
 protected:
-	static LLFloaterOpenObject* sInstance;
 
 	LLPanelInventory*	mPanelInventory;
 	LLSafeHandle<LLObjectSelection> mObjectSelection;
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index 1ef71a9d53..c4f1ebe8aa 100644
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -42,51 +42,44 @@
 
 
 LLFloaterPerms::LLFloaterPerms(const LLSD& seed)
-: LLFloater()
+: LLFloater(seed)
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_perm_prefs.xml");
+	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_perm_prefs.xml");
+	mCommitCallbackRegistrar.add("Perms.Copy",	boost::bind(&LLFloaterPerms::onCommitCopy, this));
+	mCommitCallbackRegistrar.add("Perms.OK",	boost::bind(&LLFloaterPerms::onClickOK, this));
+	mCommitCallbackRegistrar.add("Perms.Cancel",	boost::bind(&LLFloaterPerms::onClickCancel, this));
+
 }
 
 BOOL LLFloaterPerms::postBuild()
 {
-	childSetEnabled("next_owner_transfer", gSavedSettings.getBOOL("NextOwnerCopy"));
-	childSetAction("help",   onClickHelp,   this);
-	childSetAction("ok",     onClickOK,     this);
-	childSetAction("cancel", onClickCancel, this);
-	childSetCommitCallback("next_owner_copy", &onCommitCopy, this);
 
 	refresh();
 	
 	return TRUE;
 }
 
-//static 
-void LLFloaterPerms::onClickOK(void* data)
+void LLFloaterPerms::onClickOK()
 {
-	LLFloaterPerms* self = static_cast<LLFloaterPerms*>(data);
-	self->ok();
-	self->closeFloater();
+	ok();
+	closeFloater();
 }
 
-//static 
-void LLFloaterPerms::onClickCancel(void* data)
+void LLFloaterPerms::onClickCancel()
 {
-	LLFloaterPerms* self = static_cast<LLFloaterPerms*>(data);
-	self->cancel();
-	self->closeFloater();
+	cancel();
+	closeFloater();
 }
 
-//static 
-void LLFloaterPerms::onCommitCopy(LLUICtrl* ctrl, void* data)
+void LLFloaterPerms::onCommitCopy()
 {
-	LLFloaterPerms* self = static_cast<LLFloaterPerms*>(data);
 	// Implements fair use
 	BOOL copyable = gSavedSettings.getBOOL("NextOwnerCopy");
 	if(!copyable)
 	{
 		gSavedSettings.setBOOL("NextOwnerTransfer", TRUE);
 	}
-	LLCheckBoxCtrl* xfer = self->getChild<LLCheckBoxCtrl>("next_owner_transfer");
+	LLCheckBoxCtrl* xfer = getChild<LLCheckBoxCtrl>("next_owner_transfer");
 	xfer->setEnabled(copyable);
 }
 
@@ -152,9 +145,3 @@ U32 LLFloaterPerms::getNextOwnerPerms(std::string prefix)
 	return flags;
 }
 
-
-//static
-void LLFloaterPerms::onClickHelp(void* data)
-{
-	LLNotifications::instance().add("ClickUploadHelpPermissions");
-}
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
index 805039efe4..a1897a5c00 100644
--- a/indra/newview/llfloaterperms.h
+++ b/indra/newview/llfloaterperms.h
@@ -36,18 +36,18 @@
 
 #include "llfloater.h"
 
-class LLFloaterPerms : public LLFloater, public LLFloaterSingleton<LLFloaterPerms>
+class LLFloaterPerms : public LLFloater
 {
-	friend class LLUISingleton<LLFloaterPerms, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 	
 public:
 	/*virtual*/ void onClose(bool app_quitting = false);
 	/*virtual*/ BOOL postBuild();
 	void ok();
 	void cancel();
-	static void onClickOK(void*);
-	static void onClickCancel(void*);
-	static void onCommitCopy(LLUICtrl* ctrl, void* data);
+	void onClickOK();
+	void onClickCancel();
+	void onCommitCopy();
 	// Convenience methods to get current permission preference bitfields from saved settings:
 	static U32 getEveryonePerms(std::string prefix=""); // prefix + "EveryoneCopy"
 	static U32 getGroupPerms(std::string prefix=""); // prefix + "ShareWithGroup"
@@ -57,9 +57,6 @@ private:
 	LLFloaterPerms(const LLSD& seed);
 	void refresh();
 
-	/// callback for the menus help button
-	static void onClickHelp(void* data);
-
 	BOOL // cached values only for implementing cancel.
 		mShareWithGroup,
 		mEveryoneCopy,
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 57a3bf9445..99c1414461 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -58,6 +58,7 @@
 #include "llfloatergodtools.h"	// for send_sim_wide_deletes()
 #include "llfloatertopobjects.h" // added to fix SL-32336
 #include "llfloatergroups.h"
+#include "llfloaterreg.h"
 #include "llfloatertelehub.h"
 #include "llfloaterwindlight.h"
 #include "llinventorymodel.h"
@@ -164,9 +165,9 @@ bool estate_dispatch_initialized = false;
 LLUUID LLFloaterRegionInfo::sRequestInvoice;
 
 LLFloaterRegionInfo::LLFloaterRegionInfo(const LLSD& seed)
-	: LLFloater()
+	: LLFloater(seed)
 {
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_info.xml", FALSE);
+	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_info.xml", FALSE);
 }
 
 BOOL LLFloaterRegionInfo::postBuild()
@@ -247,7 +248,8 @@ void LLFloaterRegionInfo::requestRegionInfo()
 void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
 {
 	static LLDispatcher dispatch;
-	if(!findInstance())
+	LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
+	if(!floater)
 	{
 		return;
 	}
@@ -257,7 +259,7 @@ void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
 		LLPanelEstateInfo::initDispatch(dispatch);
 	}
 
-	LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
+	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
 	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
 
 	// unpack the message
@@ -283,14 +285,14 @@ void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
 void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
 {
 	LLPanel* panel;
-
+	LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
 	llinfos << "LLFloaterRegionInfo::processRegionInfo" << llendl;
-	if(!findInstance())
+	if(!floater)
 	{
 		return;
 	}
 	
-	LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
+	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
 
 	LLViewerRegion* region = gAgent.getRegion();
 	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
@@ -377,13 +379,13 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
 	panel->childSetEnabled("sun_hour_slider", allow_modify && !use_estate_sun);
 	panel->setCtrlsEnabled(allow_modify);
 
-	getInstance()->refreshFromRegion( gAgent.getRegion() );
+	floater->refreshFromRegion( gAgent.getRegion() );
 }
 
 // static
 LLPanelEstateInfo* LLFloaterRegionInfo::getPanelEstate()
 {
-	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
+	LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
 	if (!floater) return NULL;
 	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
 	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
@@ -393,7 +395,7 @@ LLPanelEstateInfo* LLFloaterRegionInfo::getPanelEstate()
 // static
 LLPanelEstateCovenant* LLFloaterRegionInfo::getPanelCovenant()
 {
-	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
+	LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
 	if (!floater) return NULL;
 	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
 	LLPanelEstateCovenant* panel = (LLPanelEstateCovenant*)tab->getChild<LLPanel>("Covenant");
@@ -611,7 +613,8 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
 	childSetAction("kick_btn", onClickKick, this);
 	childSetAction("kick_all_btn", onClickKickAll, this);
 	childSetAction("im_btn", onClickMessage, this);
-	childSetAction("manage_telehub_btn", onClickManageTelehub, this);
+//	childSetAction("manage_telehub_btn", onClickManageTelehub, this);
+	mCommitCallbackRegistrar.add("RegionInfo.Cancel",	boost::bind(&LLPanelRegionGeneralInfo::onClickManageTelehub, this));
 
 	return LLPanelRegionInfo::postBuild();
 }
@@ -719,11 +722,9 @@ bool LLPanelRegionGeneralInfo::onMessageCommit(const LLSD& notification, const L
 	return false;
 }
 
-// static
-void LLPanelRegionGeneralInfo::onClickManageTelehub(void* data)
+void LLPanelRegionGeneralInfo::onClickManageTelehub()
 {
-	LLFloaterRegionInfo::getInstance()->closeFloater();
-
+	LLFloaterReg::getInstance("region_info")->closeFloater();
 	LLFloaterTelehub::show();
 }
 
@@ -958,8 +959,10 @@ void LLPanelRegionDebugInfo::onClickTopColliders(void* data)
 	strings_t strings;
 	strings.push_back("1");	// one physics step
 	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	LLFloaterTopObjects::show();
-	LLFloaterTopObjects::clearList();
+	LLFloaterTopObjects* instance = LLFloaterReg::getTypedInstance<LLFloaterTopObjects>("top_objects");
+	if(!instance) return;
+	LLFloaterReg::showInstance("top_objects");
+	instance->clearList();
 	self->sendEstateOwnerMessage(gMessageSystem, "colliders", invoice, strings);
 }
 
@@ -970,8 +973,10 @@ void LLPanelRegionDebugInfo::onClickTopScripts(void* data)
 	strings_t strings;
 	strings.push_back("6");	// top 5 scripts
 	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	LLFloaterTopObjects::show();
-	LLFloaterTopObjects::clearList();
+	LLFloaterTopObjects* instance = LLFloaterReg::getTypedInstance<LLFloaterTopObjects>("top_objects");
+	if(!instance) return;
+	LLFloaterReg::showInstance("top_objects");
+	instance->clearList();
 	self->sendEstateOwnerMessage(gMessageSystem, "scripts", invoice, strings);
 }
 
@@ -1254,7 +1259,7 @@ BOOL LLPanelRegionTerrainInfo::sendUpdate()
 
 	// Grab estate information in case the user decided to set the
 	// region back to estate time. JC
-	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
+	LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
 	if (!floater) return true;
 
 	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index b3a1fcb7ca..be4becf7e7 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -59,11 +59,11 @@ class LLPanelRegionTerrainInfo;
 class LLPanelEstateInfo;
 class LLPanelEstateCovenant;
 
-class LLFloaterRegionInfo : public LLFloater, public LLFloaterSingleton<LLFloaterRegionInfo>
+class LLFloaterRegionInfo : public LLFloater
 {
-	friend class LLUISingleton<LLFloaterRegionInfo, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 public:
-	~LLFloaterRegionInfo();
+
 
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ BOOL postBuild();
@@ -86,8 +86,12 @@ public:
 	
 	void requestRegionInfo();
 
-protected:
+private:
+	
 	LLFloaterRegionInfo(const LLSD& seed);
+	~LLFloaterRegionInfo();
+	
+protected:
 	void refreshFromRegion(LLViewerRegion* region);
 
 	// member data
@@ -166,7 +170,7 @@ protected:
 	bool onKickAllCommit(const LLSD& notification, const LLSD& response);
 	static void onClickMessage(void* userdata);
 	bool onMessageCommit(const LLSD& notification, const LLSD& response);
-	static void onClickManageTelehub(void* data);
+	void onClickManageTelehub();
 };
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 4b175cdc27..513a6a06b1 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -53,7 +53,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "lllineeditor.h"
 #include "lltexturectrl.h"
 #include "llscrolllistctrl.h"
diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
index 87833793af..e7dda3a5f4 100644
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -38,14 +38,11 @@
 #include "lltexteditor.h"
 
 class LLFloaterSettingsDebug 
-:	public LLFloater, 
-	public LLFloaterSingleton<LLFloaterSettingsDebug>
+:	public LLFloater
 {
+	friend class LLFloaterReg;
+
 public:
-	// key - selects which settings to show, one of:
-	// "all", "base", "account", "skin"
-	LLFloaterSettingsDebug(const LLSD& key);
-	virtual ~LLFloaterSettingsDebug();
 
 	virtual BOOL postBuild();
 	virtual void draw();
@@ -56,6 +53,12 @@ public:
 	void onCommitSettings();
 	void onClickDefault();
 
+private:
+	// key - selects which settings to show, one of:
+	// "all", "base", "account", "skin"
+	LLFloaterSettingsDebug(const LLSD& key);
+	virtual ~LLFloaterSettingsDebug();
+	
 protected:
 	LLTextEditor* mComment;
 };
diff --git a/indra/newview/llfloatertestlistview.cpp b/indra/newview/llfloatertestlistview.cpp
new file mode 100644
index 0000000000..f7a327c088
--- /dev/null
+++ b/indra/newview/llfloatertestlistview.cpp
@@ -0,0 +1,77 @@
+/** 
+* @file llfloatertestlistview.cpp
+* @brief Tests of programmatic manipulation of LLListView widgets
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+* 
+* Copyright (c) 2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloatertestlistview.h"
+
+// Viewer includes
+#include "lllistview.h"
+
+// Linden library includes
+//#include "lluictrlfactory.h"
+
+LLFloaterTestListView::LLFloaterTestListView(const LLSD& seed)
+:	LLFloater(seed),
+	mListView(NULL)
+{
+	// set up named callback functions for test buttons
+	mCommitCallbackRegistrar.add("TestListView.Test1",
+		boost::bind(&LLFloaterTestListView::onClickTest1, this));
+	mCommitCallbackRegistrar.add("TestListView.Test2",
+		boost::bind(&LLFloaterTestListView::onClickTest2, this));
+}
+
+LLFloaterTestListView::~LLFloaterTestListView()
+{}
+
+BOOL LLFloaterTestListView::postBuild()
+{
+	mListView = getChild<LLListView>("test_list_view");
+	// just set a random property
+	mListView->setString("set programmatically");
+	return LLFloater::postBuild();
+}
+
+void LLFloaterTestListView::onListViewChanged()
+{
+	llinfos << "JAMESDEBUG list view changed" << llendl;
+}
+
+void LLFloaterTestListView::onClickTest1()
+{
+	llinfos << "JAMESDEBUG test 1" << llendl;
+}
+
+void LLFloaterTestListView::onClickTest2()
+{
+	llinfos << "JAMESDEBUG test 2" << llendl;
+}
diff --git a/indra/newview/llfloatertestlistview.h b/indra/newview/llfloatertestlistview.h
new file mode 100644
index 0000000000..053da95def
--- /dev/null
+++ b/indra/newview/llfloatertestlistview.h
@@ -0,0 +1,64 @@
+/** 
+* @file llfloatertestlistview.h
+* @brief Tests of programmatic manipulation of LLListView widgets
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+* 
+* Copyright (c) 2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+#ifndef LLFLOATERTESTLISTVIEW_H
+#define LLFLOATERTESTLISTVIEW_H
+
+#include "llfloater.h"
+
+class LLListView;
+class LLSD;
+
+class LLFloaterTestListView : public LLFloater
+{
+	friend class LLFloaterReg;
+public:
+	// nothing yet
+
+private:
+	// Construction handled by LLFloaterReg
+	LLFloaterTestListView(const LLSD& seed);
+	~LLFloaterTestListView();
+
+	/*virtual*/ BOOL postBuild();
+
+	// Perform some debug action when the list-view sends change notification
+	void onListViewChanged();
+
+	// Debug function hookups for buttons
+	void onClickTest1();
+	void onClickTest2();
+
+private:
+	LLListView* mListView;
+};
+
+#endif
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 4bcf470317..4704630147 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -445,7 +445,8 @@ void LLFloaterTools::draw()
 void LLFloaterTools::dirty()
 {
 	mDirty = TRUE; 
-	LLFloaterOpenObject::dirty();
+	LLFloaterOpenObject* instance = LLFloaterReg::getTypedInstance<LLFloaterOpenObject>("openobject");
+	if (instance) instance->dirty();
 }
 
 // Clean up any tool state that should not persist when the
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index 29ac0c66f8..bf5a1141a6 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -40,6 +40,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llfloatergodtools.h"
+#include "llfloaterreg.h"
 #include "llparcel.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
@@ -53,11 +54,11 @@
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 
-LLFloaterTopObjects* LLFloaterTopObjects::sInstance = NULL;
+//LLFloaterTopObjects* LLFloaterTopObjects::sInstance = NULL;
 
 // Globals
 // const U32 TIME_STR_LENGTH = 30;
-
+/*
 // static
 void LLFloaterTopObjects::show()
 {
@@ -68,21 +69,28 @@ void LLFloaterTopObjects::show()
 	}
 
 	sInstance = new LLFloaterTopObjects();
-	LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_top_objects.xml");
+//	LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_top_objects.xml");
 	sInstance->center();
 }
-
-LLFloaterTopObjects::LLFloaterTopObjects()
-:	LLFloater(),
+*/
+LLFloaterTopObjects::LLFloaterTopObjects(const LLSD& key)
+:	LLFloater(key),
 	mInitialized(FALSE),
 	mtotalScore(0.f)
 {
-	sInstance = this;
+	mCommitCallbackRegistrar.add("TopObjects.ShowBeacon",		boost::bind(&LLFloaterTopObjects::onClickShowBeacon, this));
+	mCommitCallbackRegistrar.add("TopObjects.ReturnSelected",	boost::bind(&LLFloaterTopObjects::onReturnSelected, this));
+	mCommitCallbackRegistrar.add("TopObjects.ReturnAll",		boost::bind(&LLFloaterTopObjects::onReturnAll, this));
+	mCommitCallbackRegistrar.add("TopObjects.DisableSelected",	boost::bind(&LLFloaterTopObjects::onDisableSelected, this));
+	mCommitCallbackRegistrar.add("TopObjects.DisableAll",		boost::bind(&LLFloaterTopObjects::onDisableAll, this));
+	mCommitCallbackRegistrar.add("TopObjects.Refresh",			boost::bind(&LLFloaterTopObjects::onRefresh, this));
+	mCommitCallbackRegistrar.add("TopObjects.GetByObjectName",	boost::bind(&LLFloaterTopObjects::onGetByObjectName, this));
+	mCommitCallbackRegistrar.add("TopObjects.GetByOwnerName",	boost::bind(&LLFloaterTopObjects::onGetByOwnerName, this));
+	mCommitCallbackRegistrar.add("TopObjects.CommitObjectsList",boost::bind(&LLFloaterTopObjects::onCommitObjectsList, this));
 }
 
 LLFloaterTopObjects::~LLFloaterTopObjects()
 {
-	sInstance = NULL;
 }
 
 // virtual
@@ -90,24 +98,11 @@ BOOL LLFloaterTopObjects::postBuild()
 {
 	LLScrollListCtrl *objects_list = getChild<LLScrollListCtrl>("objects_list");
 	childSetFocus("objects_list");
-	childSetCommitCallback("objects_list", onCommitObjectsList, this);
 	objects_list->setDoubleClickCallback(onDoubleClickObjectsList, this);
 	objects_list->setCommitOnSelectionChange(TRUE);
 
-	childSetAction("show_beacon_btn", onClickShowBeacon, this);
 	setDefaultBtn("show_beacon_btn");
 
-	childSetAction("return_selected_btn", onReturnSelected, this);
-	childSetAction("return_all_btn", onReturnAll, this);
-	childSetAction("disable_selected_btn", onDisableSelected, this);
-	childSetAction("disable_all_btn", onDisableAll, this);
-	childSetAction("refresh_btn", onRefresh, this);	
-
-
-	childSetAction("filter_object_btn", onGetByObjectNameClicked, this);
-	childSetAction("filter_owner_btn", onGetByOwnerNameClicked, this);	
-
-
 	/*
 	LLLineEditor* line_editor = getChild<LLLineEditor>("owner_name_editor");
 	if (line_editor)
@@ -129,19 +124,29 @@ BOOL LLFloaterTopObjects::postBuild()
 
 	return TRUE;
 }
+// static
+void LLFloaterTopObjects::setMode(U32 mode)
+{
+	LLFloaterTopObjects* instance = LLFloaterReg::getTypedInstance<LLFloaterTopObjects>("top_objects");
+	if(!instance) return;
+	instance->mCurrentMode = mode; 
+}
 
+// static 
 void LLFloaterTopObjects::handle_land_reply(LLMessageSystem* msg, void** data)
 {
+	LLFloaterTopObjects* instance = LLFloaterReg::getTypedInstance<LLFloaterTopObjects>("top_objects");
+	if(!instance) return;
 	// Make sure dialog is on screen
-	show();
-	sInstance->handleReply(msg, data);
+	LLFloaterReg::showInstance("top_objects");
+	instance->handleReply(msg, data);
 
 	//HACK: for some reason sometimes top scripts originally comes back
 	//with no results even though they're there
-	if (!sInstance->mObjectListIDs.size() && !sInstance->mInitialized)
+	if (!instance->mObjectListIDs.size() && !instance->mInitialized)
 	{
-		sInstance->onRefresh(NULL);
-		sInstance->mInitialized = TRUE;
+		instance->onRefresh();
+		instance->mInitialized = TRUE;
 	}
 
 }
@@ -260,12 +265,9 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 	}
 }
 
-// static
-void LLFloaterTopObjects::onCommitObjectsList(LLUICtrl* ctrl, void* data)
+void LLFloaterTopObjects::onCommitObjectsList()
 {
-	LLFloaterTopObjects* self = (LLFloaterTopObjects*)data;
-
-	self->updateSelectionInfo();
+	updateSelectionInfo();
 }
 
 void LLFloaterTopObjects::updateSelectionInfo()
@@ -292,11 +294,9 @@ void LLFloaterTopObjects::onDoubleClickObjectsList(void* data)
 }
 
 // static
-void LLFloaterTopObjects::onClickShowBeacon(void* data)
+void LLFloaterTopObjects::onClickShowBeacon()
 {
-	LLFloaterTopObjects* self = (LLFloaterTopObjects*)data;
-	if (!self) return;
-	self->showBeacon();
+	showBeacon();
 }
 
 void LLFloaterTopObjects::doToObjects(int action, bool all)
@@ -360,22 +360,24 @@ void LLFloaterTopObjects::doToObjects(int action, bool all)
 bool LLFloaterTopObjects::callbackReturnAll(const LLSD& notification, const LLSD& response)
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
+	LLFloaterTopObjects* instance = LLFloaterReg::getTypedInstance<LLFloaterTopObjects>("top_objects");
+	if(!instance) return false;
 	if (option == 0)
 	{
-		sInstance->doToObjects(ACTION_RETURN, true);
+		instance->doToObjects(ACTION_RETURN, true);
 	}
 	return false;
 }
 
-void LLFloaterTopObjects::onReturnAll(void* data)
+void LLFloaterTopObjects::onReturnAll()
 {	
 	LLNotifications::instance().add("ReturnAllTopObjects", LLSD(), LLSD(), &callbackReturnAll);
 }
 
 
-void LLFloaterTopObjects::onReturnSelected(void* data)
+void LLFloaterTopObjects::onReturnSelected()
 {
-	sInstance->doToObjects(ACTION_RETURN, false);
+	doToObjects(ACTION_RETURN, false);
 }
 
 
@@ -383,52 +385,52 @@ void LLFloaterTopObjects::onReturnSelected(void* data)
 bool LLFloaterTopObjects::callbackDisableAll(const LLSD& notification, const LLSD& response)
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
+	LLFloaterTopObjects* instance = LLFloaterReg::getTypedInstance<LLFloaterTopObjects>("top_objects");
+	if(!instance) return false;
 	if (option == 0)
 	{
-		sInstance->doToObjects(ACTION_DISABLE, true);
+		instance->doToObjects(ACTION_DISABLE, true);
 	}
 	return false;
 }
 
-void LLFloaterTopObjects::onDisableAll(void* data)
+void LLFloaterTopObjects::onDisableAll()
 {
 	LLNotifications::instance().add("DisableAllTopObjects", LLSD(), LLSD(), callbackDisableAll);
 }
 
-void LLFloaterTopObjects::onDisableSelected(void* data)
+void LLFloaterTopObjects::onDisableSelected()
 {
-	sInstance->doToObjects(ACTION_DISABLE, false);
+	doToObjects(ACTION_DISABLE, false);
 }
 
-//static
+
 void LLFloaterTopObjects::clearList()
 {
-	LLCtrlListInterface *list = sInstance->childGetListInterface("objects_list");
+	LLCtrlListInterface *list = childGetListInterface("objects_list");
 	
 	if (list) 
 	{
 		list->operateOnAll(LLCtrlListInterface::OP_DELETE);
 	}
 
-	sInstance->mObjectListData.clear();
-	sInstance->mObjectListIDs.clear();
-	sInstance->mtotalScore = 0.f;
+	mObjectListData.clear();
+	mObjectListIDs.clear();
+	mtotalScore = 0.f;
 }
 
-//static
-void LLFloaterTopObjects::onRefresh(void* data)
+
+void LLFloaterTopObjects::onRefresh()
 {
 	U32 mode = STAT_REPORT_TOP_SCRIPTS;
 	U32 flags = 0;
 	std::string filter = "";
 
-	if (sInstance)
-	{
-		mode = sInstance->mCurrentMode;
-		flags = sInstance->mFlags;
-		filter = sInstance->mFilter;
-		sInstance->clearList();
-	}
+	mode   = mCurrentMode;
+	flags  = mFlags;
+	filter = mFilter;
+	clearList();
+
 
 	LLMessageSystem *msg = gMessageSystem;
 	msg->newMessageFast(_PREHASH_LandStatRequest);
@@ -443,31 +445,22 @@ void LLFloaterTopObjects::onRefresh(void* data)
 
 	msg->sendReliable(gAgent.getRegionHost());
 
-	if (sInstance)
-	{
-		sInstance->mFilter.clear();
-		sInstance->mFlags = 0;
-	}
+	mFilter.clear();
+	mFlags = 0;
 }
 
-void LLFloaterTopObjects::onGetByObjectName(LLUICtrl* ctrl, void* data)
+void LLFloaterTopObjects::onGetByObjectName()
 {
-	if (sInstance)
-	{
-		sInstance->mFlags = STAT_FILTER_BY_OBJECT;
-		sInstance->mFilter = sInstance->childGetText("object_name_editor");
-		onRefresh(NULL);
-	}
+	mFlags  = STAT_FILTER_BY_OBJECT;
+	mFilter = childGetText("object_name_editor");
+	onRefresh();
 }
 
-void LLFloaterTopObjects::onGetByOwnerName(LLUICtrl* ctrl, void* data)
+void LLFloaterTopObjects::onGetByOwnerName()
 {
-	if (sInstance)
-	{
-		sInstance->mFlags = STAT_FILTER_BY_OWNER;
-		sInstance->mFilter = sInstance->childGetText("owner_name_editor");
-		onRefresh(NULL);
-	}
+	mFlags  = STAT_FILTER_BY_OWNER;
+	mFilter = childGetText("owner_name_editor");
+	onRefresh();
 }
 
 void LLFloaterTopObjects::showBeacon()
diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h
index 58cbf5d2ce..ee3c5d3cce 100644
--- a/indra/newview/llfloatertopobjects.h
+++ b/indra/newview/llfloatertopobjects.h
@@ -39,48 +39,49 @@ class LLUICtrl;
 
 class LLFloaterTopObjects : public LLFloater
 {
+	friend class LLFloaterReg;
 public:
 	// Opens the floater on screen.
-	static void show();
+//	static void show();
 
 	// Opens the floater if it's not on-screen.
 	// Juggles the UI based on method = "scripts" or "colliders"
 	static void handle_land_reply(LLMessageSystem* msg, void** data);
 	void handleReply(LLMessageSystem* msg, void** data);
 	
-	static void clearList();
+	void clearList();
 	void updateSelectionInfo();
 	virtual BOOL postBuild();
 
-	static void onRefresh(void* data);
+	void onRefresh();
 
-	static void setMode(U32 mode)		{ if (sInstance) sInstance->mCurrentMode = mode; }
+	static void setMode(U32 mode);
 
 private:
-	LLFloaterTopObjects();
+	LLFloaterTopObjects(const LLSD& key);
 	~LLFloaterTopObjects();
 
 	void initColumns(LLCtrlListInterface *list);
 
-	static void onCommitObjectsList(LLUICtrl* ctrl, void* data);
+	void onCommitObjectsList();
 	static void onDoubleClickObjectsList(void* data);
-	static void onClickShowBeacon(void* data);
+	void onClickShowBeacon();
 
 	void doToObjects(int action, bool all);
 
-	static void onReturnAll(void* data);
-	static void onReturnSelected(void* data);
-	static void onDisableAll(void* data);
-	static void onDisableSelected(void* data);
+	void onReturnAll();
+	void onReturnSelected();
+	void onDisableAll();
+	void onDisableSelected();
 
 	static bool callbackReturnAll(const LLSD& notification, const LLSD& response);
 	static bool callbackDisableAll(const LLSD& notification, const LLSD& response);
 
-	static void onGetByOwnerName(LLUICtrl* ctrl, void* data);
-	static void onGetByObjectName(LLUICtrl* ctrl, void* data);
+	void onGetByOwnerName();
+	void onGetByObjectName();
 
-	static void onGetByOwnerNameClicked(void* data)  { onGetByOwnerName(NULL, data); };
-	static void onGetByObjectNameClicked(void* data) { onGetByObjectName(NULL, data); };
+//	static void onGetByOwnerNameClicked(void* data)  { onGetByOwnerName(NULL, data); };
+//	static void onGetByObjectNameClicked(void* data) { onGetByObjectName(NULL, data); };
 
 	void showBeacon();
 
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 34db895b52..e7304ea5a9 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -264,6 +264,8 @@ BOOL LLFloaterUIPreview::postBuild()
 	main_panel_tmp->getChild<LLButton>("save_floater")->setClickedCallback(onClickSaveFloater, (void*)&PRIMARY_FLOATER);
 	main_panel_tmp->getChild<LLButton>("save_all_floaters")->setClickedCallback(onClickSaveAll, (void*)&PRIMARY_FLOATER);
 
+	getChild<LLButton>("export_schema")->setClickedCallback(boost::bind(&LLFloaterUIPreview::onClickExportSchema, this));
+
 	// get pointers to text fields
 	mEditorPathTextBox = editor_panel_tmp->getChild<LLLineEditor>("executable_path_field");
 	mEditorArgsTextBox = editor_panel_tmp->getChild<LLLineEditor>("executable_args_field");
@@ -354,6 +356,34 @@ void LLFloaterUIPreview::onLanguageComboSelect(LLUICtrl* ctrl)
 
 }
 
+void LLFloaterUIPreview::onClickExportSchema()
+{
+	std::string template_path = gDirUtilp->getExpandedFilename(LL_PATH_DEFAULT_SKIN, "xui", "schema");
+
+	typedef LLWidgetTypeRegistry::Registrar::registry_map_t::const_iterator registry_it;
+	registry_it end_it = LLWidgetTypeRegistry::defaultRegistrar().endItems();
+	for(registry_it it = LLWidgetTypeRegistry::defaultRegistrar().beginItems();
+		it != end_it;
+		++it)
+	{
+		std::string widget_name = it->first;
+		const LLInitParam::BaseBlock& block = 
+			(*LLDefaultParamBlockRegistry::instance().getValue(*LLWidgetTypeRegistry::instance().getValue(widget_name)))();
+		LLXMLNodePtr root_nodep = new LLXMLNode();
+		LLRNGWriter().writeRNG(widget_name, root_nodep, block, "http://www.lindenlab.com/xui");
+
+		std::string file_name(template_path + gDirUtilp->getDirDelimiter() + widget_name + ".rng");
+
+		LLFILE* rng_file = LLFile::fopen(file_name.c_str(), "w");
+		{
+			LLXMLNode::writeHeaderToFile(rng_file);
+			root_nodep->writeToFile(rng_file);
+		}
+		fclose(rng_file);
+	}
+}
+
+
 // Close click handler -- delete my displayed floater if it exists
 void LLFloaterUIPreview::onClose(bool app_quitting)
 {
@@ -614,7 +644,7 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save)
 		if (save)
 		{	
 			LLXMLNodePtr menu_write = new LLXMLNode();	
-			LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>(path, gMenuHolder, menu_write);
+			LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>(path, gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance(), menu_write);
 
 			if (!menu_write->isNull())
 			{
@@ -779,6 +809,10 @@ void LLFloaterUIPreview::onClickEditFloater(void*)
 	{
 		exe_path_char = path_in_textfield.c_str();
 	}
+	else if (!LLUI::sSettingGroups["config"]->getString("XUIEditor").empty())
+	{
+		exe_path_char = LLUI::sSettingGroups["config"]->getString("XUIEditor").c_str();
+	}
 	else									// otherwise use the path specified by the environment variable
 	{
 		exe_path_char = getenv("LL_XUI_EDITOR");
diff --git a/indra/newview/llfloateruipreview.h b/indra/newview/llfloateruipreview.h
index b0af841e11..1307d60689 100644
--- a/indra/newview/llfloateruipreview.h
+++ b/indra/newview/llfloateruipreview.h
@@ -211,6 +211,7 @@ private:
 	static void onClickToggleOverlapping(void*);
 	static void onClickCloseDisplayedFloater(void*);
 	void onLanguageComboSelect(LLUICtrl* ctrl);
+	void onClickExportSchema();
 };
 #endif // LL_LLUIPREVIEW_H
 
diff --git a/indra/newview/llfloaterurldisplay.cpp b/indra/newview/llfloaterurldisplay.cpp
index 7f7d05e1d2..3b9321a876 100644
--- a/indra/newview/llfloaterurldisplay.cpp
+++ b/indra/newview/llfloaterurldisplay.cpp
@@ -45,11 +45,10 @@
 
 
 LLFloaterURLDisplay::LLFloaterURLDisplay(const LLSD& sd)
-	: LLFloater()
+	: LLFloater(sd)
 {	
 	mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterURLDisplay::createPlaceDetail, this);
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml");
-	this->setVisible(false);
+//	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml");
 
 	// If positioned at 0,0 the teleport button is behind the toolbar.
 	LLRect r = getRect();
diff --git a/indra/newview/llfloaterurldisplay.h b/indra/newview/llfloaterurldisplay.h
index 91c544ae86..22f5a95ad0 100644
--- a/indra/newview/llfloaterurldisplay.h
+++ b/indra/newview/llfloaterurldisplay.h
@@ -40,11 +40,10 @@ class LLPanelPlace;
 class LLSD;
 class LLUUID;
 
-class LLFloaterURLDisplay : public LLFloater, public LLFloaterSingleton<LLFloaterURLDisplay>
+class LLFloaterURLDisplay : public LLFloater
 {
+	friend class LLFloaterReg;
 public:
-	LLFloaterURLDisplay(const LLSD& sd);
-	virtual ~LLFloaterURLDisplay();
 
 	void displayParcelInfo(U64 region_handle, const LLVector3& pos);
 	void setSnapshotDisplay(const LLUUID& snapshot_id);
@@ -54,6 +53,9 @@ public:
 	static void* createPlaceDetail(void* userdata);
 
 private:
+	LLFloaterURLDisplay(const LLSD& sd);
+	virtual ~LLFloaterURLDisplay();
+
 	LLVector3		mRegionPosition;
 	U64				mRegionHandle;
 	LLPanelPlace*	mPlacePanel;
diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp
index 16f4ecef07..0cbeaa591d 100644
--- a/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/indra/newview/llfloatervoicedevicesettings.cpp
@@ -284,7 +284,7 @@ void LLPanelVoiceDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user
 //
 
 LLFloaterVoiceDeviceSettings::LLFloaterVoiceDeviceSettings(const LLSD& seed)
-	: LLFloater(),
+	: LLFloater(seed),
 	  mDevicePanel(NULL)
 {
 	mFactoryMap["device_settings"] = LLCallbackMap(createPanelVoiceDeviceSettings, this);
diff --git a/indra/newview/llfloatervoicedevicesettings.h b/indra/newview/llfloatervoicedevicesettings.h
index 47f41d6d7e..ed8840a9f9 100644
--- a/indra/newview/llfloatervoicedevicesettings.h
+++ b/indra/newview/llfloatervoicedevicesettings.h
@@ -62,17 +62,21 @@ protected:
 	BOOL mDevicesUpdated;
 };
 
-class LLFloaterVoiceDeviceSettings : public LLFloater, public LLFloaterSingleton<LLFloaterVoiceDeviceSettings>
+class LLFloaterVoiceDeviceSettings : public LLFloater
 {
+	friend class LLFloaterReg;
+
 public:
-	LLFloaterVoiceDeviceSettings(const LLSD& seed);
+
 	virtual BOOL postBuild();
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void onClose(bool app_quitting);
 	/*virtual*/ void draw();
 	void apply();
 	void cancel();
-
+private:
+	LLFloaterVoiceDeviceSettings(const LLSD& seed);
+	
 protected:
 	static void* createPanelVoiceDeviceSettings(void* user_data);
 
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 9711e02f69..d435ec86a2 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -161,6 +161,16 @@ LLFloaterWorldMap::LLFloaterWorldMap(const LLSD& key)
 	mFactoryMap["terrain_mapview"] = LLCallbackMap(createWorldMapView, NULL);
 	
 	//Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_world_map.xml", FALSE);
+	mCommitCallbackRegistrar.add("WMap.Location",		boost::bind(&LLFloaterWorldMap::onLocationCommit, this));
+	mCommitCallbackRegistrar.add("WMap.AvatarCombo",	boost::bind(&LLFloaterWorldMap::onAvatarComboCommit, this));
+	mCommitCallbackRegistrar.add("WMap.SearchResult",	boost::bind(&LLFloaterWorldMap::onCommitSearchResult, this));
+	mCommitCallbackRegistrar.add("WMap.CommitLocation",	boost::bind(&LLFloaterWorldMap::onCommitLocation, this));
+	mCommitCallbackRegistrar.add("WMap.GoHome",			boost::bind(&LLFloaterWorldMap::onGoHome, this));	
+	mCommitCallbackRegistrar.add("WMap.Teleport",		boost::bind(&LLFloaterWorldMap::onClickTeleportBtn, this));	
+	mCommitCallbackRegistrar.add("WMap.ShowTarget",		boost::bind(&LLFloaterWorldMap::onShowTargetBtn, this));	
+	mCommitCallbackRegistrar.add("WMap.ShowAgent",		boost::bind(&LLFloaterWorldMap::onShowAgentBtn, this));		
+	mCommitCallbackRegistrar.add("WMap.Clear",			boost::bind(&LLFloaterWorldMap::onClearBtn, this));		
+	mCommitCallbackRegistrar.add("WMap.CopySLURL",		boost::bind(&LLFloaterWorldMap::onCopySLURL, this));
 }
 
 // static
@@ -183,8 +193,6 @@ BOOL LLFloaterWorldMap::postBuild()
 	//
 	//onCommitBackground();
 
-	childSetCommitCallback("friend combo", onAvatarComboCommit, this);
-
 	LLComboBox *avatar_combo = getChild<LLComboBox>("friend combo");
 	if (avatar_combo)
 	{
@@ -193,8 +201,6 @@ BOOL LLFloaterWorldMap::postBuild()
 		avatar_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
 	}
 
-	childSetAction("DoSearch", onLocationCommit, this);
-
 	getChild<LLScrollListCtrl>("location")->setFocusChangedCallback(boost::bind(&LLFloaterWorldMap::onLocationFocusChanged, this, _1));
 
 	LLLineEditor *location_editor = getChild<LLLineEditor>("location");
@@ -203,13 +209,7 @@ BOOL LLFloaterWorldMap::postBuild()
 		location_editor->setKeystrokeCallback( boost::bind(&LLFloaterWorldMap::onSearchTextEntry, this, _1), NULL );
 	}
 	
-	childSetCommitCallback("search_results", onCommitSearchResult, this);
 	getChild<LLScrollListCtrl>("search_results")->setDoubleClickCallback(onClickTeleportBtn, this);
-	childSetCommitCallback("spin x", onCommitLocation, this);
-	childSetCommitCallback("spin y", onCommitLocation, this);
-	childSetCommitCallback("spin z", onCommitLocation, this);
-
-	childSetCommitCallback("landmark combo", onLandmarkComboCommit, this);
 
 	LLComboBox *landmark_combo = getChild<LLComboBox>( "landmark combo");
 	if (landmark_combo)
@@ -219,15 +219,6 @@ BOOL LLFloaterWorldMap::postBuild()
 		landmark_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
 	}
 
-	childSetAction("Go Home", onGoHome, this);
-
-	childSetAction("Teleport", onClickTeleportBtn, this);
-
-	childSetAction("Show Destination", onShowTargetBtn, this);
-	childSetAction("Show My Location", onShowAgentBtn, this);
-	childSetAction("Clear", onClearBtn, this);
-	childSetAction("copy_slurl", onCopySLURL, this);
-
 	mCurZoomVal = log(gMapScale)/log(2.f);
 	childSetValue("zoom slider", gMapScale);
 
@@ -863,7 +854,7 @@ void LLFloaterWorldMap::buildLandmarkIDLists()
 	LLInventoryModel::cat_array_t cats;
 	LLInventoryModel::item_array_t items;
 	LLIsType is_landmark(LLAssetType::AT_LANDMARK);
-	gInventory.collectDescendentsIf(gAgent.getInventoryRootID(),
+	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
 									cats,
 									items,
 									LLInventoryModel::EXCLUDE_TRASH,
@@ -1020,8 +1011,7 @@ void LLFloaterWorldMap::onPanBtn( void* userdata )
 	map_panel->translatePan( pan_x, pan_y );
 }
 
-// static
-void LLFloaterWorldMap::onGoHome(void*)
+void LLFloaterWorldMap::onGoHome()
 {
 	gAgent.teleportHome();
 	gFloaterWorldMap->closeFloater();
@@ -1063,8 +1053,8 @@ void LLFloaterWorldMap::onSearchTextEntry( LLLineEditor* ctrl )
 	updateSearchEnabled();
 }
 
-// static 
-void LLFloaterWorldMap::onLandmarkComboCommit( LLUICtrl* ctrl, void* userdata )
+
+void LLFloaterWorldMap::onLandmarkComboCommit()
 {
 	LLFloaterWorldMap* self = gFloaterWorldMap;
 
@@ -1106,7 +1096,7 @@ void LLFloaterWorldMap::onLandmarkComboCommit( LLUICtrl* ctrl, void* userdata )
 	}
 	
 	self->trackLandmark( item_id);
-	onShowTargetBtn(self);
+	onShowTargetBtn();
 
 	// Reset to user postion if nothing is tracked
 	self->mSetToUserPosition = ( LLTracker::getTrackingStatus() == LLTracker::TRACKING_NOTHING );
@@ -1138,9 +1128,7 @@ void LLFloaterWorldMap::onAvatarComboPrearrange( )
 	}
 }
 
-
-// static 
-void LLFloaterWorldMap::onAvatarComboCommit( LLUICtrl* ctrl, void* userdata )
+void LLFloaterWorldMap::onAvatarComboCommit()
 {
 	LLFloaterWorldMap* self = gFloaterWorldMap;
 	if( !self || self->mIsClosing )
@@ -1158,7 +1146,7 @@ void LLFloaterWorldMap::onAvatarComboCommit( LLUICtrl* ctrl, void* userdata )
 		LLComboBox* combo = gFloaterWorldMap->getChild<LLComboBox>("friend combo");
 		if (combo) name = combo->getSimple();
 		self->trackAvatar(new_avatar_id, name);
-		onShowTargetBtn(self);
+		onShowTargetBtn();
 	}
 	else
 	{	// Reset to user postion if nothing is tracked
@@ -1184,8 +1172,7 @@ void LLFloaterWorldMap::updateSearchEnabled()
 	}
 }
 
-// static 
-void LLFloaterWorldMap::onLocationCommit( void* userdata )
+void LLFloaterWorldMap::onLocationCommit()
 {
 	LLFloaterWorldMap *self = gFloaterWorldMap;
 	if( !self || self->mIsClosing )
@@ -1222,16 +1209,13 @@ void LLFloaterWorldMap::onLocationCommit( void* userdata )
 	}
 }
 
-
-// static
-void LLFloaterWorldMap::onClearBtn(void* data)
+void LLFloaterWorldMap::onClearBtn()
 {
-	LLFloaterWorldMap* self = (LLFloaterWorldMap*)data;
-	self->mTrackedStatus = LLTracker::TRACKING_NOTHING;
+	mTrackedStatus = LLTracker::TRACKING_NOTHING;
 	LLTracker::stopTracking((void *)(intptr_t)TRUE);
 	LLWorldMap::getInstance()->mIsTrackingUnknownLocation = FALSE;
-	self->mSLURL = "";				// Clear the SLURL since it's invalid
-	self->mSetToUserPosition = TRUE;	// Revert back to the current user position
+	mSLURL = "";				// Clear the SLURL since it's invalid
+	mSetToUserPosition = TRUE;	// Revert back to the current user position
 }
 
 // static
@@ -1241,36 +1225,30 @@ void LLFloaterWorldMap::onFlyBtn(void* data)
 	self->fly();
 }
 
-void LLFloaterWorldMap::onShowTargetBtn(void* data)
+void LLFloaterWorldMap::onShowTargetBtn()
 {
-	LLFloaterWorldMap* self = (LLFloaterWorldMap*)data;
-	self->centerOnTarget(TRUE);
+	centerOnTarget(TRUE);
 }
 
-void LLFloaterWorldMap::onShowAgentBtn(void* data)
+void LLFloaterWorldMap::onShowAgentBtn()
 {
 	LLWorldMapView::setPan( 0, 0, FALSE); // FALSE == animate
-
 	// Set flag so user's location will be displayed if not tracking anything else
-	LLFloaterWorldMap* self = (LLFloaterWorldMap*)data;
-	self->mSetToUserPosition = TRUE;	
+	mSetToUserPosition = TRUE;	
 }
 
-// static
 void LLFloaterWorldMap::onClickTeleportBtn(void* data)
 {
 	LLFloaterWorldMap* self = (LLFloaterWorldMap*)data;
 	self->teleport();
 }
 
-// static
-void LLFloaterWorldMap::onCopySLURL(void* data)
+void LLFloaterWorldMap::onCopySLURL()
 {
-	LLFloaterWorldMap* self = (LLFloaterWorldMap*)data;
-	self->getWindow()->copyTextToClipboard(utf8str_to_wstring(self->mSLURL));
+	getWindow()->copyTextToClipboard(utf8str_to_wstring(mSLURL));
 	
 	LLSD args;
-	args["SLURL"] = self->mSLURL;
+	args["SLURL"] = mSLURL;
 
 	LLNotifications::instance().add("CopySLURL", args);
 }
@@ -1553,13 +1531,13 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
 	{
 		mExactMatch = TRUE;
 		childSetFocus("search_results");
-		onCommitSearchResult(NULL, this);
+		onCommitSearchResult();
 	}
 	else if (!mExactMatch && num_results > 0)
 	{
 		list->selectFirstItem(); // select first item by default
 		childSetFocus("search_results");
-		onCommitSearchResult(NULL, this);
+		onCommitSearchResult();
 	}
 	else if (num_results == 0)
 	{
@@ -1568,30 +1546,25 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
 	}
 }
 
-// static
-void LLFloaterWorldMap::onCommitLocation(LLUICtrl* ctrl, void* userdata)
+void LLFloaterWorldMap::onCommitLocation()
 {
-	LLFloaterWorldMap* self = (LLFloaterWorldMap*) userdata;
 	LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
 	if ( LLTracker::TRACKING_LOCATION == tracking_status)
 	{
 		LLVector3d pos_global = LLTracker::getTrackedPositionGlobal();
-		F64 local_x = self->childGetValue("spin x");
-		F64 local_y = self->childGetValue("spin y");
-		F64 local_z = self->childGetValue("spin z");
+		F64 local_x = childGetValue("spin x");
+		F64 local_y = childGetValue("spin y");
+		F64 local_z = childGetValue("spin z");
 		pos_global.mdV[VX] += -fmod(pos_global.mdV[VX], 256.0) + local_x;
 		pos_global.mdV[VY] += -fmod(pos_global.mdV[VY], 256.0) + local_y;
 		pos_global.mdV[VZ] = local_z;
-		self->trackLocation(pos_global);
+		trackLocation(pos_global);
 	}
 }
 
-// static
-void LLFloaterWorldMap::onCommitSearchResult(LLUICtrl*, void* userdata)
+void LLFloaterWorldMap::onCommitSearchResult()
 {
-	LLFloaterWorldMap* self = (LLFloaterWorldMap*) userdata;
-
-	LLCtrlListInterface *list = self->childGetListInterface("search_results");
+	LLCtrlListInterface *list = childGetListInterface("search_results");
 	if (!list) return;
 
 	LLSD selected_value = list->getSelectedValue();
@@ -1612,19 +1585,19 @@ void LLFloaterWorldMap::onCommitSearchResult(LLUICtrl*, void* userdata)
 		if (sim_name == info_sim_name)
 		{
 			LLVector3d pos_global = from_region_handle( info->mHandle );
-			F64 local_x = self->childGetValue("spin x");
-			F64 local_y = self->childGetValue("spin y");
-			F64 local_z = self->childGetValue("spin z");
+			F64 local_x = childGetValue("spin x");
+			F64 local_y = childGetValue("spin y");
+			F64 local_z = childGetValue("spin z");
 			pos_global.mdV[VX] += local_x;
 			pos_global.mdV[VY] += local_y;
 			pos_global.mdV[VZ] = local_z;
 
-			self->childSetValue("location", sim_name);
-			self->trackLocation(pos_global);
-			self->setDefaultBtn("Teleport");
+			childSetValue("location", sim_name);
+			trackLocation(pos_global);
+			setDefaultBtn("Teleport");
 			break;
 		}
 	}
 
-	onShowTargetBtn(self);
+	onShowTargetBtn();
 }
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index a7d7051b40..2f537fb735 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -114,25 +114,25 @@ public:
 protected:
 	static void		onPanBtn( void* userdata );
 
-	static void		onGoHome(void* data);
+	void			onGoHome();
 
-	void			onLandmarkComboPrearrange( );
-	static void		onLandmarkComboCommit( LLUICtrl* ctrl, void* data );
+	void			onLandmarkComboPrearrange();
+	void			onLandmarkComboCommit();
 
-	void			onAvatarComboPrearrange( );
-	static void		onAvatarComboCommit( LLUICtrl* ctrl, void* data );
+	void			onAvatarComboPrearrange();
+	void		    onAvatarComboCommit();
 
 	void			onCommitBackground();
 
 	void			onComboTextEntry( );
 	void			onSearchTextEntry( LLLineEditor* ctrl );
 
-	static void		onClearBtn(void*);
+	void			onClearBtn();
 	static void		onFlyBtn(void*);
 	static void		onClickTeleportBtn(void*);
-	static void		onShowTargetBtn(void*);
-	static void		onShowAgentBtn(void*);
-	static void		onCopySLURL(void*);
+	void			onShowTargetBtn();
+	void			onShowAgentBtn();
+	void			onCopySLURL();
 
 	static void onCheckEvents(LLUICtrl* ctrl, void*);
 
@@ -152,11 +152,11 @@ protected:
 	void			flyToAvatar();
 	void			teleportToAvatar();
 
-	void			updateSearchEnabled( );
+	void			updateSearchEnabled();
 	void			onLocationFocusChanged( LLFocusableElement* ctrl );
-	static void		onLocationCommit( void* userdata );
-	static void		onCommitLocation( LLUICtrl* ctrl, void* userdata );
-	static void		onCommitSearchResult( LLUICtrl* ctrl, void* userdata );
+	void		    onLocationCommit();
+	void			onCommitLocation();
+	void		    onCommitSearchResult();
 
 	void			cacheLandmarkPosition();
 
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index ebda8b25fd..d0a82f283c 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -34,20 +34,11 @@
 
 #include "llfolderview.h"
 
-#include <algorithm>
-
-#include "llviewercontrol.h"
-#include "lldbstrings.h"
-#include "llfocusmgr.h"
-#include "llfontgl.h"
-#include "llgl.h" 
-#include "llrender.h"
-#include "llinventory.h"
-
 #include "llcallbacklist.h"
 #include "llinventorybridge.h"
 #include "llinventoryclipboard.h" // *TODO: remove this once hack below gone.
-#include "llinventoryview.h"// hacked in for the bonus context menu items.
+#include "llinventoryfilter.h"
+#include "llfloaterinventory.h"// hacked in for the bonus context menu items.
 #include "llkeyboard.h"
 #include "lllineeditor.h"
 #include "llmenugl.h"
@@ -61,34 +52,35 @@
 #include "llviewerjointattachment.h"
 #include "llviewermenu.h"
 #include "lluictrlfactory.h"
+#include "llviewercontrol.h"
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
 #include "llfloaterproperties.h"
 
-// RN: HACK
-// We need these because some of the code below relies on things like
-// gAgent root folder. Remove them once the abstraction leak is fixed.
-#include "llagent.h"
-#include "llappviewer.h"
+// Linden library includes
+#include "lldbstrings.h"
+#include "llfocusmgr.h"
+#include "llfontgl.h"
+#include "llgl.h" 
+#include "llrender.h"
+#include "llinventory.h"
+
+// Third-party library includes
+#include <algorithm>
 
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
 
-const S32 LEFT_PAD = 5;
-const S32 LEFT_INDENTATION = 13;
-const S32 ICON_PAD = 2;
-const S32 ICON_WIDTH = 16;
-const S32 TEXT_PAD = 1;
-const S32 ARROW_SIZE = 12;
 const S32 RENAME_WIDTH_PAD = 4;
 const S32 RENAME_HEIGHT_PAD = 2;
 const S32 AUTO_OPEN_STACK_DEPTH = 16;
-const S32 MIN_ITEM_WIDTH_VISIBLE = ICON_WIDTH + ICON_PAD + ARROW_SIZE + TEXT_PAD + /*first few characters*/ 40;
+const S32 MIN_ITEM_WIDTH_VISIBLE = LLFolderViewItem::ICON_WIDTH
+			+ LLFolderViewItem::ICON_PAD 
+			+ LLFolderViewItem::ARROW_SIZE 
+			+ LLFolderViewItem::TEXT_PAD 
+			+ /*first few characters*/ 40;
 const S32 MINIMUM_RENAMER_WIDTH = 80;
-const F32 FOLDER_CLOSE_TIME_CONSTANT = 0.02f;
-const F32 FOLDER_OPEN_TIME_CONSTANT = 0.03f;
-const S32 MAX_FOLDER_ITEM_OVERLAP = 2;
 
 enum {
 	SIGNAL_NO_KEYBOARD_FOCUS = 1,
@@ -104,5030 +96,2071 @@ void properties_selected_items(void* user_data);
 void paste_items(void* user_data);
 void renamer_focus_lost( LLFocusableElement* handler, void* user_data );
 
-///----------------------------------------------------------------------------
-/// Class LLFolderViewItem
-///----------------------------------------------------------------------------
-
-// statics 
-const LLFontGL* LLFolderViewItem::sFont = NULL;
-const LLFontGL* LLFolderViewItem::sSmallFont = NULL;
-LLUIImagePtr LLFolderViewItem::sArrowImage;
-LLUIImagePtr LLFolderViewItem::sBoxImage;
 
-const LLColor4U DEFAULT_WHITE(255, 255, 255);
-
-//static
-void LLFolderViewItem::initClass()
-{
-	sFont = LLFontGL::getFontSansSerifSmall();
-	sSmallFont = LLFontGL::getFontMonospace();
-	sArrowImage = LLUI::getUIImage("folder_arrow.tga"); 
-	sBoxImage = LLUI::getUIImage("rounded_square.tga");
-}
+//---------------------------------------------------------------------------
 
-//static
-void LLFolderViewItem::cleanupClass()
+// Tells all folders in a folderview to sort their items
+// (and only their items, not folders) by a certain function.
+class LLSetItemSortFunction : public LLFolderViewFunctor
 {
-	sArrowImage = NULL;
-	sBoxImage = NULL;
-}
+public:
+	LLSetItemSortFunction(U32 ordering)
+		: mSortOrder(ordering) {}
+	virtual ~LLSetItemSortFunction() {}
+	virtual void doFolder(LLFolderViewFolder* folder);
+	virtual void doItem(LLFolderViewItem* item);
 
-// NOTE: Optimize this, we call it a *lot* when opening a large inventory
+	U32 mSortOrder;
+};
 
-// Default constructor
-LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p)
-:	LLView(p),
-	mLabelWidth(0),
-	mLabelWidthDirty(false),
-	mParentFolder( NULL ),
-	mIsSelected( FALSE ),
-	mIsCurSelection( FALSE ),
-	mSelectPending(FALSE),
-	mLabelStyle( LLFontGL::NORMAL ),
-	mHasVisibleChildren(FALSE),
-	mIndentation(0),
-	mNumDescendantsSelected(0),
-	mFiltered(FALSE),
-	mLastFilterGeneration(-1),
-	mStringMatchOffset(std::string::npos),
-	mControlLabelRotation(0.f),
-	mDragAndDropTarget(FALSE),
-	mIsLoading(FALSE),
-	mLabel(p.name),
-	mRoot(p.root),
-	mCreationDate(p.creation_date),
-	mListener(p.listener),
-	mArrowImage(p.folder_arrow_image),
-	mBoxImage(p.selection_image)
-{
-	refresh();
-}
 
-// Destroys the object
-LLFolderViewItem::~LLFolderViewItem( void )
+// Set the sort order.
+void LLSetItemSortFunction::doFolder(LLFolderViewFolder* folder)
 {
-	delete mListener;
-	mListener = NULL;
+	folder->setItemSortOrder(mSortOrder);
 }
 
-LLFolderView* LLFolderViewItem::getRoot()
+// Do nothing.
+void LLSetItemSortFunction::doItem(LLFolderViewItem* item)
 {
-	return mRoot;
+	return;
 }
 
-// Returns true if this object is a child (or grandchild, etc.) of potential_ancestor.
-BOOL LLFolderViewItem::isDescendantOf( const LLFolderViewFolder* potential_ancestor )
-{
-	LLFolderViewItem* root = this;
-	while( root->mParentFolder )
-	{
-		if( root->mParentFolder == potential_ancestor )
-		{
-			return TRUE;
-		}
-		root = root->mParentFolder;
-	}
-	return FALSE;
-}
+//---------------------------------------------------------------------------
 
-LLFolderViewItem* LLFolderViewItem::getNextOpenNode(BOOL include_children)
+// Tells all folders in a folderview to close themselves
+// For efficiency, calls setOpenArrangeRecursively().
+// The calling function must then call:
+//	LLFolderView* root = getRoot();
+//	if( root )
+//	{
+//		root->arrange( NULL, NULL );
+//		root->scrollToShowSelection();
+//	}
+// to patch things up.
+class LLCloseAllFoldersFunctor : public LLFolderViewFunctor
 {
-	if (!mParentFolder)
-	{
-		return NULL;
-	}
-	
-	LLFolderViewItem* itemp = mParentFolder->getNextFromChild( this, include_children );
-	while(itemp && !itemp->getVisible())
-	{
-		LLFolderViewItem* next_itemp = itemp->mParentFolder->getNextFromChild( itemp, include_children );
-		if (itemp == next_itemp) 
-		{
-			// hit last item
-			return itemp->getVisible() ? itemp : this;
-		}
-		itemp = next_itemp;
-	}
-
-	return itemp;
-}
+public:
+	LLCloseAllFoldersFunctor(BOOL close) { mOpen = !close; }
+	virtual ~LLCloseAllFoldersFunctor() {}
+	virtual void doFolder(LLFolderViewFolder* folder);
+	virtual void doItem(LLFolderViewItem* item);
 
-LLFolderViewItem* LLFolderViewItem::getPreviousOpenNode(BOOL include_children)
-{
-	if (!mParentFolder)
-	{
-		return NULL;
-	}
-	
-	LLFolderViewItem* itemp = mParentFolder->getPreviousFromChild( this, include_children );
-	while(itemp && !itemp->getVisible())
-	{
-		LLFolderViewItem* next_itemp = itemp->mParentFolder->getPreviousFromChild( itemp, include_children );
-		if (itemp == next_itemp) 
-		{
-			// hit first item
-			return itemp->getVisible() ? itemp : this;
-		}
-		itemp = next_itemp;
-	}
+	BOOL mOpen;
+};
 
-	return itemp;
-}
 
-// is this item something we think we should be showing?
-// for example, if we haven't gotten around to filtering it yet, then the answer is yes
-// until we find out otherwise
-BOOL LLFolderViewItem::potentiallyVisible()
+// Set the sort order.
+void LLCloseAllFoldersFunctor::doFolder(LLFolderViewFolder* folder)
 {
-	// we haven't been checked against min required filter
-	// or we have and we passed
-	return getLastFilterGeneration() < getRoot()->getFilter()->getMinRequiredGeneration() || getFiltered();
+	folder->setOpenArrangeRecursively(mOpen);
 }
 
-BOOL LLFolderViewItem::getFiltered() 
-{ 
-	return mFiltered && mLastFilterGeneration >= getRoot()->getFilter()->getMinRequiredGeneration(); 
-}
+// Do nothing.
+void LLCloseAllFoldersFunctor::doItem(LLFolderViewItem* item)
+{ }
 
-BOOL LLFolderViewItem::getFiltered(S32 filter_generation) 
-{
-	return mFiltered && mLastFilterGeneration >= filter_generation;
-}
+///----------------------------------------------------------------------------
+/// Class LLFolderView
+///----------------------------------------------------------------------------
 
-void LLFolderViewItem::setFiltered(BOOL filtered, S32 filter_generation)
-{
-	mFiltered = filtered;
-	mLastFilterGeneration = filter_generation;
-}
+// Default constructor
+LLFolderView::LLFolderView(const Params& p)
+:	LLFolderViewFolder(p),
+	mScrollContainer( NULL ),
+	mPopupMenuHandle(),
+	mAllowMultiSelect(TRUE),
+	mShowFolderHierarchy(FALSE),
+	mSourceID(p.task_id),
+	mRenameItem( NULL ),
+	mNeedsScroll( FALSE ),
+	mLastScrollItem( NULL ),
+	mNeedsAutoSelect( FALSE ),
+	mAutoSelectOverride(FALSE),
+	mNeedsAutoRename(FALSE),
+	mDebugFilters(FALSE),
+	mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME),	// This gets overridden by a pref immediately
+	mFilter( new LLInventoryFilter(p.name) ),
+	mShowSelectionContext(FALSE),
+	mShowSingleSelection(FALSE),
+	mArrangeGeneration(0),
+	mSignalSelectCallback(0),
+	mMinWidth(0),
+	mDragAndDropThisFrame(FALSE),
+	mCallbackRegistrar(NULL),
+	mParentPanel(p.parent_panel)
 
-void LLFolderViewItem::setIcon(LLUIImagePtr icon)
 {
-	mIcon = icon;
-}
+	LLRect rect = p.rect;
+	LLRect new_rect(rect.mLeft, rect.mBottom + getRect().getHeight(), rect.mLeft + getRect().getWidth(), rect.mBottom);
+	setRect( rect );
+	reshape(rect.getWidth(), rect.getHeight());
+	mIsOpen = TRUE; // this view is always open.
+	mAutoOpenItems.setDepth(AUTO_OPEN_STACK_DEPTH);
+	mAutoOpenCandidate = NULL;
+	mAutoOpenTimer.stop();
+	mKeyboardSelection = FALSE;
+	mIndentation = -LEFT_INDENTATION; // children start at indentation 0
+	gIdleCallbacks.addFunction(idle, this);
 
-// refresh information from the listener
-void LLFolderViewItem::refreshFromListener()
-{
-	if(mListener)
-	{
-		mLabel = mListener->getDisplayName();
-		LLAssetType::EType preferred_type = mListener->getPreferredType();
+	//clear label
+	// go ahead and render root folder as usual
+	// just make sure the label ("Inventory Folder") never shows up
+	mLabel = LLStringUtil::null;
 
-		// *TODO: to be removed when database supports multi language. This is a
-		// temporary attempt to display the inventory folder in the user locale.
-		if (preferred_type != LLAssetType::AT_NONE)
-		{
-			mLabel = LLTrans::getString("InvFolder " + mLabel);
-		};
+	//mRenamer->setWriteableBgColor(LLColor4::white);
+	// Escape is handled by reverting the rename, not commiting it (default behavior)
+	LLLineEditor::Params params;
+	params.name("ren");
+	params.rect(getRect());
+	params.font(sFont);
+	params.max_length_bytes(DB_INV_ITEM_NAME_STR_LEN);
+	params.commit_callback.function(boost::bind(&LLFolderView::commitRename, this, _2));
+	params.prevalidate_callback(&LLLineEditor::prevalidatePrintableNotPipe);
+	params.commit_on_focus_lost(true);
+	params.visible(false);
+	mRenamer = LLUICtrlFactory::create<LLLineEditor> (params);
+	addChild(mRenamer);
 
-		setIcon(mListener->getIcon());
-		time_t creation_date = mListener->getCreationDate();
-		if (mCreationDate != creation_date)
-		{
-			mCreationDate = mListener->getCreationDate();
-			dirtyFilter();
-		}
-		mLabelStyle = mListener->getLabelStyle();
-		mLabelSuffix = mListener->getLabelSuffix();
+	// make the popup menu available
+	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_inventory.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+	if (!menu)
+	{
+		menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu");
 	}
+	menu->setBackgroundColor(LLUIColorTable::instance().getColor("MenuPopupBgColor"));
+	mPopupMenuHandle = menu->getHandle();
+
 }
 
-void LLFolderViewItem::refresh()
+// Destroys the object
+LLFolderView::~LLFolderView( void )
 {
-	refreshFromListener();
-	
-	std::string searchable_label(mLabel);
-	searchable_label.append(mLabelSuffix);
-	LLStringUtil::toUpper(searchable_label);
+	// The release focus call can potentially call the
+	// scrollcontainer, which can potentially be called with a partly
+	// destroyed scollcontainer. Just null it out here, and no worries
+	// about calling into the invalid scroll container.
+	// Same with the renamer.
+	mScrollContainer = NULL;
+	mRenameItem = NULL;
+	mRenamer = NULL;
 
-	if (mSearchableLabel.compare(searchable_label))
+	if( gEditMenuHandler == this )
 	{
-		mSearchableLabel.assign(searchable_label);
-		dirtyFilter();
-		// some part of label has changed, so overall width has potentially changed, and sort order too
-		if (mParentFolder)
-		{
-			mParentFolder->requestSort();
-			mParentFolder->requestArrange();
-		}
+		gEditMenuHandler = NULL;
 	}
 
-	mLabelWidthDirty = true;
-}
-
-void LLFolderViewItem::applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor)
-{
-	functor(mListener);
-}
-
-// This function is called when items are added or view filters change. It's
-// implemented here but called by derived classes when folding the
-// views.
-void LLFolderViewItem::filterFromRoot( void )
-{
-	LLFolderViewItem* root = getRoot();
+	mAutoOpenItems.removeAllNodes();
+	gIdleCallbacks.deleteFunction(idle, this);
 
-	root->filter(*((LLFolderView*)root)->getFilter());
-}
+	LLView::deleteViewByHandle(mPopupMenuHandle);
 
-// This function is called when the folder view is dirty. It's
-// implemented here but called by derived classes when folding the
-// views.
-void LLFolderViewItem::arrangeFromRoot()
-{
-	LLFolderViewItem* root = getRoot();
+	if(mRenamer == gFocusMgr.getTopCtrl())
+	{
+		gFocusMgr.setTopCtrl(NULL);
+	}
 
-	S32 height = 0;
-	S32 width = 0;
-	root->arrange( &width, &height, 0 );
-}
+	mAutoOpenItems.removeAllNodes();
+	clearSelection();
+	mItems.clear();
+	mFolders.clear();
 
-// This function clears the currently selected item, and records the
-// specified selected item appropriately for display and use in the
-// UI. If open is TRUE, then folders are opened up along the way to
-// the selection.
-void LLFolderViewItem::setSelectionFromRoot(LLFolderViewItem* selection,
-											BOOL openitem,
-											BOOL take_keyboard_focus)
-{
-	getRoot()->setSelection(selection, openitem, take_keyboard_focus);
-}
+	mItemMap.clear();
 
-// helper function to change the selection from the root.
-void LLFolderViewItem::changeSelectionFromRoot(LLFolderViewItem* selection, BOOL selected)
-{
-	getRoot()->changeSelection(selection, selected);
+	delete mFilter;
+	mFilter = NULL;
 }
 
-void LLFolderViewItem::extendSelectionFromRoot(LLFolderViewItem* selection)
+BOOL LLFolderView::canFocusChildren() const
 {
-	LLDynamicArray<LLFolderViewItem*> selected_items;
-
-	getRoot()->extendSelection(selection, NULL, selected_items);
-}
-
-EInventorySortGroup LLFolderViewItem::getSortGroup()  const
-{ 
-	return SG_ITEM; 
+	return FALSE;
 }
 
-// addToFolder() returns TRUE if it succeeds. FALSE otherwise
-BOOL LLFolderViewItem::addToFolder(LLFolderViewFolder* folder, LLFolderView* root)
+void LLFolderView::checkTreeResortForModelChanged()
 {
-	if (!folder)
+	if (mSortOrder & LLInventoryFilter::SO_DATE && !(mSortOrder & LLInventoryFilter::SO_FOLDERS_BY_NAME))
 	{
-		return FALSE;
+		// This is the case where something got added or removed.  If we are date sorting
+		// everything including folders, then we need to rebuild the whole tree.
+		// Just set to something not SO_DATE to force the folder most resent date resort.
+		mSortOrder = mSortOrder & ~LLInventoryFilter::SO_DATE;
+		setSortOrder(mSortOrder | LLInventoryFilter::SO_DATE);
 	}
-	mParentFolder = folder;
-	root->addItemID(getListener()->getUUID(), this);
-	return folder->addItem(this);
 }
 
-
-// Finds width and height of this object and it's children.  Also
-// makes sure that this view and it's children are the right size.
-S32 LLFolderViewItem::arrange( S32* width, S32* height, S32 filter_generation)
+void LLFolderView::setSortOrder(U32 order)
 {
-	mIndentation = mParentFolder ? mParentFolder->getIndentation() + LEFT_INDENTATION : 0;
-	if (mLabelWidthDirty)
+	if (order != mSortOrder)
 	{
-		mLabelWidth = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + sFont->getWidth(mSearchableLabel); 
-		mLabelWidthDirty = false;
-	}
-
-	*width = llmax(*width, mLabelWidth + mIndentation); 
-	*height = getItemHeight();
-	return *height;
-}
-
-S32 LLFolderViewItem::getItemHeight()
-{
-	S32 icon_height = mIcon->getHeight();
-	S32 label_height = llround(sFont->getLineHeight());
-	return llmax( icon_height, label_height ) + ICON_PAD;
-}
+		LLFastTimer t(LLFastTimer::FTM_SORT);
+		mSortOrder = order;
 
-void LLFolderViewItem::filter( LLInventoryFilter& filter)
-{
-	BOOL filtered = mListener && filter.check(this);
-	
-	// if our visibility will change as a result of this filter, then
-	// we need to be rearranged in our parent folder
-	if (getVisible() != filtered)
-	{
-		if (mParentFolder)
+		for (folders_t::iterator iter = mFolders.begin();
+			 iter != mFolders.end();)
 		{
-			mParentFolder->requestArrange();
+			folders_t::iterator fit = iter++;
+			(*fit)->sortBy(order);
 		}
-	}
 
-	setFiltered(filtered, filter.getCurrentGeneration());
-	mStringMatchOffset = filter.getStringMatchOffset();
-	filter.decrementFilterCount();
-
-	if (getRoot()->getDebugFilters())
-	{
-		mStatusText = llformat("%d", mLastFilterGeneration);
+		arrangeAll();
 	}
 }
 
-void LLFolderViewItem::dirtyFilter()
+
+U32 LLFolderView::getSortOrder() const
 {
-	mLastFilterGeneration = -1;
-	// bubble up dirty flag all the way to root
-	if (getParentFolder())
-	{
-		getParentFolder()->setCompletedFilterGeneration(-1, TRUE);
-	}
+	return mSortOrder;
 }
 
-// *TODO: This can be optimized a lot by simply recording that it is
-// selected in the appropriate places, and assuming that set selection
-// means 'deselect' for a leaf item. Do this optimization after
-// multiple selection is implemented to make sure it all plays nice
-// together.
-BOOL LLFolderViewItem::setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus)
+BOOL LLFolderView::addFolder( LLFolderViewFolder* folder)
 {
-	if( selection == this )
+	// enforce sort order of My Inventory followed by Library
+	if (folder->getListener()->getUUID() == gInventory.getLibraryRootFolderID())
 	{
-		mIsSelected = TRUE;
-		if(mListener)
-		{
-			mListener->selectItem();
-		}
+		mFolders.push_back(folder);
 	}
 	else
 	{
-		mIsSelected = FALSE;
+		mFolders.insert(mFolders.begin(), folder);
 	}
-	return mIsSelected;
+	folder->setOrigin(0, 0);
+	folder->reshape(getRect().getWidth(), 0);
+	folder->setVisible(FALSE);
+	addChild( folder );
+	folder->dirtyFilter();
+	folder->requestArrange();
+	return TRUE;
 }
 
-BOOL LLFolderViewItem::changeSelection(LLFolderViewItem* selection, BOOL selected)
+void LLFolderView::closeAllFolders()
 {
-	if(selection == this && mIsSelected != selected)
-	{
-		mIsSelected = selected;
-		if(mListener)
-		{
-			mListener->selectItem();
-		}
-		return TRUE;
-	}
-	return FALSE;
+	// Close all the folders
+	setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN);
+	arrangeAll();
 }
 
-void LLFolderViewItem::recursiveDeselect(BOOL deselect_self)
+void LLFolderView::openFolder(const std::string& foldername)
 {
-	if (mIsSelected && deselect_self)
+	LLFolderViewFolder* inv = findChild<LLFolderViewFolder>(foldername);
+	if (inv)
 	{
-		mIsSelected = FALSE;
-
-		// update ancestors' count of selected descendents
-		LLFolderViewFolder* parent_folder = getParentFolder();
-		while(parent_folder)
-		{
-			parent_folder->mNumDescendantsSelected--;
-			parent_folder = parent_folder->getParentFolder();
-		}
+		setSelection(inv, FALSE, FALSE);
+		inv->setOpen(TRUE);
 	}
 }
 
-
-BOOL LLFolderViewItem::isMovable()
+void LLFolderView::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse)
 {
-	if( mListener )
-	{
-		return mListener->isItemMovable();
-	}
-	else
-	{
-		return TRUE;
-	}
+	// call base class to do proper recursion
+	LLFolderViewFolder::setOpenArrangeRecursively(openitem, recurse);
+	// make sure root folder is always open
+	mIsOpen = TRUE;
 }
 
-BOOL LLFolderViewItem::isRemovable()
+// This view grows and shinks to enclose all of its children items and folders.
+S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_generation )
 {
-	if( mListener )
-	{
-		return mListener->isItemRemovable();
-	}
-	else
-	{
-		return TRUE;
-	}
-}
+	LLFastTimer t2(LLFastTimer::FTM_ARRANGE);
 
-void LLFolderViewItem::destroyView()
-{
-	if (mParentFolder)
-	{
-		// removeView deletes me
-		mParentFolder->removeView(this);
-	}
-}
+	filter_generation = mFilter->getMinRequiredGeneration();
+	mMinWidth = 0;
 
-// Call through to the viewed object and return true if it can be
-// removed.
-//BOOL LLFolderViewItem::removeRecursively(BOOL single_item)
-BOOL LLFolderViewItem::remove()
-{
-	if(!isRemovable())
+	mHasVisibleChildren = hasFilteredDescendants(filter_generation);
+	// arrange always finishes, so optimistically set the arrange generation to the most current
+	mLastArrangeGeneration = getRoot()->getArrangeGeneration();
+
+	LLInventoryFilter::EFolderShow show_folder_state =
+		getRoot()->getFilter()->getShowFolderState();
+
+	S32 total_width = LEFT_PAD;
+	S32 running_height = mDebugFilters ? llceil(sSmallFont->getLineHeight()) : 0;
+	S32 target_height = running_height;
+	S32 parent_item_height = getRect().getHeight();
+
+	for (folders_t::iterator iter = mFolders.begin();
+		 iter != mFolders.end();)
 	{
-		return FALSE;
+		folders_t::iterator fit = iter++;
+		LLFolderViewFolder* folderp = (*fit);
+		if (getDebugFilters())
+		{
+			folderp->setVisible(TRUE);
+		}
+		else
+		{
+			folderp->setVisible(show_folder_state == LLInventoryFilter::SHOW_ALL_FOLDERS || // always show folders?
+									(folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation))); // passed filter or has descendants that passed filter
+		}
+		if (folderp->getVisible())
+		{
+			S32 child_height = 0;
+			S32 child_width = 0;
+			S32 child_top = parent_item_height - running_height;
+			
+			target_height += folderp->arrange( &child_width, &child_height, filter_generation );
+
+			mMinWidth = llmax(mMinWidth, child_width);
+			total_width = llmax( total_width, child_width );
+			running_height += child_height;
+			folderp->setOrigin( ICON_PAD, child_top - (*fit)->getRect().getHeight() );
+		}
 	}
-	if(mListener)
+
+	for (items_t::iterator iter = mItems.begin();
+		 iter != mItems.end();)
 	{
-		return mListener->removeItem();
+		items_t::iterator iit = iter++;
+		LLFolderViewItem* itemp = (*iit);
+		itemp->setVisible(itemp->getFiltered(filter_generation));
+
+		if (itemp->getVisible())
+		{
+			S32 child_width = 0;
+			S32 child_height = 0;
+			S32 child_top = parent_item_height - running_height;
+			
+			target_height += itemp->arrange( &child_width, &child_height, filter_generation );
+			itemp->reshape(itemp->getRect().getWidth(), child_height);
+
+			mMinWidth = llmax(mMinWidth, child_width);
+			total_width = llmax( total_width, child_width );
+			running_height += child_height;
+			itemp->setOrigin( ICON_PAD, child_top - itemp->getRect().getHeight() );
+		}
 	}
-	return TRUE;
-}
 
-// Build an appropriate context menu for the item.
-void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
-{
-	if(mListener)
+	S32 dummy_s32;
+	BOOL dummy_bool;
+	S32 min_width;
+	mScrollContainer->calcVisibleSize( &min_width, &dummy_s32, &dummy_bool, &dummy_bool);
+	reshape( llmax(min_width, total_width), running_height );
+
+	S32 new_min_width;
+	mScrollContainer->calcVisibleSize( &new_min_width, &dummy_s32, &dummy_bool, &dummy_bool);
+	if (new_min_width != min_width)
 	{
-		mListener->buildContextMenu(menu, flags);
+		reshape( llmax(min_width, total_width), running_height );
 	}
+
+	// move item renamer text field to item's new position
+	updateRenamerPosition();
+
+	mTargetHeight = (F32)target_height;
+	return llround(mTargetHeight);
 }
 
-void LLFolderViewItem::openItem( void )
+const std::string LLFolderView::getFilterSubString(BOOL trim)
 {
-	if( mListener )
-	{
-		mListener->openItem();
-	}
+	return mFilter->getFilterSubString(trim);
 }
 
-void LLFolderViewItem::preview( void )
+void LLFolderView::filter( LLInventoryFilter& filter )
 {
-	if (mListener)
+	LLFastTimer t2(LLFastTimer::FTM_FILTER);
+	filter.setFilterCount(llclamp(gSavedSettings.getS32("FilterItemsPerFrame"), 1, 5000));
+
+	if (getCompletedFilterGeneration() < filter.getCurrentGeneration())
 	{
-		mListener->previewItem();
+		mFiltered = FALSE;
+		mMinWidth = 0;
+		LLFolderViewFolder::filter(filter);
 	}
 }
 
-void LLFolderViewItem::rename(const std::string& new_name)
+void LLFolderView::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-	if( !new_name.empty() )
+	S32 min_width = 0;
+	S32 dummy_height;
+	BOOL dummy_bool;
+	if (mScrollContainer)
 	{
-		if( mListener )
-		{
-			mListener->renameItem(new_name);
-
-			if(mParentFolder)
-			{
-				mParentFolder->requestSort();
-			}
-		}
+		mScrollContainer->calcVisibleSize( &min_width, &dummy_height, &dummy_bool, &dummy_bool);
 	}
-}
+	width = llmax(mMinWidth, min_width);
+	LLView::reshape(width, height, called_from_parent);
 
-const std::string& LLFolderViewItem::getSearchableLabel() const
-{
-	return mSearchableLabel;
+	mReshapeSignal(mSelectedItems, FALSE);
 }
 
-const std::string& LLFolderViewItem::getName( void ) const
+void LLFolderView::addToSelectionList(LLFolderViewItem* item)
 {
-	if(mListener)
+	if (item->isSelected())
 	{
-		return mListener->getName();
+		removeFromSelectionList(item);
 	}
-	return mLabel;
-}
-
-// LLView functionality
-BOOL LLFolderViewItem::handleRightMouseDown( S32 x, S32 y, MASK mask )
-{
-	if(!mIsSelected)
+	if (mSelectedItems.size())
 	{
-		setSelectionFromRoot(this, FALSE);
+		mSelectedItems.back()->setIsCurSelection(FALSE);
 	}
-	make_ui_sound("UISndClick");
-	return TRUE;
+	item->setIsCurSelection(TRUE);
+	mSelectedItems.push_back(item);
 }
 
-BOOL LLFolderViewItem::handleMouseDown( S32 x, S32 y, MASK mask )
+void LLFolderView::removeFromSelectionList(LLFolderViewItem* item)
 {
-	// No handler needed for focus lost since this class has no
-	// state that depends on it.
-	gFocusMgr.setMouseCapture( this );
+	if (mSelectedItems.size())
+	{
+		mSelectedItems.back()->setIsCurSelection(FALSE);
+	}
 
-	if (!mIsSelected)
+	selected_items_t::iterator item_iter;
+	for (item_iter = mSelectedItems.begin(); item_iter != mSelectedItems.end();)
 	{
-		if(mask & MASK_CONTROL)
-		{
-			changeSelectionFromRoot(this, !mIsSelected);
-		}
-		else if (mask & MASK_SHIFT)
+		if (*item_iter == item)
 		{
-			extendSelectionFromRoot(this);
+			item_iter = mSelectedItems.erase(item_iter);
 		}
 		else
 		{
-			setSelectionFromRoot(this, FALSE);
+			++item_iter;
 		}
-		make_ui_sound("UISndClick");
 	}
-	else
+	if (mSelectedItems.size())
 	{
-		mSelectPending = TRUE;
+		mSelectedItems.back()->setIsCurSelection(TRUE);
 	}
+}
 
-	if( isMovable() )
+LLFolderViewItem* LLFolderView::getCurSelectedItem( void )
+{
+	if(mSelectedItems.size())
 	{
-		S32 screen_x;
-		S32 screen_y;
-		localPointToScreen(x, y, &screen_x, &screen_y );
-		LLToolDragAndDrop::getInstance()->setDragStart( screen_x, screen_y );
+		LLFolderViewItem* itemp = mSelectedItems.back();
+		llassert(itemp->getIsCurSelection());
+		return itemp;
 	}
-	return TRUE;
+	return NULL;
 }
 
-BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
+
+// Record the selected item and pass it down the hierachy.
+BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL openitem,
+								BOOL take_keyboard_focus)
 {
-	if( hasMouseCapture() && isMovable() )
+	if( selection == this )
 	{
-		S32 screen_x;
-		S32 screen_y;
-		localPointToScreen(x, y, &screen_x, &screen_y );
-		BOOL can_drag = TRUE;
-		if( LLToolDragAndDrop::getInstance()->isOverThreshold( screen_x, screen_y ) )
-		{
-			LLFolderView* root = getRoot();
-			
-			if(root->getCurSelectedItem())
-			{
-				LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_WORLD;
-
-				// *TODO: push this into listener and remove
-				// dependency on llagent
-				if(mListener && gInventory.isObjectDescendentOf(mListener->getUUID(), gAgent.getInventoryRootID()))
-				{
-					src = LLToolDragAndDrop::SOURCE_AGENT;
-				}
-				else if (mListener && gInventory.isObjectDescendentOf(mListener->getUUID(), gInventoryLibraryRoot))
-				{
-					src = LLToolDragAndDrop::SOURCE_LIBRARY;
-				}
-
-				can_drag = root->startDrag(src);
-				if (can_drag)
-				{
-					// if (mListener) mListener->startDrag();
-					// RN: when starting drag and drop, clear out last auto-open
-					root->autoOpenTest(NULL);
-					root->setShowSelectionContext(TRUE);
+		return FALSE;
+	}
 
-					// Release keyboard focus, so that if stuff is dropped into the
-					// world, pressing the delete key won't blow away the inventory
-					// item.
-					gFocusMgr.setKeyboardFocus(NULL);
+	if( selection && take_keyboard_focus)
+	{
+		mParentPanel->setFocus(TRUE);
+	}
 
-					return LLToolDragAndDrop::getInstance()->handleHover( x, y, mask );
-				}
-			}
-		}
+	// clear selection down here because change of keyboard focus can potentially
+	// affect selection
+	clearSelection();
 
-		if (can_drag)
-		{
-			gViewerWindow->setCursor(UI_CURSOR_ARROW);
-		}
-		else
-		{
-			gViewerWindow->setCursor(UI_CURSOR_NOLOCKED);
-		}
-		return TRUE;
+	if(selection)
+	{
+		addToSelectionList(selection);
 	}
-	else
+
+	BOOL rv = LLFolderViewFolder::setSelection(selection, openitem, take_keyboard_focus);
+	if(openitem && selection)
 	{
-		getRoot()->setShowSelectionContext(FALSE);
-		gViewerWindow->setCursor(UI_CURSOR_ARROW);
-		// let parent handle this then...
-		return FALSE;
+		selection->getParentFolder()->requestArrange();
 	}
-}
 
+	llassert(mSelectedItems.size() <= 1);
 
-BOOL LLFolderViewItem::handleDoubleClick( S32 x, S32 y, MASK mask )
-{
-	preview();
-	return TRUE;
+	mSignalSelectCallback = take_keyboard_focus ? SIGNAL_KEYBOARD_FOCUS : SIGNAL_NO_KEYBOARD_FOCUS;
+
+	return rv;
 }
 
-BOOL LLFolderViewItem::handleScrollWheel(S32 x, S32 y, S32 clicks)
+void LLFolderView::setSelectionByID(const LLUUID& obj_id, BOOL take_keyboard_focus)
 {
-	if (getParent())
+	LLFolderViewItem* itemp = getItemByID(obj_id);
+	if(itemp && itemp->getListener())
+	{
+		itemp->arrangeAndSet(TRUE, take_keyboard_focus);
+		mSelectThisID.setNull();
+		return;
+	}
+	else
 	{
-		return getParent()->handleScrollWheel(x, y, clicks);
+		// save the desired item to be selected later (if/when ready)
+		mSelectThisID = obj_id;
 	}
-	return FALSE;
 }
 
-BOOL LLFolderViewItem::handleMouseUp( S32 x, S32 y, MASK mask )
+void LLFolderView::updateSelection()
 {
-	// if mouse hasn't moved since mouse down...
-	if ( pointInView(x, y) && mSelectPending )
+	if (mSelectThisID.notNull())
 	{
-		//...then select
-		if(mask & MASK_CONTROL)
-		{
-			changeSelectionFromRoot(this, !mIsSelected);
-		}
-		else if (mask & MASK_SHIFT)
-		{
-			extendSelectionFromRoot(this);
-		}
-		else
-		{
-			setSelectionFromRoot(this, FALSE);
-		}
+		setSelectionByID(mSelectThisID, false);
+	}
+}
+
+BOOL LLFolderView::changeSelection(LLFolderViewItem* selection, BOOL selected)
+{
+	BOOL rv = FALSE;
+
+	// can't select root folder
+	if(!selection || selection == this)
+	{
+		return FALSE;
 	}
-	
-	mSelectPending = FALSE;
 
-	if( hasMouseCapture() )
+	if (!mAllowMultiSelect)
 	{
-		getRoot()->setShowSelectionContext(FALSE);
-		gFocusMgr.setMouseCapture( NULL );
+		clearSelection();
 	}
-	return TRUE;
-}
 
-BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-										 EDragAndDropType cargo_type,
-										 void* cargo_data,
-										 EAcceptance* accept,
-										 std::string& tooltip_msg)
-{
-	BOOL accepted = FALSE;
-	BOOL handled = FALSE;
-	if(mListener)
+	selected_items_t::iterator item_iter;
+	for (item_iter = mSelectedItems.begin(); item_iter != mSelectedItems.end(); ++item_iter)
 	{
-		accepted = mListener->dragOrDrop(mask,drop,cargo_type,cargo_data);
-		handled = accepted;
-		if (accepted)
-		{
-			mDragAndDropTarget = TRUE;
-			*accept = ACCEPT_YES_MULTI;
-		}
-		else
+		if (*item_iter == selection)
 		{
-			*accept = ACCEPT_NO;
+			break;
 		}
 	}
-	if(mParentFolder && !handled)
+
+	BOOL on_list = (item_iter != mSelectedItems.end());
+
+	if(selected && !on_list)
 	{
-		handled = mParentFolder->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg);
+		addToSelectionList(selection);
 	}
-	if (handled)
+	if(!selected && on_list)
 	{
-		lldebugst(LLERR_USER_INPUT) << "dragAndDrop handled by LLFolderViewItem" << llendl;
+		removeFromSelectionList(selection);
 	}
 
-	return handled;
-}
+	rv = LLFolderViewFolder::changeSelection(selection, selected);
 
+	mSignalSelectCallback = SIGNAL_KEYBOARD_FOCUS;
+	
+	return rv;
+}
 
-void LLFolderViewItem::draw()
+S32 LLFolderView::extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items)
 {
-	static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
-	static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
-	static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
-	static LLUIColor sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
-	static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
-	static LLUIColor sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemSuffixColor", DEFAULT_WHITE);
-	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
-
-	bool possibly_has_children = false;
-	bool up_to_date = mListener && mListener->isUpToDate();
-	if((up_to_date && hasVisibleChildren() ) || // we fetched our children and some of them have passed the filter...
-		(!up_to_date && mListener && mListener->hasChildren())) // ...or we know we have children but haven't fetched them (doesn't obey filter)
-	{
-		possibly_has_children = true;
-	}
-	if(/*mControlLabel[0] != '\0' && */possibly_has_children)
+	S32 rv = 0;
+
+	// now store resulting selection
+	if (mAllowMultiSelect)
 	{
-		if (sArrowImage)
+		LLFolderViewItem *cur_selection = getCurSelectedItem();
+		rv = LLFolderViewFolder::extendSelection(selection, cur_selection, items);
+		for (S32 i = 0; i < items.count(); i++)
 		{
-			gl_draw_scaled_rotated_image(mIndentation, getRect().getHeight() - ARROW_SIZE - TEXT_PAD,
-				ARROW_SIZE, ARROW_SIZE, mControlLabelRotation, sArrowImage->getImage(), sFgColor);
+			addToSelectionList(items[i]);
+			rv++;
 		}
 	}
+	else
+	{
+		setSelection(selection, FALSE, FALSE);
+		rv++;
+	}
+
+	mSignalSelectCallback = SIGNAL_KEYBOARD_FOCUS;
+	return rv;
+}
 
-	F32 text_left = (F32)(ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + mIndentation);
+void LLFolderView::sanitizeSelection()
+{
+	// store off current item in case it is automatically deselected
+	// and we want to preserve context
+	LLFolderViewItem* original_selected_item = getCurSelectedItem();
 
-	// If we have keyboard focus, draw selection filled
-	BOOL show_context = getRoot()->getShowSelectionContext();
-	BOOL filled = show_context || (getRoot()->getParentPanel()->hasFocus());
+	// Cache "Show all folders" filter setting
+	BOOL show_all_folders = (getRoot()->getFilter()->getShowFolderState() == LLInventoryFilter::SHOW_ALL_FOLDERS);
 
-	// always render "current" item, only render other selected items if
-	// mShowSingleSelection is FALSE
-	if( mIsSelected )
+	std::vector<LLFolderViewItem*> items_to_remove;
+	selected_items_t::iterator item_iter;
+	for (item_iter = mSelectedItems.begin(); item_iter != mSelectedItems.end(); ++item_iter)
 	{
-		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-		LLColor4 bg_color = sHighlightBgColor;
-		//const S32 TRAILING_PAD = 5;  // It just looks better with this.
-		if (!mIsCurSelection)
+		LLFolderViewItem* item = *item_iter;
+
+		// ensure that each ancestor is open and potentially passes filtering
+		BOOL visible = item->potentiallyVisible(); // initialize from filter state for this item
+		// modify with parent open and filters states
+		LLFolderViewFolder* parent_folder = item->getParentFolder();
+		if ( parent_folder )
 		{
-			// do time-based fade of extra objects
-			F32 fade_time = getRoot()->getSelectionFadeElapsedTime();
-			if (getRoot()->getShowSingleSelection())
-			{
-				// fading out
-				bg_color.mV[VALPHA] = clamp_rescale(fade_time, 0.f, 0.4f, bg_color.mV[VALPHA], 0.f);
+			if ( show_all_folders )
+			{	// "Show all folders" is on, so this folder is visible
+				visible = TRUE;
 			}
 			else
-			{
-				// fading in
-				bg_color.mV[VALPHA] = clamp_rescale(fade_time, 0.f, 0.4f, 0.f, bg_color.mV[VALPHA]);
+			{	// Move up through parent folders and see what's visible
+				while(parent_folder)
+				{
+					visible = visible && parent_folder->isOpen() && parent_folder->potentiallyVisible();
+					parent_folder = parent_folder->getParentFolder();
+				}
 			}
 		}
 
-		gl_rect_2d(
-			0, 
-			getRect().getHeight(), 
-			getRect().getWidth() - 2,
-			llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD),
-			bg_color, filled);
-		if (mIsCurSelection)
+		//  deselect item if any ancestor is closed or didn't pass filter requirements.
+		if (!visible)
 		{
-			gl_rect_2d(
-				0, 
-				getRect().getHeight(), 
-				getRect().getWidth() - 2,
-				llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD),
-				sHighlightFgColor, FALSE);
+			items_to_remove.push_back(item);
 		}
-		if (getRect().getHeight() > llround(sFont->getLineHeight()) + ICON_PAD + 2)
+
+		// disallow nested selections (i.e. folder items plus one or more ancestors)
+		// could check cached mum selections count and only iterate if there are any
+		// but that may be a premature optimization.
+		selected_items_t::iterator other_item_iter;
+		for (other_item_iter = mSelectedItems.begin(); other_item_iter != mSelectedItems.end(); ++other_item_iter)
 		{
-			gl_rect_2d(
-				0, 
-				llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
-				getRect().getWidth() - 2,
-				2,
-				sHighlightFgColor, FALSE);
-			if (show_context)
+			LLFolderViewItem* other_item = *other_item_iter;
+			for( parent_folder = other_item->getParentFolder(); parent_folder; parent_folder = parent_folder->getParentFolder())
 			{
-				gl_rect_2d(
-					0, 
-					llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
-					getRect().getWidth() - 2,
-					2,
-					sHighlightBgColor, TRUE);
+				if (parent_folder == item)
+				{
+					// this is a descendent of the current folder, remove from list
+					items_to_remove.push_back(other_item);
+					break;
+				}
 			}
 		}
 	}
-	if (mDragAndDropTarget)
-	{
-		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-		gl_rect_2d(
-			0, 
-			getRect().getHeight(), 
-			getRect().getWidth() - 2,
-			llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD),
-			sHighlightBgColor, FALSE);
-
-		if (getRect().getHeight() > llround(sFont->getLineHeight()) + ICON_PAD + 2)
-		{
-			gl_rect_2d(
-				0, 
-				llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
-				getRect().getWidth() - 2,
-				2,
-				sHighlightBgColor, FALSE);
-		}
-		mDragAndDropTarget = FALSE;
-	}
 
-
-	if(mIcon)
+	std::vector<LLFolderViewItem*>::iterator item_it;
+	for (item_it = items_to_remove.begin(); item_it != items_to_remove.end(); ++item_it )
 	{
-		mIcon->draw(mIndentation + ARROW_SIZE + TEXT_PAD, getRect().getHeight() - mIcon->getHeight());
+		changeSelection(*item_it, FALSE); // toggle selection (also removes from list)
 	}
 
-	if (!mLabel.empty())
+	// if nothing selected after prior constraints...
+	if (mSelectedItems.empty())
 	{
-		// highlight filtered text
-		BOOL debug_filters = getRoot()->getDebugFilters();
-		LLColor4 color = ( (mIsSelected && filled) ? sHighlightFgColor : sFgColor );
-		F32 right_x;
-		F32 y = (F32)getRect().getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
-
-		if (debug_filters)
+		// ...select first available parent of original selection, or "My Inventory" otherwise
+		LLFolderViewItem* new_selection = NULL;
+		if (original_selected_item)
 		{
-			if (!getFiltered() && !possibly_has_children)
+			for(LLFolderViewFolder* parent_folder = original_selected_item->getParentFolder();
+				parent_folder;
+				parent_folder = parent_folder->getParentFolder())
 			{
-				color.mV[VALPHA] *= 0.5f;
+				if (parent_folder->potentiallyVisible())
+				{
+					// give initial selection to first ancestor folder that potentially passes the filter
+					if (!new_selection)
+					{
+						new_selection = parent_folder;
+					}
+
+					// if any ancestor folder of original item is closed, move the selection up 
+					// to the highest closed
+					if (!parent_folder->isOpen())
+					{	
+						new_selection = parent_folder;
+					}
+				}
 			}
-			
-			LLColor4 filter_color = mLastFilterGeneration >= getRoot()->getFilter()->getCurrentGeneration() ? LLColor4(0.5f, 0.8f, 0.5f, 1.f) : LLColor4(0.8f, 0.5f, 0.5f, 1.f);
-			sSmallFont->renderUTF8(mStatusText, 0, text_left, y, filter_color,
-					LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-							S32_MAX, S32_MAX, &right_x, FALSE );
-			text_left = right_x;
 		}
-
-
-		if ( mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime") )
+		else
 		{
-			sFont->renderUTF8(LLTrans::getString("LoadingData"), 0, text_left, y, sSearchStatusColor,
-					LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, &right_x, FALSE);
-			text_left = right_x;
+			// nothing selected to start with, so pick "My Inventory" as best guess
+			new_selection = getItemByID(gInventory.getRootFolderID());
 		}
 
-		sFont->renderUTF8( mLabel, 0, text_left, y, color,
-							LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW,
-							S32_MAX, S32_MAX, &right_x, FALSE );
-		if (!mLabelSuffix.empty())
+		if (new_selection)
 		{
-			sFont->renderUTF8( mLabelSuffix, 0, right_x, y, sSuffixColor,
-								LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW,
-								S32_MAX, S32_MAX, &right_x, FALSE );
+			setSelection(new_selection, FALSE, FALSE);
 		}
+	}
+}
 
-		if (sBoxImage.notNull() && mStringMatchOffset != std::string::npos)
-		{
-			// don't draw backgrounds for zero-length strings
-			S32 filter_string_length = getRoot()->getFilterSubString().size();
-			if (filter_string_length > 0)
-			{
-				std::string combined_string = mLabel + mLabelSuffix;
-				S32 left = llround(text_left) + sFont->getWidth(combined_string, 0, mStringMatchOffset) - 1;
-				S32 right = left + sFont->getWidth(combined_string, mStringMatchOffset, filter_string_length) + 2;
-				S32 bottom = llfloor(getRect().getHeight() - sFont->getLineHeight() - 3);
-				S32 top = getRect().getHeight();
-
-				LLRect box_rect(left, top, right, bottom);
-				sBoxImage->draw(box_rect, sFilterBGColor);
-				F32 match_string_left = text_left + sFont->getWidthF32(combined_string, 0, mStringMatchOffset);
-				F32 y = (F32)getRect().getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
-				sFont->renderUTF8( combined_string, mStringMatchOffset, match_string_left, y,
-								sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW,
-								filter_string_length, S32_MAX, &right_x, FALSE );
-			}
-		}
+void LLFolderView::clearSelection()
+{
+	if (mSelectedItems.size() > 0)
+	{
+		recursiveDeselect(FALSE);
+		mSelectedItems.clear();
 	}
+	mSelectThisID.setNull();
+}
 
-	if( sDebugRects )
+BOOL LLFolderView::getSelectionList(std::set<LLUUID> &selection)
+{
+	selected_items_t::iterator item_it;
+	for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
 	{
-		drawDebugRect();
+		selection.insert((*item_it)->getListener()->getUUID());
 	}
 
-	//// *HACK: also draw debug rectangles around currently-being-edited LLView, and any elements that are being highlighted by GUI preview code (see LLFloaterUIPreview)
-	//std::set<LLView*>::iterator iter = std::find(sPreviewHighlightedElements.begin(), sPreviewHighlightedElements.end(), this);
-	//if ((sEditingUI && this == sEditingUIView) || (iter != sPreviewHighlightedElements.end() && sDrawPreviewHighlights))
-	//{
-	//	drawDebugRect();
-	//}
+	return (selection.size() != 0);
 }
 
+BOOL LLFolderView::startDrag(LLToolDragAndDrop::ESource source)
+{
+	std::vector<EDragAndDropType> types;
+	std::vector<LLUUID> cargo_ids;
+	selected_items_t::iterator item_it;
+	BOOL can_drag = TRUE;
+	if (!mSelectedItems.empty())
+	{
+		for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
+		{
+			EDragAndDropType type = DAD_NONE;
+			LLUUID id = LLUUID::null;
+			can_drag = can_drag && (*item_it)->getListener()->startDrag(&type, &id);
 
-///----------------------------------------------------------------------------
-/// Class LLFolderViewFolder
-///----------------------------------------------------------------------------
+			types.push_back(type);
+			cargo_ids.push_back(id);
+		}
 
-LLFolderViewFolder::LLFolderViewFolder( const LLFolderViewItem::Params& p ): 
-	LLFolderViewItem( p ),	// 0 = no create time
-	mIsOpen(FALSE),
-	mExpanderHighlighted(FALSE),
-	mCurHeight(0.f),
-	mTargetHeight(0.f),
-	mAutoOpenCountdown(0.f),
-	mSubtreeCreationDate(0),
-	mAmTrash(LLFolderViewFolder::UNKNOWN),
-	mLastArrangeGeneration( -1 ),
-	mLastCalculatedWidth(0),
-	mCompletedFilterGeneration(-1),
-	mMostFilteredDescendantGeneration(-1),
-	mNeedsSort(false)
-{}
+		LLToolDragAndDrop::getInstance()->beginMultiDrag(types, cargo_ids, source, mSourceID); 
+	}
+	return can_drag;
+}
 
-// Destroys the object
-LLFolderViewFolder::~LLFolderViewFolder( void )
+void LLFolderView::commitRename( const LLSD& data )
 {
-	// The LLView base class takes care of object destruction. make sure that we
-	// don't have mouse or keyboard focus
-	gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit()
+	finishRenamingItem();
 }
 
-// addToFolder() returns TRUE if it succeeds. FALSE otherwise
-BOOL LLFolderViewFolder::addToFolder(LLFolderViewFolder* folder, LLFolderView* root)
+void LLFolderView::draw()
 {
-	if (!folder)
+	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", LLColor4::white);
+	if (mDebugFilters)
 	{
-		return FALSE;
+		std::string current_filter_string = llformat("Current Filter: %d, Least Filter: %d, Auto-accept Filter: %d",
+										mFilter->getCurrentGeneration(), mFilter->getMinRequiredGeneration(), mFilter->getMustPassGeneration());
+		sSmallFont->renderUTF8(current_filter_string, 0, 2, 
+			getRect().getHeight() - sSmallFont->getLineHeight(), LLColor4(0.5f, 0.5f, 0.8f, 1.f), 
+			LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
 	}
-	mParentFolder = folder;
-	root->addItemID(getListener()->getUUID(), this);
-	return folder->addFolder(this);
-}
 
-// Finds width and height of this object and it's children.  Also
-// makes sure that this view and it's children are the right size.
-S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
-{
-	// sort before laying out contents
-	if (mNeedsSort)
+	// if cursor has moved off of me during drag and drop
+	// close all auto opened folders
+	if (!mDragAndDropThisFrame)
 	{
-		mFolders.sort(mSortFunction);
-		mItems.sort(mSortFunction);
-		mNeedsSort = false;
+		closeAutoOpenedFolders();
 	}
 
-	mHasVisibleChildren = hasFilteredDescendants(filter_generation);
-	
-	LLInventoryFilter::EFolderShow show_folder_state = getRoot()->getShowFolderState();
-
-	// calculate height as a single item (without any children), and reshapes rectangle to match
-	LLFolderViewItem::arrange( width, height, filter_generation );
-
-	// clamp existing animated height so as to never get smaller than a single item
-	mCurHeight = llmax((F32)*height, mCurHeight);
-
-	// initialize running height value as height of single item in case we have no children
-	*height = getItemHeight();
-	F32 running_height = (F32)*height;
-	F32 target_height = (F32)*height;
-
-	// are my children visible?
-	if (needsArrange())
+	// while dragging, update selection rendering to reflect single/multi drag status
+	if (LLToolDragAndDrop::getInstance()->hasMouseCapture())
 	{
-		// set last arrange generation first, in case children are animating
-		// and need to be arranged again
-		mLastArrangeGeneration = getRoot()->getArrangeGeneration();
-		if (mIsOpen)
+		EAcceptance last_accept = LLToolDragAndDrop::getInstance()->getLastAccept();
+		if (last_accept == ACCEPT_YES_SINGLE || last_accept == ACCEPT_YES_COPY_SINGLE)
 		{
-			// Add sizes of children
-			S32 parent_item_height = getRect().getHeight();
-
-			for(folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
-			{
-				LLFolderViewFolder* folderp = (*fit);
-				if (getRoot()->getDebugFilters())
-				{
-					folderp->setVisible(TRUE);
-				}
-				else
-				{
-					folderp->setVisible(show_folder_state == LLInventoryFilter::SHOW_ALL_FOLDERS || // always show folders?
-										(folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation))); // passed filter or has descendants that passed filter
-				}
-
-				if (folderp->getVisible())
-				{
-					S32 child_width = *width;
-					S32 child_height = 0;
-					S32 child_top = parent_item_height - llround(running_height);
-
-					target_height += folderp->arrange( &child_width, &child_height, filter_generation );
-
-					running_height += (F32)child_height;
-					*width = llmax(*width, child_width);
-					folderp->setOrigin( 0, child_top - folderp->getRect().getHeight() );
-				}
-			}
-			for(items_t::iterator iit = mItems.begin();
-				iit != mItems.end(); ++iit)
-			{
-				LLFolderViewItem* itemp = (*iit);
-				if (getRoot()->getDebugFilters())
-				{
-					itemp->setVisible(TRUE);
-				}
-				else
-				{
-					itemp->setVisible(itemp->getFiltered(filter_generation));
-				}
-
-				if (itemp->getVisible())
-				{
-					S32 child_width = *width;
-					S32 child_height = 0;
-					S32 child_top = parent_item_height - llround(running_height);
-
-					target_height += itemp->arrange( &child_width, &child_height, filter_generation );
-					// don't change width, as this item is as wide as its parent folder by construction
-					itemp->reshape( itemp->getRect().getWidth(), child_height);
-
-					running_height += (F32)child_height;
-					*width = llmax(*width, child_width);
-					itemp->setOrigin( 0, child_top - itemp->getRect().getHeight() );
-				}
-			}
+			setShowSingleSelection(TRUE);
+		}
+		else
+		{
+			setShowSingleSelection(FALSE);
 		}
-
-		mTargetHeight = target_height;
-		// cache this width so next time we can just return it
-		mLastCalculatedWidth = *width;
 	}
 	else
 	{
-		// just use existing width
-		*width = mLastCalculatedWidth;
+		setShowSingleSelection(FALSE);
 	}
 
-	// animate current height towards target height
-	if (llabs(mCurHeight - mTargetHeight) > 1.f)
-	{
-		mCurHeight = lerp(mCurHeight, mTargetHeight, LLCriticalDamp::getInterpolant(mIsOpen ? FOLDER_OPEN_TIME_CONSTANT : FOLDER_CLOSE_TIME_CONSTANT));
-		
-		requestArrange();
 
-		// hide child elements that fall out of current animated height
-		for (folders_t::iterator iter = mFolders.begin();
-			 iter != mFolders.end();)
-		{
-			folders_t::iterator fit = iter++;
-			// number of pixels that bottom of folder label is from top of parent folder
-			if (getRect().getHeight() - (*fit)->getRect().mTop + (*fit)->getItemHeight() 
-				> llround(mCurHeight) + MAX_FOLDER_ITEM_OVERLAP)
-			{
-				// hide if beyond current folder height
-				(*fit)->setVisible(FALSE);
-			}
-		}
-
-		for (items_t::iterator iter = mItems.begin();
-			 iter != mItems.end();)
-		{
-			items_t::iterator iit = iter++;
-			// number of pixels that bottom of item label is from top of parent folder
-			if (getRect().getHeight() - (*iit)->getRect().mBottom
-				> llround(mCurHeight) + MAX_FOLDER_ITEM_OVERLAP)
-			{
-				(*iit)->setVisible(FALSE);
-			}
-		}
-	}
-	else
-	{
-		mCurHeight = mTargetHeight;
-	}
-
-	// don't change width as this item is already as wide as its parent folder
-	reshape(getRect().getWidth(),llround(mCurHeight));
-
-	// pass current height value back to parent
-	*height = llround(mCurHeight);
-
-	return llround(mTargetHeight);
-}
-
-BOOL LLFolderViewFolder::needsArrange()
-{
-	return mLastArrangeGeneration < getRoot()->getArrangeGeneration(); 
-}
-
-void LLFolderViewFolder::requestSort()
-{
-	mNeedsSort = true;
-	// whenever item order changes, we need to lay things out again
-	requestArrange();
-}
-
-void LLFolderViewFolder::setCompletedFilterGeneration(S32 generation, BOOL recurse_up)
-{
-	mMostFilteredDescendantGeneration = llmin(mMostFilteredDescendantGeneration, generation);
-	mCompletedFilterGeneration = generation;
-	// only aggregate up if we are a lower (older) value
-	if (recurse_up && mParentFolder && generation < mParentFolder->getCompletedFilterGeneration())
+	if (mSearchTimer.getElapsedTimeF32() > gSavedSettings.getF32("TypeAheadTimeout") || !mSearchString.size())
 	{
-		mParentFolder->setCompletedFilterGeneration(generation, TRUE);
+		mSearchString.clear();
 	}
-}
 
-void LLFolderViewFolder::filter( LLInventoryFilter& filter)
-{
-	S32 filter_generation = filter.getCurrentGeneration();
-	// if failed to pass filter newer than must_pass_generation
-	// you will automatically fail this time, so we only
-	// check against items that have passed the filter
-	S32 must_pass_generation = filter.getMustPassGeneration();
-
-	// if we have already been filtered against this generation, skip out
-	if (getCompletedFilterGeneration() >= filter_generation)
+	if (hasVisibleChildren()
+		|| mFilter->getShowFolderState() == LLInventoryFilter::SHOW_ALL_FOLDERS)
 	{
-		return;
+		mStatusText.clear();
 	}
-
-	// filter folder itself
-	if (getLastFilterGeneration() < filter_generation)
+	else
 	{
-		if (getLastFilterGeneration() >= must_pass_generation &&		// folder has been compared to a valid precursor filter
-			!mFiltered)													// and did not pass the filter
+		if (gInventory.backgroundFetchActive() || mCompletedFilterGeneration < mFilter->getMinRequiredGeneration())
 		{
-			// go ahead and flag this folder as done
-			mLastFilterGeneration = filter_generation;			
+			mStatusText = LLTrans::getString("Searching");
+			sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL,  LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
 		}
 		else
 		{
-			// filter self only on first pass through
-			LLFolderViewItem::filter( filter );
+			mStatusText = LLTrans::getString("InventoryNoMatchingItems");
+			sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL,  LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
 		}
 	}
 
-	if (getRoot()->getDebugFilters())
-	{
-		mStatusText = llformat("%d", mLastFilterGeneration);
-		mStatusText += llformat("(%d)", mCompletedFilterGeneration);
-		mStatusText += llformat("+%d", mMostFilteredDescendantGeneration);
-	}
+	LLFolderViewFolder::draw();
+
+	mDragAndDropThisFrame = FALSE;
+}
 
-	// all descendants have been filtered later than must pass generation
-	// but none passed
-	if(getCompletedFilterGeneration() >= must_pass_generation && !hasFilteredDescendants(must_pass_generation))
+void LLFolderView::finishRenamingItem( void )
+{
+	if(!mRenamer)
 	{
-		// don't traverse children if we've already filtered them since must_pass_generation
-		// and came back with nothing
 		return;
 	}
+	if( mRenameItem )
+	{
+		mRenameItem->rename( mRenamer->getText() );
+	}
+
+	mRenamer->setCommitOnFocusLost( FALSE );
+	mRenamer->setFocus( FALSE );
+	mRenamer->setVisible( FALSE );
+	mRenamer->setCommitOnFocusLost( TRUE );
+	gFocusMgr.setTopCtrl( NULL );
 
-	// we entered here with at least one filter iteration left
-	// check to see if we have any more before continuing on to children
-	if (filter.getFilterCount() < 0)
+	if( mRenameItem )
 	{
-		return;
+		setSelectionFromRoot( mRenameItem, TRUE );
+		mRenameItem = NULL;
 	}
 
-	// when applying a filter, matching folders get their contents downloaded first
-	if (filter.isNotDefault() && getFiltered(filter.getMinRequiredGeneration()) && (mListener && !gInventory.isCategoryComplete(mListener->getUUID())))
+	// List is re-sorted alphabeticly, so scroll to make sure the selected item is visible.
+	scrollToShowSelection();
+}
+
+void LLFolderView::closeRenamer( void )
+{
+	// will commit current name (which could be same as original name)
+	mRenamer->setFocus( FALSE );
+	mRenamer->setVisible( FALSE );
+	gFocusMgr.setTopCtrl( NULL );
+
+	if( mRenameItem )
 	{
-		gInventory.startBackgroundFetch(mListener->getUUID());
+		setSelectionFromRoot( mRenameItem, TRUE );
+		mRenameItem = NULL;
 	}
+}
 
-	// now query children
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
+void LLFolderView::removeSelectedItems( void )
+{
+	if(getVisible() && getEnabled())
 	{
-		folders_t::iterator fit = iter++;
-		// have we run out of iterations this frame?
-		if (filter.getFilterCount() < 0)
+		// just in case we're removing the renaming item.
+		mRenameItem = NULL;
+
+		// create a temporary structure which we will use to remove
+		// items, since the removal will futz with internal data
+		// structures.
+		std::vector<LLFolderViewItem*> items;
+		S32 count = mSelectedItems.size();
+		if(count == 0) return;
+		LLFolderViewItem* item = NULL;
+		selected_items_t::iterator item_it;
+		for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
 		{
-			break;
+			item = *item_it;
+			if(item->isRemovable())
+			{
+				items.push_back(item);
+			}
+			else
+			{
+				llinfos << "Cannot delete " << item->getName() << llendl;
+				return;
+			}
 		}
 
-		// mMostFilteredDescendantGeneration might have been reset
-		// in which case we need to update it even for folders that
-		// don't need to be filtered anymore
-		if ((*fit)->getCompletedFilterGeneration() >= filter_generation)
+		// iterate through the new container.
+		count = items.size();
+		LLUUID new_selection_id;
+		if(count == 1)
 		{
-			// track latest generation to pass any child items
-			if ((*fit)->getFiltered() || (*fit)->hasFilteredDescendants(filter.getMinRequiredGeneration()))
+			LLFolderViewItem* item_to_delete = items[0];
+			LLFolderViewFolder* parent = item_to_delete->getParentFolder();
+			LLFolderViewItem* new_selection = item_to_delete->getNextOpenNode(FALSE);
+			if (!new_selection)
+			{
+				new_selection = item_to_delete->getPreviousOpenNode(FALSE);
+			}
+			if(parent)
 			{
-				mMostFilteredDescendantGeneration = filter_generation;
-				if (getRoot()->needsAutoSelect())
+				if (parent->removeItem(item_to_delete))
 				{
-					(*fit)->setOpenArrangeRecursively(TRUE);
+					// change selection on successful delete
+					if (new_selection)
+					{
+						setSelectionFromRoot(new_selection, new_selection->isOpen(), mParentPanel->hasFocus());
+					}
+					else
+					{
+						setSelectionFromRoot(NULL, mParentPanel->hasFocus());
+					}
 				}
 			}
-			// just skip it, it has already been filtered
-			continue;
+			arrangeAll();
 		}
-
-		// update this folders filter status (and children)
-		(*fit)->filter( filter );
-		
-		// track latest generation to pass any child items
-		if ((*fit)->getFiltered() || (*fit)->hasFilteredDescendants(filter_generation))
+		else if (count > 1)
 		{
-			mMostFilteredDescendantGeneration = filter_generation;
-			if (getRoot()->needsAutoSelect())
+			LLDynamicArray<LLFolderViewEventListener*> listeners;
+			LLFolderViewEventListener* listener;
+			LLFolderViewItem* last_item = items[count - 1];
+			LLFolderViewItem* new_selection = last_item->getNextOpenNode(FALSE);
+			while(new_selection && new_selection->isSelected())
+			{
+				new_selection = new_selection->getNextOpenNode(FALSE);
+			}
+			if (!new_selection)
+			{
+				new_selection = last_item->getPreviousOpenNode(FALSE);
+				while (new_selection && new_selection->isSelected())
+				{
+					new_selection = new_selection->getPreviousOpenNode(FALSE);
+				}
+			}
+			if (new_selection)
+			{
+				setSelectionFromRoot(new_selection, new_selection->isOpen(), mParentPanel->hasFocus());
+			}
+			else
+			{
+				setSelectionFromRoot(NULL, mParentPanel->hasFocus());
+			}
+
+			for(S32 i = 0; i < count; ++i)
+			{
+				listener = items[i]->getListener();
+				if(listener && (listeners.find(listener) == LLDynamicArray<LLFolderViewEventListener*>::FAIL))
+				{
+					listeners.put(listener);
+				}
+			}
+			listener = listeners.get(0);
+			if(listener)
 			{
-				(*fit)->setOpenArrangeRecursively(TRUE);
+				listener->removeBatch(listeners);
 			}
 		}
+		arrangeAll();
+		scrollToShowSelection();
 	}
+}
 
-	for (items_t::iterator iter = mItems.begin();
-		 iter != mItems.end();)
+// open the selected item.
+void LLFolderView::openSelectedItems( void )
+{
+	if(getVisible() && getEnabled())
 	{
-		items_t::iterator iit = iter++;
-		if (filter.getFilterCount() < 0)
+		if (mSelectedItems.size() == 1)
 		{
-			break;
+			mSelectedItems.front()->openItem();
 		}
-		if ((*iit)->getLastFilterGeneration() >= filter_generation)
+		else
 		{
-			if ((*iit)->getFiltered())
+			LLMultiPreview* multi_previewp = new LLMultiPreview();
+			LLMultiProperties* multi_propertiesp = new LLMultiProperties();
+
+			selected_items_t::iterator item_it;
+			for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
 			{
-				mMostFilteredDescendantGeneration = filter_generation;
+				// IT_{OBJECT,ATTACHMENT} creates LLProperties
+				// floaters; others create LLPreviews.  Put
+				// each one in the right type of container.
+				LLFolderViewEventListener* listener = (*item_it)->getListener();
+				bool is_prop = listener && (listener->getInventoryType() == LLInventoryType::IT_OBJECT || listener->getInventoryType() == LLInventoryType::IT_ATTACHMENT);
+				if (is_prop)
+					LLFloater::setFloaterHost(multi_propertiesp);
+				else
+					LLFloater::setFloaterHost(multi_previewp);
+				(*item_it)->openItem();
 			}
-			continue;
+
+			LLFloater::setFloaterHost(NULL);
+			// *NOTE: LLMulti* will safely auto-delete when open'd
+			// without any children.
+			multi_previewp->openFloater(LLSD());
+			multi_propertiesp->openFloater(LLSD());
 		}
+	}
+}
 
-		if ((*iit)->getLastFilterGeneration() >= must_pass_generation && 
-			!(*iit)->getFiltered(must_pass_generation))
+void LLFolderView::propertiesSelectedItems( void )
+{
+	if(getVisible() && getEnabled())
+	{
+		if (mSelectedItems.size() == 1)
 		{
-			// failed to pass an earlier filter that was a subset of the current one
-			// go ahead and flag this item as done
-			(*iit)->setFiltered(FALSE, filter_generation);
-			continue;
+			LLFolderViewItem* folder_item = mSelectedItems.front();
+			if(!folder_item) return;
+			folder_item->getListener()->showProperties();
 		}
-
-		(*iit)->filter( filter );
-		
-		if ((*iit)->getFiltered(filter.getMinRequiredGeneration()))
+		else
 		{
-			mMostFilteredDescendantGeneration = filter_generation;
+			LLMultiProperties* multi_propertiesp = new LLMultiProperties();
+
+			LLFloater::setFloaterHost(multi_propertiesp);
+
+			selected_items_t::iterator item_it;
+			for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
+			{
+				(*item_it)->getListener()->showProperties();
+			}
+
+			LLFloater::setFloaterHost(NULL);
+			multi_propertiesp->openFloater(LLSD());
 		}
 	}
-	
-	// if we didn't use all filter iterations
-	// that means we filtered all of our descendants
-	// instead of exhausting the filter count for this frame
-	if (filter.getFilterCount() > 0)
-	{
-		// flag this folder as having completed filter pass for all descendants
-		setCompletedFilterGeneration(filter_generation, FALSE/*dont recurse up to root*/);
-	}
 }
 
-void LLFolderViewFolder::setFiltered(BOOL filtered, S32 filter_generation)
+void LLFolderView::autoOpenItem( LLFolderViewFolder* item )
 {
-	// if this folder is now filtered, but wasn't before
-	// (it just passed)
-	if (filtered && !mFiltered)
+	if (mAutoOpenItems.check() == item || mAutoOpenItems.getDepth() >= (U32)AUTO_OPEN_STACK_DEPTH)
 	{
-		// reset current height, because last time we drew it
-		// it might have had more visible items than now
-		mCurHeight = 0.f;
+		return;
 	}
 
-	LLFolderViewItem::setFiltered(filtered, filter_generation);
-}
+	// close auto-opened folders
+	LLFolderViewFolder* close_item = mAutoOpenItems.check();
+	while (close_item && close_item != item->getParentFolder())
+	{
+		mAutoOpenItems.pop();
+		close_item->setOpenArrangeRecursively(FALSE);
+		close_item = mAutoOpenItems.check();
+	}
 
-void LLFolderViewFolder::dirtyFilter()
-{
-	// we're a folder, so invalidate our completed generation
-	setCompletedFilterGeneration(-1, FALSE);
-	LLFolderViewItem::dirtyFilter();
-}
+	item->requestArrange();
 
-BOOL LLFolderViewFolder::hasFilteredDescendants()
-{
-	return mMostFilteredDescendantGeneration >= getRoot()->getFilter()->getCurrentGeneration();
+	mAutoOpenItems.push(item);
+	
+	item->setOpen(TRUE);
+	scrollToShowItem(item);
 }
 
-// Passes selection information on to children and record selection
-// information if necessary.
-BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem,
-									  BOOL take_keyboard_focus)
+void LLFolderView::closeAutoOpenedFolders()
 {
-	BOOL rv = FALSE;
-	if( selection == this )
+	while (mAutoOpenItems.check())
 	{
-		mIsSelected = TRUE;
-		if(mListener)
-		{
-			mListener->selectItem();
-		}
-		rv = TRUE;
-	}
-	else
-	{
-		mIsSelected = FALSE;
-		rv = FALSE;
-	}
-	BOOL child_selected = FALSE;
-	
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
-	{
-		folders_t::iterator fit = iter++;
-		if((*fit)->setSelection(selection, openitem, take_keyboard_focus))
-		{
-			rv = TRUE;
-			child_selected = TRUE;
-			mNumDescendantsSelected++;
-		}
-	}
-	for (items_t::iterator iter = mItems.begin();
-		 iter != mItems.end();)
-	{
-		items_t::iterator iit = iter++;
-		if((*iit)->setSelection(selection, openitem, take_keyboard_focus))
-		{
-			rv = TRUE;
-			child_selected = TRUE;
-			mNumDescendantsSelected++;
-		}
+		LLFolderViewFolder* close_item = mAutoOpenItems.pop();
+		close_item->setOpen(FALSE);
 	}
-	if(openitem && child_selected)
+
+	if (mAutoOpenCandidate)
 	{
-		setOpenArrangeRecursively(TRUE);
+		mAutoOpenCandidate->setAutoOpenCountdown(0.f);
 	}
-	return rv;
+	mAutoOpenCandidate = NULL;
+	mAutoOpenTimer.stop();
 }
 
-// This method is used to change the selection of an item. If
-// selection is 'this', then note selection as true. Returns TRUE
-// if this or a child is now selected.
-BOOL LLFolderViewFolder::changeSelection(LLFolderViewItem* selection,
-										 BOOL selected)
+BOOL LLFolderView::autoOpenTest(LLFolderViewFolder* folder)
 {
-	BOOL rv = FALSE;
-	if(selection == this)
-	{
-		mIsSelected = selected;
-		if(mListener && selected)
-		{
-			mListener->selectItem();
-		}
-		rv = TRUE;
-	}
-
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
+	if (folder && mAutoOpenCandidate == folder)
 	{
-		folders_t::iterator fit = iter++;
-		if((*fit)->changeSelection(selection, selected))
+		if (mAutoOpenTimer.getStarted())
 		{
-			if (selected)
+			if (!mAutoOpenCandidate->isOpen())
 			{
-				mNumDescendantsSelected++;
+				mAutoOpenCandidate->setAutoOpenCountdown(clamp_rescale(mAutoOpenTimer.getElapsedTimeF32(), 0.f, sAutoOpenTime, 0.f, 1.f));
 			}
-			else
+			if (mAutoOpenTimer.getElapsedTimeF32() > sAutoOpenTime)
 			{
-				mNumDescendantsSelected--;
+				autoOpenItem(folder);
+				mAutoOpenTimer.stop();
+				return TRUE;
 			}
-			rv = TRUE;
 		}
+		return FALSE;
 	}
-	for (items_t::iterator iter = mItems.begin();
-		 iter != mItems.end();)
+
+	// otherwise new candidate, restart timer
+	if (mAutoOpenCandidate)
 	{
-		items_t::iterator iit = iter++;
-		if((*iit)->changeSelection(selection, selected))
-		{
-			if (selected)
-			{
-				mNumDescendantsSelected++;
-			}
-			else
-			{
-				mNumDescendantsSelected--;
-			}
-			rv = TRUE;
-		}
+		mAutoOpenCandidate->setAutoOpenCountdown(0.f);
 	}
-	return rv;
+	mAutoOpenCandidate = folder;
+	mAutoOpenTimer.start();
+	return FALSE;
 }
 
-S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& selected_items)
+BOOL LLFolderView::canCopy() const
 {
-	S32 num_selected = 0;
-
-	// pass on to child folders first
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
+	if (!(getVisible() && getEnabled() && (mSelectedItems.size() > 0)))
 	{
-		folders_t::iterator fit = iter++;
-		num_selected += (*fit)->extendSelection(selection, last_selected, selected_items);
-		mNumDescendantsSelected += num_selected;
+		return FALSE;
 	}
-
-	// handle selection of our immediate children...
-	BOOL reverse_select = FALSE;
-	BOOL found_last_selected = FALSE;
-	BOOL found_selection = FALSE;
-	LLDynamicArray<LLFolderViewItem*> items_to_select;
-	LLFolderViewItem* item;
-
-	//...folders first...
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
+	
+	for (selected_items_t::const_iterator selected_it = mSelectedItems.begin(); selected_it != mSelectedItems.end(); ++selected_it)
 	{
-		folders_t::iterator fit = iter++;
-		item = (*fit);
-		if(item == selection)
-		{
-			found_selection = TRUE;
-		}
-		else if (item == last_selected)
+		const LLFolderViewItem* item = *selected_it;
+		if (!item->getListener()->isItemCopyable())
 		{
-			found_last_selected = TRUE;
-			if (found_selection)
-			{
-				reverse_select = TRUE;
-			}
+			return FALSE;
 		}
+	}
+	return TRUE;
+}
 
-		if (found_selection || found_last_selected)
+// copy selected item
+void LLFolderView::copy()
+{
+	// *NOTE: total hack to clear the inventory clipboard
+	LLInventoryClipboard::instance().reset();
+	S32 count = mSelectedItems.size();
+	if(getVisible() && getEnabled() && (count > 0))
+	{
+		LLFolderViewEventListener* listener = NULL;
+		selected_items_t::iterator item_it;
+		for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
 		{
-			// deselect currently selected items so they can be pushed back on queue
-			if (item->isSelected())
+			listener = (*item_it)->getListener();
+			if(listener)
 			{
-				item->changeSelection(item, FALSE);
+				listener->copyToClipboard();
 			}
-			items_to_select.put(item);
 		}
+	}
+	mSearchString.clear();
+}
 
-		if (found_selection && found_last_selected)
-		{
-			break;
-		}		
+BOOL LLFolderView::canCut() const
+{
+	return FALSE;
+}
+
+void LLFolderView::cut()
+{
+	// implement Windows-style cut-and-leave
+}
+
+BOOL LLFolderView::canPaste() const
+{
+	if (mSelectedItems.empty())
+	{
+		return FALSE;
 	}
 
-	if (!(found_selection && found_last_selected))
+	if(getVisible() && getEnabled())
 	{
-		//,,,then items
-		for (items_t::iterator iter = mItems.begin();
-			 iter != mItems.end();)
+		for (selected_items_t::const_iterator item_it = mSelectedItems.begin();
+			 item_it != mSelectedItems.end(); ++item_it)
 		{
-			items_t::iterator iit = iter++;
-			item = (*iit);
-			if(item == selection)
-			{
-				found_selection = TRUE;
-			}
-			else if (item == last_selected)
-			{
-				found_last_selected = TRUE;
-				if (found_selection)
-				{
-					reverse_select = TRUE;
-				}
-			}
-
-			if (found_selection || found_last_selected)
+			// *TODO: only check folders and parent folders of items
+			const LLFolderViewItem* item = (*item_it);
+			const LLFolderViewEventListener* listener = item->getListener();
+			if(!listener || !listener->isClipboardPasteable())
 			{
-				// deselect currently selected items so they can be pushed back on queue
-				if (item->isSelected())
+				const LLFolderViewFolder* folderp = item->getParentFolder();
+				listener = folderp->getListener();
+				if (!listener || !listener->isClipboardPasteable())
 				{
-					item->changeSelection(item, FALSE);
+					return FALSE;
 				}
-				items_to_select.put(item);
-			}
-
-			if (found_selection && found_last_selected)
-			{
-				break;
 			}
 		}
+		return TRUE;
 	}
+	return FALSE;
+}
 
-	if (found_last_selected && found_selection)
+// paste selected item
+void LLFolderView::paste()
+{
+	if(getVisible() && getEnabled())
 	{
-		// we have a complete selection inside this folder
-		for (S32 index = reverse_select ? items_to_select.getLength() - 1 : 0; 
-			reverse_select ? index >= 0 : index < items_to_select.getLength(); reverse_select ? index-- : index++)
+		// find set of unique folders to paste into
+		std::set<LLFolderViewItem*> folder_set;
+
+		selected_items_t::iterator selected_it;
+		for (selected_it = mSelectedItems.begin(); selected_it != mSelectedItems.end(); ++selected_it)
 		{
-			LLFolderViewItem* item = items_to_select[index];
-			if (item->changeSelection(item, TRUE))
+			LLFolderViewItem* item = *selected_it;
+			LLFolderViewEventListener* listener = item->getListener();
+			if (listener->getInventoryType() != LLInventoryType::IT_CATEGORY)
 			{
-				selected_items.put(item);
-				mNumDescendantsSelected++;
-				num_selected++;
+				item = item->getParentFolder();
 			}
+			folder_set.insert(item);
 		}
-	}
-	else if (found_selection)
-	{
-		// last selection was not in this folder....go ahead and select just the new item
-		if (selection->changeSelection(selection, TRUE))
+
+		std::set<LLFolderViewItem*>::iterator set_iter;
+		for(set_iter = folder_set.begin(); set_iter != folder_set.end(); ++set_iter)
 		{
-			selected_items.put(selection);
-			mNumDescendantsSelected++;
-			num_selected++;
+			LLFolderViewEventListener* listener = (*set_iter)->getListener();
+			if(listener && listener->isClipboardPasteable())
+			{
+				listener->pasteFromClipboard();
+			}
 		}
 	}
-
-	return num_selected;
+	mSearchString.clear();
 }
 
-void LLFolderViewFolder::recursiveDeselect(BOOL deselect_self)
+// public rename functionality - can only start the process
+void LLFolderView::startRenamingSelectedItem( void )
 {
-	// make sure we don't have negative values
-	llassert(mNumDescendantsSelected >= 0);
+	// make sure selection is visible
+	scrollToShowSelection();
 
-	if (mIsSelected && deselect_self)
+	S32 count = mSelectedItems.size();
+	LLFolderViewItem* item = NULL;
+	if(count > 0)
 	{
-		mIsSelected = FALSE;
-
-		// update ancestors' count of selected descendents
-		LLFolderViewFolder* parent_folder = getParentFolder();
-		while(parent_folder)
-		{
-			parent_folder->mNumDescendantsSelected--;
-			parent_folder = parent_folder->getParentFolder();
-		}
+		item = mSelectedItems.front();
 	}
-
-	if (0 == mNumDescendantsSelected)
+	if(getVisible() && getEnabled() && (count == 1) && item && item->getListener() &&
+	   item->getListener()->isItemRenameable())
 	{
-		return;
-	}
+		mRenameItem = item;
 
-	for (items_t::iterator iter = mItems.begin();
-		 iter != mItems.end();)
-	{
-		items_t::iterator iit = iter++;
-		LLFolderViewItem* item = (*iit);
-		item->recursiveDeselect(TRUE);
-	}
+		updateRenamerPosition();
 
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
-	{
-		folders_t::iterator fit = iter++;
-		LLFolderViewFolder* folder = (*fit);
-		folder->recursiveDeselect(TRUE);
-	}
 
+		mRenamer->setText(item->getName());
+		mRenamer->selectAll();
+		mRenamer->setVisible( TRUE );
+		// set focus will fail unless item is visible
+		mRenamer->setFocus( TRUE );
+		mRenamer->setTopLostCallback(onRenamerLost);
+		gFocusMgr.setTopCtrl( mRenamer );
+	}
 }
 
-void LLFolderViewFolder::destroyView()
+BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
 {
-	for (items_t::iterator iter = mItems.begin();
-		 iter != mItems.end();)
-	{
-		items_t::iterator iit = iter++;
-		LLFolderViewItem* item = (*iit);
-		getRoot()->removeItemID(item->getListener()->getUUID());
-	}
-
-	std::for_each(mItems.begin(), mItems.end(), DeletePointer());
-	mItems.clear();
-
-	while (!mFolders.empty())
-	{
-		LLFolderViewFolder *folderp = mFolders.back();
-		folderp->destroyView(); // removes entry from mFolders
-	}
+	BOOL handled = FALSE;
 
-	deleteAllChildren();
-	
-	if (mParentFolder)
+	// SL-51858: Key presses are not being passed to the Popup menu.
+	// A proper fix is non-trivial so instead just close the menu.
+	LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
+	if (menu && menu->isOpen())
 	{
-		mParentFolder->removeView(this);
+		LLMenuGL::sMenuContainer->hideMenus();
 	}
-}
 
-// remove the specified item (and any children) if possible. Return
-// TRUE if the item was deleted.
-BOOL LLFolderViewFolder::removeItem(LLFolderViewItem* item)
-{
-	if(item->remove())
+	LLView *item = NULL;
+	if (getChildCount() > 0)
 	{
-		//RN: this seem unneccessary as remove() moves to trash
-		//removeView(item);
-		return TRUE;
+		item = *(getChildList()->begin());
 	}
-	return FALSE;
-}
 
-// simply remove the view (and any children) Don't bother telling the
-// listeners.
-void LLFolderViewFolder::removeView(LLFolderViewItem* item)
-{
-	if (!item || item->getParentFolder() != this)
+	switch( key )
 	{
-		return;
-	}
-	// deselect without traversing hierarchy
-	item->recursiveDeselect(TRUE);
-	getRoot()->removeFromSelectionList(item);
-	extractItem(item);
-	delete item;
-}
+	case KEY_F2:
+		mSearchString.clear();
+		startRenamingSelectedItem();
+		handled = TRUE;
+		break;
 
-// extractItem() removes the specified item from the folder, but
-// doesn't delete it.
-void LLFolderViewFolder::extractItem( LLFolderViewItem* item )
-{
-	items_t::iterator it = std::find(mItems.begin(), mItems.end(), item);
-	if(it == mItems.end())
-	{
-		// This is an evil downcast. However, it's only doing
-		// pointer comparison to find if (which it should be ) the
-		// item is in the container, so it's pretty safe.
-		LLFolderViewFolder* f = reinterpret_cast<LLFolderViewFolder*>(item);
-		folders_t::iterator ft;
-		ft = std::find(mFolders.begin(), mFolders.end(), f);
-		if(ft != mFolders.end())
+	case KEY_RETURN:
+		if (mask == MASK_NONE)
 		{
-			mFolders.erase(ft);
-		}
-	}
-	else
-	{
-		mItems.erase(it);
-	}
-	//item has been removed, need to update filter
-	dirtyFilter();
-	//because an item is going away regardless of filter status, force rearrange
-	requestArrange();
-	getRoot()->removeItemID(item->getListener()->getUUID());
-	removeChild(item);
-}
-
-bool LLFolderViewFolder::isTrash() const
-{
-	if (mAmTrash == LLFolderViewFolder::UNKNOWN)
-	{
-		mAmTrash = mListener->getUUID() == gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH, false) ? LLFolderViewFolder::TRASH : LLFolderViewFolder::NOT_TRASH;
-	}
-	return mAmTrash == LLFolderViewFolder::TRASH;
-}
-
-void LLFolderViewFolder::sortBy(U32 order)
-{
-	if (!mSortFunction.updateSort(order))
-	{
-		// No changes.
-		return;
-	}
-
-	// Propegate this change to sub folders
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
-	{
-		folders_t::iterator fit = iter++;
-		(*fit)->sortBy(order);
-	}
-
-	mFolders.sort(mSortFunction);
-	mItems.sort(mSortFunction);
-
-	if (order & LLInventoryFilter::SO_DATE)
-	{
-		time_t latest = 0;
-		
-		if (!mItems.empty())
-		{
-			LLFolderViewItem* item = *(mItems.begin());
-			latest = item->getCreationDate();
-		}
-
-		if (!mFolders.empty())
-		{
-			LLFolderViewFolder* folder = *(mFolders.begin());
-			if (folder->getCreationDate() > latest)
+			if( mRenameItem && mRenamer->getVisible() )
+			{
+				finishRenamingItem();
+				mSearchString.clear();
+				handled = TRUE;
+			}
+			else
 			{
-				latest = folder->getCreationDate();
+				LLFolderView::openSelectedItems();
+				handled = TRUE;
 			}
 		}
-		mSubtreeCreationDate = latest;
-	}
-}
+		break;
 
-void LLFolderViewFolder::setItemSortOrder(U32 ordering)
-{
-	if (mSortFunction.updateSort(ordering))
-	{
-		for (folders_t::iterator iter = mFolders.begin();
-			iter != mFolders.end();)
+	case KEY_ESCAPE:
+		if( mRenameItem && mRenamer->getVisible() )
 		{
-			folders_t::iterator fit = iter++;
-			(*fit)->setItemSortOrder(ordering);
+			closeRenamer();
+			handled = TRUE;
 		}
+		mSearchString.clear();
+		break;
 
-		mFolders.sort(mSortFunction);
-		mItems.sort(mSortFunction);
-	}
-}
+	case KEY_PAGE_UP:
+		mSearchString.clear();
+		mScrollContainer->pageUp(30);
+		handled = TRUE;
+		break;
 
-EInventorySortGroup LLFolderViewFolder::getSortGroup() const
-{
-	if (isTrash())
-	{
-		return SG_TRASH_FOLDER;
-	}
+	case KEY_PAGE_DOWN:
+		mSearchString.clear();
+		mScrollContainer->pageDown(30);
+		handled = TRUE;
+		break;
 
-	// Folders that can't be moved are 'system' folders. 
-	if( mListener )
-	{
-		if( !(mListener->isItemMovable()) )
-		{
-			return SG_SYSTEM_FOLDER;
-		}
-	}
-	
-	return SG_NORMAL_FOLDER;
-}
+	case KEY_HOME:
+		mSearchString.clear();
+		mScrollContainer->goToTop();
+		handled = TRUE;
+		break;
 
-BOOL LLFolderViewFolder::isMovable()
-{
-	if( mListener )
-	{
-		if( !(mListener->isItemMovable()) )
-		{
-			return FALSE;
-		}
+	case KEY_END:
+		mSearchString.clear();
+		mScrollContainer->goToBottom();
+		break;
 
-		for (items_t::iterator iter = mItems.begin();
-			 iter != mItems.end();)
+	case KEY_DOWN:
+		if((mSelectedItems.size() > 0) && mScrollContainer)
 		{
-			items_t::iterator iit = iter++;
-			if(!(*iit)->isMovable())
+			LLFolderViewItem* last_selected = getCurSelectedItem();
+
+			if (!mKeyboardSelection)
+			{
+				setSelection(last_selected, FALSE, TRUE);
+				mKeyboardSelection = TRUE;
+			}
+
+			LLFolderViewItem* next = NULL;
+			if (mask & MASK_SHIFT)
+			{
+				// don't shift select down to children of folders (they are implicitly selected through parent)
+				next = last_selected->getNextOpenNode(FALSE);
+				if (next)
+				{
+					if (next->isSelected())
+					{
+						// shrink selection
+						changeSelectionFromRoot(last_selected, FALSE);
+					}
+					else if (last_selected->getParentFolder() == next->getParentFolder())
+					{
+						// grow selection
+						changeSelectionFromRoot(next, TRUE);
+					}
+				}
+			}
+			else
 			{
-				return FALSE;
+				next = last_selected->getNextOpenNode();
+				if( next )
+				{
+					if (next == last_selected)
+					{
+						return FALSE;
+					}
+					setSelection( next, FALSE, TRUE );
+				}
 			}
+			scrollToShowSelection();
+			mSearchString.clear();
+			handled = TRUE;
 		}
+		break;
 
-		for (folders_t::iterator iter = mFolders.begin();
-			 iter != mFolders.end();)
+	case KEY_UP:
+		if((mSelectedItems.size() > 0) && mScrollContainer)
 		{
-			folders_t::iterator fit = iter++;
-			if(!(*fit)->isMovable())
+			LLFolderViewItem* last_selected = mSelectedItems.back();
+
+			if (!mKeyboardSelection)
 			{
-				return FALSE;
+				setSelection(last_selected, FALSE, TRUE);
+				mKeyboardSelection = TRUE;
 			}
-		}
-	}
-	return TRUE;
-}
 
+			LLFolderViewItem* prev = NULL;
+			if (mask & MASK_SHIFT)
+			{
+				// don't shift select down to children of folders (they are implicitly selected through parent)
+				prev = last_selected->getPreviousOpenNode(FALSE);
+				if (prev)
+				{
+					if (prev->isSelected())
+					{
+						// shrink selection
+						changeSelectionFromRoot(last_selected, FALSE);
+					}
+					else if (last_selected->getParentFolder() == prev->getParentFolder())
+					{
+						// grow selection
+						changeSelectionFromRoot(prev, TRUE);
+					}
+				}
+			}
+			else
+			{
+				prev = last_selected->getPreviousOpenNode();
+				if( prev )
+				{
+					if (prev == this)
+					{
+						return FALSE;
+					}
+					setSelection( prev, FALSE, TRUE );
+				}
+			}
+			scrollToShowSelection();
+			mSearchString.clear();
+
+			handled = TRUE;
+		}
+		break;
 
-BOOL LLFolderViewFolder::isRemovable()
-{
-	if( mListener )
-	{
-		if( !(mListener->isItemRemovable()) )
+	case KEY_RIGHT:
+		if(mSelectedItems.size())
 		{
-			return FALSE;
+			LLFolderViewItem* last_selected = getCurSelectedItem();
+			last_selected->setOpen( TRUE );
+			mSearchString.clear();
+			handled = TRUE;
 		}
+		break;
 
-		for (items_t::iterator iter = mItems.begin();
-			 iter != mItems.end();)
+	case KEY_LEFT:
+		if(mSelectedItems.size())
 		{
-			items_t::iterator iit = iter++;
-			if(!(*iit)->isRemovable())
+			LLFolderViewItem* last_selected = getCurSelectedItem();
+			LLFolderViewItem* parent_folder = last_selected->getParentFolder();
+			if (!last_selected->isOpen() && parent_folder && parent_folder->getParentFolder())
+			{
+				setSelection(parent_folder, FALSE, TRUE);
+			}
+			else
 			{
-				return FALSE;
+				last_selected->setOpen( FALSE );
 			}
+			mSearchString.clear();
+			scrollToShowSelection();
+			handled = TRUE;
 		}
+		break;
+	}
 
-		for (folders_t::iterator iter = mFolders.begin();
-			 iter != mFolders.end();)
+	if (!handled && mParentPanel->hasFocus())
+	{
+		if (key == KEY_BACKSPACE)
 		{
-			folders_t::iterator fit = iter++;
-			if(!(*fit)->isRemovable())
+			mSearchTimer.reset();
+			if (mSearchString.size())
 			{
-				return FALSE;
+				mSearchString.erase(mSearchString.size() - 1, 1);
 			}
+			search(getCurSelectedItem(), mSearchString, FALSE);
+			handled = TRUE;
 		}
 	}
-	return TRUE;
-}
 
-// this is an internal method used for adding items to folders. 
-BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
-{
-	mItems.push_back(item);
-	item->setRect(LLRect(0, 0, getRect().getWidth(), 0));
-	item->setVisible(FALSE);
-	addChild( item );
-	item->dirtyFilter();
-	requestArrange();
-	requestSort();
-	return TRUE;
+	return handled;
 }
 
-// this is an internal method used for adding items to folders. 
-BOOL LLFolderViewFolder::addFolder(LLFolderViewFolder* folder)
-{
-	mFolders.push_back(folder);
-	folder->setOrigin(0, 0);
-	folder->reshape(getRect().getWidth(), 0);
-	folder->setVisible(FALSE);
-	addChild( folder );
-	folder->dirtyFilter();
-	// rearrange all descendants too, as our indentation level might have changed
-	folder->requestArrange(TRUE);
-	requestSort();
-	return TRUE;
-}
 
-void LLFolderViewFolder::requestArrange(BOOL include_descendants)	
-{ 
-	mLastArrangeGeneration = -1; 
-	// flag all items up to root
-	if (mParentFolder)
+BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char)
+{
+	if ((uni_char < 0x20) || (uni_char == 0x7F)) // Control character or DEL
 	{
-		mParentFolder->requestArrange();
+		return FALSE;
 	}
 
-	if (include_descendants)
+	if (uni_char > 0x7f)
 	{
-		for (folders_t::iterator iter = mFolders.begin();
-			iter != mFolders.end();
-			++iter)
-		{
-			(*iter)->requestArrange(TRUE);
-		}
+		llwarns << "LLFolderView::handleUnicodeCharHere - Don't handle non-ascii yet, aborting" << llendl;
+		return FALSE;
 	}
-}
-
-void LLFolderViewFolder::toggleOpen()
-{
-	setOpen(!mIsOpen);
-}
-
-// Force a folder open or closed
-void LLFolderViewFolder::setOpen(BOOL openitem)
-{
-	setOpenArrangeRecursively(openitem);
-}
 
-void LLFolderViewFolder::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse)
-{
-	BOOL was_open = mIsOpen;
-	mIsOpen = openitem;
-	if(!was_open && openitem)
+	BOOL handled = FALSE;
+	if (gFocusMgr.childHasKeyboardFocus(getRoot()))
 	{
-		if(mListener)
+		// SL-51858: Key presses are not being passed to the Popup menu.
+		// A proper fix is non-trivial so instead just close the menu.
+		LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
+		if (menu && menu->isOpen())
 		{
-			mListener->openItem();
+			LLMenuGL::sMenuContainer->hideMenus();
 		}
-	}
 
-	if (recurse == RECURSE_DOWN || recurse == RECURSE_UP_DOWN)
-	{
-		for (folders_t::iterator iter = mFolders.begin();
-			 iter != mFolders.end();)
+		//do text search
+		if (mSearchTimer.getElapsedTimeF32() > gSavedSettings.getF32("TypeAheadTimeout"))
 		{
-			folders_t::iterator fit = iter++;
-			(*fit)->setOpenArrangeRecursively(openitem, RECURSE_DOWN);		/* Flawfinder: ignore */
-		}
-	}
-	if (mParentFolder && (recurse == RECURSE_UP || recurse == RECURSE_UP_DOWN))
-	{
-		mParentFolder->setOpenArrangeRecursively(openitem, RECURSE_UP);
-	}
-	
-	if (was_open != mIsOpen)
-	{
-		requestArrange();
-	}
-}
-
-BOOL LLFolderViewFolder::handleDragAndDropFromChild(MASK mask,
-						BOOL drop,
-						EDragAndDropType c_type,
-						void* cargo_data,
-						EAcceptance* accept,
-						std::string& tooltip_msg)
-{
-	BOOL accepted = mListener && mListener->dragOrDrop(mask,drop,c_type,cargo_data);
-	if (accepted) 
-	{
-		mDragAndDropTarget = TRUE;
-		*accept = ACCEPT_YES_MULTI;
-	}
-	else 
-	{
-		*accept = ACCEPT_NO;
-	}
-
-	// drag and drop to child item, so clear pending auto-opens
-	getRoot()->autoOpenTest(NULL);
-
-	return TRUE;
-}
-
-void LLFolderViewFolder::openItem( void )
-{
-	toggleOpen();
-}
-
-void LLFolderViewFolder::applyFunctorRecursively(LLFolderViewFunctor& functor)
-{
-	functor.doFolder(this);
-
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
-	{
-		folders_t::iterator fit = iter++;
-		(*fit)->applyFunctorRecursively(functor);
-	}
-	for (items_t::iterator iter = mItems.begin();
-		 iter != mItems.end();)
-	{
-		items_t::iterator iit = iter++;
-		functor.doItem((*iit));
-	}
-}
-
-void LLFolderViewFolder::applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor)
-{
-	functor(mListener);
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
-	{
-		folders_t::iterator fit = iter++;
-		(*fit)->applyListenerFunctorRecursively(functor);
-	}
-	for (items_t::iterator iter = mItems.begin();
-		 iter != mItems.end();)
-	{
-		items_t::iterator iit = iter++;
-		(*iit)->applyListenerFunctorRecursively(functor);
-	}
-}
-
-// LLView functionality
-BOOL LLFolderViewFolder::handleDragAndDrop(S32 x, S32 y, MASK mask,
-										   BOOL drop,
-										   EDragAndDropType cargo_type,
-										   void* cargo_data,
-										   EAcceptance* accept,
-										   std::string& tooltip_msg)
-{
-	LLFolderView* root_view = getRoot();
-
-	BOOL handled = FALSE;
-	if(mIsOpen)
-	{
-		handled = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type,
-											cargo_data, accept, tooltip_msg) != NULL;
-	}
-
-	if (!handled)
-	{
-		BOOL accepted = mListener && mListener->dragOrDrop(mask, drop,cargo_type,cargo_data);
-
-		if (accepted) 
-		{
-			mDragAndDropTarget = TRUE;
-			*accept = ACCEPT_YES_MULTI;
-		}
-		else 
-		{
-			*accept = ACCEPT_NO;
-		}
-
-		if (!drop && accepted)
-		{
-			root_view->autoOpenTest(this);
-		}
-
-		lldebugst(LLERR_USER_INPUT) << "dragAndDrop handled by LLFolderViewFolder" << llendl;
-	}
-
-	return TRUE;
-}
-
-
-BOOL LLFolderViewFolder::handleRightMouseDown( S32 x, S32 y, MASK mask )
-{
-	BOOL handled = FALSE;
-	// fetch contents of this folder, as context menu can depend on contents
-	// still, user would have to open context menu again to see the changes
-	gInventory.fetchDescendentsOf(mListener->getUUID());
-	
-	if( mIsOpen )
-	{
-		handled = childrenHandleRightMouseDown( x, y, mask ) != NULL;
-	}
-	if (!handled)
-	{
-		handled = LLFolderViewItem::handleRightMouseDown( x, y, mask );
-	}
-	return handled;
-}
-
-
-BOOL LLFolderViewFolder::handleHover(S32 x, S32 y, MASK mask)
-{
-	BOOL handled = LLView::handleHover(x, y, mask);
-
-	if (!handled)
-	{
-		// this doesn't do child processing
-		handled = LLFolderViewItem::handleHover(x, y, mask);
-	}
-
-	//if(x < LEFT_INDENTATION + mIndentation && x > mIndentation - LEFT_PAD && y > getRect().getHeight() - )
-	//{
-	//	gViewerWindow->setCursor(UI_CURSOR_ARROW);
-	//	mExpanderHighlighted = TRUE;
-	//	handled = TRUE;
-	//}
-	return handled;
-}
-
-BOOL LLFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask )
-{
-	BOOL handled = FALSE;
-	if( mIsOpen )
-	{
-		handled = childrenHandleMouseDown(x,y,mask) != NULL;
-	}
-	if( !handled )
-	{
-		if(x < LEFT_INDENTATION + mIndentation && x > mIndentation - LEFT_PAD)
-		{
-			toggleOpen();
-			handled = TRUE;
-		}
-		else
-		{
-			// do normal selection logic
-			handled = LLFolderViewItem::handleMouseDown(x, y, mask);
-		}
-	}
-
-	return handled;
-}
-
-BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
-{
-	BOOL handled = FALSE;
-	if( mIsOpen )
-	{
-		handled = childrenHandleDoubleClick( x, y, mask ) != NULL;
-	}
-	if( !handled )
-	{
-		if(x < LEFT_INDENTATION + mIndentation && x > mIndentation - LEFT_PAD)
-		{
-			// don't select when user double-clicks plus sign
-			// so as not to contradict single-click behavior
-			toggleOpen();
-		}
-		else
-		{
-			setSelectionFromRoot(this, FALSE);
-			toggleOpen();
-		}
-		handled = TRUE;
-	}
-	return handled;
-}
-
-void LLFolderViewFolder::draw()
-{
-	if (mAutoOpenCountdown != 0.f)
-	{
-		mControlLabelRotation = mAutoOpenCountdown * -90.f;
-	}
-	else if (mIsOpen)
-	{
-		mControlLabelRotation = lerp(mControlLabelRotation, -90.f, LLCriticalDamp::getInterpolant(0.04f));
-	}
-	else
-	{
-		mControlLabelRotation = lerp(mControlLabelRotation, 0.f, LLCriticalDamp::getInterpolant(0.025f));
-	}
-
-	bool possibly_has_children = false;
-	bool up_to_date = mListener && mListener->isUpToDate();
-	if(!up_to_date && mListener && mListener->hasChildren()) // we know we have children but haven't fetched them (doesn't obey filter)
-	{
-		possibly_has_children = true;
-	}
-	
-	
-	BOOL loading = ( mIsOpen && possibly_has_children && !up_to_date );
-	
-	if ( loading && !mIsLoading )
-	{
-		// Measure how long we've been in the loading state
-		mTimeSinceRequestStart.reset();
-	}
-	
-	mIsLoading = loading;
-
-	LLFolderViewItem::draw();
-
-	// draw children if root folder, or any other folder that is open or animating to closed state
-	if( getRoot() == this || (mIsOpen || mCurHeight != mTargetHeight ))
-	{
-		LLView::draw();
-	}
-
-	mExpanderHighlighted = FALSE;
-}
-
-time_t LLFolderViewFolder::getCreationDate() const
-{
-	return llmax<time_t>(mCreationDate, mSubtreeCreationDate);
-}
-
-
-BOOL	LLFolderViewFolder::potentiallyVisible()
-{
-	// folder should be visible by it's own filter status
-	return LLFolderViewItem::potentiallyVisible() 	
-		 // or one or more of its descendants have passed the minimum filter requirement
-		|| hasFilteredDescendants(getRoot()->getFilter()->getMinRequiredGeneration())
-		// or not all of its descendants have been checked against minimum filter requirement
-		|| getCompletedFilterGeneration() < getRoot()->getFilter()->getMinRequiredGeneration(); 
-}
-
-// this does prefix traversal, as folders are listed above their contents
-LLFolderViewItem* LLFolderViewFolder::getNextFromChild( LLFolderViewItem* item, BOOL include_children )
-{
-	BOOL found_item = FALSE;
-
-	LLFolderViewItem* result = NULL;
-	// when not starting from a given item, start at beginning
-	if(item == NULL)
-	{
-		found_item = TRUE;
-	}
-
-	// find current item among children
-	folders_t::iterator fit = mFolders.begin();
-	folders_t::iterator fend = mFolders.end();
-
-	items_t::iterator iit = mItems.begin();
-	items_t::iterator iend = mItems.end();
-
-	// if not trivially starting at the beginning, we have to find the current item
-	if (!found_item)
-	{
-		// first, look among folders, since they are always above items
-		for(; fit != fend; ++fit)
-		{
-			if(item == (*fit))
-			{
-				found_item = TRUE;
-				// if we are on downwards traversal
-				if (include_children && (*fit)->isOpen())
-				{
-					// look for first descendant
-					return (*fit)->getNextFromChild(NULL, TRUE);
-				}
-				// otherwise advance to next folder
-				++fit;
-				include_children = TRUE;
-				break;
-			}
-		}
-
-		// didn't find in folders?  Check items...
-		if (!found_item)
-		{
-			for(; iit != iend; ++iit)
-			{
-				if(item == (*iit))
-				{
-					found_item = TRUE;
-					// point to next item
-					++iit;
-					break;
-				}
-			}
-		}
-	}
-
-	if (!found_item)
-	{
-		// you should never call this method with an item that isn't a child
-		// so we should always find something
-		llassert(FALSE);
-		return NULL;
-	}
-
-	// at this point, either iit or fit point to a candidate "next" item
-	// if both are out of range, we need to punt up to our parent
-
-	// now, starting from found folder, continue through folders
-	// searching for next visible folder
-	while(fit != fend && !(*fit)->getVisible())
-	{
-		// turn on downwards traversal for next folder
-		++fit;
-	} 
-	
-	if (fit != fend)
-	{
-		result = (*fit);
-	}
-	else
-	{
-		// otherwise, scan for next visible item
-		while(iit != iend && !(*iit)->getVisible())
-		{
-			++iit;
-		} 
-
-		// check to see if we have a valid item
-		if (iit != iend)
-		{
-			result = (*iit);
-		}
-	}
-
-	if( !result && mParentFolder )
-	{
-		// If there are no siblings or children to go to, recurse up one level in the tree
-		// and skip children for this folder, as we've already discounted them
-		result = mParentFolder->getNextFromChild(this, FALSE);
-	}
-
-	return result;
-}
-
-// this does postfix traversal, as folders are listed above their contents
-LLFolderViewItem* LLFolderViewFolder::getPreviousFromChild( LLFolderViewItem* item, BOOL include_children )
-{
-	BOOL found_item = FALSE;
-
-	LLFolderViewItem* result = NULL;
-	// when not starting from a given item, start at end
-	if(item == NULL)
-	{
-		found_item = TRUE;
-	}
-
-	// find current item among children
-	folders_t::reverse_iterator fit = mFolders.rbegin();
-	folders_t::reverse_iterator fend = mFolders.rend();
-
-	items_t::reverse_iterator iit = mItems.rbegin();
-	items_t::reverse_iterator iend = mItems.rend();
-
-	// if not trivially starting at the end, we have to find the current item
-	if (!found_item)
-	{
-		// first, look among items, since they are always below the folders
-		for(; iit != iend; ++iit)
-		{
-			if(item == (*iit))
-			{
-				found_item = TRUE;
-				// point to next item
-				++iit;
-				break;
-			}
-		}
-
-		// didn't find in items?  Check folders...
-		if (!found_item)
-		{
-			for(; fit != fend; ++fit)
-			{
-				if(item == (*fit))
-				{
-					found_item = TRUE;
-					// point to next folder
-					++fit;
-					break;
-				}
-			}
-		}
-	}
-
-	if (!found_item)
-	{
-		// you should never call this method with an item that isn't a child
-		// so we should always find something
-		llassert(FALSE);
-		return NULL;
-	}
-
-	// at this point, either iit or fit point to a candidate "next" item
-	// if both are out of range, we need to punt up to our parent
-
-	// now, starting from found item, continue through items
-	// searching for next visible item
-	while(iit != iend && !(*iit)->getVisible())
-	{
-		++iit;
-	} 
-	
-	if (iit != iend)
-	{
-		// we found an appropriate item
-		result = (*iit);
-	}
-	else
-	{
-		// otherwise, scan for next visible folder
-		while(fit != fend && !(*fit)->getVisible())
-		{
-			++fit;
-		} 
-
-		// check to see if we have a valid folder
-		if (fit != fend)
-		{
-			// try selecting child element of this folder
-			if ((*fit)->isOpen())
-			{
-				result = (*fit)->getPreviousFromChild(NULL);
-			}
-			else
-			{
-				result = (*fit);
-			}
-		}
-	}
-
-	if( !result )
-	{
-		// If there are no siblings or children to go to, recurse up one level in the tree
-		// which gets back to this folder, which will only be visited if it is a valid, visible item
-		result = this;
-	}
-
-	return result;
-}
-
-
-//---------------------------------------------------------------------------
-
-// Tells all folders in a folderview to sort their items
-// (and only their items, not folders) by a certain function.
-class LLSetItemSortFunction : public LLFolderViewFunctor
-{
-public:
-	LLSetItemSortFunction(U32 ordering)
-		: mSortOrder(ordering) {}
-	virtual ~LLSetItemSortFunction() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item);
-
-	U32 mSortOrder;
-};
-
-
-// Set the sort order.
-void LLSetItemSortFunction::doFolder(LLFolderViewFolder* folder)
-{
-	folder->setItemSortOrder(mSortOrder);
-}
-
-// Do nothing.
-void LLSetItemSortFunction::doItem(LLFolderViewItem* item)
-{
-	return;
-}
-
-//---------------------------------------------------------------------------
-
-// Tells all folders in a folderview to close themselves
-// For efficiency, calls setOpenArrangeRecursively().
-// The calling function must then call:
-//	LLFolderView* root = getRoot();
-//	if( root )
-//	{
-//		root->arrange( NULL, NULL );
-//		root->scrollToShowSelection();
-//	}
-// to patch things up.
-class LLCloseAllFoldersFunctor : public LLFolderViewFunctor
-{
-public:
-	LLCloseAllFoldersFunctor(BOOL close) { mOpen = !close; }
-	virtual ~LLCloseAllFoldersFunctor() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item);
-
-	BOOL mOpen;
-};
-
-
-// Set the sort order.
-void LLCloseAllFoldersFunctor::doFolder(LLFolderViewFolder* folder)
-{
-	folder->setOpenArrangeRecursively(mOpen);
-}
-
-// Do nothing.
-void LLCloseAllFoldersFunctor::doItem(LLFolderViewItem* item)
-{ }
-
-///----------------------------------------------------------------------------
-/// Class LLFolderView
-///----------------------------------------------------------------------------
-
-// Default constructor
-LLFolderView::LLFolderView(const Params& p)
-:	LLFolderViewFolder(p),
-	mScrollContainer( NULL ),
-	mPopupMenuHandle(),
-	mAllowMultiSelect(TRUE),
-	mShowFolderHierarchy(FALSE),
-	mSourceID(p.task_id),
-	mRenameItem( NULL ),
-	mNeedsScroll( FALSE ),
-	mLastScrollItem( NULL ),
-	mNeedsAutoSelect( FALSE ),
-	mAutoSelectOverride(FALSE),
-	mNeedsAutoRename(FALSE),
-	mDebugFilters(FALSE),
-	mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME),	// This gets overridden by a pref immediately
-	mFilter(p.name),
-	mShowSelectionContext(FALSE),
-	mShowSingleSelection(FALSE),
-	mArrangeGeneration(0),
-	mSignalSelectCallback(0),
-	mMinWidth(0),
-	mDragAndDropThisFrame(FALSE),
-	mCallbackRegistrar(NULL),
-	mParentPanel(p.parent_panel)
-
-{
-	LLRect rect = p.rect;
-	LLRect new_rect(rect.mLeft, rect.mBottom + getRect().getHeight(), rect.mLeft + getRect().getWidth(), rect.mBottom);
-	setRect( rect );
-	reshape(rect.getWidth(), rect.getHeight());
-	mIsOpen = TRUE; // this view is always open.
-	mAutoOpenItems.setDepth(AUTO_OPEN_STACK_DEPTH);
-	mAutoOpenCandidate = NULL;
-	mAutoOpenTimer.stop();
-	mKeyboardSelection = FALSE;
-	mIndentation = -LEFT_INDENTATION; // children start at indentation 0
-	gIdleCallbacks.addFunction(idle, this);
-
-	//clear label
-	// go ahead and render root folder as usual
-	// just make sure the label ("Inventory Folder") never shows up
-	mLabel = LLStringUtil::null;
-
-	//mRenamer->setWriteableBgColor(LLColor4::white);
-	// Escape is handled by reverting the rename, not commiting it (default behavior)
-	LLLineEditor::Params params;
-	params.name("ren");
-	params.rect(getRect());
-	params.font(sFont);
-	params.max_length_bytes(DB_INV_ITEM_NAME_STR_LEN);
-	params.commit_callback.function(boost::bind(&LLFolderView::commitRename, this, _2));
-	params.prevalidate_callback(&LLLineEditor::prevalidatePrintableNotPipe);
-	params.commit_on_focus_lost(true);
-	params.visible(false);
-	mRenamer = LLUICtrlFactory::create<LLLineEditor> (params);
-	addChild(mRenamer);
-
-	// make the popup menu available
-	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_inventory.xml", gMenuHolder);
-	if (!menu)
-	{
-		menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu");
-	}
-	menu->setBackgroundColor(LLUIColorTable::instance().getColor("MenuPopupBgColor"));
-	mPopupMenuHandle = menu->getHandle();
-
-}
-
-// Destroys the object
-LLFolderView::~LLFolderView( void )
-{
-	// The release focus call can potentially call the
-	// scrollcontainer, which can potentially be called with a partly
-	// destroyed scollcontainer. Just null it out here, and no worries
-	// about calling into the invalid scroll container.
-	// Same with the renamer.
-	mScrollContainer = NULL;
-	mRenameItem = NULL;
-	mRenamer = NULL;
-
-	if( gEditMenuHandler == this )
-	{
-		gEditMenuHandler = NULL;
-	}
-
-	mAutoOpenItems.removeAllNodes();
-	gIdleCallbacks.deleteFunction(idle, this);
-
-	LLView::deleteViewByHandle(mPopupMenuHandle);
-
-	if(mRenamer == gFocusMgr.getTopCtrl())
-	{
-		gFocusMgr.setTopCtrl(NULL);
-	}
-
-	mAutoOpenItems.removeAllNodes();
-	clearSelection();
-	mItems.clear();
-	mFolders.clear();
-
-	mItemMap.clear();
-}
-
-BOOL LLFolderView::canFocusChildren() const
-{
-	return FALSE;
-}
-
-void LLFolderView::checkTreeResortForModelChanged()
-{
-	if (mSortOrder & LLInventoryFilter::SO_DATE && !(mSortOrder & LLInventoryFilter::SO_FOLDERS_BY_NAME))
-	{
-		// This is the case where something got added or removed.  If we are date sorting
-		// everything including folders, then we need to rebuild the whole tree.
-		// Just set to something not SO_DATE to force the folder most resent date resort.
-		mSortOrder = mSortOrder & ~LLInventoryFilter::SO_DATE;
-		setSortOrder(mSortOrder | LLInventoryFilter::SO_DATE);
-	}
-}
-
-void LLFolderView::setSortOrder(U32 order)
-{
-	if (order != mSortOrder)
-	{
-		LLFastTimer t(LLFastTimer::FTM_SORT);
-		mSortOrder = order;
-
-		for (folders_t::iterator iter = mFolders.begin();
-			 iter != mFolders.end();)
-		{
-			folders_t::iterator fit = iter++;
-			(*fit)->sortBy(order);
-		}
-
-		arrangeAll();
-	}
-}
-
-
-U32 LLFolderView::getSortOrder() const
-{
-	return mSortOrder;
-}
-
-BOOL LLFolderView::addFolder( LLFolderViewFolder* folder)
-{
-	// enforce sort order of My Inventory followed by Library
-	if (folder->getListener()->getUUID() == gInventoryLibraryRoot)
-	{
-		mFolders.push_back(folder);
-	}
-	else
-	{
-		mFolders.insert(mFolders.begin(), folder);
-	}
-	folder->setOrigin(0, 0);
-	folder->reshape(getRect().getWidth(), 0);
-	folder->setVisible(FALSE);
-	addChild( folder );
-	folder->dirtyFilter();
-	folder->requestArrange();
-	return TRUE;
-}
-
-void LLFolderView::closeAllFolders()
-{
-	// Close all the folders
-	setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN);
-	arrangeAll();
-}
-
-void LLFolderView::openFolder(const std::string& foldername)
-{
-	LLFolderViewFolder* inv = findChild<LLFolderViewFolder>(foldername);
-	if (inv)
-	{
-		setSelection(inv, FALSE, FALSE);
-		inv->setOpen(TRUE);
-	}
-}
-
-void LLFolderView::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse)
-{
-	// call base class to do proper recursion
-	LLFolderViewFolder::setOpenArrangeRecursively(openitem, recurse);
-	// make sure root folder is always open
-	mIsOpen = TRUE;
-}
-
-// This view grows and shinks to enclose all of its children items and folders.
-S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_generation )
-{
-	LLFastTimer t2(LLFastTimer::FTM_ARRANGE);
-
-	filter_generation = mFilter.getMinRequiredGeneration();
-	mMinWidth = 0;
-
-	mHasVisibleChildren = hasFilteredDescendants(filter_generation);
-	// arrange always finishes, so optimistically set the arrange generation to the most current
-	mLastArrangeGeneration = getRoot()->getArrangeGeneration();
-
-	LLInventoryFilter::EFolderShow show_folder_state = getRoot()->getShowFolderState();
-
-	S32 total_width = LEFT_PAD;
-	S32 running_height = mDebugFilters ? llceil(sSmallFont->getLineHeight()) : 0;
-	S32 target_height = running_height;
-	S32 parent_item_height = getRect().getHeight();
-
-	for (folders_t::iterator iter = mFolders.begin();
-		 iter != mFolders.end();)
-	{
-		folders_t::iterator fit = iter++;
-		LLFolderViewFolder* folderp = (*fit);
-		if (getDebugFilters())
-		{
-			folderp->setVisible(TRUE);
-		}
-		else
-		{
-			folderp->setVisible(show_folder_state == LLInventoryFilter::SHOW_ALL_FOLDERS || // always show folders?
-									(folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation))); // passed filter or has descendants that passed filter
-		}
-		if (folderp->getVisible())
-		{
-			S32 child_height = 0;
-			S32 child_width = 0;
-			S32 child_top = parent_item_height - running_height;
-			
-			target_height += folderp->arrange( &child_width, &child_height, filter_generation );
-
-			mMinWidth = llmax(mMinWidth, child_width);
-			total_width = llmax( total_width, child_width );
-			running_height += child_height;
-			folderp->setOrigin( ICON_PAD, child_top - (*fit)->getRect().getHeight() );
-		}
-	}
-
-	for (items_t::iterator iter = mItems.begin();
-		 iter != mItems.end();)
-	{
-		items_t::iterator iit = iter++;
-		LLFolderViewItem* itemp = (*iit);
-		itemp->setVisible(itemp->getFiltered(filter_generation));
-
-		if (itemp->getVisible())
-		{
-			S32 child_width = 0;
-			S32 child_height = 0;
-			S32 child_top = parent_item_height - running_height;
-			
-			target_height += itemp->arrange( &child_width, &child_height, filter_generation );
-			itemp->reshape(itemp->getRect().getWidth(), child_height);
-
-			mMinWidth = llmax(mMinWidth, child_width);
-			total_width = llmax( total_width, child_width );
-			running_height += child_height;
-			itemp->setOrigin( ICON_PAD, child_top - itemp->getRect().getHeight() );
-		}
-	}
-
-	S32 dummy_s32;
-	BOOL dummy_bool;
-	S32 min_width;
-	mScrollContainer->calcVisibleSize( &min_width, &dummy_s32, &dummy_bool, &dummy_bool);
-	reshape( llmax(min_width, total_width), running_height );
-
-	S32 new_min_width;
-	mScrollContainer->calcVisibleSize( &new_min_width, &dummy_s32, &dummy_bool, &dummy_bool);
-	if (new_min_width != min_width)
-	{
-		reshape( llmax(min_width, total_width), running_height );
-	}
-
-	// move item renamer text field to item's new position
-	updateRenamerPosition();
-
-	mTargetHeight = (F32)target_height;
-	return llround(mTargetHeight);
-}
-
-const std::string LLFolderView::getFilterSubString(BOOL trim)
-{
-	return mFilter.getFilterSubString(trim);
-}
-
-void LLFolderView::filter( LLInventoryFilter& filter )
-{
-	LLFastTimer t2(LLFastTimer::FTM_FILTER);
-	filter.setFilterCount(llclamp(gSavedSettings.getS32("FilterItemsPerFrame"), 1, 5000));
-
-	if (getCompletedFilterGeneration() < filter.getCurrentGeneration())
-	{
-		mFiltered = FALSE;
-		mMinWidth = 0;
-		LLFolderViewFolder::filter(filter);
-	}
-}
-
-void LLFolderView::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
-	S32 min_width = 0;
-	S32 dummy_height;
-	BOOL dummy_bool;
-	if (mScrollContainer)
-	{
-		mScrollContainer->calcVisibleSize( &min_width, &dummy_height, &dummy_bool, &dummy_bool);
-	}
-	width = llmax(mMinWidth, min_width);
-	LLView::reshape(width, height, called_from_parent);
-
-	mReshapeSignal(mSelectedItems, FALSE);
-}
-
-void LLFolderView::addToSelectionList(LLFolderViewItem* item)
-{
-	if (item->isSelected())
-	{
-		removeFromSelectionList(item);
-	}
-	if (mSelectedItems.size())
-	{
-		mSelectedItems.back()->setIsCurSelection(FALSE);
-	}
-	item->setIsCurSelection(TRUE);
-	mSelectedItems.push_back(item);
-}
-
-void LLFolderView::removeFromSelectionList(LLFolderViewItem* item)
-{
-	if (mSelectedItems.size())
-	{
-		mSelectedItems.back()->setIsCurSelection(FALSE);
-	}
-
-	selected_items_t::iterator item_iter;
-	for (item_iter = mSelectedItems.begin(); item_iter != mSelectedItems.end();)
-	{
-		if (*item_iter == item)
-		{
-			item_iter = mSelectedItems.erase(item_iter);
-		}
-		else
-		{
-			++item_iter;
-		}
-	}
-	if (mSelectedItems.size())
-	{
-		mSelectedItems.back()->setIsCurSelection(TRUE);
-	}
-}
-
-LLFolderViewItem* LLFolderView::getCurSelectedItem( void )
-{
-	if(mSelectedItems.size())
-	{
-		LLFolderViewItem* itemp = mSelectedItems.back();
-		llassert(itemp->getIsCurSelection());
-		return itemp;
-	}
-	return NULL;
-}
-
-
-// Record the selected item and pass it down the hierachy.
-BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL openitem,
-								BOOL take_keyboard_focus)
-{
-	if( selection == this )
-	{
-		return FALSE;
-	}
-
-	if( selection && take_keyboard_focus)
-	{
-		mParentPanel->setFocus(TRUE);
-	}
-
-	// clear selection down here because change of keyboard focus can potentially
-	// affect selection
-	clearSelection();
-
-	if(selection)
-	{
-		addToSelectionList(selection);
-	}
-
-	BOOL rv = LLFolderViewFolder::setSelection(selection, openitem, take_keyboard_focus);
-	if(openitem && selection)
-	{
-		selection->getParentFolder()->requestArrange();
-	}
-
-	llassert(mSelectedItems.size() <= 1);
-
-	mSignalSelectCallback = take_keyboard_focus ? SIGNAL_KEYBOARD_FOCUS : SIGNAL_NO_KEYBOARD_FOCUS;
-
-	return rv;
-}
-
-void LLFolderView::setSelectionByID(const LLUUID& obj_id, BOOL take_keyboard_focus)
-{
-	LLFolderViewItem* itemp = getItemByID(obj_id);
-	if(itemp && itemp->getListener())
-	{
-		itemp->getListener()->arrangeAndSet(itemp, TRUE, take_keyboard_focus);
-		mSelectThisID.setNull();
-		return;
-	}
-	else
-	{
-		// save the desired item to be selected later (if/when ready)
-		mSelectThisID = obj_id;
-	}
-}
-
-void LLFolderView::updateSelection()
-{
-	if (mSelectThisID.notNull())
-	{
-		setSelectionByID(mSelectThisID, false);
-	}
-}
-
-BOOL LLFolderView::changeSelection(LLFolderViewItem* selection, BOOL selected)
-{
-	BOOL rv = FALSE;
-
-	// can't select root folder
-	if(!selection || selection == this)
-	{
-		return FALSE;
-	}
-
-	if (!mAllowMultiSelect)
-	{
-		clearSelection();
-	}
-
-	selected_items_t::iterator item_iter;
-	for (item_iter = mSelectedItems.begin(); item_iter != mSelectedItems.end(); ++item_iter)
-	{
-		if (*item_iter == selection)
-		{
-			break;
-		}
-	}
-
-	BOOL on_list = (item_iter != mSelectedItems.end());
-
-	if(selected && !on_list)
-	{
-		addToSelectionList(selection);
-	}
-	if(!selected && on_list)
-	{
-		removeFromSelectionList(selection);
-	}
-
-	rv = LLFolderViewFolder::changeSelection(selection, selected);
-
-	mSignalSelectCallback = SIGNAL_KEYBOARD_FOCUS;
-	
-	return rv;
-}
-
-S32 LLFolderView::extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items)
-{
-	S32 rv = 0;
-
-	// now store resulting selection
-	if (mAllowMultiSelect)
-	{
-		LLFolderViewItem *cur_selection = getCurSelectedItem();
-		rv = LLFolderViewFolder::extendSelection(selection, cur_selection, items);
-		for (S32 i = 0; i < items.count(); i++)
-		{
-			addToSelectionList(items[i]);
-			rv++;
-		}
-	}
-	else
-	{
-		setSelection(selection, FALSE, FALSE);
-		rv++;
-	}
-
-	mSignalSelectCallback = SIGNAL_KEYBOARD_FOCUS;
-	return rv;
-}
-
-void LLFolderView::sanitizeSelection()
-{
-	// store off current item in case it is automatically deselected
-	// and we want to preserve context
-	LLFolderViewItem* original_selected_item = getCurSelectedItem();
-
-	// Cache "Show all folders" filter setting
-	BOOL show_all_folders = (getRoot()->getShowFolderState() == LLInventoryFilter::SHOW_ALL_FOLDERS);
-
-	std::vector<LLFolderViewItem*> items_to_remove;
-	selected_items_t::iterator item_iter;
-	for (item_iter = mSelectedItems.begin(); item_iter != mSelectedItems.end(); ++item_iter)
-	{
-		LLFolderViewItem* item = *item_iter;
-
-		// ensure that each ancestor is open and potentially passes filtering
-		BOOL visible = item->potentiallyVisible(); // initialize from filter state for this item
-		// modify with parent open and filters states
-		LLFolderViewFolder* parent_folder = item->getParentFolder();
-		if ( parent_folder )
-		{
-			if ( show_all_folders )
-			{	// "Show all folders" is on, so this folder is visible
-				visible = TRUE;
-			}
-			else
-			{	// Move up through parent folders and see what's visible
-				while(parent_folder)
-				{
-					visible = visible && parent_folder->isOpen() && parent_folder->potentiallyVisible();
-					parent_folder = parent_folder->getParentFolder();
-				}
-			}
-		}
-
-		//  deselect item if any ancestor is closed or didn't pass filter requirements.
-		if (!visible)
-		{
-			items_to_remove.push_back(item);
-		}
-
-		// disallow nested selections (i.e. folder items plus one or more ancestors)
-		// could check cached mum selections count and only iterate if there are any
-		// but that may be a premature optimization.
-		selected_items_t::iterator other_item_iter;
-		for (other_item_iter = mSelectedItems.begin(); other_item_iter != mSelectedItems.end(); ++other_item_iter)
-		{
-			LLFolderViewItem* other_item = *other_item_iter;
-			for( parent_folder = other_item->getParentFolder(); parent_folder; parent_folder = parent_folder->getParentFolder())
-			{
-				if (parent_folder == item)
-				{
-					// this is a descendent of the current folder, remove from list
-					items_to_remove.push_back(other_item);
-					break;
-				}
-			}
-		}
-	}
-
-	std::vector<LLFolderViewItem*>::iterator item_it;
-	for (item_it = items_to_remove.begin(); item_it != items_to_remove.end(); ++item_it )
-	{
-		changeSelection(*item_it, FALSE); // toggle selection (also removes from list)
-	}
-
-	// if nothing selected after prior constraints...
-	if (mSelectedItems.empty())
-	{
-		// ...select first available parent of original selection, or "My Inventory" otherwise
-		LLFolderViewItem* new_selection = NULL;
-		if (original_selected_item)
-		{
-			for(LLFolderViewFolder* parent_folder = original_selected_item->getParentFolder();
-				parent_folder;
-				parent_folder = parent_folder->getParentFolder())
-			{
-				if (parent_folder->potentiallyVisible())
-				{
-					// give initial selection to first ancestor folder that potentially passes the filter
-					if (!new_selection)
-					{
-						new_selection = parent_folder;
-					}
-
-					// if any ancestor folder of original item is closed, move the selection up 
-					// to the highest closed
-					if (!parent_folder->isOpen())
-					{	
-						new_selection = parent_folder;
-					}
-				}
-			}
-		}
-		else
-		{
-			// nothing selected to start with, so pick "My Inventory" as best guess
-			new_selection = getItemByID(gAgent.getInventoryRootID());
-		}
-
-		if (new_selection)
-		{
-			setSelection(new_selection, FALSE, FALSE);
-		}
-	}
-}
-
-void LLFolderView::clearSelection()
-{
-	if (mSelectedItems.size() > 0)
-	{
-		recursiveDeselect(FALSE);
-		mSelectedItems.clear();
-	}
-	mSelectThisID.setNull();
-}
-
-BOOL LLFolderView::getSelectionList(std::set<LLUUID> &selection)
-{
-	selected_items_t::iterator item_it;
-	for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
-	{
-		selection.insert((*item_it)->getListener()->getUUID());
-	}
-
-	return (selection.size() != 0);
-}
-
-BOOL LLFolderView::startDrag(LLToolDragAndDrop::ESource source)
-{
-	std::vector<EDragAndDropType> types;
-	std::vector<LLUUID> cargo_ids;
-	selected_items_t::iterator item_it;
-	BOOL can_drag = TRUE;
-	if (!mSelectedItems.empty())
-	{
-		for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
-		{
-			EDragAndDropType type = DAD_NONE;
-			LLUUID id = LLUUID::null;
-			can_drag = can_drag && (*item_it)->getListener()->startDrag(&type, &id);
-
-			types.push_back(type);
-			cargo_ids.push_back(id);
-		}
-
-		LLToolDragAndDrop::getInstance()->beginMultiDrag(types, cargo_ids, source, mSourceID); 
-	}
-	return can_drag;
-}
-
-void LLFolderView::commitRename( const LLSD& data )
-{
-	finishRenamingItem();
-}
-
-void LLFolderView::draw()
-{
-	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
-	if (mDebugFilters)
-	{
-		std::string current_filter_string = llformat("Current Filter: %d, Least Filter: %d, Auto-accept Filter: %d",
-										mFilter.getCurrentGeneration(), mFilter.getMinRequiredGeneration(), mFilter.getMustPassGeneration());
-		sSmallFont->renderUTF8(current_filter_string, 0, 2, 
-			getRect().getHeight() - sSmallFont->getLineHeight(), LLColor4(0.5f, 0.5f, 0.8f, 1.f), 
-			LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
-	}
-
-	// if cursor has moved off of me during drag and drop
-	// close all auto opened folders
-	if (!mDragAndDropThisFrame)
-	{
-		closeAutoOpenedFolders();
-	}
-
-	// while dragging, update selection rendering to reflect single/multi drag status
-	if (LLToolDragAndDrop::getInstance()->hasMouseCapture())
-	{
-		EAcceptance last_accept = LLToolDragAndDrop::getInstance()->getLastAccept();
-		if (last_accept == ACCEPT_YES_SINGLE || last_accept == ACCEPT_YES_COPY_SINGLE)
-		{
-			setShowSingleSelection(TRUE);
-		}
-		else
-		{
-			setShowSingleSelection(FALSE);
-		}
-	}
-	else
-	{
-		setShowSingleSelection(FALSE);
-	}
-
-
-	if (mSearchTimer.getElapsedTimeF32() > gSavedSettings.getF32("TypeAheadTimeout") || !mSearchString.size())
-	{
-		mSearchString.clear();
-	}
-
-	if (hasVisibleChildren() || getShowFolderState() == LLInventoryFilter::SHOW_ALL_FOLDERS)
-	{
-		mStatusText.clear();
-	}
-	else
-	{
-		if (gInventory.backgroundFetchActive() || mCompletedFilterGeneration < mFilter.getMinRequiredGeneration())
-		{
-			mStatusText = LLTrans::getString("Searching");
-			sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL,  LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
-		}
-		else
-		{
-			mStatusText = LLTrans::getString("InventoryNoMatchingItems");
-			sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL,  LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
-		}
-	}
-
-	LLFolderViewFolder::draw();
-
-	mDragAndDropThisFrame = FALSE;
-}
-
-void LLFolderView::finishRenamingItem( void )
-{
-	if(!mRenamer)
-	{
-		return;
-	}
-	if( mRenameItem )
-	{
-		mRenameItem->rename( mRenamer->getText() );
-	}
-
-	mRenamer->setCommitOnFocusLost( FALSE );
-	mRenamer->setFocus( FALSE );
-	mRenamer->setVisible( FALSE );
-	mRenamer->setCommitOnFocusLost( TRUE );
-	gFocusMgr.setTopCtrl( NULL );
-
-	if( mRenameItem )
-	{
-		setSelectionFromRoot( mRenameItem, TRUE );
-		mRenameItem = NULL;
-	}
-
-	// List is re-sorted alphabeticly, so scroll to make sure the selected item is visible.
-	scrollToShowSelection();
-}
-
-void LLFolderView::closeRenamer( void )
-{
-	// will commit current name (which could be same as original name)
-	mRenamer->setFocus( FALSE );
-	mRenamer->setVisible( FALSE );
-	gFocusMgr.setTopCtrl( NULL );
-
-	if( mRenameItem )
-	{
-		setSelectionFromRoot( mRenameItem, TRUE );
-		mRenameItem = NULL;
-	}
-}
-
-void LLFolderView::removeSelectedItems( void )
-{
-	if(getVisible() && getEnabled())
-	{
-		// just in case we're removing the renaming item.
-		mRenameItem = NULL;
-
-		// create a temporary structure which we will use to remove
-		// items, since the removal will futz with internal data
-		// structures.
-		std::vector<LLFolderViewItem*> items;
-		S32 count = mSelectedItems.size();
-		if(count == 0) return;
-		LLFolderViewItem* item = NULL;
-		selected_items_t::iterator item_it;
-		for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
-		{
-			item = *item_it;
-			if(item->isRemovable())
-			{
-				items.push_back(item);
-			}
-			else
-			{
-				llinfos << "Cannot delete " << item->getName() << llendl;
-				return;
-			}
-		}
-
-		// iterate through the new container.
-		count = items.size();
-		LLUUID new_selection_id;
-		if(count == 1)
-		{
-			LLFolderViewItem* item_to_delete = items[0];
-			LLFolderViewFolder* parent = item_to_delete->getParentFolder();
-			LLFolderViewItem* new_selection = item_to_delete->getNextOpenNode(FALSE);
-			if (!new_selection)
-			{
-				new_selection = item_to_delete->getPreviousOpenNode(FALSE);
-			}
-			if(parent)
-			{
-				if (parent->removeItem(item_to_delete))
-				{
-					// change selection on successful delete
-					if (new_selection)
-					{
-						setSelectionFromRoot(new_selection, new_selection->isOpen(), mParentPanel->hasFocus());
-					}
-					else
-					{
-						setSelectionFromRoot(NULL, mParentPanel->hasFocus());
-					}
-				}
-			}
-			arrangeAll();
-		}
-		else if (count > 1)
-		{
-			LLDynamicArray<LLFolderViewEventListener*> listeners;
-			LLFolderViewEventListener* listener;
-			LLFolderViewItem* last_item = items[count - 1];
-			LLFolderViewItem* new_selection = last_item->getNextOpenNode(FALSE);
-			while(new_selection && new_selection->isSelected())
-			{
-				new_selection = new_selection->getNextOpenNode(FALSE);
-			}
-			if (!new_selection)
-			{
-				new_selection = last_item->getPreviousOpenNode(FALSE);
-				while (new_selection && new_selection->isSelected())
-				{
-					new_selection = new_selection->getPreviousOpenNode(FALSE);
-				}
-			}
-			if (new_selection)
-			{
-				setSelectionFromRoot(new_selection, new_selection->isOpen(), mParentPanel->hasFocus());
-			}
-			else
-			{
-				setSelectionFromRoot(NULL, mParentPanel->hasFocus());
-			}
-
-			for(S32 i = 0; i < count; ++i)
-			{
-				listener = items[i]->getListener();
-				if(listener && (listeners.find(listener) == LLDynamicArray<LLFolderViewEventListener*>::FAIL))
-				{
-					listeners.put(listener);
-				}
-			}
-			listener = listeners.get(0);
-			if(listener)
-			{
-				listener->removeBatch(listeners);
-			}
-		}
-		arrangeAll();
-		scrollToShowSelection();
-	}
-}
-
-// open the selected item.
-void LLFolderView::openSelectedItems( void )
-{
-	if(getVisible() && getEnabled())
-	{
-		if (mSelectedItems.size() == 1)
-		{
-			mSelectedItems.front()->openItem();
-		}
-		else
-		{
-			LLMultiPreview* multi_previewp = new LLMultiPreview();
-			LLMultiProperties* multi_propertiesp = new LLMultiProperties();
-
-			selected_items_t::iterator item_it;
-			for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
-			{
-				// IT_{OBJECT,ATTACHMENT} creates LLProperties
-				// floaters; others create LLPreviews.  Put
-				// each one in the right type of container.
-				LLFolderViewEventListener* listener = (*item_it)->getListener();
-				bool is_prop = listener && (listener->getInventoryType() == LLInventoryType::IT_OBJECT || listener->getInventoryType() == LLInventoryType::IT_ATTACHMENT);
-				if (is_prop)
-					LLFloater::setFloaterHost(multi_propertiesp);
-				else
-					LLFloater::setFloaterHost(multi_previewp);
-				(*item_it)->openItem();
-			}
-
-			LLFloater::setFloaterHost(NULL);
-			// *NOTE: LLMulti* will safely auto-delete when open'd
-			// without any children.
-			multi_previewp->openFloater(LLSD());
-			multi_propertiesp->openFloater(LLSD());
-		}
-	}
-}
-
-void LLFolderView::propertiesSelectedItems( void )
-{
-	if(getVisible() && getEnabled())
-	{
-		if (mSelectedItems.size() == 1)
-		{
-			LLFolderViewItem* folder_item = mSelectedItems.front();
-			if(!folder_item) return;
-			folder_item->getListener()->showProperties();
-		}
-		else
-		{
-			LLMultiProperties* multi_propertiesp = new LLMultiProperties();
-
-			LLFloater::setFloaterHost(multi_propertiesp);
-
-			selected_items_t::iterator item_it;
-			for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
-			{
-				(*item_it)->getListener()->showProperties();
-			}
-
-			LLFloater::setFloaterHost(NULL);
-			multi_propertiesp->openFloater(LLSD());
-		}
-	}
-}
-
-void LLFolderView::autoOpenItem( LLFolderViewFolder* item )
-{
-	if (mAutoOpenItems.check() == item || mAutoOpenItems.getDepth() >= (U32)AUTO_OPEN_STACK_DEPTH)
-	{
-		return;
-	}
-
-	// close auto-opened folders
-	LLFolderViewFolder* close_item = mAutoOpenItems.check();
-	while (close_item && close_item != item->getParentFolder())
-	{
-		mAutoOpenItems.pop();
-		close_item->setOpenArrangeRecursively(FALSE);
-		close_item = mAutoOpenItems.check();
-	}
-
-	item->requestArrange();
-
-	mAutoOpenItems.push(item);
-	
-	item->setOpen(TRUE);
-	scrollToShowItem(item);
-}
-
-void LLFolderView::closeAutoOpenedFolders()
-{
-	while (mAutoOpenItems.check())
-	{
-		LLFolderViewFolder* close_item = mAutoOpenItems.pop();
-		close_item->setOpen(FALSE);
-	}
-
-	if (mAutoOpenCandidate)
-	{
-		mAutoOpenCandidate->setAutoOpenCountdown(0.f);
-	}
-	mAutoOpenCandidate = NULL;
-	mAutoOpenTimer.stop();
-}
-
-BOOL LLFolderView::autoOpenTest(LLFolderViewFolder* folder)
-{
-	if (folder && mAutoOpenCandidate == folder)
-	{
-		if (mAutoOpenTimer.getStarted())
-		{
-			if (!mAutoOpenCandidate->isOpen())
-			{
-				mAutoOpenCandidate->setAutoOpenCountdown(clamp_rescale(mAutoOpenTimer.getElapsedTimeF32(), 0.f, sAutoOpenTime, 0.f, 1.f));
-			}
-			if (mAutoOpenTimer.getElapsedTimeF32() > sAutoOpenTime)
-			{
-				autoOpenItem(folder);
-				mAutoOpenTimer.stop();
-				return TRUE;
-			}
-		}
-		return FALSE;
-	}
-
-	// otherwise new candidate, restart timer
-	if (mAutoOpenCandidate)
-	{
-		mAutoOpenCandidate->setAutoOpenCountdown(0.f);
-	}
-	mAutoOpenCandidate = folder;
-	mAutoOpenTimer.start();
-	return FALSE;
-}
-
-BOOL LLFolderView::canCopy() const
-{
-	if (!(getVisible() && getEnabled() && (mSelectedItems.size() > 0)))
-	{
-		return FALSE;
-	}
-	
-	for (selected_items_t::const_iterator selected_it = mSelectedItems.begin(); selected_it != mSelectedItems.end(); ++selected_it)
-	{
-		const LLFolderViewItem* item = *selected_it;
-		if (!item->getListener()->isItemCopyable())
-		{
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
-// copy selected item
-void LLFolderView::copy()
-{
-	// *NOTE: total hack to clear the inventory clipboard
-	LLInventoryClipboard::instance().reset();
-	S32 count = mSelectedItems.size();
-	if(getVisible() && getEnabled() && (count > 0))
-	{
-		LLFolderViewEventListener* listener = NULL;
-		selected_items_t::iterator item_it;
-		for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
-		{
-			listener = (*item_it)->getListener();
-			if(listener)
-			{
-				listener->copyToClipboard();
-			}
-		}
-	}
-	mSearchString.clear();
-}
-
-BOOL LLFolderView::canCut() const
-{
-	return FALSE;
-}
-
-void LLFolderView::cut()
-{
-	// implement Windows-style cut-and-leave
-}
-
-BOOL LLFolderView::canPaste() const
-{
-	if (mSelectedItems.empty())
-	{
-		return FALSE;
-	}
-
-	if(getVisible() && getEnabled())
-	{
-		for (selected_items_t::const_iterator item_it = mSelectedItems.begin();
-			 item_it != mSelectedItems.end(); ++item_it)
-		{
-			// *TODO: only check folders and parent folders of items
-			const LLFolderViewItem* item = (*item_it);
-			const LLFolderViewEventListener* listener = item->getListener();
-			if(!listener || !listener->isClipboardPasteable())
-			{
-				const LLFolderViewFolder* folderp = item->getParentFolder();
-				listener = folderp->getListener();
-				if (!listener || !listener->isClipboardPasteable())
-				{
-					return FALSE;
-				}
-			}
-		}
-		return TRUE;
-	}
-	return FALSE;
-}
-
-// paste selected item
-void LLFolderView::paste()
-{
-	if(getVisible() && getEnabled())
-	{
-		// find set of unique folders to paste into
-		std::set<LLFolderViewItem*> folder_set;
-
-		selected_items_t::iterator selected_it;
-		for (selected_it = mSelectedItems.begin(); selected_it != mSelectedItems.end(); ++selected_it)
-		{
-			LLFolderViewItem* item = *selected_it;
-			LLFolderViewEventListener* listener = item->getListener();
-			if (listener->getInventoryType() != LLInventoryType::IT_CATEGORY)
-			{
-				item = item->getParentFolder();
-			}
-			folder_set.insert(item);
-		}
-
-		std::set<LLFolderViewItem*>::iterator set_iter;
-		for(set_iter = folder_set.begin(); set_iter != folder_set.end(); ++set_iter)
-		{
-			LLFolderViewEventListener* listener = (*set_iter)->getListener();
-			if(listener && listener->isClipboardPasteable())
-			{
-				listener->pasteFromClipboard();
-			}
-		}
-	}
-	mSearchString.clear();
-}
-
-// public rename functionality - can only start the process
-void LLFolderView::startRenamingSelectedItem( void )
-{
-	// make sure selection is visible
-	scrollToShowSelection();
-
-	S32 count = mSelectedItems.size();
-	LLFolderViewItem* item = NULL;
-	if(count > 0)
-	{
-		item = mSelectedItems.front();
-	}
-	if(getVisible() && getEnabled() && (count == 1) && item && item->getListener() &&
-	   item->getListener()->isItemRenameable())
-	{
-		mRenameItem = item;
-
-		updateRenamerPosition();
-
-
-		mRenamer->setText(item->getName());
-		mRenamer->selectAll();
-		mRenamer->setVisible( TRUE );
-		// set focus will fail unless item is visible
-		mRenamer->setFocus( TRUE );
-		mRenamer->setTopLostCallback(onRenamerLost);
-		gFocusMgr.setTopCtrl( mRenamer );
-	}
-}
-
-BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
-{
-	BOOL handled = FALSE;
-
-	// SL-51858: Key presses are not being passed to the Popup menu.
-	// A proper fix is non-trivial so instead just close the menu.
-	LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
-	if (menu && menu->isOpen())
-	{
-		LLMenuGL::sMenuContainer->hideMenus();
-	}
-
-	LLView *item = NULL;
-	if (getChildCount() > 0)
-	{
-		item = *(getChildList()->begin());
-	}
-
-	switch( key )
-	{
-	case KEY_F2:
-		mSearchString.clear();
-		startRenamingSelectedItem();
-		handled = TRUE;
-		break;
-
-	case KEY_RETURN:
-		if (mask == MASK_NONE)
-		{
-			if( mRenameItem && mRenamer->getVisible() )
-			{
-				finishRenamingItem();
-				mSearchString.clear();
-				handled = TRUE;
-			}
-			else
-			{
-				LLFolderView::openSelectedItems();
-				handled = TRUE;
-			}
-		}
-		break;
-
-	case KEY_ESCAPE:
-		if( mRenameItem && mRenamer->getVisible() )
-		{
-			closeRenamer();
-			handled = TRUE;
-		}
-		mSearchString.clear();
-		break;
-
-	case KEY_PAGE_UP:
-		mSearchString.clear();
-		mScrollContainer->pageUp(30);
-		handled = TRUE;
-		break;
-
-	case KEY_PAGE_DOWN:
-		mSearchString.clear();
-		mScrollContainer->pageDown(30);
-		handled = TRUE;
-		break;
-
-	case KEY_HOME:
-		mSearchString.clear();
-		mScrollContainer->goToTop();
-		handled = TRUE;
-		break;
-
-	case KEY_END:
-		mSearchString.clear();
-		mScrollContainer->goToBottom();
-		break;
-
-	case KEY_DOWN:
-		if((mSelectedItems.size() > 0) && mScrollContainer)
-		{
-			LLFolderViewItem* last_selected = getCurSelectedItem();
-
-			if (!mKeyboardSelection)
-			{
-				setSelection(last_selected, FALSE, TRUE);
-				mKeyboardSelection = TRUE;
-			}
-
-			LLFolderViewItem* next = NULL;
-			if (mask & MASK_SHIFT)
-			{
-				// don't shift select down to children of folders (they are implicitly selected through parent)
-				next = last_selected->getNextOpenNode(FALSE);
-				if (next)
-				{
-					if (next->isSelected())
-					{
-						// shrink selection
-						changeSelectionFromRoot(last_selected, FALSE);
-					}
-					else if (last_selected->getParentFolder() == next->getParentFolder())
-					{
-						// grow selection
-						changeSelectionFromRoot(next, TRUE);
-					}
-				}
-			}
-			else
-			{
-				next = last_selected->getNextOpenNode();
-				if( next )
-				{
-					if (next == last_selected)
-					{
-						return FALSE;
-					}
-					setSelection( next, FALSE, TRUE );
-				}
-			}
-			scrollToShowSelection();
-			mSearchString.clear();
-			handled = TRUE;
-		}
-		break;
-
-	case KEY_UP:
-		if((mSelectedItems.size() > 0) && mScrollContainer)
-		{
-			LLFolderViewItem* last_selected = mSelectedItems.back();
-
-			if (!mKeyboardSelection)
-			{
-				setSelection(last_selected, FALSE, TRUE);
-				mKeyboardSelection = TRUE;
-			}
-
-			LLFolderViewItem* prev = NULL;
-			if (mask & MASK_SHIFT)
-			{
-				// don't shift select down to children of folders (they are implicitly selected through parent)
-				prev = last_selected->getPreviousOpenNode(FALSE);
-				if (prev)
-				{
-					if (prev->isSelected())
-					{
-						// shrink selection
-						changeSelectionFromRoot(last_selected, FALSE);
-					}
-					else if (last_selected->getParentFolder() == prev->getParentFolder())
-					{
-						// grow selection
-						changeSelectionFromRoot(prev, TRUE);
-					}
-				}
-			}
-			else
-			{
-				prev = last_selected->getPreviousOpenNode();
-				if( prev )
-				{
-					if (prev == this)
-					{
-						return FALSE;
-					}
-					setSelection( prev, FALSE, TRUE );
-				}
-			}
-			scrollToShowSelection();
-			mSearchString.clear();
-
-			handled = TRUE;
-		}
-		break;
-
-	case KEY_RIGHT:
-		if(mSelectedItems.size())
-		{
-			LLFolderViewItem* last_selected = getCurSelectedItem();
-			last_selected->setOpen( TRUE );
-			mSearchString.clear();
-			handled = TRUE;
-		}
-		break;
-
-	case KEY_LEFT:
-		if(mSelectedItems.size())
-		{
-			LLFolderViewItem* last_selected = getCurSelectedItem();
-			LLFolderViewItem* parent_folder = last_selected->getParentFolder();
-			if (!last_selected->isOpen() && parent_folder && parent_folder->getParentFolder())
-			{
-				setSelection(parent_folder, FALSE, TRUE);
-			}
-			else
-			{
-				last_selected->setOpen( FALSE );
-			}
-			mSearchString.clear();
-			scrollToShowSelection();
-			handled = TRUE;
-		}
-		break;
-	}
-
-	if (!handled && mParentPanel->hasFocus())
-	{
-		if (key == KEY_BACKSPACE)
-		{
-			mSearchTimer.reset();
-			if (mSearchString.size())
-			{
-				mSearchString.erase(mSearchString.size() - 1, 1);
-			}
-			search(getCurSelectedItem(), mSearchString, FALSE);
-			handled = TRUE;
-		}
-	}
-
-	return handled;
-}
-
-
-BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char)
-{
-	if ((uni_char < 0x20) || (uni_char == 0x7F)) // Control character or DEL
-	{
-		return FALSE;
-	}
-
-	if (uni_char > 0x7f)
-	{
-		llwarns << "LLFolderView::handleUnicodeCharHere - Don't handle non-ascii yet, aborting" << llendl;
-		return FALSE;
-	}
-
-	BOOL handled = FALSE;
-	if (gFocusMgr.childHasKeyboardFocus(getRoot()))
-	{
-		// SL-51858: Key presses are not being passed to the Popup menu.
-		// A proper fix is non-trivial so instead just close the menu.
-		LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
-		if (menu && menu->isOpen())
-		{
-			LLMenuGL::sMenuContainer->hideMenus();
-		}
-
-		//do text search
-		if (mSearchTimer.getElapsedTimeF32() > gSavedSettings.getF32("TypeAheadTimeout"))
-		{
-			mSearchString.clear();
-		}
-		mSearchTimer.reset();
-		if (mSearchString.size() < 128)
-		{
-			mSearchString += uni_char;
-		}
-		search(getCurSelectedItem(), mSearchString, FALSE);
-
-		handled = TRUE;
-	}
-
-	return handled;
-}
-
-
-BOOL LLFolderView::canDoDelete() const
-{
-	if (mSelectedItems.size() == 0) return FALSE;
-
-	for (selected_items_t::const_iterator item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
-	{
-		if (!(*item_it)->getListener()->isItemRemovable())
-		{
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
-void LLFolderView::doDelete()
-{
-	if(mSelectedItems.size() > 0)
-	{				
-		removeSelectedItems();
-	}
-}
-
-
-BOOL LLFolderView::handleMouseDown( S32 x, S32 y, MASK mask )
-{
-	mKeyboardSelection = FALSE;
-	mSearchString.clear();
-
-	mParentPanel->setFocus(TRUE);
-
-	return LLView::handleMouseDown( x, y, mask );
-}
-
-BOOL LLFolderView::search(LLFolderViewItem* first_item, const std::string &search_string, BOOL backward)
-{
-	// get first selected item
-	LLFolderViewItem* search_item = first_item;
-
-	// make sure search string is upper case
-	std::string upper_case_string = search_string;
-	LLStringUtil::toUpper(upper_case_string);
-
-	// if nothing selected, select first item in folder
-	if (!search_item)
-	{
-		// start from first item
-		search_item = getNextFromChild(NULL);
-	}
-
-	// search over all open nodes for first substring match (with wrapping)
-	BOOL found = FALSE;
-	LLFolderViewItem* original_search_item = search_item;
-	do
-	{
-		// wrap at end
-		if (!search_item)
-		{
-			if (backward)
-			{
-				search_item = getPreviousFromChild(NULL);
-			}
-			else
-			{
-				search_item = getNextFromChild(NULL);
-			}
-			if (!search_item || search_item == original_search_item)
-			{
-				break;
-			}
-		}
-
-		const std::string current_item_label(search_item->getSearchableLabel());
-		S32 search_string_length = llmin(upper_case_string.size(), current_item_label.size());
-		if (!current_item_label.compare(0, search_string_length, upper_case_string))
-		{
-			found = TRUE;
-			break;
-		}
-		if (backward)
-		{
-			search_item = search_item->getPreviousOpenNode();
-		}
-		else
-		{
-			search_item = search_item->getNextOpenNode();
-		}
-
-	} while(search_item != original_search_item);
-	
-
-	if (found)
-	{
-		setSelection(search_item, FALSE, TRUE);
-		scrollToShowSelection();
-	}
-
-	return found;
-}
-
-BOOL LLFolderView::handleDoubleClick( S32 x, S32 y, MASK mask )
-{
-	// skip LLFolderViewFolder::handleDoubleClick()
-	return LLView::handleDoubleClick( x, y, mask );
-}
-
-BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
-{
-	// all user operations move keyboard focus to inventory
-	// this way, we know when to stop auto-updating a search
-	mParentPanel->setFocus(TRUE);
-
-	BOOL handled = childrenHandleRightMouseDown(x, y, mask) != NULL;
-	S32 count = mSelectedItems.size();
-	LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
-	if(handled && (count > 0) && menu)
-	{
-		if (mCallbackRegistrar)
-			mCallbackRegistrar->pushScope();
-		//menu->empty();
-		const LLView::child_list_t *list = menu->getChildList();
-
-		LLView::child_list_t::const_iterator menu_itor;
-		for (menu_itor = list->begin(); menu_itor != list->end(); ++menu_itor)
-		{
-			(*menu_itor)->setVisible(TRUE);
-			(*menu_itor)->setEnabled(TRUE);
-		}
-		
-		// Successively filter out invalid options
-		selected_items_t::iterator item_itor;
-		U32 flags = FIRST_SELECTED_ITEM;
-		for (item_itor = mSelectedItems.begin(); item_itor != mSelectedItems.end(); ++item_itor)
-		{
-			(*item_itor)->buildContextMenu(*menu, flags);
-			flags = 0x0;
-		}
-
-		menu->updateParent(LLMenuGL::sMenuContainer);
-		LLMenuGL::showPopup(this, menu, x, y);
-		if (mCallbackRegistrar)
-			mCallbackRegistrar->popScope();
-	}
-	else
-	{
-		if(menu && menu->getVisible())
-		{
-			menu->setVisible(FALSE);
-		}
-		setSelection(NULL, FALSE, TRUE);
-	}
-	return handled;
-}
-
-BOOL LLFolderView::handleHover( S32 x, S32 y, MASK mask )
-{
-	return LLView::handleHover( x, y, mask );
-}
-
-BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-									 EDragAndDropType cargo_type,
-									 void* cargo_data, 
-									 EAcceptance* accept,
-									 std::string& tooltip_msg)
-{
-	mDragAndDropThisFrame = TRUE;
-	BOOL handled = LLView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data,
-											 accept, tooltip_msg);
-
-	if (handled)
-	{
-		lldebugst(LLERR_USER_INPUT) << "dragAndDrop handled by LLFolderView" << llendl;
-	}
-
-	return handled;
-}
-
-BOOL LLFolderView::handleScrollWheel(S32 x, S32 y, S32 clicks)
-{
-	if (mScrollContainer)
-	{
-		return mScrollContainer->handleScrollWheel(x, y, clicks);
-	}
-	return FALSE;
-}
-
-void LLFolderView::deleteAllChildren()
-{
-	if(mRenamer == gFocusMgr.getTopCtrl())
-	{
-		gFocusMgr.setTopCtrl(NULL);
-	}
-	LLView::deleteViewByHandle(mPopupMenuHandle);
-	mPopupMenuHandle = LLHandle<LLView>();
-	mRenamer = NULL;
-	mRenameItem = NULL;
-	clearSelection();
-	LLView::deleteAllChildren();
-}
-
-void LLFolderView::scrollToShowSelection()
-{
-	if (mSelectedItems.size())
-	{
-		mNeedsScroll = TRUE;
-	}
-}
-
-// If the parent is scroll containter, scroll it to make the selection
-// is maximally visible.
-void LLFolderView::scrollToShowItem(LLFolderViewItem* item)
-{
-	// don't scroll to items when mouse is being used to scroll/drag and drop
-	if (gFocusMgr.childHasMouseCapture(mScrollContainer))
-	{
-		mNeedsScroll = FALSE;
-		return;
-	}
-	if(item && mScrollContainer)
-	{
-		LLRect local_rect = item->getRect();
-		LLRect item_scrolled_rect; // item position relative to display area of scroller
-		
-		S32 icon_height = mIcon.isNull() ? 0 : mIcon->getHeight(); 
-		S32 label_height = llround(sFont->getLineHeight()); 
-		// when navigating with keyboard, only move top of folders on screen, otherwise show whole folder
-		S32 max_height_to_show = gFocusMgr.childHasKeyboardFocus(this) ? (llmax( icon_height, label_height ) + ICON_PAD) : local_rect.getHeight(); 
-		item->localPointToOtherView(item->getIndentation(), llmax(0, local_rect.getHeight() - max_height_to_show), &item_scrolled_rect.mLeft, &item_scrolled_rect.mBottom, mScrollContainer);
-		item->localPointToOtherView(local_rect.getWidth(), local_rect.getHeight(), &item_scrolled_rect.mRight, &item_scrolled_rect.mTop, mScrollContainer);
-
-		item_scrolled_rect.mRight = llmin(item_scrolled_rect.mLeft + MIN_ITEM_WIDTH_VISIBLE, item_scrolled_rect.mRight);
-		LLCoordGL scroll_offset(-mScrollContainer->getBorderWidth() - item_scrolled_rect.mLeft, 
-				mScrollContainer->getRect().getHeight() - item_scrolled_rect.mTop - 1);
-
-		S32 max_scroll_offset = getVisibleRect().getHeight() - item_scrolled_rect.getHeight();
-		if (item != mLastScrollItem || // if we're scrolling to focus on a new item
-		// or the item has just appeared on screen and it wasn't onscreen before
-			(scroll_offset.mY > 0 && scroll_offset.mY < max_scroll_offset && 
-			(mLastScrollOffset.mY < 0 || mLastScrollOffset.mY > max_scroll_offset)))
-		{
-			// we now have a position on screen that we want to keep stable
-			// offset of selection relative to top of visible area
-			mLastScrollOffset = scroll_offset;
-			mLastScrollItem = item;
-		}
-
-		mScrollContainer->scrollToShowRect( item_scrolled_rect, mLastScrollOffset );
-
-		// after scrolling, store new offset
-		// in case we don't have room to maintain the original position
-		LLCoordGL new_item_left_top;
-		item->localPointToOtherView(item->getIndentation(), item->getRect().getHeight(), &new_item_left_top.mX, &new_item_left_top.mY, mScrollContainer);
-		mLastScrollOffset.set(-mScrollContainer->getBorderWidth() - new_item_left_top.mX, mScrollContainer->getRect().getHeight() - new_item_left_top.mY - 1);
-	}
-}
-
-LLRect LLFolderView::getVisibleRect()
-{
-	S32 visible_height = mScrollContainer->getRect().getHeight();
-	S32 visible_width = mScrollContainer->getRect().getWidth();
-	LLRect visible_rect;
-	visible_rect.setLeftTopAndSize(-getRect().mLeft, visible_height - getRect().mBottom, visible_width, visible_height);
-	return visible_rect;
-}
-
-BOOL LLFolderView::getShowSelectionContext()
-{
-	if (mShowSelectionContext)
-	{
-		return TRUE;
-	}
-	LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
-	if (menu && menu->getVisible())
-	{
-		return TRUE;
-	}
-	return FALSE;
-}
-
-void LLFolderView::setShowSingleSelection(BOOL show)
-{
-	if (show != mShowSingleSelection)
-	{
-		mMultiSelectionFadeTimer.reset();
-		mShowSingleSelection = show;
-	}
-}
-
-void LLFolderView::addItemID(const LLUUID& id, LLFolderViewItem* itemp)
-{
-	mItemMap[id] = itemp;
-}
-
-void LLFolderView::removeItemID(const LLUUID& id)
-{
-	mItemMap.erase(id);
-}
-
-LLFolderViewItem* LLFolderView::getItemByID(const LLUUID& id)
-{
-	if (id.isNull())
-	{
-		return this;
-	}
-
-	std::map<LLUUID, LLFolderViewItem*>::iterator map_it;
-	map_it = mItemMap.find(id);
-	if (map_it != mItemMap.end())
-	{
-		return map_it->second;
-	}
-
-	return NULL;
-}
-
-bool LLFolderView::doToSelected(LLInventoryModel* model, const LLSD& userdata)
-{
-	std::string action = userdata.asString();
-	
-	if ("rename" == action)
-	{
-		startRenamingSelectedItem();
-		return true;
-	}
-	if ("delete" == action)
-	{
-		removeSelectedItems();
-		return true;
-	}
-
-	if ("copy" == action)
-	{	
-		LLInventoryClipboard::instance().reset();
-	}
-
-	std::set<LLUUID> selected_items;
-	getSelectionList(selected_items);
-
-	LLMultiPreview* multi_previewp = NULL;
-	LLMultiProperties* multi_propertiesp = NULL;
-
-	if (("task_open" == action  || "open" == action) && selected_items.size() > 1)
-	{
-		multi_previewp = new LLMultiPreview();
-		gFloaterView->addChild(multi_previewp);
-
-		LLFloater::setFloaterHost(multi_previewp);
-	
-	}
-	else if (("task_properties" == action || "properties" == action) && selected_items.size() > 1)
-	{
-		multi_propertiesp = new LLMultiProperties();
-		gFloaterView->addChild(multi_propertiesp);
-
-		LLFloater::setFloaterHost(multi_propertiesp);
-	}
-
-	std::set<LLUUID>::iterator set_iter;
-
-	for (set_iter = selected_items.begin(); set_iter != selected_items.end(); ++set_iter)
-	{
-		LLFolderViewItem* folder_item = getItemByID(*set_iter);
-		if(!folder_item) continue;
-		LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getListener();
-		if(!bridge) continue;
-
-		bridge->performAction(this, model, action);
-	}
-
-	LLFloater::setFloaterHost(NULL);
-	if (multi_previewp)
-	{
-		multi_previewp->openFloater(LLSD());
-	}
-	else if (multi_propertiesp)
-	{
-		multi_propertiesp->openFloater(LLSD());
-	}
-
-	return true;
-}
-
-// Main idle routine
-void LLFolderView::doIdle()
-{
-	LLFastTimer t2(LLFastTimer::FTM_INVENTORY);
-
-	BOOL debug_filters = gSavedSettings.getBOOL("DebugInventoryFilters");
-	if (debug_filters != getDebugFilters())
-	{
-		mDebugFilters = debug_filters;
-		arrangeAll();
-	}
-
-	mFilter.clearModified();
-	BOOL filter_modified_and_active = mCompletedFilterGeneration < mFilter.getCurrentGeneration() && 
-										mFilter.isNotDefault();
-	mNeedsAutoSelect = filter_modified_and_active &&
-							!(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture());
-	
-	// filter to determine visiblity before arranging
-	filterFromRoot();
-
-	// automatically show matching items, and select first one
-	// do this every frame until user puts keyboard focus into the inventory window
-	// signaling the end of the automatic update
-	// only do this when mNeedsFilter is set, meaning filtered items have
-	// potentially changed
-	if (mNeedsAutoSelect)
-	{
-		LLFastTimer t3(LLFastTimer::FTM_AUTO_SELECT);
-		// select new item only if a filtered item not currently selected
-		LLFolderViewItem* selected_itemp = mSelectedItems.empty() ? NULL : mSelectedItems.back();
-		if ((!selected_itemp || !selected_itemp->getFiltered()) && !mAutoSelectOverride)
-		{
-			// select first filtered item
-			LLSelectFirstFilteredItem filter;
-			applyFunctorRecursively(filter);
-		}
-		scrollToShowSelection();
-	}
-
-	BOOL is_visible = isInVisibleChain();
-
-	if ( is_visible )
-	{
-		sanitizeSelection();
-		if( needsArrange() )
-		{
-			arrangeFromRoot();
-		}
-	}
-
-	if (mSelectedItems.size() && mNeedsScroll)
-	{
-		scrollToShowItem(mSelectedItems.back());
-		// continue scrolling until animated layout change is done
-		if (getCompletedFilterGeneration() >= mFilter.getMinRequiredGeneration() &&
-			(!needsArrange() || !is_visible))
-		{
-			mNeedsScroll = FALSE;
-		}
-	}
-
-	if (mSignalSelectCallback)
-	{
-		//RN: we use keyboard focus as a proxy for user-explicit actions
-		BOOL take_keyboard_focus = (mSignalSelectCallback == SIGNAL_KEYBOARD_FOCUS);
-		mSelectSignal(mSelectedItems, take_keyboard_focus);
-	}
-	mSignalSelectCallback = FALSE;
-}
-
-
-//static
-void LLFolderView::idle(void* user_data)
-{
-	LLFolderView* self = (LLFolderView*)user_data;
-	if ( self )
-	{	// Do the real idle 
-		self->doIdle();
-	}
-}
-
-void LLFolderView::dumpSelectionInformation()
-{
-	llinfos << "LLFolderView::dumpSelectionInformation()" << llendl;
-	llinfos << "****************************************" << llendl;
-	selected_items_t::iterator item_it;
-	for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
-	{
-		llinfos << "  " << (*item_it)->getName() << llendl;
-	}
-	llinfos << "****************************************" << llendl;
-}
-
-void LLFolderView::updateRenamerPosition()
-{
-	if(mRenameItem)
-	{
-		S32 x = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD - 1 + mRenameItem->getIndentation();
-		S32 y = llfloor(mRenameItem->getRect().getHeight()-sFont->getLineHeight()-2);
-		mRenameItem->localPointToScreen( x, y, &x, &y );
-		screenPointToLocal( x, y, &x, &y );
-		mRenamer->setOrigin( x, y );
-
-		S32 scroller_height = 0;
-		S32 scroller_width = gViewerWindow->getWindowWidth();
-		BOOL dummy_bool;
-		if (mScrollContainer)
-		{
-			mScrollContainer->calcVisibleSize( &scroller_width, &scroller_height, &dummy_bool, &dummy_bool);
-		}
-
-		S32 width = llmax(llmin(mRenameItem->getRect().getWidth() - x, scroller_width - x - getRect().mLeft), MINIMUM_RENAMER_WIDTH);
-		S32 height = llfloor(sFont->getLineHeight() + RENAME_HEIGHT_PAD);
-		mRenamer->reshape( width, height, TRUE );
-	}
-}
-
-
-///----------------------------------------------------------------------------
-/// Local function definitions
-///----------------------------------------------------------------------------
-bool LLInventorySort::updateSort(U32 order)
-{
-	if (order != mSortOrder)
-	{
-		mSortOrder = order;
-		mByDate = (order & LLInventoryFilter::SO_DATE);
-		mSystemToTop = (order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP);
-		mFoldersByName = (order & LLInventoryFilter::SO_FOLDERS_BY_NAME);
-		return true;
-	}
-	return false;
-}
-
-bool LLInventorySort::operator()(const LLFolderViewItem* const& a, const LLFolderViewItem* const& b)
-{
-	// We sort by name if we aren't sorting by date
-	// OR if these are folders and we are sorting folders by name.
-	bool by_name = (!mByDate 
-					|| (mFoldersByName 
-						&& (a->getSortGroup() != SG_ITEM)));
-	
-	if (a->getSortGroup() != b->getSortGroup())
-	{
-		if (mSystemToTop)
-		{
-			// Group order is System Folders, Trash, Normal Folders, Items
-			return (a->getSortGroup() < b->getSortGroup());
-		}
-		else if (mByDate)
-		{
-			// Trash needs to go to the bottom if we are sorting by date
-			if ( (a->getSortGroup() == SG_TRASH_FOLDER)
-				|| (b->getSortGroup() == SG_TRASH_FOLDER))
-			{
-				return (b->getSortGroup() == SG_TRASH_FOLDER);
-			}
-		}
-	}
-
-	if (by_name)
-	{
-		S32 compare = LLStringUtil::compareDict(a->getLabel(), b->getLabel());
-		if (0 == compare)
-		{
-			return (a->getCreationDate() > b->getCreationDate());
-		}
-		else
-		{
-			return (compare < 0);
-		}
-	}
-	else
-	{
-		// BUG: This is very very slow.  The getCreationDate() is log n in number
-		// of inventory items.
-		time_t first_create = a->getCreationDate();
-		time_t second_create = b->getCreationDate();
-		if (first_create == second_create)
-		{
-			return (LLStringUtil::compareDict(a->getLabel(), b->getLabel()) < 0);
-		}
-		else
-		{
-			return (first_create > second_create);
-		}
-	}
-}
-
-//static 
-void LLFolderView::onRenamerLost( LLFocusableElement* renamer, void* user_data)
-{
-	LLUICtrl* uictrl = dynamic_cast<LLUICtrl*>(renamer);
-	if (uictrl)
-	{
-		uictrl->setVisible(FALSE);
-	}
-}
-
-void delete_selected_item(void* user_data)
-{
-	if(user_data)
-	{
-		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
-		fv->removeSelectedItems();
-	}
-}
-
-void copy_selected_item(void* user_data)
-{
-	if(user_data)
-	{
-		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
-		fv->copy();
-	}
-}
-
-void paste_items(void* user_data)
-{
-	if(user_data)
-	{
-		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
-		fv->paste();
-	}
-}
-
-void open_selected_items(void* user_data)
-{
-	if(user_data)
-	{
-		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
-		fv->openSelectedItems();
-	}
-}
-
-void properties_selected_items(void* user_data)
-{
-	if(user_data)
-	{
-		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
-		fv->propertiesSelectedItems();
-	}
-}
-
-///----------------------------------------------------------------------------
-/// Class LLFolderViewEventListener
-///----------------------------------------------------------------------------
-
-void LLFolderViewEventListener::arrangeAndSet(LLFolderViewItem* focus,
-											  BOOL set_selection,
-											  BOOL take_keyboard_focus)
-{
-	if(!focus) return;
-	LLFolderView* root = focus->getRoot();
-	focus->getParentFolder()->requestArrange();
-	if(set_selection)
-	{
-		focus->setSelectionFromRoot(focus, TRUE, take_keyboard_focus);
-		if(root)
-		{
-			root->scrollToShowSelection();
+			mSearchString.clear();
 		}
-	}
-}
-
-
-///----------------------------------------------------------------------------
-/// Class LLInventoryFilter
-///----------------------------------------------------------------------------
-LLInventoryFilter::LLInventoryFilter(const std::string& name) :
-	mName(name),
-	mModified(FALSE),
-	mNeedTextRebuild(TRUE)
-{
-	mFilterOps.mFilterTypes = 0xffffffff;
-	mFilterOps.mMinDate = time_min();
-	mFilterOps.mMaxDate = time_max();
-	mFilterOps.mHoursAgo = 0;
-	mFilterOps.mShowFolderState = SHOW_NON_EMPTY_FOLDERS;
-	mFilterOps.mPermissions = PERM_NONE;
-	
-	mOrder = SO_FOLDERS_BY_NAME; // This gets overridden by a pref immediately
-
-	mSubStringMatchOffset = 0;
-	mFilterSubString.clear();
-	mFilterGeneration = 0;
-	mMustPassGeneration = S32_MAX;
-	mMinRequiredGeneration = 0;
-	mFilterCount = 0;
-	mNextFilterGeneration = mFilterGeneration + 1;
+		mSearchTimer.reset();
+		if (mSearchString.size() < 128)
+		{
+			mSearchString += uni_char;
+		}
+		search(getCurSelectedItem(), mSearchString, FALSE);
 
-	mLastLogoff = gSavedPerAccountSettings.getU32("LastLogoff");
-	mFilterBehavior = FILTER_NONE;
+		handled = TRUE;
+	}
 
-	// copy mFilterOps into mDefaultFilterOps
-	markDefault();
+	return handled;
 }
 
-LLInventoryFilter::~LLInventoryFilter()
-{
-}
 
-BOOL LLInventoryFilter::check(LLFolderViewItem* item) 
+BOOL LLFolderView::canDoDelete() const
 {
-	time_t earliest;
+	if (mSelectedItems.size() == 0) return FALSE;
 
-	earliest = time_corrected() - mFilterOps.mHoursAgo * 3600;
-	if (mFilterOps.mMinDate > time_min() && mFilterOps.mMinDate < earliest)
-	{
-		earliest = mFilterOps.mMinDate;
-	}
-	else if (!mFilterOps.mHoursAgo)
+	for (selected_items_t::const_iterator item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
 	{
-		earliest = 0;
+		if (!(*item_it)->getListener()->isItemRemovable())
+		{
+			return FALSE;
+		}
 	}
-	LLFolderViewEventListener* listener = item->getListener();
-	mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
-	BOOL passed = (0x1 << listener->getInventoryType() & mFilterOps.mFilterTypes || listener->getInventoryType() == LLInventoryType::IT_NONE)
-					&& (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos)
-					&& ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
-					&& (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
-	return passed;
+	return TRUE;
 }
 
-const std::string LLInventoryFilter::getFilterSubString(BOOL trim)
+void LLFolderView::doDelete()
 {
-	return mFilterSubString;
+	if(mSelectedItems.size() > 0)
+	{				
+		removeSelectedItems();
+	}
 }
 
-std::string::size_type LLInventoryFilter::getStringMatchOffset() const
-{
-	return mSubStringMatchOffset;
-}
 
-// has user modified default filter params?
-BOOL LLInventoryFilter::isNotDefault()
+BOOL LLFolderView::handleMouseDown( S32 x, S32 y, MASK mask )
 {
-	return mFilterOps.mFilterTypes != mDefaultFilterOps.mFilterTypes 
-		|| mFilterSubString.size() 
-		|| mFilterOps.mPermissions != mDefaultFilterOps.mPermissions
-		|| mFilterOps.mMinDate != mDefaultFilterOps.mMinDate 
-		|| mFilterOps.mMaxDate != mDefaultFilterOps.mMaxDate
-		|| mFilterOps.mHoursAgo != mDefaultFilterOps.mHoursAgo;
-}
+	mKeyboardSelection = FALSE;
+	mSearchString.clear();
 
-BOOL LLInventoryFilter::isActive()
-{
-	return mFilterOps.mFilterTypes != 0xffffffff 
-		|| mFilterSubString.size() 
-		|| mFilterOps.mPermissions != PERM_NONE 
-		|| mFilterOps.mMinDate != time_min()
-		|| mFilterOps.mMaxDate != time_max()
-		|| mFilterOps.mHoursAgo != 0;
-}
+	mParentPanel->setFocus(TRUE);
 
-BOOL LLInventoryFilter::isModified()
-{
-	return mModified;
+	return LLView::handleMouseDown( x, y, mask );
 }
 
-BOOL LLInventoryFilter::isModifiedAndClear()
+BOOL LLFolderView::search(LLFolderViewItem* first_item, const std::string &search_string, BOOL backward)
 {
-	BOOL ret = mModified;
-	mModified = FALSE;
-	return ret;
-}
+	// get first selected item
+	LLFolderViewItem* search_item = first_item;
 
-void LLInventoryFilter::setFilterTypes(U32 types)
-{
-	if (mFilterOps.mFilterTypes != types)
-	{
-		// keep current items only if no type bits getting turned off
-		BOOL fewer_bits_set = (mFilterOps.mFilterTypes & ~types);
-		BOOL more_bits_set = (~mFilterOps.mFilterTypes & types);
-	
-		mFilterOps.mFilterTypes = types;
-		if (more_bits_set && fewer_bits_set)
-		{
-			// neither less or more restrive, both simultaneously
-			// so we need to filter from scratch
-			setModified(FILTER_RESTART);
-		}
-		else if (more_bits_set)
-		{
-			// target is only one of all requested types so more type bits == less restrictive
-			setModified(FILTER_LESS_RESTRICTIVE);
-		}
-		else if (fewer_bits_set)
-		{
-			setModified(FILTER_MORE_RESTRICTIVE);
-		}
+	// make sure search string is upper case
+	std::string upper_case_string = search_string;
+	LLStringUtil::toUpper(upper_case_string);
 
+	// if nothing selected, select first item in folder
+	if (!search_item)
+	{
+		// start from first item
+		search_item = getNextFromChild(NULL);
 	}
-}
 
-void LLInventoryFilter::setFilterSubString(const std::string& string)
-{
-	if (mFilterSubString != string)
+	// search over all open nodes for first substring match (with wrapping)
+	BOOL found = FALSE;
+	LLFolderViewItem* original_search_item = search_item;
+	do
 	{
-		// hitting BACKSPACE, for example
-		BOOL less_restrictive = mFilterSubString.size() >= string.size() && !mFilterSubString.substr(0, string.size()).compare(string);
-		// appending new characters
-		BOOL more_restrictive = mFilterSubString.size() < string.size() && !string.substr(0, mFilterSubString.size()).compare(mFilterSubString);
-		mFilterSubString = string;
-		LLStringUtil::toUpper(mFilterSubString);
-		LLStringUtil::trimHead(mFilterSubString);
-
-		if (less_restrictive)
+		// wrap at end
+		if (!search_item)
 		{
-			setModified(FILTER_LESS_RESTRICTIVE);
+			if (backward)
+			{
+				search_item = getPreviousFromChild(NULL);
+			}
+			else
+			{
+				search_item = getNextFromChild(NULL);
+			}
+			if (!search_item || search_item == original_search_item)
+			{
+				break;
+			}
+		}
+
+		const std::string current_item_label(search_item->getSearchableLabel());
+		S32 search_string_length = llmin(upper_case_string.size(), current_item_label.size());
+		if (!current_item_label.compare(0, search_string_length, upper_case_string))
+		{
+			found = TRUE;
+			break;
 		}
-		else if (more_restrictive)
+		if (backward)
 		{
-			setModified(FILTER_MORE_RESTRICTIVE);
+			search_item = search_item->getPreviousOpenNode();
 		}
 		else
 		{
-			setModified(FILTER_RESTART);
+			search_item = search_item->getNextOpenNode();
 		}
+
+	} while(search_item != original_search_item);
+	
+
+	if (found)
+	{
+		setSelection(search_item, FALSE, TRUE);
+		scrollToShowSelection();
 	}
+
+	return found;
+}
+
+BOOL LLFolderView::handleDoubleClick( S32 x, S32 y, MASK mask )
+{
+	// skip LLFolderViewFolder::handleDoubleClick()
+	return LLView::handleDoubleClick( x, y, mask );
 }
 
-void LLInventoryFilter::setFilterPermissions(PermissionMask perms)
+BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
 {
-	if (mFilterOps.mPermissions != perms)
+	// all user operations move keyboard focus to inventory
+	// this way, we know when to stop auto-updating a search
+	mParentPanel->setFocus(TRUE);
+
+	BOOL handled = childrenHandleRightMouseDown(x, y, mask) != NULL;
+	S32 count = mSelectedItems.size();
+	LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
+	if(handled && (count > 0) && menu)
 	{
-		// keep current items only if no perm bits getting turned off
-		BOOL fewer_bits_set = (mFilterOps.mPermissions & ~perms);
-		BOOL more_bits_set = (~mFilterOps.mPermissions & perms);
-		mFilterOps.mPermissions = perms;
+		if (mCallbackRegistrar)
+			mCallbackRegistrar->pushScope();
+		//menu->empty();
+		const LLView::child_list_t *list = menu->getChildList();
 
-		if (more_bits_set && fewer_bits_set)
+		LLView::child_list_t::const_iterator menu_itor;
+		for (menu_itor = list->begin(); menu_itor != list->end(); ++menu_itor)
 		{
-			setModified(FILTER_RESTART);
+			(*menu_itor)->setVisible(TRUE);
+			(*menu_itor)->setEnabled(TRUE);
 		}
-		else if (more_bits_set)
+		
+		// Successively filter out invalid options
+		selected_items_t::iterator item_itor;
+		U32 flags = FIRST_SELECTED_ITEM;
+		for (item_itor = mSelectedItems.begin(); item_itor != mSelectedItems.end(); ++item_itor)
 		{
-			// target must have all requested permission bits, so more bits == more restrictive
-			setModified(FILTER_MORE_RESTRICTIVE);
+			(*item_itor)->buildContextMenu(*menu, flags);
+			flags = 0x0;
 		}
-		else if (fewer_bits_set)
+
+		menu->updateParent(LLMenuGL::sMenuContainer);
+		LLMenuGL::showPopup(this, menu, x, y);
+		if (mCallbackRegistrar)
+			mCallbackRegistrar->popScope();
+	}
+	else
+	{
+		if(menu && menu->getVisible())
 		{
-			setModified(FILTER_LESS_RESTRICTIVE);
+			menu->setVisible(FALSE);
 		}
+		setSelection(NULL, FALSE, TRUE);
 	}
+	return handled;
 }
 
-void LLInventoryFilter::setDateRange(time_t min_date, time_t max_date)
+BOOL LLFolderView::handleHover( S32 x, S32 y, MASK mask )
 {
-	mFilterOps.mHoursAgo = 0;
-	if (mFilterOps.mMinDate != min_date)
-	{
-		mFilterOps.mMinDate = min_date;
-		setModified();
-	}
-	if (mFilterOps.mMaxDate != llmax(mFilterOps.mMinDate, max_date))
+	return LLView::handleHover( x, y, mask );
+}
+
+BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+									 EDragAndDropType cargo_type,
+									 void* cargo_data, 
+									 EAcceptance* accept,
+									 std::string& tooltip_msg)
+{
+	mDragAndDropThisFrame = TRUE;
+	BOOL handled = LLView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data,
+											 accept, tooltip_msg);
+
+	if (handled)
 	{
-		mFilterOps.mMaxDate = llmax(mFilterOps.mMinDate, max_date);
-		setModified();
+		lldebugst(LLERR_USER_INPUT) << "dragAndDrop handled by LLFolderView" << llendl;
 	}
+
+	return handled;
 }
 
-void LLInventoryFilter::setDateRangeLastLogoff(BOOL sl)
+BOOL LLFolderView::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	if (sl && !isSinceLogoff())
+	if (mScrollContainer)
 	{
-		setDateRange(mLastLogoff, time_max());
-		setModified();
+		return mScrollContainer->handleScrollWheel(x, y, clicks);
 	}
-	if (!sl && isSinceLogoff())
+	return FALSE;
+}
+
+void LLFolderView::deleteAllChildren()
+{
+	if(mRenamer == gFocusMgr.getTopCtrl())
 	{
-		setDateRange(0, time_max());
-		setModified();
+		gFocusMgr.setTopCtrl(NULL);
 	}
+	LLView::deleteViewByHandle(mPopupMenuHandle);
+	mPopupMenuHandle = LLHandle<LLView>();
+	mRenamer = NULL;
+	mRenameItem = NULL;
+	clearSelection();
+	LLView::deleteAllChildren();
 }
 
-BOOL LLInventoryFilter::isSinceLogoff()
+void LLFolderView::scrollToShowSelection()
 {
-	return (mFilterOps.mMinDate == (time_t)mLastLogoff) &&
-		(mFilterOps.mMaxDate == time_max());
+	if (mSelectedItems.size())
+	{
+		mNeedsScroll = TRUE;
+	}
 }
 
-void LLInventoryFilter::setHoursAgo(U32 hours)
+// If the parent is scroll containter, scroll it to make the selection
+// is maximally visible.
+void LLFolderView::scrollToShowItem(LLFolderViewItem* item)
 {
-	if (mFilterOps.mHoursAgo != hours)
+	// don't scroll to items when mouse is being used to scroll/drag and drop
+	if (gFocusMgr.childHasMouseCapture(mScrollContainer))
 	{
-		// *NOTE: need to cache last filter time, in case filter goes stale
-		BOOL less_restrictive = (mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max() && hours > mFilterOps.mHoursAgo);
-		BOOL more_restrictive = (mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max() && hours <= mFilterOps.mHoursAgo);
-		mFilterOps.mHoursAgo = hours;
-		mFilterOps.mMinDate = time_min();
-		mFilterOps.mMaxDate = time_max();
-		if (less_restrictive)
-		{
-			setModified(FILTER_LESS_RESTRICTIVE);
-		}
-		else if (more_restrictive)
-		{
-			setModified(FILTER_MORE_RESTRICTIVE);
-		}
-		else
+		mNeedsScroll = FALSE;
+		return;
+	}
+	if(item && mScrollContainer)
+	{
+		LLRect local_rect = item->getRect();
+		LLRect item_scrolled_rect; // item position relative to display area of scroller
+		
+		S32 icon_height = mIcon.isNull() ? 0 : mIcon->getHeight(); 
+		S32 label_height = llround(sFont->getLineHeight()); 
+		// when navigating with keyboard, only move top of folders on screen, otherwise show whole folder
+		S32 max_height_to_show = gFocusMgr.childHasKeyboardFocus(this) ? (llmax( icon_height, label_height ) + ICON_PAD) : local_rect.getHeight(); 
+		item->localPointToOtherView(item->getIndentation(), llmax(0, local_rect.getHeight() - max_height_to_show), &item_scrolled_rect.mLeft, &item_scrolled_rect.mBottom, mScrollContainer);
+		item->localPointToOtherView(local_rect.getWidth(), local_rect.getHeight(), &item_scrolled_rect.mRight, &item_scrolled_rect.mTop, mScrollContainer);
+
+		item_scrolled_rect.mRight = llmin(item_scrolled_rect.mLeft + MIN_ITEM_WIDTH_VISIBLE, item_scrolled_rect.mRight);
+		LLCoordGL scroll_offset(-mScrollContainer->getBorderWidth() - item_scrolled_rect.mLeft, 
+				mScrollContainer->getRect().getHeight() - item_scrolled_rect.mTop - 1);
+
+		S32 max_scroll_offset = getVisibleRect().getHeight() - item_scrolled_rect.getHeight();
+		if (item != mLastScrollItem || // if we're scrolling to focus on a new item
+		// or the item has just appeared on screen and it wasn't onscreen before
+			(scroll_offset.mY > 0 && scroll_offset.mY < max_scroll_offset && 
+			(mLastScrollOffset.mY < 0 || mLastScrollOffset.mY > max_scroll_offset)))
 		{
-			setModified(FILTER_RESTART);
+			// we now have a position on screen that we want to keep stable
+			// offset of selection relative to top of visible area
+			mLastScrollOffset = scroll_offset;
+			mLastScrollItem = item;
 		}
+
+		mScrollContainer->scrollToShowRect( item_scrolled_rect, mLastScrollOffset );
+
+		// after scrolling, store new offset
+		// in case we don't have room to maintain the original position
+		LLCoordGL new_item_left_top;
+		item->localPointToOtherView(item->getIndentation(), item->getRect().getHeight(), &new_item_left_top.mX, &new_item_left_top.mY, mScrollContainer);
+		mLastScrollOffset.set(-mScrollContainer->getBorderWidth() - new_item_left_top.mX, mScrollContainer->getRect().getHeight() - new_item_left_top.mY - 1);
 	}
 }
-void LLInventoryFilter::setShowFolderState(EFolderShow state)
+
+LLRect LLFolderView::getVisibleRect()
+{
+	S32 visible_height = mScrollContainer->getRect().getHeight();
+	S32 visible_width = mScrollContainer->getRect().getWidth();
+	LLRect visible_rect;
+	visible_rect.setLeftTopAndSize(-getRect().mLeft, visible_height - getRect().mBottom, visible_width, visible_height);
+	return visible_rect;
+}
+
+BOOL LLFolderView::getShowSelectionContext()
 {
-	if (mFilterOps.mShowFolderState != state)
+	if (mShowSelectionContext)
 	{
-		mFilterOps.mShowFolderState = state;
-		if (state == SHOW_NON_EMPTY_FOLDERS)
-		{
-			// showing fewer folders than before
-			setModified(FILTER_MORE_RESTRICTIVE);
-		}
-		else if (state == SHOW_ALL_FOLDERS)
-		{
-			// showing same folders as before and then some
-			setModified(FILTER_LESS_RESTRICTIVE);
-		}
-		else
-		{
-			setModified();
-		}
+		return TRUE;
+	}
+	LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
+	if (menu && menu->getVisible())
+	{
+		return TRUE;
 	}
+	return FALSE;
 }
 
-void LLInventoryFilter::setSortOrder(U32 order)
+void LLFolderView::setShowSingleSelection(BOOL show)
 {
-	if (mOrder != order)
+	if (show != mShowSingleSelection)
 	{
-		mOrder = order;
-		setModified();
+		mMultiSelectionFadeTimer.reset();
+		mShowSingleSelection = show;
 	}
 }
 
-void LLInventoryFilter::markDefault()
+void LLFolderView::addItemID(const LLUUID& id, LLFolderViewItem* itemp)
 {
-	mDefaultFilterOps = mFilterOps;
+	mItemMap[id] = itemp;
 }
 
-void LLInventoryFilter::resetDefault()
+void LLFolderView::removeItemID(const LLUUID& id)
 {
-	mFilterOps = mDefaultFilterOps;
-	setModified();
+	mItemMap.erase(id);
 }
 
-void LLInventoryFilter::setModified(EFilterBehavior behavior)
+LLFolderViewItem* LLFolderView::getItemByID(const LLUUID& id)
 {
-	mModified = TRUE;
-	mNeedTextRebuild = TRUE;
-	mFilterGeneration = mNextFilterGeneration++;
-	
-	if (mFilterBehavior == FILTER_NONE)
-	{
-		mFilterBehavior = behavior;
-	}
-	else if (mFilterBehavior != behavior)
+	if (id.isNull())
 	{
-		// trying to do both less restrictive and more restrictive filter
-		// basically means restart from scratch
-		mFilterBehavior = FILTER_RESTART;
+		return this;
 	}
 
-	if (isNotDefault())
-	{
-		// if not keeping current filter results, update last valid as well
-		switch(mFilterBehavior)
-		{
-		case FILTER_RESTART:
-			mMustPassGeneration = mFilterGeneration;
-			mMinRequiredGeneration = mFilterGeneration;
-			break;
-		case FILTER_LESS_RESTRICTIVE:
-			mMustPassGeneration = mFilterGeneration;
-			break;
-		case FILTER_MORE_RESTRICTIVE:
-			mMinRequiredGeneration = mFilterGeneration;
-			// must have passed either current filter generation (meaningless, as it hasn't been run yet)
-			// or some older generation, so keep the value
-			mMustPassGeneration = llmin(mMustPassGeneration, mFilterGeneration);
-			break;
-		default:
-			llerrs << "Bad filter behavior specified" << llendl;
-		}
-	}
-	else
+	std::map<LLUUID, LLFolderViewItem*>::iterator map_it;
+	map_it = mItemMap.find(id);
+	if (map_it != mItemMap.end())
 	{
-		// shortcut disabled filters to show everything immediately
-		mMinRequiredGeneration = 0;
-		mMustPassGeneration = S32_MAX;
+		return map_it->second;
 	}
-}
 
-BOOL LLInventoryFilter::isFilterWith(LLInventoryType::EType t)
-{
-	return mFilterOps.mFilterTypes & (0x01 << t);
+	return NULL;
 }
 
-std::string LLInventoryFilter::getFilterText()
+bool LLFolderView::doToSelected(LLInventoryModel* model, const LLSD& userdata)
 {
-	if (!mNeedTextRebuild)
+	std::string action = userdata.asString();
+	
+	if ("rename" == action)
 	{
-		return mFilterText;
+		startRenamingSelectedItem();
+		return true;
 	}
-
-	mNeedTextRebuild = FALSE;
-	std::string filtered_types;
-	std::string not_filtered_types;
-	BOOL filtered_by_type = FALSE;
-	BOOL filtered_by_all_types = TRUE;
-	S32 num_filter_types = 0;
-	mFilterText.clear();
-
-	if (isFilterWith(LLInventoryType::IT_ANIMATION))
+	if ("delete" == action)
 	{
-		//filtered_types += " Animations,";
-		filtered_types += LLTrans::getString("Animations");
-		filtered_by_type = TRUE;
-		num_filter_types++;
+		removeSelectedItems();
+		return true;
 	}
-	else
-	{
-		//not_filtered_types += " Animations,";
-		not_filtered_types += LLTrans::getString("Animations");
 
-		filtered_by_all_types = FALSE;
+	if ("copy" == action)
+	{	
+		LLInventoryClipboard::instance().reset();
 	}
 
-	if (isFilterWith(LLInventoryType::IT_CALLINGCARD))
-	{
-		//filtered_types += " Calling Cards,";
-		filtered_types += LLTrans::getString("Calling Cards");
-		filtered_by_type = TRUE;
-		num_filter_types++;
-	}
-	else
-	{
-		//not_filtered_types += " Calling Cards,";
-		not_filtered_types += LLTrans::getString("Calling Cards");
-		filtered_by_all_types = FALSE;
-	}
+	std::set<LLUUID> selected_items;
+	getSelectionList(selected_items);
 
-	if (isFilterWith(LLInventoryType::IT_WEARABLE))
-	{
-		//filtered_types += " Clothing,";
-		filtered_types +=  LLTrans::getString("Clothing");
-		filtered_by_type = TRUE;
-		num_filter_types++;
-	}
-	else
-	{
-		//not_filtered_types += " Clothing,";
-		not_filtered_types +=  LLTrans::getString("Clothing");
-		filtered_by_all_types = FALSE;
-	}
+	LLMultiPreview* multi_previewp = NULL;
+	LLMultiProperties* multi_propertiesp = NULL;
 
-	if (isFilterWith(LLInventoryType::IT_GESTURE))
-	{
-		//filtered_types += " Gestures,";
-		filtered_types +=  LLTrans::getString("Gestures");
-		filtered_by_type = TRUE;
-		num_filter_types++;
-	}
-	else
+	if (("task_open" == action  || "open" == action) && selected_items.size() > 1)
 	{
-		//not_filtered_types += " Gestures,";
-		not_filtered_types +=  LLTrans::getString("Gestures");
-		filtered_by_all_types = FALSE;
-	}
+		multi_previewp = new LLMultiPreview();
+		gFloaterView->addChild(multi_previewp);
 
-	if (isFilterWith(LLInventoryType::IT_LANDMARK))
-	{
-		//filtered_types += " Landmarks,";
-		filtered_types +=  LLTrans::getString("Landmarks");
-		filtered_by_type = TRUE;
-		num_filter_types++;
+		LLFloater::setFloaterHost(multi_previewp);
+	
 	}
-	else
+	else if (("task_properties" == action || "properties" == action) && selected_items.size() > 1)
 	{
-		//not_filtered_types += " Landmarks,";
-		not_filtered_types +=  LLTrans::getString("Landmarks");
-		filtered_by_all_types = FALSE;
-	}
+		multi_propertiesp = new LLMultiProperties();
+		gFloaterView->addChild(multi_propertiesp);
 
-	if (isFilterWith(LLInventoryType::IT_NOTECARD))
-	{
-		//filtered_types += " Notecards,";
-		filtered_types +=  LLTrans::getString("Notecards");
-		filtered_by_type = TRUE;
-		num_filter_types++;
-	}
-	else
-	{
-		//not_filtered_types += " Notecards,";
-		not_filtered_types +=  LLTrans::getString("Notecards");
-		filtered_by_all_types = FALSE;
+		LLFloater::setFloaterHost(multi_propertiesp);
 	}
-	
-	if (isFilterWith(LLInventoryType::IT_OBJECT) && isFilterWith(LLInventoryType::IT_ATTACHMENT))
+
+	std::set<LLUUID>::iterator set_iter;
+
+	for (set_iter = selected_items.begin(); set_iter != selected_items.end(); ++set_iter)
 	{
-		//filtered_types += " Objects,";
-		filtered_types +=  LLTrans::getString("Objects");
-		filtered_by_type = TRUE;
-		num_filter_types++;
+		LLFolderViewItem* folder_item = getItemByID(*set_iter);
+		if(!folder_item) continue;
+		LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getListener();
+		if(!bridge) continue;
+
+		bridge->performAction(this, model, action);
 	}
-	else
+
+	LLFloater::setFloaterHost(NULL);
+	if (multi_previewp)
 	{
-		//not_filtered_types += " Objects,";
-		not_filtered_types +=  LLTrans::getString("Objects");
-		filtered_by_all_types = FALSE;
+		multi_previewp->openFloater(LLSD());
 	}
-	
-	if (isFilterWith(LLInventoryType::IT_LSL))
+	else if (multi_propertiesp)
 	{
-		//filtered_types += " Scripts,";
-		filtered_types +=  LLTrans::getString("Scripts");
-		filtered_by_type = TRUE;
-		num_filter_types++;
+		multi_propertiesp->openFloater(LLSD());
 	}
-	else
+
+	return true;
+}
+
+// Main idle routine
+void LLFolderView::doIdle()
+{
+	LLFastTimer t2(LLFastTimer::FTM_INVENTORY);
+
+	BOOL debug_filters = gSavedSettings.getBOOL("DebugInventoryFilters");
+	if (debug_filters != getDebugFilters())
 	{
-		//not_filtered_types += " Scripts,";
-		not_filtered_types +=  LLTrans::getString("Scripts");
-		filtered_by_all_types = FALSE;
+		mDebugFilters = debug_filters;
+		arrangeAll();
 	}
+
+	mFilter->clearModified();
+	BOOL filter_modified_and_active = mCompletedFilterGeneration < mFilter->getCurrentGeneration() && 
+										mFilter->isNotDefault();
+	mNeedsAutoSelect = filter_modified_and_active &&
+							!(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture());
 	
-	if (isFilterWith(LLInventoryType::IT_SOUND))
+	// filter to determine visiblity before arranging
+	filterFromRoot();
+
+	// automatically show matching items, and select first one
+	// do this every frame until user puts keyboard focus into the inventory window
+	// signaling the end of the automatic update
+	// only do this when mNeedsFilter is set, meaning filtered items have
+	// potentially changed
+	if (mNeedsAutoSelect)
 	{
-		//filtered_types += " Sounds,";
-		filtered_types +=  LLTrans::getString("Sounds");
-		filtered_by_type = TRUE;
-		num_filter_types++;
+		LLFastTimer t3(LLFastTimer::FTM_AUTO_SELECT);
+		// select new item only if a filtered item not currently selected
+		LLFolderViewItem* selected_itemp = mSelectedItems.empty() ? NULL : mSelectedItems.back();
+		if ((!selected_itemp || !selected_itemp->getFiltered()) && !mAutoSelectOverride)
+		{
+			// select first filtered item
+			LLSelectFirstFilteredItem filter;
+			applyFunctorRecursively(filter);
+		}
+		scrollToShowSelection();
 	}
-	else
+
+	BOOL is_visible = isInVisibleChain();
+
+	if ( is_visible )
 	{
-		//not_filtered_types += " Sounds,";
-		not_filtered_types +=  LLTrans::getString("Sounds");
-		filtered_by_all_types = FALSE;
+		sanitizeSelection();
+		if( needsArrange() )
+		{
+			arrangeFromRoot();
+		}
 	}
 
-	if (isFilterWith(LLInventoryType::IT_TEXTURE))
+	if (mSelectedItems.size() && mNeedsScroll)
 	{
-		//filtered_types += " Textures,";
-		filtered_types +=  LLTrans::getString("Textures");
-		filtered_by_type = TRUE;
-		num_filter_types++;
+		scrollToShowItem(mSelectedItems.back());
+		// continue scrolling until animated layout change is done
+		if (getCompletedFilterGeneration() >= mFilter->getMinRequiredGeneration() &&
+			(!needsArrange() || !is_visible))
+		{
+			mNeedsScroll = FALSE;
+		}
 	}
-	else
+
+	if (mSignalSelectCallback)
 	{
-		//not_filtered_types += " Textures,";
-		not_filtered_types +=  LLTrans::getString("Textures");
-		filtered_by_all_types = FALSE;
+		//RN: we use keyboard focus as a proxy for user-explicit actions
+		BOOL take_keyboard_focus = (mSignalSelectCallback == SIGNAL_KEYBOARD_FOCUS);
+		mSelectSignal(mSelectedItems, take_keyboard_focus);
 	}
+	mSignalSelectCallback = FALSE;
+}
 
-	if (isFilterWith(LLInventoryType::IT_SNAPSHOT))
-	{
-		//filtered_types += " Snapshots,";
-		filtered_types +=  LLTrans::getString("Snapshots");
-		filtered_by_type = TRUE;
-		num_filter_types++;
+
+//static
+void LLFolderView::idle(void* user_data)
+{
+	LLFolderView* self = (LLFolderView*)user_data;
+	if ( self )
+	{	// Do the real idle 
+		self->doIdle();
 	}
-	else
+}
+
+void LLFolderView::dumpSelectionInformation()
+{
+	llinfos << "LLFolderView::dumpSelectionInformation()" << llendl;
+	llinfos << "****************************************" << llendl;
+	selected_items_t::iterator item_it;
+	for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
 	{
-		//not_filtered_types += " Snapshots,";
-		not_filtered_types +=  LLTrans::getString("Snapshots");
-		filtered_by_all_types = FALSE;
+		llinfos << "  " << (*item_it)->getName() << llendl;
 	}
+	llinfos << "****************************************" << llendl;
+}
 
-	if (!gInventory.backgroundFetchActive() && filtered_by_type && !filtered_by_all_types)
+void LLFolderView::updateRenamerPosition()
+{
+	if(mRenameItem)
 	{
-		mFilterText += " - ";
-		if (num_filter_types < 5)
-		{
-			mFilterText += filtered_types;
-		}
-		else
+		S32 x = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD - 1 + mRenameItem->getIndentation();
+		S32 y = llfloor(mRenameItem->getRect().getHeight()-sFont->getLineHeight()-2);
+		mRenameItem->localPointToScreen( x, y, &x, &y );
+		screenPointToLocal( x, y, &x, &y );
+		mRenamer->setOrigin( x, y );
+
+		S32 scroller_height = 0;
+		S32 scroller_width = gViewerWindow->getWindowWidth();
+		BOOL dummy_bool;
+		if (mScrollContainer)
 		{
-			//mFilterText += "No ";
-			mFilterText += LLTrans::getString("No Filters");
-			mFilterText += not_filtered_types;
+			mScrollContainer->calcVisibleSize( &scroller_width, &scroller_height, &dummy_bool, &dummy_bool);
 		}
-		// remove the ',' at the end
-		mFilterText.erase(mFilterText.size() - 1, 1);
+
+		S32 width = llmax(llmin(mRenameItem->getRect().getWidth() - x, scroller_width - x - getRect().mLeft), MINIMUM_RENAMER_WIDTH);
+		S32 height = llfloor(sFont->getLineHeight() + RENAME_HEIGHT_PAD);
+		mRenamer->reshape( width, height, TRUE );
 	}
+}
+
+
+///----------------------------------------------------------------------------
+/// Local function definitions
+///----------------------------------------------------------------------------
 
-	if (isSinceLogoff())
+//static 
+void LLFolderView::onRenamerLost( LLFocusableElement* renamer, void* user_data)
+{
+	LLUICtrl* uictrl = dynamic_cast<LLUICtrl*>(renamer);
+	if (uictrl)
 	{
-		//mFilterText += " - Since Logoff";
-		mFilterText += LLTrans::getString("Since Logoff");
+		uictrl->setVisible(FALSE);
 	}
-	return mFilterText;
 }
 
-void LLInventoryFilter::toLLSD(LLSD& data)
+LLInventoryFilter* LLFolderView::getFilter()
 {
-	data["filter_types"] = (LLSD::Integer)getFilterTypes();
-	data["min_date"] = (LLSD::Integer)getMinDate();
-	data["max_date"] = (LLSD::Integer)getMaxDate();
-	data["hours_ago"] = (LLSD::Integer)getHoursAgo();
-	data["show_folder_state"] = (LLSD::Integer)getShowFolderState();
-	data["permissions"] = (LLSD::Integer)getFilterPermissions();
-	data["substring"] = (LLSD::String)getFilterSubString();
-	data["sort_order"] = (LLSD::Integer)getSortOrder();
-	data["since_logoff"] = (LLSD::Boolean)isSinceLogoff();
+	return mFilter;
 }
 
-void LLInventoryFilter::fromLLSD(LLSD& data)
+void LLFolderView::setFilterPermMask( PermissionMask filter_perm_mask )
 {
-	if(data.has("filter_types"))
-	{
-		setFilterTypes((U32)data["filter_types"].asInteger());
-	}
+	mFilter->setFilterPermissions(filter_perm_mask);
+}
 
-	if(data.has("min_date") && data.has("max_date"))
-	{
-		setDateRange(data["min_date"].asInteger(), data["max_date"].asInteger());
-	}
+U32 LLFolderView::getFilterTypes() const
+{
+	return mFilter->getFilterTypes();
+}
 
-	if(data.has("hours_ago"))
-	{
-		setHoursAgo((U32)data["hours_ago"].asInteger());
-	}
+PermissionMask LLFolderView::getFilterPermissions() const
+{
+	return mFilter->getFilterPermissions();
+}
+
+// JAMESDEBUG
+//LLInventoryFilter::EFolderShow LLFolderView::getShowFolderState()
+//{
+//	return mFilter->getShowFolderState();
+//}
+
+BOOL LLFolderView::isFilterModified()
+{
+	return mFilter->isNotDefault();
+}
 
-	if(data.has("show_folder_state"))
+BOOL LLFolderView::getAllowMultiSelect()
+{
+	return mAllowMultiSelect;
+}
+
+void delete_selected_item(void* user_data)
+{
+	if(user_data)
 	{
-		setShowFolderState((EFolderShow)data["show_folder_state"].asInteger());
+		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
+		fv->removeSelectedItems();
 	}
+}
 
-	if(data.has("permissions"))
+void copy_selected_item(void* user_data)
+{
+	if(user_data)
 	{
-		setFilterPermissions((PermissionMask)data["permissions"].asInteger());
+		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
+		fv->copy();
 	}
+}
 
-	if(data.has("substring"))
+void paste_items(void* user_data)
+{
+	if(user_data)
 	{
-		setFilterSubString(std::string(data["substring"].asString()));
+		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
+		fv->paste();
 	}
+}
 
-	if(data.has("sort_order"))
+void open_selected_items(void* user_data)
+{
+	if(user_data)
 	{
-		setSortOrder((U32)data["sort_order"].asInteger());
+		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
+		fv->openSelectedItems();
 	}
+}
 
-	if(data.has("since_logoff"))
+void properties_selected_items(void* user_data)
+{
+	if(user_data)
 	{
-		setDateRangeLastLogoff((bool)data["since_logoff"].asBoolean());
+		LLFolderView* fv = reinterpret_cast<LLFolderView*>(user_data);
+		fv->propertiesSelectedItems();
 	}
 }
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 3386a7fb0e..e8f0c4130e 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -41,6 +41,7 @@
 #ifndef LL_LLFOLDERVIEW_H
 #define LL_LLFOLDERVIEW_H
 
+// JAMESDEBUG - trim this list
 #include <vector>
 #include <map>
 #include <deque>
@@ -57,96 +58,8 @@
 #include "llviewerimage.h"
 #include "lldepthstack.h"
 #include "lltooldraganddrop.h"
-
-class LLMenuGL;
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLFolderViewEventListener
-//
-// This is an abstract base class that users of the folderview classes
-// would use to catch the useful events emitted from the folder
-// views.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class LLFolderViewItem;
-class LLFolderView;
-class LLInventoryModel;
-class LLScrollContainer;
-
-class LLFolderViewEventListener
-{
-public:
-	virtual ~LLFolderViewEventListener( void ) {}
-	virtual const std::string& getName() const = 0;
-	virtual const std::string& getDisplayName() const = 0;
-	virtual const LLUUID& getUUID() const = 0;
-	virtual time_t getCreationDate() const = 0;	// UTC seconds
-	virtual PermissionMask getPermissionMask() const = 0;
-	virtual LLAssetType::EType getPreferredType() const {return LLAssetType::AT_NONE;};
-	virtual LLUIImagePtr getIcon() const = 0;
-	virtual LLFontGL::StyleFlags getLabelStyle() const = 0;
-	virtual std::string getLabelSuffix() const = 0;
-	virtual void openItem( void ) = 0;
-	virtual void previewItem( void ) = 0;
-	virtual void selectItem(void) = 0;
-	virtual void showProperties(void) = 0;
-	virtual BOOL isItemRenameable() const = 0;
-	virtual BOOL renameItem(const std::string& new_name) = 0;
-	virtual BOOL isItemMovable( void ) = 0;		// Can be moved to another folder
-	virtual BOOL isItemRemovable( void ) = 0;	// Can be destroyed
-	virtual BOOL removeItem() = 0;
-	virtual void removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batch) = 0;
-	virtual void move( LLFolderViewEventListener* parent_listener ) = 0;
-	virtual BOOL isItemCopyable() const = 0;
-	virtual BOOL copyToClipboard() const = 0;
-	virtual void cutToClipboard() = 0;
-	virtual BOOL isClipboardPasteable() const = 0;
-	virtual void pasteFromClipboard() = 0;
-	virtual void pasteLinkFromClipboard() = 0;
-	virtual void buildContextMenu(LLMenuGL& menu, U32 flags) = 0;
-	virtual BOOL isUpToDate() const = 0;
-	virtual BOOL hasChildren() const = 0;
-	virtual LLInventoryType::EType getInventoryType() const = 0;
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action) {}
-
-	// This method should be called when a drag begins. returns TRUE
-	// if the drag can begin, otherwise FALSE.
-	virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const = 0;
-
-	// This method will be called to determine if a drop can be
-	// performed, and will set drop to TRUE if a drop is
-	// requested. Returns TRUE if a drop is possible/happened,
-	// otherwise FALSE.
-	virtual BOOL dragOrDrop(MASK mask, BOOL drop,
-							EDragAndDropType cargo_type,
-							void* cargo_data) = 0;
-
-	// This method is called when the object being referenced by the
-	// bridge is actually dropped. This allows for cleanup of the old
-	// view, reference counting, etc.
-//	virtual void dropped() = 0;
-
-	// this method accesses the parent and arranges and sets it as
-	// specified.
-	void arrangeAndSet(LLFolderViewItem* focus, BOOL set_selection,
-		BOOL take_keyboard_focus = TRUE);
-};
-
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLFolderViewListenerFunctor
-//
-// This simple abstract base class can be used to applied to all
-// listeners in a hierarchy.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLFolderViewListenerFunctor
-{
-public:
-	virtual ~LLFolderViewListenerFunctor() {}
-	virtual void operator()(LLFolderViewEventListener* listener) = 0;
-};
+// JAMESDEBUG - move this up
+#include "llfolderviewitem.h"	// because LLFolderView is-a LLFolderViewFolder
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLFolderViewFunctor
@@ -168,571 +81,6 @@ public:
 	virtual void doItem(LLFolderViewItem* item) = 0;
 };
 
-class LLInventoryFilter
-{
-public:
-	typedef enum e_folder_show
-	{
-		SHOW_ALL_FOLDERS,
-		SHOW_NON_EMPTY_FOLDERS,
-		SHOW_NO_FOLDERS
-	} EFolderShow;
-
-	typedef enum e_filter_behavior
-	{
-		FILTER_NONE,				// nothing to do, already filtered
-		FILTER_RESTART,				// restart filtering from scratch
-		FILTER_LESS_RESTRICTIVE,	// existing filtered items will certainly pass this filter
-		FILTER_MORE_RESTRICTIVE		// if you didn't pass the previous filter, you definitely won't pass this one
-	} EFilterBehavior;
-
-	static const U32 SO_DATE = 1;
-	static const U32 SO_FOLDERS_BY_NAME = 2;
-	static const U32 SO_SYSTEM_FOLDERS_TO_TOP = 4;
-
-	LLInventoryFilter(const std::string& name);
-	virtual ~LLInventoryFilter();
-
-	void setFilterTypes(U32 types);
-	U32 getFilterTypes() const { return mFilterOps.mFilterTypes; }
-	
-	void setFilterSubString(const std::string& string);
-	const std::string getFilterSubString(BOOL trim = FALSE);
-
-	void setFilterPermissions(PermissionMask perms);
-	PermissionMask getFilterPermissions() const { return mFilterOps.mPermissions; }
-
-	void setDateRange(time_t min_date, time_t max_date);
-	void setDateRangeLastLogoff(BOOL sl);
-	time_t getMinDate() const { return mFilterOps.mMinDate; }
-	time_t getMaxDate() const { return mFilterOps.mMaxDate; }
-
-	void setHoursAgo(U32 hours);
-	U32 getHoursAgo() const { return mFilterOps.mHoursAgo; }
-
-	void setShowFolderState( EFolderShow state);
-	EFolderShow getShowFolderState() { return mFilterOps.mShowFolderState; }
-
-	void setSortOrder(U32 order);
-	U32 getSortOrder() { return mOrder; }
-
-	BOOL check(LLFolderViewItem* item);
-	std::string::size_type getStringMatchOffset() const;
-	BOOL isActive();
-	BOOL isNotDefault();
-	BOOL isModified();
-	BOOL isModifiedAndClear();
-	BOOL isSinceLogoff();
-	void clearModified() { mModified = FALSE; mFilterBehavior = FILTER_NONE; }
-	const std::string getName() const { return mName; }
-	std::string getFilterText();
-
-	void setFilterCount(S32 count) { mFilterCount = count; }
-	S32 getFilterCount() { return mFilterCount; }
-	void decrementFilterCount() { mFilterCount--; }
-	
-	void markDefault();
-	void resetDefault();
-
-	BOOL isFilterWith(LLInventoryType::EType t);
-
-	S32 getCurrentGeneration() const { return mFilterGeneration; }
-	S32 getMinRequiredGeneration() const { return mMinRequiredGeneration; }
-	S32 getMustPassGeneration() const { return mMustPassGeneration; }
-
-	//RN: this is public to allow system to externally force a global refilter
-	void setModified(EFilterBehavior behavior = FILTER_RESTART);
-
-	void toLLSD(LLSD& data);
-	void fromLLSD(LLSD& data);
-
-protected:
-	struct filter_ops
-	{
-		U32			mFilterTypes;
-		time_t		mMinDate;
-		time_t		mMaxDate;
-		U32			mHoursAgo;
-		EFolderShow	mShowFolderState;
-		PermissionMask	mPermissions;
-	};
-	filter_ops		mFilterOps;
-	filter_ops		mDefaultFilterOps;
-	std::string::size_type	mSubStringMatchOffset;
-	std::string		mFilterSubString;
-	U32				mOrder;
-	const std::string	mName;
-	S32				mFilterGeneration;
-	S32				mMustPassGeneration;
-	S32				mMinRequiredGeneration;
-	S32				mFilterCount;
-	S32				mNextFilterGeneration;
-	EFilterBehavior mFilterBehavior;
-
-private:
-	U32 mLastLogoff;
-	BOOL mModified;
-	BOOL mNeedTextRebuild;
-	std::string mFilterText;
-};
-
-// These are grouping of inventory types.
-// Order matters when sorting system folders to the top.
-enum EInventorySortGroup
-{ 
-	SG_SYSTEM_FOLDER, 
-	SG_TRASH_FOLDER, 
-	SG_NORMAL_FOLDER, 
-	SG_ITEM 
-};
-
-class LLInventorySort
-{
-public:
-	LLInventorySort() 
-		: mSortOrder(0),
-		  mByDate(false),
-		  mSystemToTop(false),
-		  mFoldersByName(false) { }
-	
-	// Returns true if order has changed
-	bool updateSort(U32 order);
-	U32 getSort() { return mSortOrder; }
-
-	bool operator()(const LLFolderViewItem* const& a, const LLFolderViewItem* const& b);
-private:
-	U32  mSortOrder;
-	bool mByDate;
-	bool mSystemToTop;
-	bool mFoldersByName;
-};
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLFolderViewItem
-//
-// An instance of this class represents a single item in a folder view
-// such as an inventory item or a file.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLFontGL;
-class LLFolderViewFolder;
-class LLFolderView;
-
-class LLFolderViewItem : public LLView
-{
-public:
-	static void initClass();
-	static void cleanupClass();
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<LLUIImage*>					icon;
-		Optional<LLFolderView*>					root;
-		Optional<LLFolderViewEventListener*>	listener;
-
-		Optional<LLUIImage*>					folder_arrow_image;
-		Optional<LLUIImage*>					selection_image;
-
-		Optional<S32>							creation_date; //UTC seconds
-		Params()
-		:	folder_arrow_image("", LLUI::getUIImage("folder_arrow.tga")),
-			selection_image("", LLUI::getUIImage("rounded_square.tga"))
-		{
-			mouse_opaque(true);
-			follows.flags(FOLLOWS_LEFT|FOLLOWS_TOP|FOLLOWS_RIGHT);
-			tab_stop(false);
-		}
-	};
-
-protected:
-	friend class LLUICtrlFactory;
-	friend class LLFolderViewEventListener;
-
-	LLFolderViewItem(Params = LLFolderViewItem::Params());
-
-	static const LLFontGL*		sFont;
-	static const LLFontGL*		sSmallFont;
-	static LLUIImagePtr			sArrowImage;
-	static LLUIImagePtr			sBoxImage;
-	std::string					mLabel;
-	std::string					mSearchableLabel;
-	S32							mLabelWidth;
-	bool						mLabelWidthDirty;
-	time_t						mCreationDate;
-	LLFolderViewFolder*			mParentFolder;
-	LLFolderViewEventListener*	mListener;
-	BOOL						mIsSelected;
-	BOOL						mIsCurSelection;
-	BOOL						mSelectPending;
-	LLFontGL::StyleFlags		mLabelStyle;
-	std::string					mLabelSuffix;
-	LLUIImagePtr				mIcon;
-	std::string					mStatusText;
-	BOOL						mHasVisibleChildren;
-	S32							mIndentation;
-	S32							mNumDescendantsSelected;
-	BOOL						mFiltered;
-	S32							mLastFilterGeneration;
-	std::string::size_type		mStringMatchOffset;
-	F32							mControlLabelRotation;
-	LLFolderView*				mRoot;
-	BOOL						mDragAndDropTarget;
-	LLUIImagePtr				mArrowImage;
-	LLUIImagePtr				mBoxImage;
-	BOOL                            mIsLoading;
-	LLTimer                         mTimeSinceRequestStart;
-	
-	// This function clears the currently selected item, and records
-	// the specified selected item appropriately for display and use
-	// in the UI. If open is TRUE, then folders are opened up along
-	// the way to the selection.
-	void setSelectionFromRoot(LLFolderViewItem* selection, BOOL openitem,
-		BOOL take_keyboard_focus = TRUE);
-
-	// helper function to change the selection from the root.
-	void changeSelectionFromRoot(LLFolderViewItem* selection, BOOL selected);
-
-	// helper function to change the selection from the root.
-	void extendSelectionFromRoot(LLFolderViewItem* selection);
-
-	// this is an internal method used for adding items to folders. A
-	// no-op at this leve, but reimplemented in derived classes.
-	virtual BOOL addItem(LLFolderViewItem*) { return FALSE; }
-	virtual BOOL addFolder(LLFolderViewFolder*) { return FALSE; }
-
-public:
-	// This function is called when the folder view is dirty. It's
-	// implemented here but called by derived classes when folding the
-	// views.
-	void arrangeFromRoot();
-	void filterFromRoot( void );
-
-	virtual ~LLFolderViewItem( void );
-
-	// addToFolder() returns TRUE if it succeeds. FALSE otherwise
-	enum { ARRANGE = TRUE, DO_NOT_ARRANGE = FALSE };
-	virtual BOOL addToFolder(LLFolderViewFolder* folder, LLFolderView* root);
-
-	virtual EInventorySortGroup getSortGroup() const;
-
-	// Finds width and height of this object and it's children.  Also
-	// makes sure that this view and it's children are the right size.
-	virtual S32 arrange( S32* width, S32* height, S32 filter_generation );
-	virtual S32 getItemHeight();
-
-	// applies filters to control visibility of inventory items
-	virtual void filter( LLInventoryFilter& filter);
-
-	// updates filter serial number and optionally propagated value up to root
-	S32		getLastFilterGeneration() { return mLastFilterGeneration; }
-
-	virtual void	dirtyFilter();
-
-	// If the selection is 'this' then note that otherwise
-	// ignore. Returns TRUE if this object was affected. If open is
-	// TRUE, then folders are opened up along the way to the
-	// selection.
-	virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
-		BOOL take_keyboard_focus);
-
-	// This method is used to toggle the selection of an item. If
-	// selection is 'this', then note selection, and return TRUE.
-	virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
-
-	// this method is used to group select items
-	virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items){ return FALSE; }
-
-	// this method is used to group select items
-	virtual void recursiveDeselect(BOOL deselect_self);
-
-	// gets multiple-element selection
-	virtual BOOL getSelectionList(std::set<LLUUID> &selection){return TRUE;}
-
-	// Returns true is this object and all of its children can be removed (deleted by user)
-	virtual BOOL isRemovable();
-
-	// Returns true is this object and all of its children can be moved
-	virtual BOOL isMovable();
-
-	// destroys this item recursively
-	virtual void destroyView();
-
-	S32 getNumSelectedDescendants() { return mNumDescendantsSelected; }
-
-	BOOL isSelected() { return mIsSelected; }
-
-	void setIsCurSelection(BOOL select) { mIsCurSelection = select; }
-
-	BOOL getIsCurSelection() { return mIsCurSelection; }
-
-	BOOL hasVisibleChildren() { return mHasVisibleChildren; }
-
-	// Call through to the viewed object and return true if it can be
-	// removed. Returns true if it's removed.
-	//virtual BOOL removeRecursively(BOOL single_item);
-	BOOL remove();
-
-	// Build an appropriate context menu for the item.	Flags unused.
-	void buildContextMenu(LLMenuGL& menu, U32 flags);
-
-	// This method returns the actual name of the thing being
-	// viewed. This method will ask the viewed object itself.
-	const std::string& getName( void ) const;
-
-	const std::string& getSearchableLabel( void ) const;
-
-	// This method returns the label displayed on the view. This
-	// method was primarily added to allow sorting on the folder
-	// contents possible before the entire view has been constructed.
-	const std::string& getLabel() const { return mLabel; }
-
-	// Used for sorting, like getLabel() above.
-	virtual time_t getCreationDate() const { return mCreationDate; }
-	
-	LLFolderViewFolder* getParentFolder( void ) { return mParentFolder; }
-	const LLFolderViewFolder* getParentFolder( void ) const { return mParentFolder; }
-	
-	LLFolderViewItem* getNextOpenNode( BOOL include_children = TRUE );
-	LLFolderViewItem* getPreviousOpenNode( BOOL include_children = TRUE );
-
-	const LLFolderViewEventListener* getListener( void ) const { return mListener; }
-	LLFolderViewEventListener* getListener( void ) { return mListener; }
-
-	// just rename the object.
-	void rename(const std::string& new_name);
-
-	// open
-	virtual void openItem( void );
-	virtual void preview(void);
-
-	// Show children (unfortunate that this is called "open")
-	virtual void setOpen(BOOL open = TRUE) {};
-
-	virtual BOOL isOpen() { return FALSE; }
-
-	virtual LLFolderView*	getRoot();
-	BOOL			isDescendantOf( const LLFolderViewFolder* potential_ancestor );
-	S32				getIndentation() { return mIndentation; }
-
-	virtual BOOL	potentiallyVisible(); // do we know for a fact that this item has been filtered out?
-
-	virtual BOOL	getFiltered();
-	virtual BOOL	getFiltered(S32 filter_generation);
-	virtual void	setFiltered(BOOL filtered, S32 filter_generation);
-
-	// change the icon
-	void setIcon(LLUIImagePtr icon);
-
-	// refresh information from the object being viewed.
-	void refreshFromListener();
-	virtual void refresh();
-
-	virtual void applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor);
-
-	// LLView functionality
-	virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
-	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
-	virtual BOOL handleHover( S32 x, S32 y, MASK mask );
-	virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
-	virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
-	virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
-
-	//	virtual void handleDropped();
-	virtual void draw();
-	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-								   EDragAndDropType cargo_type,
-								   void* cargo_data,
-								   EAcceptance* accept,
-								   std::string& tooltip_msg);
-};
-
-
-// function used for sorting.
-typedef bool (*sort_order_f)(LLFolderViewItem* a, LLFolderViewItem* b);
-
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLFolderViewFolder
-//
-// An instance of an LLFolderViewFolder represents a collection of
-// more folders and items. This is used to build the hierarchy of
-// items found in the folder view. :)
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLFolderViewFolder : public LLFolderViewItem
-{
-protected:
-	LLFolderViewFolder( const LLFolderViewItem::Params& );
-	friend class LLUICtrlFactory;
-
-public:
-	typedef enum e_trash
-	{
-		UNKNOWN, TRASH, NOT_TRASH
-	} ETrash;
-	
-protected:
-	typedef std::list<LLFolderViewItem*> items_t;
-	typedef std::list<LLFolderViewFolder*> folders_t;
-	items_t mItems;
-	folders_t mFolders;
-	LLInventorySort	mSortFunction;
-
-	BOOL		mIsOpen;
-	BOOL		mExpanderHighlighted;
-	F32			mCurHeight;
-	F32			mTargetHeight;
-	F32			mAutoOpenCountdown;
-	time_t		mSubtreeCreationDate;
-	mutable ETrash mAmTrash;
-	S32			mLastArrangeGeneration;
-	S32			mLastCalculatedWidth;
-	S32			mCompletedFilterGeneration;
-	S32			mMostFilteredDescendantGeneration;
-	bool		mNeedsSort;
-public:
-	typedef enum e_recurse_type
-	{
-		RECURSE_NO,
-		RECURSE_UP,
-		RECURSE_DOWN,
-		RECURSE_UP_DOWN
-	} ERecurseType;
-
-
-	virtual ~LLFolderViewFolder( void );
-
-	virtual BOOL	potentiallyVisible();
-
-	LLFolderViewItem* getNextFromChild( LLFolderViewItem*, BOOL include_children = TRUE );
-	LLFolderViewItem* getPreviousFromChild( LLFolderViewItem*, BOOL include_children = TRUE  );
-
-	// addToFolder() returns TRUE if it succeeds. FALSE otherwise
-	virtual BOOL addToFolder(LLFolderViewFolder* folder, LLFolderView* root);
-
-	// Finds width and height of this object and it's children.  Also
-	// makes sure that this view and it's children are the right size.
-	virtual S32 arrange( S32* width, S32* height, S32 filter_generation );
-
-	BOOL needsArrange();
-	void requestSort();
-
-	// Returns the sort group (system, trash, folder) for this folder.
-	virtual EInventorySortGroup getSortGroup() const;
-
-	virtual void	setCompletedFilterGeneration(S32 generation, BOOL recurse_up);
-	virtual S32		getCompletedFilterGeneration() { return mCompletedFilterGeneration; }
-
-	BOOL hasFilteredDescendants(S32 filter_generation) { return mMostFilteredDescendantGeneration >= filter_generation; }
-	BOOL hasFilteredDescendants();
-
-	// applies filters to control visibility of inventory items
-	virtual void filter( LLInventoryFilter& filter);
-	virtual void setFiltered(BOOL filtered, S32 filter_generation);
-	virtual void dirtyFilter();
-
-	// Passes selection information on to children and record
-	// selection information if necessary. Returns TRUE if this object
-	// (or a child) was affected.
-	virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
-							  BOOL take_keyboard_focus);
-
-	// This method is used to change the selection of an item. If
-	// selection is 'this', then note selection as true. Returns TRUE
-	// if this or a child is now selected.
-	virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
-
-	// this method is used to group select items
-	virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
-
-	virtual void recursiveDeselect(BOOL deselect_self);
-
-	// Returns true is this object and all of its children can be removed.
-	virtual BOOL isRemovable();
-
-	// Returns true is this object and all of its children can be moved
-	virtual BOOL isMovable();
-
-	// destroys this folder, and all children
-	virtual void destroyView();
-
-	// If this folder can be removed, remove all children that can be
-	// removed, return TRUE if this is empty after the operation and
-	// it's viewed folder object can be removed.
-	//virtual BOOL removeRecursively(BOOL single_item);
-	//virtual BOOL remove();
-
-	// remove the specified item (and any children) if
-	// possible. Return TRUE if the item was deleted.
-	BOOL removeItem(LLFolderViewItem* item);
-
-	// simply remove the view (and any children) Don't bother telling
-	// the listeners.
-	void removeView(LLFolderViewItem* item);
-
-	// extractItem() removes the specified item from the folder, but
-	// doesn't delete it.
-	void extractItem( LLFolderViewItem* item );
-
-	// This function is called by a child that needs to be resorted.
-	void resort(LLFolderViewItem* item);
-
-	void setItemSortOrder(U32 ordering);
-	void sortBy(U32);
-	//BOOL (*func)(LLFolderViewItem* a, LLFolderViewItem* b));
-
-	void setAutoOpenCountdown(F32 countdown) { mAutoOpenCountdown = countdown; }
-
-	// folders can be opened. This will usually be called by internal
-	// methods.
-	virtual void toggleOpen();
-
-	// Force a folder open or closed
-	virtual void setOpen(BOOL openitem = TRUE);
-
-	// Called when a child is refreshed.
-	// don't rearrange child folder contents unless explicitly requested
-	virtual void requestArrange(BOOL include_descendants = FALSE);
-
-	// internal method which doesn't update the entire view. This
-	// method was written because the list iterators destroy the state
-	// of other iterations, thus, we can't arrange while iterating
-	// through the children (such as when setting which is selected.
-	virtual void setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse = RECURSE_NO);
-
-	// Get the current state of the folder.
-	virtual BOOL isOpen() { return mIsOpen; }
-
-	// special case if an object is dropped on the child.
-	BOOL handleDragAndDropFromChild(MASK mask,
-									BOOL drop,
-									EDragAndDropType cargo_type,
-									void* cargo_data,
-									EAcceptance* accept,
-									std::string& tooltip_msg);
-
-	void applyFunctorRecursively(LLFolderViewFunctor& functor);
-	virtual void applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor);
-
-	virtual void openItem( void );
-	virtual BOOL addItem(LLFolderViewItem* item);
-	virtual BOOL addFolder( LLFolderViewFolder* folder);
-
-	// LLView functionality
-	virtual BOOL handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
-	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
-	virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
-	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-								   EDragAndDropType cargo_type,
-								   void* cargo_data,
-								   EAcceptance* accept,
-								   std::string& tooltip_msg);
-	virtual void draw();
-
-	time_t getCreationDate() const;
-	bool isTrash() const;
-};
-
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLFolderView
@@ -741,8 +89,12 @@ public:
 // manages the screen region of the folder view.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-class LLUICtrl;
+class LLFolderViewEventListener;
+class LLInventoryModel;
 class LLLineEditor;
+class LLMenuGL;
+class LLScrollContainer;
+class LLUICtrl;
 
 class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
 {
@@ -765,21 +117,23 @@ public:
 	// and resort the items if necessary.
 	void setSortOrder(U32 order);
 	void checkTreeResortForModelChanged();
-	void setFilterPermMask(PermissionMask filter_perm_mask) { mFilter.setFilterPermissions(filter_perm_mask); }
+	void setFilterPermMask(PermissionMask filter_perm_mask);
 	void setAllowMultiSelect(BOOL allow) { mAllowMultiSelect = allow; }
 	
 	typedef boost::signals2::signal<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)> signal_t;
 	void setSelectCallback(const signal_t::slot_type& cb) { mSelectSignal.connect(cb); }
 	void setReshapeCallback(const signal_t::slot_type& cb) { mReshapeSignal.connect(cb); }
 	
-	LLInventoryFilter* getFilter() { return &mFilter; }
+	// filter is never null
+	LLInventoryFilter* getFilter();
 	const std::string getFilterSubString(BOOL trim = FALSE);
-	U32 getFilterTypes() const { return mFilter.getFilterTypes(); }
-	PermissionMask getFilterPermissions() const { return mFilter.getFilterPermissions(); }
-	LLInventoryFilter::EFolderShow getShowFolderState() { return mFilter.getShowFolderState(); }
+	U32 getFilterTypes() const;
+	PermissionMask getFilterPermissions() const;
+	// JAMESDEBUG use getFilter()->getShowFolderState();
+	//LLInventoryFilter::EFolderShow getShowFolderState();
 	U32 getSortOrder() const;
-	BOOL isFilterModified() { return mFilter.isNotDefault(); }
-	BOOL getAllowMultiSelect() { return mAllowMultiSelect; }
+	BOOL isFilterModified();
+	BOOL getAllowMultiSelect();
 
 	// Close all folders in the view
 	void closeAllFolders();
@@ -914,7 +268,7 @@ public:
 	LLPanel* getParentPanel() { return mParentPanel; }
 	// DEBUG only
 	void dumpSelectionInformation();
-
+	
 private:
 	void updateRenamerPosition();
 
@@ -955,7 +309,7 @@ protected:
 	LLFrameTimer					mAutoOpenTimer;
 	LLFrameTimer					mSearchTimer;
 	std::string						mSearchString;
-	LLInventoryFilter				mFilter;
+	LLInventoryFilter*				mFilter;
 	BOOL							mShowSelectionContext;
 	BOOL							mShowSingleSelection;
 	LLFrameTimer					mMultiSelectionFadeTimer;
diff --git a/indra/newview/llfoldervieweventlistener.h b/indra/newview/llfoldervieweventlistener.h
new file mode 100644
index 0000000000..eb06123b46
--- /dev/null
+++ b/indra/newview/llfoldervieweventlistener.h
@@ -0,0 +1,100 @@
+/** 
+ * @file llfoldervieweventlistener.h
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLFOLDERVIEWEVENTLISTENER_H
+#define LLFOLDERVIEWEVENTLISTENER_H
+
+#include "lldarray.h"	// JAMESDEBUG convert to std::vector
+#include "llfontgl.h"	// just for StyleFlags enum
+#include "llpointer.h"
+
+
+class LLFolderViewItem;
+class LLFolderView;
+class LLFontGL;
+class LLInventoryModel;
+class LLMenuGL;
+class LLScrollContainer;
+class LLUIImage;
+class LLUUID;
+
+// This is an abstract base class that users of the folderview classes
+// would use to catch the useful events emitted from the folder
+// views.
+class LLFolderViewEventListener
+{
+public:
+	virtual ~LLFolderViewEventListener( void ) {}
+	virtual const std::string& getName() const = 0;
+	virtual const std::string& getDisplayName() const = 0;
+	virtual const LLUUID& getUUID() const = 0;
+	virtual time_t getCreationDate() const = 0;	// UTC seconds
+	virtual PermissionMask getPermissionMask() const = 0;
+	virtual LLAssetType::EType getPreferredType() const = 0;
+	virtual LLPointer<LLUIImage> getIcon() const = 0;
+	virtual LLFontGL::StyleFlags getLabelStyle() const = 0;
+	virtual std::string getLabelSuffix() const = 0;
+	virtual void openItem( void ) = 0;
+	virtual void previewItem( void ) = 0;
+	virtual void selectItem(void) = 0;
+	virtual void showProperties(void) = 0;
+	virtual BOOL isItemRenameable() const = 0;
+	virtual BOOL renameItem(const std::string& new_name) = 0;
+	virtual BOOL isItemMovable( void ) = 0;		// Can be moved to another folder
+	virtual BOOL isItemRemovable( void ) = 0;	// Can be destroyed
+	virtual BOOL removeItem() = 0;
+	virtual void removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batch) = 0;
+	virtual void move( LLFolderViewEventListener* parent_listener ) = 0;
+	virtual BOOL isItemCopyable() const = 0;
+	virtual BOOL copyToClipboard() const = 0;
+	virtual void cutToClipboard() = 0;
+	virtual BOOL isClipboardPasteable() const = 0;
+	virtual void pasteFromClipboard() = 0;
+	virtual void pasteLinkFromClipboard() = 0;
+	virtual void buildContextMenu(LLMenuGL& menu, U32 flags) = 0;
+	virtual BOOL isUpToDate() const = 0;
+	virtual BOOL hasChildren() const = 0;
+	virtual LLInventoryType::EType getInventoryType() const = 0;
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action) = 0;
+	
+	// This method should be called when a drag begins. returns TRUE
+	// if the drag can begin, otherwise FALSE.
+	virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const = 0;
+	
+	// This method will be called to determine if a drop can be
+	// performed, and will set drop to TRUE if a drop is
+	// requested. Returns TRUE if a drop is possible/happened,
+	// otherwise FALSE.
+	virtual BOOL dragOrDrop(MASK mask, BOOL drop,
+							EDragAndDropType cargo_type,
+							void* cargo_data) = 0;
+};
+
+#endif
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
new file mode 100644
index 0000000000..7032e86958
--- /dev/null
+++ b/indra/newview/llfolderviewitem.cpp
@@ -0,0 +1,2474 @@
+/** 
+* @file llfolderviewitem.cpp
+* @brief Items and folders that can appear in a hierarchical folder view
+*
+* $LicenseInfo:firstyear=2001&license=viewergpl$
+* 
+* Copyright (c) 2001-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+#include "llviewerprecompiledheaders.h"
+
+#include "llfolderviewitem.h"
+
+// viewer includes
+#include "llfolderview.h"		// Items depend extensively on LLFolderViews
+#include "llfoldervieweventlistener.h"
+#include "llinventoryfilter.h"
+#include "llinventorymodel.h"	// *TODO: make it take a pointer to an inventory-model interface
+#include "llviewercontrol.h"	// gSavedSettings
+#include "llviewerwindow.h"		// Argh, only for setCursor()
+
+// linden library includes
+#include "llfocusmgr.h"		// gFocusMgr
+#include "llpanel.h"		// panel->hasFocus()
+#include "lltrans.h"
+
+///----------------------------------------------------------------------------
+/// Class LLFolderViewItem
+///----------------------------------------------------------------------------
+
+// statics 
+const LLFontGL* LLFolderViewItem::sFont = NULL;
+const LLFontGL* LLFolderViewItem::sSmallFont = NULL;
+LLUIImagePtr LLFolderViewItem::sArrowImage;
+LLUIImagePtr LLFolderViewItem::sBoxImage;
+
+// only integers can be initialized in header
+const F32 LLFolderViewItem::FOLDER_CLOSE_TIME_CONSTANT = 0.02f;
+const F32 LLFolderViewItem::FOLDER_OPEN_TIME_CONSTANT = 0.03f;
+
+const LLColor4U DEFAULT_WHITE(255, 255, 255);
+
+//static
+void LLFolderViewItem::initClass()
+{
+	sFont = LLFontGL::getFontSansSerifSmall();
+	sSmallFont = LLFontGL::getFontMonospace();
+	sArrowImage = LLUI::getUIImage("folder_arrow.tga"); 
+	sBoxImage = LLUI::getUIImage("rounded_square.tga");
+}
+
+//static
+void LLFolderViewItem::cleanupClass()
+{
+	sArrowImage = NULL;
+	sBoxImage = NULL;
+}
+
+
+// NOTE: Optimize this, we call it a *lot* when opening a large inventory
+LLFolderViewItem::Params::Params()
+:	folder_arrow_image("", LLUI::getUIImage("folder_arrow.tga")),
+	selection_image("", LLUI::getUIImage("rounded_square.tga"))
+{
+	mouse_opaque(true);
+	follows.flags(FOLLOWS_LEFT|FOLLOWS_TOP|FOLLOWS_RIGHT);
+	// JAMESDEBUG tab_stop(false);
+}
+
+// Default constructor
+LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p)
+:	LLView(p),
+	mLabelWidth(0),
+	mLabelWidthDirty(false),
+	mParentFolder( NULL ),
+	mIsSelected( FALSE ),
+	mIsCurSelection( FALSE ),
+	mSelectPending(FALSE),
+	mLabelStyle( LLFontGL::NORMAL ),
+	mHasVisibleChildren(FALSE),
+	mIndentation(0),
+	mNumDescendantsSelected(0),
+	mFiltered(FALSE),
+	mLastFilterGeneration(-1),
+	mStringMatchOffset(std::string::npos),
+	mControlLabelRotation(0.f),
+	mDragAndDropTarget(FALSE),
+	mIsLoading(FALSE),
+	mLabel(p.name),
+	mRoot(p.root),
+	mCreationDate(p.creation_date),
+	mListener(p.listener),
+	mArrowImage(p.folder_arrow_image),
+	mBoxImage(p.selection_image)
+{
+	refresh();
+}
+
+// Destroys the object
+LLFolderViewItem::~LLFolderViewItem( void )
+{
+	delete mListener;
+	mListener = NULL;
+}
+
+LLFolderView* LLFolderViewItem::getRoot()
+{
+	return mRoot;
+}
+
+// Returns true if this object is a child (or grandchild, etc.) of potential_ancestor.
+BOOL LLFolderViewItem::isDescendantOf( const LLFolderViewFolder* potential_ancestor )
+{
+	LLFolderViewItem* root = this;
+	while( root->mParentFolder )
+	{
+		if( root->mParentFolder == potential_ancestor )
+		{
+			return TRUE;
+		}
+		root = root->mParentFolder;
+	}
+	return FALSE;
+}
+
+LLFolderViewItem* LLFolderViewItem::getNextOpenNode(BOOL include_children)
+{
+	if (!mParentFolder)
+	{
+		return NULL;
+	}
+
+	LLFolderViewItem* itemp = mParentFolder->getNextFromChild( this, include_children );
+	while(itemp && !itemp->getVisible())
+	{
+		LLFolderViewItem* next_itemp = itemp->mParentFolder->getNextFromChild( itemp, include_children );
+		if (itemp == next_itemp) 
+		{
+			// hit last item
+			return itemp->getVisible() ? itemp : this;
+		}
+		itemp = next_itemp;
+	}
+
+	return itemp;
+}
+
+LLFolderViewItem* LLFolderViewItem::getPreviousOpenNode(BOOL include_children)
+{
+	if (!mParentFolder)
+	{
+		return NULL;
+	}
+
+	LLFolderViewItem* itemp = mParentFolder->getPreviousFromChild( this, include_children );
+	while(itemp && !itemp->getVisible())
+	{
+		LLFolderViewItem* next_itemp = itemp->mParentFolder->getPreviousFromChild( itemp, include_children );
+		if (itemp == next_itemp) 
+		{
+			// hit first item
+			return itemp->getVisible() ? itemp : this;
+		}
+		itemp = next_itemp;
+	}
+
+	return itemp;
+}
+
+// is this item something we think we should be showing?
+// for example, if we haven't gotten around to filtering it yet, then the answer is yes
+// until we find out otherwise
+BOOL LLFolderViewItem::potentiallyVisible()
+{
+	// we haven't been checked against min required filter
+	// or we have and we passed
+	return getLastFilterGeneration() < getRoot()->getFilter()->getMinRequiredGeneration() || getFiltered();
+}
+
+BOOL LLFolderViewItem::getFiltered() 
+{ 
+	return mFiltered && mLastFilterGeneration >= getRoot()->getFilter()->getMinRequiredGeneration(); 
+}
+
+BOOL LLFolderViewItem::getFiltered(S32 filter_generation) 
+{
+	return mFiltered && mLastFilterGeneration >= filter_generation;
+}
+
+void LLFolderViewItem::setFiltered(BOOL filtered, S32 filter_generation)
+{
+	mFiltered = filtered;
+	mLastFilterGeneration = filter_generation;
+}
+
+void LLFolderViewItem::setIcon(LLUIImagePtr icon)
+{
+	mIcon = icon;
+}
+
+// refresh information from the listener
+void LLFolderViewItem::refreshFromListener()
+{
+	if(mListener)
+	{
+		mLabel = mListener->getDisplayName();
+		LLAssetType::EType preferred_type = mListener->getPreferredType();
+
+		// *TODO: to be removed when database supports multi language. This is a
+		// temporary attempt to display the inventory folder in the user locale.
+		if (preferred_type != LLAssetType::AT_NONE)
+		{
+			mLabel = LLTrans::getString("InvFolder " + mLabel);
+		};
+
+		setIcon(mListener->getIcon());
+		time_t creation_date = mListener->getCreationDate();
+		if (mCreationDate != creation_date)
+		{
+			mCreationDate = mListener->getCreationDate();
+			dirtyFilter();
+		}
+		mLabelStyle = mListener->getLabelStyle();
+		mLabelSuffix = mListener->getLabelSuffix();
+	}
+}
+
+void LLFolderViewItem::refresh()
+{
+	refreshFromListener();
+
+	std::string searchable_label(mLabel);
+	searchable_label.append(mLabelSuffix);
+	LLStringUtil::toUpper(searchable_label);
+
+	if (mSearchableLabel.compare(searchable_label))
+	{
+		mSearchableLabel.assign(searchable_label);
+		dirtyFilter();
+		// some part of label has changed, so overall width has potentially changed, and sort order too
+		if (mParentFolder)
+		{
+			mParentFolder->requestSort();
+			mParentFolder->requestArrange();
+		}
+	}
+
+	mLabelWidthDirty = true;
+}
+
+void LLFolderViewItem::applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor)
+{
+	functor(mListener);
+}
+
+// This function is called when items are added or view filters change. It's
+// implemented here but called by derived classes when folding the
+// views.
+void LLFolderViewItem::filterFromRoot( void )
+{
+	LLFolderViewItem* root = getRoot();
+
+	root->filter(*((LLFolderView*)root)->getFilter());
+}
+
+// This function is called when the folder view is dirty. It's
+// implemented here but called by derived classes when folding the
+// views.
+void LLFolderViewItem::arrangeFromRoot()
+{
+	LLFolderViewItem* root = getRoot();
+
+	S32 height = 0;
+	S32 width = 0;
+	root->arrange( &width, &height, 0 );
+}
+
+// Utility function for LLFolderView
+void LLFolderViewItem::arrangeAndSet(BOOL set_selection,
+									 BOOL take_keyboard_focus)
+{
+	LLFolderView* root = getRoot();
+	getParentFolder()->requestArrange();
+	if(set_selection)
+	{
+		setSelectionFromRoot(this, TRUE, take_keyboard_focus);
+		if(root)
+		{
+			root->scrollToShowSelection();
+		}
+	}		
+}
+
+// This function clears the currently selected item, and records the
+// specified selected item appropriately for display and use in the
+// UI. If open is TRUE, then folders are opened up along the way to
+// the selection.
+void LLFolderViewItem::setSelectionFromRoot(LLFolderViewItem* selection,
+											BOOL openitem,
+											BOOL take_keyboard_focus)
+{
+	getRoot()->setSelection(selection, openitem, take_keyboard_focus);
+}
+
+// helper function to change the selection from the root.
+void LLFolderViewItem::changeSelectionFromRoot(LLFolderViewItem* selection, BOOL selected)
+{
+	getRoot()->changeSelection(selection, selected);
+}
+
+void LLFolderViewItem::extendSelectionFromRoot(LLFolderViewItem* selection)
+{
+	LLDynamicArray<LLFolderViewItem*> selected_items;
+
+	getRoot()->extendSelection(selection, NULL, selected_items);
+}
+
+EInventorySortGroup LLFolderViewItem::getSortGroup()  const
+{ 
+	return SG_ITEM; 
+}
+
+// addToFolder() returns TRUE if it succeeds. FALSE otherwise
+BOOL LLFolderViewItem::addToFolder(LLFolderViewFolder* folder, LLFolderView* root)
+{
+	if (!folder)
+	{
+		return FALSE;
+	}
+	mParentFolder = folder;
+	root->addItemID(getListener()->getUUID(), this);
+	return folder->addItem(this);
+}
+
+
+// Finds width and height of this object and it's children.  Also
+// makes sure that this view and it's children are the right size.
+S32 LLFolderViewItem::arrange( S32* width, S32* height, S32 filter_generation)
+{
+	mIndentation = mParentFolder ? mParentFolder->getIndentation() + LEFT_INDENTATION : 0;
+	if (mLabelWidthDirty)
+	{
+		mLabelWidth = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + sFont->getWidth(mSearchableLabel); 
+		mLabelWidthDirty = false;
+	}
+
+	*width = llmax(*width, mLabelWidth + mIndentation); 
+	*height = getItemHeight();
+	return *height;
+}
+
+S32 LLFolderViewItem::getItemHeight()
+{
+	S32 icon_height = mIcon->getHeight();
+	S32 label_height = llround(sFont->getLineHeight());
+	return llmax( icon_height, label_height ) + ICON_PAD;
+}
+
+void LLFolderViewItem::filter( LLInventoryFilter& filter)
+{
+	BOOL filtered = mListener && filter.check(this);
+
+	// if our visibility will change as a result of this filter, then
+	// we need to be rearranged in our parent folder
+	if (getVisible() != filtered)
+	{
+		if (mParentFolder)
+		{
+			mParentFolder->requestArrange();
+		}
+	}
+
+	setFiltered(filtered, filter.getCurrentGeneration());
+	mStringMatchOffset = filter.getStringMatchOffset();
+	filter.decrementFilterCount();
+
+	if (getRoot()->getDebugFilters())
+	{
+		mStatusText = llformat("%d", mLastFilterGeneration);
+	}
+}
+
+void LLFolderViewItem::dirtyFilter()
+{
+	mLastFilterGeneration = -1;
+	// bubble up dirty flag all the way to root
+	if (getParentFolder())
+	{
+		getParentFolder()->setCompletedFilterGeneration(-1, TRUE);
+	}
+}
+
+// *TODO: This can be optimized a lot by simply recording that it is
+// selected in the appropriate places, and assuming that set selection
+// means 'deselect' for a leaf item. Do this optimization after
+// multiple selection is implemented to make sure it all plays nice
+// together.
+BOOL LLFolderViewItem::setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus)
+{
+	if( selection == this )
+	{
+		mIsSelected = TRUE;
+		if(mListener)
+		{
+			mListener->selectItem();
+		}
+	}
+	else
+	{
+		mIsSelected = FALSE;
+	}
+	return mIsSelected;
+}
+
+BOOL LLFolderViewItem::changeSelection(LLFolderViewItem* selection, BOOL selected)
+{
+	if(selection == this && mIsSelected != selected)
+	{
+		mIsSelected = selected;
+		if(mListener)
+		{
+			mListener->selectItem();
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void LLFolderViewItem::recursiveDeselect(BOOL deselect_self)
+{
+	if (mIsSelected && deselect_self)
+	{
+		mIsSelected = FALSE;
+
+		// update ancestors' count of selected descendents
+		LLFolderViewFolder* parent_folder = getParentFolder();
+		while(parent_folder)
+		{
+			parent_folder->mNumDescendantsSelected--;
+			parent_folder = parent_folder->getParentFolder();
+		}
+	}
+}
+
+
+BOOL LLFolderViewItem::isMovable()
+{
+	if( mListener )
+	{
+		return mListener->isItemMovable();
+	}
+	else
+	{
+		return TRUE;
+	}
+}
+
+BOOL LLFolderViewItem::isRemovable()
+{
+	if( mListener )
+	{
+		return mListener->isItemRemovable();
+	}
+	else
+	{
+		return TRUE;
+	}
+}
+
+void LLFolderViewItem::destroyView()
+{
+	if (mParentFolder)
+	{
+		// removeView deletes me
+		mParentFolder->removeView(this);
+	}
+}
+
+// Call through to the viewed object and return true if it can be
+// removed.
+//BOOL LLFolderViewItem::removeRecursively(BOOL single_item)
+BOOL LLFolderViewItem::remove()
+{
+	if(!isRemovable())
+	{
+		return FALSE;
+	}
+	if(mListener)
+	{
+		return mListener->removeItem();
+	}
+	return TRUE;
+}
+
+// Build an appropriate context menu for the item.
+void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
+{
+	if(mListener)
+	{
+		mListener->buildContextMenu(menu, flags);
+	}
+}
+
+void LLFolderViewItem::openItem( void )
+{
+	if( mListener )
+	{
+		mListener->openItem();
+	}
+}
+
+void LLFolderViewItem::preview( void )
+{
+	if (mListener)
+	{
+		mListener->previewItem();
+	}
+}
+
+void LLFolderViewItem::rename(const std::string& new_name)
+{
+	if( !new_name.empty() )
+	{
+		if( mListener )
+		{
+			mListener->renameItem(new_name);
+
+			if(mParentFolder)
+			{
+				mParentFolder->requestSort();
+			}
+		}
+	}
+}
+
+const std::string& LLFolderViewItem::getSearchableLabel() const
+{
+	return mSearchableLabel;
+}
+
+const std::string& LLFolderViewItem::getName( void ) const
+{
+	if(mListener)
+	{
+		return mListener->getName();
+	}
+	return mLabel;
+}
+
+// LLView functionality
+BOOL LLFolderViewItem::handleRightMouseDown( S32 x, S32 y, MASK mask )
+{
+	if(!mIsSelected)
+	{
+		setSelectionFromRoot(this, FALSE);
+	}
+	make_ui_sound("UISndClick");
+	return TRUE;
+}
+
+BOOL LLFolderViewItem::handleMouseDown( S32 x, S32 y, MASK mask )
+{
+	// No handler needed for focus lost since this class has no
+	// state that depends on it.
+	gFocusMgr.setMouseCapture( this );
+
+	if (!mIsSelected)
+	{
+		if(mask & MASK_CONTROL)
+		{
+			changeSelectionFromRoot(this, !mIsSelected);
+		}
+		else if (mask & MASK_SHIFT)
+		{
+			extendSelectionFromRoot(this);
+		}
+		else
+		{
+			setSelectionFromRoot(this, FALSE);
+		}
+		make_ui_sound("UISndClick");
+	}
+	else
+	{
+		mSelectPending = TRUE;
+	}
+
+	if( isMovable() )
+	{
+		S32 screen_x;
+		S32 screen_y;
+		localPointToScreen(x, y, &screen_x, &screen_y );
+		LLToolDragAndDrop::getInstance()->setDragStart( screen_x, screen_y );
+	}
+	return TRUE;
+}
+
+BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
+{
+	if( hasMouseCapture() && isMovable() )
+	{
+		S32 screen_x;
+		S32 screen_y;
+		localPointToScreen(x, y, &screen_x, &screen_y );
+		BOOL can_drag = TRUE;
+		if( LLToolDragAndDrop::getInstance()->isOverThreshold( screen_x, screen_y ) )
+		{
+			LLFolderView* root = getRoot();
+
+			if(root->getCurSelectedItem())
+			{
+				LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_WORLD;
+
+				// *TODO: push this into listener and remove
+				// dependency on llagent
+				if (mListener
+					&& gInventory.isObjectDescendentOf(mListener->getUUID(), gInventory.getRootFolderID()))
+				{
+					src = LLToolDragAndDrop::SOURCE_AGENT;
+				}
+				else if (mListener
+					&& gInventory.isObjectDescendentOf(mListener->getUUID(), gInventory.getLibraryRootFolderID()))
+				{
+					src = LLToolDragAndDrop::SOURCE_LIBRARY;
+				}
+
+				can_drag = root->startDrag(src);
+				if (can_drag)
+				{
+					// if (mListener) mListener->startDrag();
+					// RN: when starting drag and drop, clear out last auto-open
+					root->autoOpenTest(NULL);
+					root->setShowSelectionContext(TRUE);
+
+					// Release keyboard focus, so that if stuff is dropped into the
+					// world, pressing the delete key won't blow away the inventory
+					// item.
+					gFocusMgr.setKeyboardFocus(NULL);
+
+					return LLToolDragAndDrop::getInstance()->handleHover( x, y, mask );
+				}
+			}
+		}
+
+		if (can_drag)
+		{
+			gViewerWindow->setCursor(UI_CURSOR_ARROW);
+		}
+		else
+		{
+			gViewerWindow->setCursor(UI_CURSOR_NOLOCKED);
+		}
+		return TRUE;
+	}
+	else
+	{
+		getRoot()->setShowSelectionContext(FALSE);
+		gViewerWindow->setCursor(UI_CURSOR_ARROW);
+		// let parent handle this then...
+		return FALSE;
+	}
+}
+
+
+BOOL LLFolderViewItem::handleDoubleClick( S32 x, S32 y, MASK mask )
+{
+	preview();
+	return TRUE;
+}
+
+BOOL LLFolderViewItem::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	if (getParent())
+	{
+		return getParent()->handleScrollWheel(x, y, clicks);
+	}
+	return FALSE;
+}
+
+BOOL LLFolderViewItem::handleMouseUp( S32 x, S32 y, MASK mask )
+{
+	// if mouse hasn't moved since mouse down...
+	if ( pointInView(x, y) && mSelectPending )
+	{
+		//...then select
+		if(mask & MASK_CONTROL)
+		{
+			changeSelectionFromRoot(this, !mIsSelected);
+		}
+		else if (mask & MASK_SHIFT)
+		{
+			extendSelectionFromRoot(this);
+		}
+		else
+		{
+			setSelectionFromRoot(this, FALSE);
+		}
+	}
+
+	mSelectPending = FALSE;
+
+	if( hasMouseCapture() )
+	{
+		getRoot()->setShowSelectionContext(FALSE);
+		gFocusMgr.setMouseCapture( NULL );
+	}
+	return TRUE;
+}
+
+BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+										 EDragAndDropType cargo_type,
+										 void* cargo_data,
+										 EAcceptance* accept,
+										 std::string& tooltip_msg)
+{
+	BOOL accepted = FALSE;
+	BOOL handled = FALSE;
+	if(mListener)
+	{
+		accepted = mListener->dragOrDrop(mask,drop,cargo_type,cargo_data);
+		handled = accepted;
+		if (accepted)
+		{
+			mDragAndDropTarget = TRUE;
+			*accept = ACCEPT_YES_MULTI;
+		}
+		else
+		{
+			*accept = ACCEPT_NO;
+		}
+	}
+	if(mParentFolder && !handled)
+	{
+		handled = mParentFolder->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg);
+	}
+	if (handled)
+	{
+		lldebugst(LLERR_USER_INPUT) << "dragAndDrop handled by LLFolderViewItem" << llendl;
+	}
+
+	return handled;
+}
+
+
+void LLFolderViewItem::draw()
+{
+	static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
+	static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
+	static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
+	static LLUIColor sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
+	static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
+	static LLUIColor sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemSuffixColor", DEFAULT_WHITE);
+	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
+
+	bool possibly_has_children = false;
+	bool up_to_date = mListener && mListener->isUpToDate();
+	if((up_to_date && hasVisibleChildren() ) || // we fetched our children and some of them have passed the filter...
+		(!up_to_date && mListener && mListener->hasChildren())) // ...or we know we have children but haven't fetched them (doesn't obey filter)
+	{
+		possibly_has_children = true;
+	}
+	if(/*mControlLabel[0] != '\0' && */possibly_has_children)
+	{
+		if (sArrowImage)
+		{
+			gl_draw_scaled_rotated_image(mIndentation, getRect().getHeight() - ARROW_SIZE - TEXT_PAD,
+				ARROW_SIZE, ARROW_SIZE, mControlLabelRotation, sArrowImage->getImage(), sFgColor);
+		}
+	}
+
+	F32 text_left = (F32)(ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + mIndentation);
+
+	// If we have keyboard focus, draw selection filled
+	BOOL show_context = getRoot()->getShowSelectionContext();
+	BOOL filled = show_context || (getRoot()->getParentPanel()->hasFocus());
+
+	// always render "current" item, only render other selected items if
+	// mShowSingleSelection is FALSE
+	if( mIsSelected )
+	{
+		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+		LLColor4 bg_color = sHighlightBgColor;
+		//const S32 TRAILING_PAD = 5;  // It just looks better with this.
+		if (!mIsCurSelection)
+		{
+			// do time-based fade of extra objects
+			F32 fade_time = getRoot()->getSelectionFadeElapsedTime();
+			if (getRoot()->getShowSingleSelection())
+			{
+				// fading out
+				bg_color.mV[VALPHA] = clamp_rescale(fade_time, 0.f, 0.4f, bg_color.mV[VALPHA], 0.f);
+			}
+			else
+			{
+				// fading in
+				bg_color.mV[VALPHA] = clamp_rescale(fade_time, 0.f, 0.4f, 0.f, bg_color.mV[VALPHA]);
+			}
+		}
+
+		gl_rect_2d(
+			0, 
+			getRect().getHeight(), 
+			getRect().getWidth() - 2,
+			llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD),
+			bg_color, filled);
+		if (mIsCurSelection)
+		{
+			gl_rect_2d(
+				0, 
+				getRect().getHeight(), 
+				getRect().getWidth() - 2,
+				llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD),
+				sHighlightFgColor, FALSE);
+		}
+		if (getRect().getHeight() > llround(sFont->getLineHeight()) + ICON_PAD + 2)
+		{
+			gl_rect_2d(
+				0, 
+				llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
+				getRect().getWidth() - 2,
+				2,
+				sHighlightFgColor, FALSE);
+			if (show_context)
+			{
+				gl_rect_2d(
+					0, 
+					llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
+					getRect().getWidth() - 2,
+					2,
+					sHighlightBgColor, TRUE);
+			}
+		}
+	}
+	if (mDragAndDropTarget)
+	{
+		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+		gl_rect_2d(
+			0, 
+			getRect().getHeight(), 
+			getRect().getWidth() - 2,
+			llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD),
+			sHighlightBgColor, FALSE);
+
+		if (getRect().getHeight() > llround(sFont->getLineHeight()) + ICON_PAD + 2)
+		{
+			gl_rect_2d(
+				0, 
+				llfloor(getRect().getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
+				getRect().getWidth() - 2,
+				2,
+				sHighlightBgColor, FALSE);
+		}
+		mDragAndDropTarget = FALSE;
+	}
+
+
+	if(mIcon)
+	{
+		mIcon->draw(mIndentation + ARROW_SIZE + TEXT_PAD, getRect().getHeight() - mIcon->getHeight());
+	}
+
+	if (!mLabel.empty())
+	{
+		// highlight filtered text
+		BOOL debug_filters = getRoot()->getDebugFilters();
+		LLColor4 color = ( (mIsSelected && filled) ? sHighlightFgColor : sFgColor );
+		F32 right_x;
+		F32 y = (F32)getRect().getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
+
+		if (debug_filters)
+		{
+			if (!getFiltered() && !possibly_has_children)
+			{
+				color.mV[VALPHA] *= 0.5f;
+			}
+
+			LLColor4 filter_color = mLastFilterGeneration >= getRoot()->getFilter()->getCurrentGeneration() ? LLColor4(0.5f, 0.8f, 0.5f, 1.f) : LLColor4(0.8f, 0.5f, 0.5f, 1.f);
+			sSmallFont->renderUTF8(mStatusText, 0, text_left, y, filter_color,
+				LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
+				S32_MAX, S32_MAX, &right_x, FALSE );
+			text_left = right_x;
+		}
+
+
+		if ( mIsLoading 
+			&& mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime") )
+		{
+			sFont->renderUTF8(LLTrans::getString("LoadingData"), 0, text_left, y, sSearchStatusColor,
+				LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, &right_x, FALSE);
+			text_left = right_x;
+		}
+
+		sFont->renderUTF8( mLabel, 0, text_left, y, color,
+			LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW,
+			S32_MAX, S32_MAX, &right_x, FALSE );
+		if (!mLabelSuffix.empty())
+		{
+			sFont->renderUTF8( mLabelSuffix, 0, right_x, y, sSuffixColor,
+				LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW,
+				S32_MAX, S32_MAX, &right_x, FALSE );
+		}
+
+		if (sBoxImage.notNull() && mStringMatchOffset != std::string::npos)
+		{
+			// don't draw backgrounds for zero-length strings
+			S32 filter_string_length = getRoot()->getFilterSubString().size();
+			if (filter_string_length > 0)
+			{
+				std::string combined_string = mLabel + mLabelSuffix;
+				S32 left = llround(text_left) + sFont->getWidth(combined_string, 0, mStringMatchOffset) - 1;
+				S32 right = left + sFont->getWidth(combined_string, mStringMatchOffset, filter_string_length) + 2;
+				S32 bottom = llfloor(getRect().getHeight() - sFont->getLineHeight() - 3);
+				S32 top = getRect().getHeight();
+
+				LLRect box_rect(left, top, right, bottom);
+				sBoxImage->draw(box_rect, sFilterBGColor);
+				F32 match_string_left = text_left + sFont->getWidthF32(combined_string, 0, mStringMatchOffset);
+				F32 y = (F32)getRect().getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
+				sFont->renderUTF8( combined_string, mStringMatchOffset, match_string_left, y,
+					sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW,
+					filter_string_length, S32_MAX, &right_x, FALSE );
+			}
+		}
+	}
+
+	if( sDebugRects )
+	{
+		drawDebugRect();
+	}
+
+	//// *HACK: also draw debug rectangles around currently-being-edited LLView, and any elements that are being highlighted by GUI preview code (see LLFloaterUIPreview)
+	//std::set<LLView*>::iterator iter = std::find(sPreviewHighlightedElements.begin(), sPreviewHighlightedElements.end(), this);
+	//if ((sEditingUI && this == sEditingUIView) || (iter != sPreviewHighlightedElements.end() && sDrawPreviewHighlights))
+	//{
+	//	drawDebugRect();
+	//}
+}
+
+
+///----------------------------------------------------------------------------
+/// Class LLFolderViewFolder
+///----------------------------------------------------------------------------
+
+LLFolderViewFolder::LLFolderViewFolder( const LLFolderViewItem::Params& p ): 
+LLFolderViewItem( p ),	// 0 = no create time
+mIsOpen(FALSE),
+mExpanderHighlighted(FALSE),
+mCurHeight(0.f),
+mTargetHeight(0.f),
+mAutoOpenCountdown(0.f),
+mSubtreeCreationDate(0),
+mAmTrash(LLFolderViewFolder::UNKNOWN),
+mLastArrangeGeneration( -1 ),
+mLastCalculatedWidth(0),
+mCompletedFilterGeneration(-1),
+mMostFilteredDescendantGeneration(-1),
+mNeedsSort(false)
+{}
+
+// Destroys the object
+LLFolderViewFolder::~LLFolderViewFolder( void )
+{
+	// The LLView base class takes care of object destruction. make sure that we
+	// don't have mouse or keyboard focus
+	gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit()
+}
+
+// addToFolder() returns TRUE if it succeeds. FALSE otherwise
+BOOL LLFolderViewFolder::addToFolder(LLFolderViewFolder* folder, LLFolderView* root)
+{
+	if (!folder)
+	{
+		return FALSE;
+	}
+	mParentFolder = folder;
+	root->addItemID(getListener()->getUUID(), this);
+	return folder->addFolder(this);
+}
+
+// Finds width and height of this object and it's children.  Also
+// makes sure that this view and it's children are the right size.
+S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
+{
+	// sort before laying out contents
+	if (mNeedsSort)
+	{
+		mFolders.sort(mSortFunction);
+		mItems.sort(mSortFunction);
+		mNeedsSort = false;
+	}
+
+	mHasVisibleChildren = hasFilteredDescendants(filter_generation);
+
+	LLInventoryFilter::EFolderShow show_folder_state = getRoot()->getFilter()->getShowFolderState();
+
+	// calculate height as a single item (without any children), and reshapes rectangle to match
+	LLFolderViewItem::arrange( width, height, filter_generation );
+
+	// clamp existing animated height so as to never get smaller than a single item
+	mCurHeight = llmax((F32)*height, mCurHeight);
+
+	// initialize running height value as height of single item in case we have no children
+	*height = getItemHeight();
+	F32 running_height = (F32)*height;
+	F32 target_height = (F32)*height;
+
+	// are my children visible?
+	if (needsArrange())
+	{
+		// set last arrange generation first, in case children are animating
+		// and need to be arranged again
+		mLastArrangeGeneration = getRoot()->getArrangeGeneration();
+		if (mIsOpen)
+		{
+			// Add sizes of children
+			S32 parent_item_height = getRect().getHeight();
+
+			for(folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
+			{
+				LLFolderViewFolder* folderp = (*fit);
+				if (getRoot()->getDebugFilters())
+				{
+					folderp->setVisible(TRUE);
+				}
+				else
+				{
+					folderp->setVisible(show_folder_state == LLInventoryFilter::SHOW_ALL_FOLDERS || // always show folders?
+						(folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation))); // passed filter or has descendants that passed filter
+				}
+
+				if (folderp->getVisible())
+				{
+					S32 child_width = *width;
+					S32 child_height = 0;
+					S32 child_top = parent_item_height - llround(running_height);
+
+					target_height += folderp->arrange( &child_width, &child_height, filter_generation );
+
+					running_height += (F32)child_height;
+					*width = llmax(*width, child_width);
+					folderp->setOrigin( 0, child_top - folderp->getRect().getHeight() );
+				}
+			}
+			for(items_t::iterator iit = mItems.begin();
+				iit != mItems.end(); ++iit)
+			{
+				LLFolderViewItem* itemp = (*iit);
+				if (getRoot()->getDebugFilters())
+				{
+					itemp->setVisible(TRUE);
+				}
+				else
+				{
+					itemp->setVisible(itemp->getFiltered(filter_generation));
+				}
+
+				if (itemp->getVisible())
+				{
+					S32 child_width = *width;
+					S32 child_height = 0;
+					S32 child_top = parent_item_height - llround(running_height);
+
+					target_height += itemp->arrange( &child_width, &child_height, filter_generation );
+					// don't change width, as this item is as wide as its parent folder by construction
+					itemp->reshape( itemp->getRect().getWidth(), child_height);
+
+					running_height += (F32)child_height;
+					*width = llmax(*width, child_width);
+					itemp->setOrigin( 0, child_top - itemp->getRect().getHeight() );
+				}
+			}
+		}
+
+		mTargetHeight = target_height;
+		// cache this width so next time we can just return it
+		mLastCalculatedWidth = *width;
+	}
+	else
+	{
+		// just use existing width
+		*width = mLastCalculatedWidth;
+	}
+
+	// animate current height towards target height
+	if (llabs(mCurHeight - mTargetHeight) > 1.f)
+	{
+		mCurHeight = lerp(mCurHeight, mTargetHeight, LLCriticalDamp::getInterpolant(mIsOpen ? FOLDER_OPEN_TIME_CONSTANT : FOLDER_CLOSE_TIME_CONSTANT));
+
+		requestArrange();
+
+		// hide child elements that fall out of current animated height
+		for (folders_t::iterator iter = mFolders.begin();
+			iter != mFolders.end();)
+		{
+			folders_t::iterator fit = iter++;
+			// number of pixels that bottom of folder label is from top of parent folder
+			if (getRect().getHeight() - (*fit)->getRect().mTop + (*fit)->getItemHeight() 
+				> llround(mCurHeight) + MAX_FOLDER_ITEM_OVERLAP)
+			{
+				// hide if beyond current folder height
+				(*fit)->setVisible(FALSE);
+			}
+		}
+
+		for (items_t::iterator iter = mItems.begin();
+			iter != mItems.end();)
+		{
+			items_t::iterator iit = iter++;
+			// number of pixels that bottom of item label is from top of parent folder
+			if (getRect().getHeight() - (*iit)->getRect().mBottom
+				> llround(mCurHeight) + MAX_FOLDER_ITEM_OVERLAP)
+			{
+				(*iit)->setVisible(FALSE);
+			}
+		}
+	}
+	else
+	{
+		mCurHeight = mTargetHeight;
+	}
+
+	// don't change width as this item is already as wide as its parent folder
+	reshape(getRect().getWidth(),llround(mCurHeight));
+
+	// pass current height value back to parent
+	*height = llround(mCurHeight);
+
+	return llround(mTargetHeight);
+}
+
+BOOL LLFolderViewFolder::needsArrange()
+{
+	return mLastArrangeGeneration < getRoot()->getArrangeGeneration(); 
+}
+
+void LLFolderViewFolder::requestSort()
+{
+	mNeedsSort = true;
+	// whenever item order changes, we need to lay things out again
+	requestArrange();
+}
+
+void LLFolderViewFolder::setCompletedFilterGeneration(S32 generation, BOOL recurse_up)
+{
+	mMostFilteredDescendantGeneration = llmin(mMostFilteredDescendantGeneration, generation);
+	mCompletedFilterGeneration = generation;
+	// only aggregate up if we are a lower (older) value
+	if (recurse_up && mParentFolder && generation < mParentFolder->getCompletedFilterGeneration())
+	{
+		mParentFolder->setCompletedFilterGeneration(generation, TRUE);
+	}
+}
+
+void LLFolderViewFolder::filter( LLInventoryFilter& filter)
+{
+	S32 filter_generation = filter.getCurrentGeneration();
+	// if failed to pass filter newer than must_pass_generation
+	// you will automatically fail this time, so we only
+	// check against items that have passed the filter
+	S32 must_pass_generation = filter.getMustPassGeneration();
+
+	// if we have already been filtered against this generation, skip out
+	if (getCompletedFilterGeneration() >= filter_generation)
+	{
+		return;
+	}
+
+	// filter folder itself
+	if (getLastFilterGeneration() < filter_generation)
+	{
+		if (getLastFilterGeneration() >= must_pass_generation &&		// folder has been compared to a valid precursor filter
+			!mFiltered)													// and did not pass the filter
+		{
+			// go ahead and flag this folder as done
+			mLastFilterGeneration = filter_generation;			
+		}
+		else
+		{
+			// filter self only on first pass through
+			LLFolderViewItem::filter( filter );
+		}
+	}
+
+	if (getRoot()->getDebugFilters())
+	{
+		mStatusText = llformat("%d", mLastFilterGeneration);
+		mStatusText += llformat("(%d)", mCompletedFilterGeneration);
+		mStatusText += llformat("+%d", mMostFilteredDescendantGeneration);
+	}
+
+	// all descendants have been filtered later than must pass generation
+	// but none passed
+	if(getCompletedFilterGeneration() >= must_pass_generation && !hasFilteredDescendants(must_pass_generation))
+	{
+		// don't traverse children if we've already filtered them since must_pass_generation
+		// and came back with nothing
+		return;
+	}
+
+	// we entered here with at least one filter iteration left
+	// check to see if we have any more before continuing on to children
+	if (filter.getFilterCount() < 0)
+	{
+		return;
+	}
+
+	// when applying a filter, matching folders get their contents downloaded first
+	if (filter.isNotDefault() && getFiltered(filter.getMinRequiredGeneration()) && (mListener && !gInventory.isCategoryComplete(mListener->getUUID())))
+	{
+		gInventory.startBackgroundFetch(mListener->getUUID());
+	}
+
+	// now query children
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		// have we run out of iterations this frame?
+		if (filter.getFilterCount() < 0)
+		{
+			break;
+		}
+
+		// mMostFilteredDescendantGeneration might have been reset
+		// in which case we need to update it even for folders that
+		// don't need to be filtered anymore
+		if ((*fit)->getCompletedFilterGeneration() >= filter_generation)
+		{
+			// track latest generation to pass any child items
+			if ((*fit)->getFiltered() || (*fit)->hasFilteredDescendants(filter.getMinRequiredGeneration()))
+			{
+				mMostFilteredDescendantGeneration = filter_generation;
+				if (getRoot()->needsAutoSelect())
+				{
+					(*fit)->setOpenArrangeRecursively(TRUE);
+				}
+			}
+			// just skip it, it has already been filtered
+			continue;
+		}
+
+		// update this folders filter status (and children)
+		(*fit)->filter( filter );
+
+		// track latest generation to pass any child items
+		if ((*fit)->getFiltered() || (*fit)->hasFilteredDescendants(filter_generation))
+		{
+			mMostFilteredDescendantGeneration = filter_generation;
+			if (getRoot()->needsAutoSelect())
+			{
+				(*fit)->setOpenArrangeRecursively(TRUE);
+			}
+		}
+	}
+
+	for (items_t::iterator iter = mItems.begin();
+		iter != mItems.end();)
+	{
+		items_t::iterator iit = iter++;
+		if (filter.getFilterCount() < 0)
+		{
+			break;
+		}
+		if ((*iit)->getLastFilterGeneration() >= filter_generation)
+		{
+			if ((*iit)->getFiltered())
+			{
+				mMostFilteredDescendantGeneration = filter_generation;
+			}
+			continue;
+		}
+
+		if ((*iit)->getLastFilterGeneration() >= must_pass_generation && 
+			!(*iit)->getFiltered(must_pass_generation))
+		{
+			// failed to pass an earlier filter that was a subset of the current one
+			// go ahead and flag this item as done
+			(*iit)->setFiltered(FALSE, filter_generation);
+			continue;
+		}
+
+		(*iit)->filter( filter );
+
+		if ((*iit)->getFiltered(filter.getMinRequiredGeneration()))
+		{
+			mMostFilteredDescendantGeneration = filter_generation;
+		}
+	}
+
+	// if we didn't use all filter iterations
+	// that means we filtered all of our descendants
+	// instead of exhausting the filter count for this frame
+	if (filter.getFilterCount() > 0)
+	{
+		// flag this folder as having completed filter pass for all descendants
+		setCompletedFilterGeneration(filter_generation, FALSE/*dont recurse up to root*/);
+	}
+}
+
+void LLFolderViewFolder::setFiltered(BOOL filtered, S32 filter_generation)
+{
+	// if this folder is now filtered, but wasn't before
+	// (it just passed)
+	if (filtered && !mFiltered)
+	{
+		// reset current height, because last time we drew it
+		// it might have had more visible items than now
+		mCurHeight = 0.f;
+	}
+
+	LLFolderViewItem::setFiltered(filtered, filter_generation);
+}
+
+void LLFolderViewFolder::dirtyFilter()
+{
+	// we're a folder, so invalidate our completed generation
+	setCompletedFilterGeneration(-1, FALSE);
+	LLFolderViewItem::dirtyFilter();
+}
+
+BOOL LLFolderViewFolder::hasFilteredDescendants()
+{
+	return mMostFilteredDescendantGeneration >= getRoot()->getFilter()->getCurrentGeneration();
+}
+
+// Passes selection information on to children and record selection
+// information if necessary.
+BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem,
+									  BOOL take_keyboard_focus)
+{
+	BOOL rv = FALSE;
+	if( selection == this )
+	{
+		mIsSelected = TRUE;
+		if(mListener)
+		{
+			mListener->selectItem();
+		}
+		rv = TRUE;
+	}
+	else
+	{
+		mIsSelected = FALSE;
+		rv = FALSE;
+	}
+	BOOL child_selected = FALSE;
+
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		if((*fit)->setSelection(selection, openitem, take_keyboard_focus))
+		{
+			rv = TRUE;
+			child_selected = TRUE;
+			mNumDescendantsSelected++;
+		}
+	}
+	for (items_t::iterator iter = mItems.begin();
+		iter != mItems.end();)
+	{
+		items_t::iterator iit = iter++;
+		if((*iit)->setSelection(selection, openitem, take_keyboard_focus))
+		{
+			rv = TRUE;
+			child_selected = TRUE;
+			mNumDescendantsSelected++;
+		}
+	}
+	if(openitem && child_selected)
+	{
+		setOpenArrangeRecursively(TRUE);
+	}
+	return rv;
+}
+
+// This method is used to change the selection of an item. If
+// selection is 'this', then note selection as true. Returns TRUE
+// if this or a child is now selected.
+BOOL LLFolderViewFolder::changeSelection(LLFolderViewItem* selection,
+										 BOOL selected)
+{
+	BOOL rv = FALSE;
+	if(selection == this)
+	{
+		mIsSelected = selected;
+		if(mListener && selected)
+		{
+			mListener->selectItem();
+		}
+		rv = TRUE;
+	}
+
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		if((*fit)->changeSelection(selection, selected))
+		{
+			if (selected)
+			{
+				mNumDescendantsSelected++;
+			}
+			else
+			{
+				mNumDescendantsSelected--;
+			}
+			rv = TRUE;
+		}
+	}
+	for (items_t::iterator iter = mItems.begin();
+		iter != mItems.end();)
+	{
+		items_t::iterator iit = iter++;
+		if((*iit)->changeSelection(selection, selected))
+		{
+			if (selected)
+			{
+				mNumDescendantsSelected++;
+			}
+			else
+			{
+				mNumDescendantsSelected--;
+			}
+			rv = TRUE;
+		}
+	}
+	return rv;
+}
+
+S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& selected_items)
+{
+	S32 num_selected = 0;
+
+	// pass on to child folders first
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		num_selected += (*fit)->extendSelection(selection, last_selected, selected_items);
+		mNumDescendantsSelected += num_selected;
+	}
+
+	// handle selection of our immediate children...
+	BOOL reverse_select = FALSE;
+	BOOL found_last_selected = FALSE;
+	BOOL found_selection = FALSE;
+	LLDynamicArray<LLFolderViewItem*> items_to_select;
+	LLFolderViewItem* item;
+
+	//...folders first...
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		item = (*fit);
+		if(item == selection)
+		{
+			found_selection = TRUE;
+		}
+		else if (item == last_selected)
+		{
+			found_last_selected = TRUE;
+			if (found_selection)
+			{
+				reverse_select = TRUE;
+			}
+		}
+
+		if (found_selection || found_last_selected)
+		{
+			// deselect currently selected items so they can be pushed back on queue
+			if (item->isSelected())
+			{
+				item->changeSelection(item, FALSE);
+			}
+			items_to_select.put(item);
+		}
+
+		if (found_selection && found_last_selected)
+		{
+			break;
+		}		
+	}
+
+	if (!(found_selection && found_last_selected))
+	{
+		//,,,then items
+		for (items_t::iterator iter = mItems.begin();
+			iter != mItems.end();)
+		{
+			items_t::iterator iit = iter++;
+			item = (*iit);
+			if(item == selection)
+			{
+				found_selection = TRUE;
+			}
+			else if (item == last_selected)
+			{
+				found_last_selected = TRUE;
+				if (found_selection)
+				{
+					reverse_select = TRUE;
+				}
+			}
+
+			if (found_selection || found_last_selected)
+			{
+				// deselect currently selected items so they can be pushed back on queue
+				if (item->isSelected())
+				{
+					item->changeSelection(item, FALSE);
+				}
+				items_to_select.put(item);
+			}
+
+			if (found_selection && found_last_selected)
+			{
+				break;
+			}
+		}
+	}
+
+	if (found_last_selected && found_selection)
+	{
+		// we have a complete selection inside this folder
+		for (S32 index = reverse_select ? items_to_select.getLength() - 1 : 0; 
+			reverse_select ? index >= 0 : index < items_to_select.getLength(); reverse_select ? index-- : index++)
+		{
+			LLFolderViewItem* item = items_to_select[index];
+			if (item->changeSelection(item, TRUE))
+			{
+				selected_items.put(item);
+				mNumDescendantsSelected++;
+				num_selected++;
+			}
+		}
+	}
+	else if (found_selection)
+	{
+		// last selection was not in this folder....go ahead and select just the new item
+		if (selection->changeSelection(selection, TRUE))
+		{
+			selected_items.put(selection);
+			mNumDescendantsSelected++;
+			num_selected++;
+		}
+	}
+
+	return num_selected;
+}
+
+void LLFolderViewFolder::recursiveDeselect(BOOL deselect_self)
+{
+	// make sure we don't have negative values
+	llassert(mNumDescendantsSelected >= 0);
+
+	if (mIsSelected && deselect_self)
+	{
+		mIsSelected = FALSE;
+
+		// update ancestors' count of selected descendents
+		LLFolderViewFolder* parent_folder = getParentFolder();
+		while(parent_folder)
+		{
+			parent_folder->mNumDescendantsSelected--;
+			parent_folder = parent_folder->getParentFolder();
+		}
+	}
+
+	if (0 == mNumDescendantsSelected)
+	{
+		return;
+	}
+
+	for (items_t::iterator iter = mItems.begin();
+		iter != mItems.end();)
+	{
+		items_t::iterator iit = iter++;
+		LLFolderViewItem* item = (*iit);
+		item->recursiveDeselect(TRUE);
+	}
+
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		LLFolderViewFolder* folder = (*fit);
+		folder->recursiveDeselect(TRUE);
+	}
+
+}
+
+void LLFolderViewFolder::destroyView()
+{
+	for (items_t::iterator iter = mItems.begin();
+		iter != mItems.end();)
+	{
+		items_t::iterator iit = iter++;
+		LLFolderViewItem* item = (*iit);
+		getRoot()->removeItemID(item->getListener()->getUUID());
+	}
+
+	std::for_each(mItems.begin(), mItems.end(), DeletePointer());
+	mItems.clear();
+
+	while (!mFolders.empty())
+	{
+		LLFolderViewFolder *folderp = mFolders.back();
+		folderp->destroyView(); // removes entry from mFolders
+	}
+
+	deleteAllChildren();
+
+	if (mParentFolder)
+	{
+		mParentFolder->removeView(this);
+	}
+}
+
+// remove the specified item (and any children) if possible. Return
+// TRUE if the item was deleted.
+BOOL LLFolderViewFolder::removeItem(LLFolderViewItem* item)
+{
+	if(item->remove())
+	{
+		//RN: this seem unneccessary as remove() moves to trash
+		//removeView(item);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+// simply remove the view (and any children) Don't bother telling the
+// listeners.
+void LLFolderViewFolder::removeView(LLFolderViewItem* item)
+{
+	if (!item || item->getParentFolder() != this)
+	{
+		return;
+	}
+	// deselect without traversing hierarchy
+	item->recursiveDeselect(TRUE);
+	getRoot()->removeFromSelectionList(item);
+	extractItem(item);
+	delete item;
+}
+
+// extractItem() removes the specified item from the folder, but
+// doesn't delete it.
+void LLFolderViewFolder::extractItem( LLFolderViewItem* item )
+{
+	items_t::iterator it = std::find(mItems.begin(), mItems.end(), item);
+	if(it == mItems.end())
+	{
+		// This is an evil downcast. However, it's only doing
+		// pointer comparison to find if (which it should be ) the
+		// item is in the container, so it's pretty safe.
+		LLFolderViewFolder* f = reinterpret_cast<LLFolderViewFolder*>(item);
+		folders_t::iterator ft;
+		ft = std::find(mFolders.begin(), mFolders.end(), f);
+		if(ft != mFolders.end())
+		{
+			mFolders.erase(ft);
+		}
+	}
+	else
+	{
+		mItems.erase(it);
+	}
+	//item has been removed, need to update filter
+	dirtyFilter();
+	//because an item is going away regardless of filter status, force rearrange
+	requestArrange();
+	getRoot()->removeItemID(item->getListener()->getUUID());
+	removeChild(item);
+}
+
+bool LLFolderViewFolder::isTrash() const
+{
+	if (mAmTrash == LLFolderViewFolder::UNKNOWN)
+	{
+		mAmTrash = mListener->getUUID() == gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH, false) ? LLFolderViewFolder::TRASH : LLFolderViewFolder::NOT_TRASH;
+	}
+	return mAmTrash == LLFolderViewFolder::TRASH;
+}
+
+void LLFolderViewFolder::sortBy(U32 order)
+{
+	if (!mSortFunction.updateSort(order))
+	{
+		// No changes.
+		return;
+	}
+
+	// Propegate this change to sub folders
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		(*fit)->sortBy(order);
+	}
+
+	mFolders.sort(mSortFunction);
+	mItems.sort(mSortFunction);
+
+	if (order & LLInventoryFilter::SO_DATE)
+	{
+		time_t latest = 0;
+
+		if (!mItems.empty())
+		{
+			LLFolderViewItem* item = *(mItems.begin());
+			latest = item->getCreationDate();
+		}
+
+		if (!mFolders.empty())
+		{
+			LLFolderViewFolder* folder = *(mFolders.begin());
+			if (folder->getCreationDate() > latest)
+			{
+				latest = folder->getCreationDate();
+			}
+		}
+		mSubtreeCreationDate = latest;
+	}
+}
+
+void LLFolderViewFolder::setItemSortOrder(U32 ordering)
+{
+	if (mSortFunction.updateSort(ordering))
+	{
+		for (folders_t::iterator iter = mFolders.begin();
+			iter != mFolders.end();)
+		{
+			folders_t::iterator fit = iter++;
+			(*fit)->setItemSortOrder(ordering);
+		}
+
+		mFolders.sort(mSortFunction);
+		mItems.sort(mSortFunction);
+	}
+}
+
+EInventorySortGroup LLFolderViewFolder::getSortGroup() const
+{
+	if (isTrash())
+	{
+		return SG_TRASH_FOLDER;
+	}
+
+	// Folders that can't be moved are 'system' folders. 
+	if( mListener )
+	{
+		if( !(mListener->isItemMovable()) )
+		{
+			return SG_SYSTEM_FOLDER;
+		}
+	}
+
+	return SG_NORMAL_FOLDER;
+}
+
+BOOL LLFolderViewFolder::isMovable()
+{
+	if( mListener )
+	{
+		if( !(mListener->isItemMovable()) )
+		{
+			return FALSE;
+		}
+
+		for (items_t::iterator iter = mItems.begin();
+			iter != mItems.end();)
+		{
+			items_t::iterator iit = iter++;
+			if(!(*iit)->isMovable())
+			{
+				return FALSE;
+			}
+		}
+
+		for (folders_t::iterator iter = mFolders.begin();
+			iter != mFolders.end();)
+		{
+			folders_t::iterator fit = iter++;
+			if(!(*fit)->isMovable())
+			{
+				return FALSE;
+			}
+		}
+	}
+	return TRUE;
+}
+
+
+BOOL LLFolderViewFolder::isRemovable()
+{
+	if( mListener )
+	{
+		if( !(mListener->isItemRemovable()) )
+		{
+			return FALSE;
+		}
+
+		for (items_t::iterator iter = mItems.begin();
+			iter != mItems.end();)
+		{
+			items_t::iterator iit = iter++;
+			if(!(*iit)->isRemovable())
+			{
+				return FALSE;
+			}
+		}
+
+		for (folders_t::iterator iter = mFolders.begin();
+			iter != mFolders.end();)
+		{
+			folders_t::iterator fit = iter++;
+			if(!(*fit)->isRemovable())
+			{
+				return FALSE;
+			}
+		}
+	}
+	return TRUE;
+}
+
+// this is an internal method used for adding items to folders. 
+BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
+{
+	mItems.push_back(item);
+	item->setRect(LLRect(0, 0, getRect().getWidth(), 0));
+	item->setVisible(FALSE);
+	addChild( item );
+	item->dirtyFilter();
+	requestArrange();
+	requestSort();
+	return TRUE;
+}
+
+// this is an internal method used for adding items to folders. 
+BOOL LLFolderViewFolder::addFolder(LLFolderViewFolder* folder)
+{
+	mFolders.push_back(folder);
+	folder->setOrigin(0, 0);
+	folder->reshape(getRect().getWidth(), 0);
+	folder->setVisible(FALSE);
+	addChild( folder );
+	folder->dirtyFilter();
+	// rearrange all descendants too, as our indentation level might have changed
+	folder->requestArrange(TRUE);
+	requestSort();
+	return TRUE;
+}
+
+void LLFolderViewFolder::requestArrange(BOOL include_descendants)	
+{ 
+	mLastArrangeGeneration = -1; 
+	// flag all items up to root
+	if (mParentFolder)
+	{
+		mParentFolder->requestArrange();
+	}
+
+	if (include_descendants)
+	{
+		for (folders_t::iterator iter = mFolders.begin();
+			iter != mFolders.end();
+			++iter)
+		{
+			(*iter)->requestArrange(TRUE);
+		}
+	}
+}
+
+void LLFolderViewFolder::toggleOpen()
+{
+	setOpen(!mIsOpen);
+}
+
+// Force a folder open or closed
+void LLFolderViewFolder::setOpen(BOOL openitem)
+{
+	setOpenArrangeRecursively(openitem);
+}
+
+void LLFolderViewFolder::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse)
+{
+	BOOL was_open = mIsOpen;
+	mIsOpen = openitem;
+	if(!was_open && openitem)
+	{
+		if(mListener)
+		{
+			mListener->openItem();
+		}
+	}
+
+	if (recurse == RECURSE_DOWN || recurse == RECURSE_UP_DOWN)
+	{
+		for (folders_t::iterator iter = mFolders.begin();
+			iter != mFolders.end();)
+		{
+			folders_t::iterator fit = iter++;
+			(*fit)->setOpenArrangeRecursively(openitem, RECURSE_DOWN);		/* Flawfinder: ignore */
+		}
+	}
+	if (mParentFolder && (recurse == RECURSE_UP || recurse == RECURSE_UP_DOWN))
+	{
+		mParentFolder->setOpenArrangeRecursively(openitem, RECURSE_UP);
+	}
+
+	if (was_open != mIsOpen)
+	{
+		requestArrange();
+	}
+}
+
+BOOL LLFolderViewFolder::handleDragAndDropFromChild(MASK mask,
+													BOOL drop,
+													EDragAndDropType c_type,
+													void* cargo_data,
+													EAcceptance* accept,
+													std::string& tooltip_msg)
+{
+	BOOL accepted = mListener && mListener->dragOrDrop(mask,drop,c_type,cargo_data);
+	if (accepted) 
+	{
+		mDragAndDropTarget = TRUE;
+		*accept = ACCEPT_YES_MULTI;
+	}
+	else 
+	{
+		*accept = ACCEPT_NO;
+	}
+
+	// drag and drop to child item, so clear pending auto-opens
+	getRoot()->autoOpenTest(NULL);
+
+	return TRUE;
+}
+
+void LLFolderViewFolder::openItem( void )
+{
+	toggleOpen();
+}
+
+void LLFolderViewFolder::applyFunctorRecursively(LLFolderViewFunctor& functor)
+{
+	functor.doFolder(this);
+
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		(*fit)->applyFunctorRecursively(functor);
+	}
+	for (items_t::iterator iter = mItems.begin();
+		iter != mItems.end();)
+	{
+		items_t::iterator iit = iter++;
+		functor.doItem((*iit));
+	}
+}
+
+void LLFolderViewFolder::applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor)
+{
+	functor(mListener);
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		(*fit)->applyListenerFunctorRecursively(functor);
+	}
+	for (items_t::iterator iter = mItems.begin();
+		iter != mItems.end();)
+	{
+		items_t::iterator iit = iter++;
+		(*iit)->applyListenerFunctorRecursively(functor);
+	}
+}
+
+// LLView functionality
+BOOL LLFolderViewFolder::handleDragAndDrop(S32 x, S32 y, MASK mask,
+										   BOOL drop,
+										   EDragAndDropType cargo_type,
+										   void* cargo_data,
+										   EAcceptance* accept,
+										   std::string& tooltip_msg)
+{
+	LLFolderView* root_view = getRoot();
+
+	BOOL handled = FALSE;
+	if(mIsOpen)
+	{
+		handled = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type,
+			cargo_data, accept, tooltip_msg) != NULL;
+	}
+
+	if (!handled)
+	{
+		BOOL accepted = mListener && mListener->dragOrDrop(mask, drop,cargo_type,cargo_data);
+
+		if (accepted) 
+		{
+			mDragAndDropTarget = TRUE;
+			*accept = ACCEPT_YES_MULTI;
+		}
+		else 
+		{
+			*accept = ACCEPT_NO;
+		}
+
+		if (!drop && accepted)
+		{
+			root_view->autoOpenTest(this);
+		}
+
+		lldebugst(LLERR_USER_INPUT) << "dragAndDrop handled by LLFolderViewFolder" << llendl;
+	}
+
+	return TRUE;
+}
+
+
+BOOL LLFolderViewFolder::handleRightMouseDown( S32 x, S32 y, MASK mask )
+{
+	BOOL handled = FALSE;
+	// fetch contents of this folder, as context menu can depend on contents
+	// still, user would have to open context menu again to see the changes
+	gInventory.fetchDescendentsOf(mListener->getUUID());
+
+	if( mIsOpen )
+	{
+		handled = childrenHandleRightMouseDown( x, y, mask ) != NULL;
+	}
+	if (!handled)
+	{
+		handled = LLFolderViewItem::handleRightMouseDown( x, y, mask );
+	}
+	return handled;
+}
+
+
+BOOL LLFolderViewFolder::handleHover(S32 x, S32 y, MASK mask)
+{
+	BOOL handled = LLView::handleHover(x, y, mask);
+
+	if (!handled)
+	{
+		// this doesn't do child processing
+		handled = LLFolderViewItem::handleHover(x, y, mask);
+	}
+
+	//if(x < LEFT_INDENTATION + mIndentation && x > mIndentation - LEFT_PAD && y > getRect().getHeight() - )
+	//{
+	//	gViewerWindow->setCursor(UI_CURSOR_ARROW);
+	//	mExpanderHighlighted = TRUE;
+	//	handled = TRUE;
+	//}
+	return handled;
+}
+
+BOOL LLFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask )
+{
+	BOOL handled = FALSE;
+	if( mIsOpen )
+	{
+		handled = childrenHandleMouseDown(x,y,mask) != NULL;
+	}
+	if( !handled )
+	{
+		if(x < LEFT_INDENTATION + mIndentation && x > mIndentation - LEFT_PAD)
+		{
+			toggleOpen();
+			handled = TRUE;
+		}
+		else
+		{
+			// do normal selection logic
+			handled = LLFolderViewItem::handleMouseDown(x, y, mask);
+		}
+	}
+
+	return handled;
+}
+
+BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
+{
+	BOOL handled = FALSE;
+	if( mIsOpen )
+	{
+		handled = childrenHandleDoubleClick( x, y, mask ) != NULL;
+	}
+	if( !handled )
+	{
+		if(x < LEFT_INDENTATION + mIndentation && x > mIndentation - LEFT_PAD)
+		{
+			// don't select when user double-clicks plus sign
+			// so as not to contradict single-click behavior
+			toggleOpen();
+		}
+		else
+		{
+			setSelectionFromRoot(this, FALSE);
+			toggleOpen();
+		}
+		handled = TRUE;
+	}
+	return handled;
+}
+
+void LLFolderViewFolder::draw()
+{
+	if (mAutoOpenCountdown != 0.f)
+	{
+		mControlLabelRotation = mAutoOpenCountdown * -90.f;
+	}
+	else if (mIsOpen)
+	{
+		mControlLabelRotation = lerp(mControlLabelRotation, -90.f, LLCriticalDamp::getInterpolant(0.04f));
+	}
+	else
+	{
+		mControlLabelRotation = lerp(mControlLabelRotation, 0.f, LLCriticalDamp::getInterpolant(0.025f));
+	}
+
+	bool possibly_has_children = false;
+	bool up_to_date = mListener && mListener->isUpToDate();
+	if(!up_to_date && mListener && mListener->hasChildren()) // we know we have children but haven't fetched them (doesn't obey filter)
+	{
+		possibly_has_children = true;
+	}
+
+
+	BOOL loading = ( mIsOpen && possibly_has_children && !up_to_date );
+
+	if ( loading && !mIsLoading )
+	{
+		// Measure how long we've been in the loading state
+		mTimeSinceRequestStart.reset();
+	}
+
+	mIsLoading = loading;
+
+	LLFolderViewItem::draw();
+
+	// draw children if root folder, or any other folder that is open or animating to closed state
+	if( getRoot() == this || (mIsOpen || mCurHeight != mTargetHeight ))
+	{
+		LLView::draw();
+	}
+
+	mExpanderHighlighted = FALSE;
+}
+
+time_t LLFolderViewFolder::getCreationDate() const
+{
+	return llmax<time_t>(mCreationDate, mSubtreeCreationDate);
+}
+
+
+BOOL	LLFolderViewFolder::potentiallyVisible()
+{
+	// folder should be visible by it's own filter status
+	return LLFolderViewItem::potentiallyVisible() 	
+		// or one or more of its descendants have passed the minimum filter requirement
+		|| hasFilteredDescendants(getRoot()->getFilter()->getMinRequiredGeneration())
+		// or not all of its descendants have been checked against minimum filter requirement
+		|| getCompletedFilterGeneration() < getRoot()->getFilter()->getMinRequiredGeneration(); 
+}
+
+// this does prefix traversal, as folders are listed above their contents
+LLFolderViewItem* LLFolderViewFolder::getNextFromChild( LLFolderViewItem* item, BOOL include_children )
+{
+	BOOL found_item = FALSE;
+
+	LLFolderViewItem* result = NULL;
+	// when not starting from a given item, start at beginning
+	if(item == NULL)
+	{
+		found_item = TRUE;
+	}
+
+	// find current item among children
+	folders_t::iterator fit = mFolders.begin();
+	folders_t::iterator fend = mFolders.end();
+
+	items_t::iterator iit = mItems.begin();
+	items_t::iterator iend = mItems.end();
+
+	// if not trivially starting at the beginning, we have to find the current item
+	if (!found_item)
+	{
+		// first, look among folders, since they are always above items
+		for(; fit != fend; ++fit)
+		{
+			if(item == (*fit))
+			{
+				found_item = TRUE;
+				// if we are on downwards traversal
+				if (include_children && (*fit)->isOpen())
+				{
+					// look for first descendant
+					return (*fit)->getNextFromChild(NULL, TRUE);
+				}
+				// otherwise advance to next folder
+				++fit;
+				include_children = TRUE;
+				break;
+			}
+		}
+
+		// didn't find in folders?  Check items...
+		if (!found_item)
+		{
+			for(; iit != iend; ++iit)
+			{
+				if(item == (*iit))
+				{
+					found_item = TRUE;
+					// point to next item
+					++iit;
+					break;
+				}
+			}
+		}
+	}
+
+	if (!found_item)
+	{
+		// you should never call this method with an item that isn't a child
+		// so we should always find something
+		llassert(FALSE);
+		return NULL;
+	}
+
+	// at this point, either iit or fit point to a candidate "next" item
+	// if both are out of range, we need to punt up to our parent
+
+	// now, starting from found folder, continue through folders
+	// searching for next visible folder
+	while(fit != fend && !(*fit)->getVisible())
+	{
+		// turn on downwards traversal for next folder
+		++fit;
+	} 
+
+	if (fit != fend)
+	{
+		result = (*fit);
+	}
+	else
+	{
+		// otherwise, scan for next visible item
+		while(iit != iend && !(*iit)->getVisible())
+		{
+			++iit;
+		} 
+
+		// check to see if we have a valid item
+		if (iit != iend)
+		{
+			result = (*iit);
+		}
+	}
+
+	if( !result && mParentFolder )
+	{
+		// If there are no siblings or children to go to, recurse up one level in the tree
+		// and skip children for this folder, as we've already discounted them
+		result = mParentFolder->getNextFromChild(this, FALSE);
+	}
+
+	return result;
+}
+
+// this does postfix traversal, as folders are listed above their contents
+LLFolderViewItem* LLFolderViewFolder::getPreviousFromChild( LLFolderViewItem* item, BOOL include_children )
+{
+	BOOL found_item = FALSE;
+
+	LLFolderViewItem* result = NULL;
+	// when not starting from a given item, start at end
+	if(item == NULL)
+	{
+		found_item = TRUE;
+	}
+
+	// find current item among children
+	folders_t::reverse_iterator fit = mFolders.rbegin();
+	folders_t::reverse_iterator fend = mFolders.rend();
+
+	items_t::reverse_iterator iit = mItems.rbegin();
+	items_t::reverse_iterator iend = mItems.rend();
+
+	// if not trivially starting at the end, we have to find the current item
+	if (!found_item)
+	{
+		// first, look among items, since they are always below the folders
+		for(; iit != iend; ++iit)
+		{
+			if(item == (*iit))
+			{
+				found_item = TRUE;
+				// point to next item
+				++iit;
+				break;
+			}
+		}
+
+		// didn't find in items?  Check folders...
+		if (!found_item)
+		{
+			for(; fit != fend; ++fit)
+			{
+				if(item == (*fit))
+				{
+					found_item = TRUE;
+					// point to next folder
+					++fit;
+					break;
+				}
+			}
+		}
+	}
+
+	if (!found_item)
+	{
+		// you should never call this method with an item that isn't a child
+		// so we should always find something
+		llassert(FALSE);
+		return NULL;
+	}
+
+	// at this point, either iit or fit point to a candidate "next" item
+	// if both are out of range, we need to punt up to our parent
+
+	// now, starting from found item, continue through items
+	// searching for next visible item
+	while(iit != iend && !(*iit)->getVisible())
+	{
+		++iit;
+	} 
+
+	if (iit != iend)
+	{
+		// we found an appropriate item
+		result = (*iit);
+	}
+	else
+	{
+		// otherwise, scan for next visible folder
+		while(fit != fend && !(*fit)->getVisible())
+		{
+			++fit;
+		} 
+
+		// check to see if we have a valid folder
+		if (fit != fend)
+		{
+			// try selecting child element of this folder
+			if ((*fit)->isOpen())
+			{
+				result = (*fit)->getPreviousFromChild(NULL);
+			}
+			else
+			{
+				result = (*fit);
+			}
+		}
+	}
+
+	if( !result )
+	{
+		// If there are no siblings or children to go to, recurse up one level in the tree
+		// which gets back to this folder, which will only be visited if it is a valid, visible item
+		result = this;
+	}
+
+	return result;
+}
+
+
+bool LLInventorySort::updateSort(U32 order)
+{
+	if (order != mSortOrder)
+	{
+		mSortOrder = order;
+		mByDate = (order & LLInventoryFilter::SO_DATE);
+		mSystemToTop = (order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP);
+		mFoldersByName = (order & LLInventoryFilter::SO_FOLDERS_BY_NAME);
+		return true;
+	}
+	return false;
+}
+
+bool LLInventorySort::operator()(const LLFolderViewItem* const& a, const LLFolderViewItem* const& b)
+{
+	// We sort by name if we aren't sorting by date
+	// OR if these are folders and we are sorting folders by name.
+	bool by_name = (!mByDate 
+		|| (mFoldersByName 
+		&& (a->getSortGroup() != SG_ITEM)));
+
+	if (a->getSortGroup() != b->getSortGroup())
+	{
+		if (mSystemToTop)
+		{
+			// Group order is System Folders, Trash, Normal Folders, Items
+			return (a->getSortGroup() < b->getSortGroup());
+		}
+		else if (mByDate)
+		{
+			// Trash needs to go to the bottom if we are sorting by date
+			if ( (a->getSortGroup() == SG_TRASH_FOLDER)
+				|| (b->getSortGroup() == SG_TRASH_FOLDER))
+			{
+				return (b->getSortGroup() == SG_TRASH_FOLDER);
+			}
+		}
+	}
+
+	if (by_name)
+	{
+		S32 compare = LLStringUtil::compareDict(a->getLabel(), b->getLabel());
+		if (0 == compare)
+		{
+			return (a->getCreationDate() > b->getCreationDate());
+		}
+		else
+		{
+			return (compare < 0);
+		}
+	}
+	else
+	{
+		// BUG: This is very very slow.  The getCreationDate() is log n in number
+		// of inventory items.
+		time_t first_create = a->getCreationDate();
+		time_t second_create = b->getCreationDate();
+		if (first_create == second_create)
+		{
+			return (LLStringUtil::compareDict(a->getLabel(), b->getLabel()) < 0);
+		}
+		else
+		{
+			return (first_create > second_create);
+		}
+	}
+}
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
new file mode 100644
index 0000000000..57807005c2
--- /dev/null
+++ b/indra/newview/llfolderviewitem.h
@@ -0,0 +1,528 @@
+/** 
+* @file llfolderviewitem.h
+* @brief Items and folders that can appear in a hierarchical folder view
+*
+* $LicenseInfo:firstyear=2001&license=viewergpl$
+* 
+* Copyright (c) 2001-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+#ifndef LLFOLDERVIEWITEM_H
+#define LLFOLDERVIEWITEM_H
+
+#include "llview.h"
+
+class LLFontGL;
+class LLFolderView;
+class LLFolderViewEventListener;
+class LLFolderViewFolder;
+class LLFolderViewFunctor;
+class LLFolderViewItem;
+class LLFolderViewListenerFunctor;
+class LLInventoryFilter;
+class LLMenuGL;
+class LLUIImage;
+
+// These are grouping of inventory types.
+// Order matters when sorting system folders to the top.
+enum EInventorySortGroup
+{ 
+	SG_SYSTEM_FOLDER, 
+	SG_TRASH_FOLDER, 
+	SG_NORMAL_FOLDER, 
+	SG_ITEM 
+};
+
+// JAMESDEBUG *TODO: do we really need one sort object per folder?
+// can we just have one of these per LLFolderView ?
+class LLInventorySort
+{
+public:
+	LLInventorySort() 
+		: mSortOrder(0),
+		mByDate(false),
+		mSystemToTop(false),
+		mFoldersByName(false) { }
+
+	// Returns true if order has changed
+	bool updateSort(U32 order);
+	U32 getSort() { return mSortOrder; }
+
+	bool operator()(const LLFolderViewItem* const& a, const LLFolderViewItem* const& b);
+private:
+	U32  mSortOrder;
+	bool mByDate;
+	bool mSystemToTop;
+	bool mFoldersByName;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLFolderViewItem
+//
+// An instance of this class represents a single item in a folder view
+// such as an inventory item or a file.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLFolderViewItem : public LLView
+{
+public:
+	static void initClass();
+	static void cleanupClass();
+
+	// jamesdebug was LLUICtrl::Params
+	struct Params : public LLInitParam::Block<Params, LLView::Params>
+	{
+		Optional<LLUIImage*>					icon;
+		Optional<LLFolderView*>					root;
+		Optional<LLFolderViewEventListener*>	listener;
+
+		Optional<LLUIImage*>					folder_arrow_image;
+		Optional<LLUIImage*>					selection_image;
+
+		Optional<S32>							creation_date; //UTC seconds
+
+		Params();
+	};
+
+	// layout constants
+	static const S32 LEFT_PAD = 5;
+	static const S32 LEFT_INDENTATION = 13;
+	static const S32 ICON_PAD = 2;
+	static const S32 ICON_WIDTH = 16;
+	static const S32 TEXT_PAD = 1;
+	static const S32 ARROW_SIZE = 12;
+	static const S32 MAX_FOLDER_ITEM_OVERLAP = 2;
+	// animation parameters
+	static const F32 FOLDER_CLOSE_TIME_CONSTANT;
+	static const F32 FOLDER_OPEN_TIME_CONSTANT;
+
+protected:
+	friend class LLUICtrlFactory;
+	friend class LLFolderViewEventListener;
+
+	LLFolderViewItem(Params p = LLFolderViewItem::Params());
+
+	static const LLFontGL*		sFont;
+	static const LLFontGL*		sSmallFont;
+	static LLUIImagePtr			sArrowImage;
+	static LLUIImagePtr			sBoxImage;
+
+	std::string					mLabel;
+	std::string					mSearchableLabel;
+	S32							mLabelWidth;
+	bool						mLabelWidthDirty;
+	time_t						mCreationDate;
+	LLFolderViewFolder*			mParentFolder;
+	LLFolderViewEventListener*	mListener;
+	BOOL						mIsSelected;
+	BOOL						mIsCurSelection;
+	BOOL						mSelectPending;
+	LLFontGL::StyleFlags		mLabelStyle;
+	std::string					mLabelSuffix;
+	LLUIImagePtr				mIcon;
+	std::string					mStatusText;
+	BOOL						mHasVisibleChildren;
+	S32							mIndentation;
+	S32							mNumDescendantsSelected;
+	BOOL						mFiltered;
+	S32							mLastFilterGeneration;
+	std::string::size_type		mStringMatchOffset;
+	F32							mControlLabelRotation;
+	LLFolderView*				mRoot;
+	BOOL						mDragAndDropTarget;
+	LLUIImagePtr				mArrowImage;
+	LLUIImagePtr				mBoxImage;
+	BOOL                            mIsLoading;
+	LLTimer                         mTimeSinceRequestStart;
+
+	// This function clears the currently selected item, and records
+	// the specified selected item appropriately for display and use
+	// in the UI. If open is TRUE, then folders are opened up along
+	// the way to the selection.
+	void setSelectionFromRoot(LLFolderViewItem* selection, BOOL openitem,
+		BOOL take_keyboard_focus = TRUE);
+
+	// helper function to change the selection from the root.
+	void changeSelectionFromRoot(LLFolderViewItem* selection, BOOL selected);
+
+	// helper function to change the selection from the root.
+	void extendSelectionFromRoot(LLFolderViewItem* selection);
+
+	// this is an internal method used for adding items to folders. A
+	// no-op at this leve, but reimplemented in derived classes.
+	virtual BOOL addItem(LLFolderViewItem*) { return FALSE; }
+	virtual BOOL addFolder(LLFolderViewFolder*) { return FALSE; }
+
+public:
+	// This function is called when the folder view is dirty. It's
+	// implemented here but called by derived classes when folding the
+	// views.
+	void arrangeFromRoot();
+	void filterFromRoot( void );
+	
+	void arrangeAndSet(BOOL set_selection, BOOL take_keyboard_focus);
+
+	virtual ~LLFolderViewItem( void );
+
+	// addToFolder() returns TRUE if it succeeds. FALSE otherwise
+	enum { ARRANGE = TRUE, DO_NOT_ARRANGE = FALSE };
+	virtual BOOL addToFolder(LLFolderViewFolder* folder, LLFolderView* root);
+
+	virtual EInventorySortGroup getSortGroup() const;
+
+	// Finds width and height of this object and it's children.  Also
+	// makes sure that this view and it's children are the right size.
+	virtual S32 arrange( S32* width, S32* height, S32 filter_generation );
+	virtual S32 getItemHeight();
+
+	// applies filters to control visibility of inventory items
+	virtual void filter( LLInventoryFilter& filter);
+
+	// updates filter serial number and optionally propagated value up to root
+	S32		getLastFilterGeneration() { return mLastFilterGeneration; }
+
+	virtual void	dirtyFilter();
+
+	// If the selection is 'this' then note that otherwise
+	// ignore. Returns TRUE if this object was affected. If open is
+	// TRUE, then folders are opened up along the way to the
+	// selection.
+	virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
+		BOOL take_keyboard_focus);
+
+	// This method is used to toggle the selection of an item. If
+	// selection is 'this', then note selection, and return TRUE.
+	virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
+
+	// this method is used to group select items
+	virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items){ return FALSE; }
+
+	// this method is used to group select items
+	virtual void recursiveDeselect(BOOL deselect_self);
+
+	// gets multiple-element selection
+	virtual BOOL getSelectionList(std::set<LLUUID> &selection){return TRUE;}
+
+	// Returns true is this object and all of its children can be removed (deleted by user)
+	virtual BOOL isRemovable();
+
+	// Returns true is this object and all of its children can be moved
+	virtual BOOL isMovable();
+
+	// destroys this item recursively
+	virtual void destroyView();
+
+	S32 getNumSelectedDescendants() { return mNumDescendantsSelected; }
+
+	BOOL isSelected() { return mIsSelected; }
+
+	void setIsCurSelection(BOOL select) { mIsCurSelection = select; }
+
+	BOOL getIsCurSelection() { return mIsCurSelection; }
+
+	BOOL hasVisibleChildren() { return mHasVisibleChildren; }
+
+	// Call through to the viewed object and return true if it can be
+	// removed. Returns true if it's removed.
+	//virtual BOOL removeRecursively(BOOL single_item);
+	BOOL remove();
+
+	// Build an appropriate context menu for the item.	Flags unused.
+	void buildContextMenu(LLMenuGL& menu, U32 flags);
+
+	// This method returns the actual name of the thing being
+	// viewed. This method will ask the viewed object itself.
+	const std::string& getName( void ) const;
+
+	const std::string& getSearchableLabel( void ) const;
+
+	// This method returns the label displayed on the view. This
+	// method was primarily added to allow sorting on the folder
+	// contents possible before the entire view has been constructed.
+	const std::string& getLabel() const { return mLabel; }
+
+	// Used for sorting, like getLabel() above.
+	virtual time_t getCreationDate() const { return mCreationDate; }
+
+	LLFolderViewFolder* getParentFolder( void ) { return mParentFolder; }
+	const LLFolderViewFolder* getParentFolder( void ) const { return mParentFolder; }
+
+	LLFolderViewItem* getNextOpenNode( BOOL include_children = TRUE );
+	LLFolderViewItem* getPreviousOpenNode( BOOL include_children = TRUE );
+
+	const LLFolderViewEventListener* getListener( void ) const { return mListener; }
+	LLFolderViewEventListener* getListener( void ) { return mListener; }
+
+	// just rename the object.
+	void rename(const std::string& new_name);
+
+	// open
+	virtual void openItem( void );
+	virtual void preview(void);
+
+	// Show children (unfortunate that this is called "open")
+	virtual void setOpen(BOOL open = TRUE) {};
+
+	virtual BOOL isOpen() { return FALSE; }
+
+	virtual LLFolderView*	getRoot();
+	BOOL			isDescendantOf( const LLFolderViewFolder* potential_ancestor );
+	S32				getIndentation() { return mIndentation; }
+
+	virtual BOOL	potentiallyVisible(); // do we know for a fact that this item has been filtered out?
+
+	virtual BOOL	getFiltered();
+	virtual BOOL	getFiltered(S32 filter_generation);
+	virtual void	setFiltered(BOOL filtered, S32 filter_generation);
+
+	// change the icon
+	void setIcon(LLUIImagePtr icon);
+
+	// refresh information from the object being viewed.
+	void refreshFromListener();
+	virtual void refresh();
+
+	virtual void applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor);
+
+	// LLView functionality
+	virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
+	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
+	virtual BOOL handleHover( S32 x, S32 y, MASK mask );
+	virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
+	virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
+	virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+
+	//	virtual void handleDropped();
+	virtual void draw();
+	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+		EDragAndDropType cargo_type,
+		void* cargo_data,
+		EAcceptance* accept,
+		std::string& tooltip_msg);
+};
+
+
+// function used for sorting.
+typedef bool (*sort_order_f)(LLFolderViewItem* a, LLFolderViewItem* b);
+
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLFolderViewFolder
+//
+// An instance of an LLFolderViewFolder represents a collection of
+// more folders and items. This is used to build the hierarchy of
+// items found in the folder view. :)
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLFolderViewFolder : public LLFolderViewItem
+{
+protected:
+	LLFolderViewFolder( const LLFolderViewItem::Params& );
+	friend class LLUICtrlFactory;
+
+public:
+	typedef enum e_trash
+	{
+		UNKNOWN, TRASH, NOT_TRASH
+	} ETrash;
+
+protected:
+	typedef std::list<LLFolderViewItem*> items_t;
+	typedef std::list<LLFolderViewFolder*> folders_t;
+	items_t mItems;
+	folders_t mFolders;
+	LLInventorySort	mSortFunction;
+
+	BOOL		mIsOpen;
+	BOOL		mExpanderHighlighted;
+	F32			mCurHeight;
+	F32			mTargetHeight;
+	F32			mAutoOpenCountdown;
+	time_t		mSubtreeCreationDate;
+	mutable ETrash mAmTrash;
+	S32			mLastArrangeGeneration;
+	S32			mLastCalculatedWidth;
+	S32			mCompletedFilterGeneration;
+	S32			mMostFilteredDescendantGeneration;
+	bool		mNeedsSort;
+public:
+	typedef enum e_recurse_type
+	{
+		RECURSE_NO,
+		RECURSE_UP,
+		RECURSE_DOWN,
+		RECURSE_UP_DOWN
+	} ERecurseType;
+
+
+	virtual ~LLFolderViewFolder( void );
+
+	virtual BOOL	potentiallyVisible();
+
+	LLFolderViewItem* getNextFromChild( LLFolderViewItem*, BOOL include_children = TRUE );
+	LLFolderViewItem* getPreviousFromChild( LLFolderViewItem*, BOOL include_children = TRUE  );
+
+	// addToFolder() returns TRUE if it succeeds. FALSE otherwise
+	virtual BOOL addToFolder(LLFolderViewFolder* folder, LLFolderView* root);
+
+	// Finds width and height of this object and it's children.  Also
+	// makes sure that this view and it's children are the right size.
+	virtual S32 arrange( S32* width, S32* height, S32 filter_generation );
+
+	BOOL needsArrange();
+	void requestSort();
+
+	// Returns the sort group (system, trash, folder) for this folder.
+	virtual EInventorySortGroup getSortGroup() const;
+
+	virtual void	setCompletedFilterGeneration(S32 generation, BOOL recurse_up);
+	virtual S32		getCompletedFilterGeneration() { return mCompletedFilterGeneration; }
+
+	BOOL hasFilteredDescendants(S32 filter_generation) { return mMostFilteredDescendantGeneration >= filter_generation; }
+	BOOL hasFilteredDescendants();
+
+	// applies filters to control visibility of inventory items
+	virtual void filter( LLInventoryFilter& filter);
+	virtual void setFiltered(BOOL filtered, S32 filter_generation);
+	virtual void dirtyFilter();
+
+	// Passes selection information on to children and record
+	// selection information if necessary. Returns TRUE if this object
+	// (or a child) was affected.
+	virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
+		BOOL take_keyboard_focus);
+
+	// This method is used to change the selection of an item. If
+	// selection is 'this', then note selection as true. Returns TRUE
+	// if this or a child is now selected.
+	virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
+
+	// this method is used to group select items
+	virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
+
+	virtual void recursiveDeselect(BOOL deselect_self);
+
+	// Returns true is this object and all of its children can be removed.
+	virtual BOOL isRemovable();
+
+	// Returns true is this object and all of its children can be moved
+	virtual BOOL isMovable();
+
+	// destroys this folder, and all children
+	virtual void destroyView();
+
+	// If this folder can be removed, remove all children that can be
+	// removed, return TRUE if this is empty after the operation and
+	// it's viewed folder object can be removed.
+	//virtual BOOL removeRecursively(BOOL single_item);
+	//virtual BOOL remove();
+
+	// remove the specified item (and any children) if
+	// possible. Return TRUE if the item was deleted.
+	BOOL removeItem(LLFolderViewItem* item);
+
+	// simply remove the view (and any children) Don't bother telling
+	// the listeners.
+	void removeView(LLFolderViewItem* item);
+
+	// extractItem() removes the specified item from the folder, but
+	// doesn't delete it.
+	void extractItem( LLFolderViewItem* item );
+
+	// This function is called by a child that needs to be resorted.
+	void resort(LLFolderViewItem* item);
+
+	void setItemSortOrder(U32 ordering);
+	void sortBy(U32);
+	//BOOL (*func)(LLFolderViewItem* a, LLFolderViewItem* b));
+
+	void setAutoOpenCountdown(F32 countdown) { mAutoOpenCountdown = countdown; }
+
+	// folders can be opened. This will usually be called by internal
+	// methods.
+	virtual void toggleOpen();
+
+	// Force a folder open or closed
+	virtual void setOpen(BOOL openitem = TRUE);
+
+	// Called when a child is refreshed.
+	// don't rearrange child folder contents unless explicitly requested
+	virtual void requestArrange(BOOL include_descendants = FALSE);
+
+	// internal method which doesn't update the entire view. This
+	// method was written because the list iterators destroy the state
+	// of other iterations, thus, we can't arrange while iterating
+	// through the children (such as when setting which is selected.
+	virtual void setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse = RECURSE_NO);
+
+	// Get the current state of the folder.
+	virtual BOOL isOpen() { return mIsOpen; }
+
+	// special case if an object is dropped on the child.
+	BOOL handleDragAndDropFromChild(MASK mask,
+		BOOL drop,
+		EDragAndDropType cargo_type,
+		void* cargo_data,
+		EAcceptance* accept,
+		std::string& tooltip_msg);
+
+	void applyFunctorRecursively(LLFolderViewFunctor& functor);
+	virtual void applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor);
+
+	virtual void openItem( void );
+	virtual BOOL addItem(LLFolderViewItem* item);
+	virtual BOOL addFolder( LLFolderViewFolder* folder);
+
+	// LLView functionality
+	virtual BOOL handleHover(S32 x, S32 y, MASK mask);
+	virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
+	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
+	virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
+	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+		EDragAndDropType cargo_type,
+		void* cargo_data,
+		EAcceptance* accept,
+		std::string& tooltip_msg);
+	virtual void draw();
+
+	time_t getCreationDate() const;
+	bool isTrash() const;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLFolderViewListenerFunctor
+//
+// This simple abstract base class can be used to applied to all
+// listeners in a hierarchy.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLFolderViewListenerFunctor
+{
+public:
+	virtual ~LLFolderViewListenerFunctor() {}
+	virtual void operator()(LLFolderViewEventListener* listener) = 0;
+};
+
+#endif  // LLFOLDERVIEWITEM_H
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index 6473c85775..85da2eb2e3 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -40,7 +40,7 @@
 // newview
 #include "llagent.h"
 
-static LLDefaultWidgetRegistry::Register<LLGroupList> r("group_list");
+static LLDefaultChildRegistry::Register<LLGroupList> r("group_list");
 
 LLGroupList::LLGroupList(const Params& p)
 :	LLAvatarList(p)
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index fbf990e1af..e5b05d9f51 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -55,8 +55,7 @@
 #include "llimview.h"
 #include "llinventory.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
-#include "llfloateractivespeakers.h"
+#include "llfloaterinventory.h"
 #include "llfloaterchat.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
@@ -101,190 +100,7 @@ LLVoiceChannel* LLVoiceChannel::sSuspendedVoiceChannel = NULL;
 
 BOOL LLVoiceChannel::sSuspended = FALSE;
 
-void session_starter_helper(
-	const LLUUID& temp_session_id,
-	const LLUUID& other_participant_id,
-	EInstantMessage im_type)
-{
-	LLMessageSystem *msg = gMessageSystem;
-
-	msg->newMessageFast(_PREHASH_ImprovedInstantMessage);
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-
-	msg->nextBlockFast(_PREHASH_MessageBlock);
-	msg->addBOOLFast(_PREHASH_FromGroup, FALSE);
-	msg->addUUIDFast(_PREHASH_ToAgentID, other_participant_id);
-	msg->addU8Fast(_PREHASH_Offline, IM_ONLINE);
-	msg->addU8Fast(_PREHASH_Dialog, im_type);
-	msg->addUUIDFast(_PREHASH_ID, temp_session_id);
-	msg->addU32Fast(_PREHASH_Timestamp, NO_TIMESTAMP); // no timestamp necessary
-
-	std::string name;
-	gAgent.buildFullname(name);
-
-	msg->addStringFast(_PREHASH_FromAgentName, name);
-	msg->addStringFast(_PREHASH_Message, LLStringUtil::null);
-	msg->addU32Fast(_PREHASH_ParentEstateID, 0);
-	msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null);
-	msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent());
-}
-
-void start_deprecated_conference_chat(
-	const LLUUID& temp_session_id,
-	const LLUUID& creator_id,
-	const LLUUID& other_participant_id,
-	const LLSD& agents_to_invite)
-{
-	U8* bucket;
-	U8* pos;
-	S32 count;
-	S32 bucket_size;
-
-	// *FIX: this could suffer from endian issues
-	count = agents_to_invite.size();
-	bucket_size = UUID_BYTES * count;
-	bucket = new U8[bucket_size];
-	pos = bucket;
-
-	for(S32 i = 0; i < count; ++i)
-	{
-		LLUUID agent_id = agents_to_invite[i].asUUID();
-		
-		memcpy(pos, &agent_id, UUID_BYTES);
-		pos += UUID_BYTES;
-	}
-
-	session_starter_helper(
-		temp_session_id,
-		other_participant_id,
-		IM_SESSION_CONFERENCE_START);
-
-	gMessageSystem->addBinaryDataFast(
-		_PREHASH_BinaryBucket,
-		bucket,
-		bucket_size);
-
-	gAgent.sendReliableMessage();
- 
-	delete[] bucket;
-}
-
-class LLStartConferenceChatResponder : public LLHTTPClient::Responder
-{
-public:
-	LLStartConferenceChatResponder(
-		const LLUUID& temp_session_id,
-		const LLUUID& creator_id,
-		const LLUUID& other_participant_id,
-		const LLSD& agents_to_invite)
-	{
-		mTempSessionID = temp_session_id;
-		mCreatorID = creator_id;
-		mOtherParticipantID = other_participant_id;
-		mAgents = agents_to_invite;
-	}
-
-	virtual void error(U32 statusNum, const std::string& reason)
-	{
-		//try an "old school" way.
-		if ( statusNum == 400 )
-		{
-			start_deprecated_conference_chat(
-				mTempSessionID,
-				mCreatorID,
-				mOtherParticipantID,
-				mAgents);
-		}
-
-		//else throw an error back to the client?
-		//in theory we should have just have these error strings
-		//etc. set up in this file as opposed to the IMMgr,
-		//but the error string were unneeded here previously
-		//and it is not worth the effort switching over all
-		//the possible different language translations
-	}
-
-private:
-	LLUUID mTempSessionID;
-	LLUUID mCreatorID;
-	LLUUID mOtherParticipantID;
-
-	LLSD mAgents;
-};
-
-// Returns true if any messages were sent, false otherwise.
-// Is sort of equivalent to "does the server need to do anything?"
-bool send_start_session_messages(
-	const LLUUID& temp_session_id,
-	const LLUUID& other_participant_id,
-	const std::vector<LLUUID>& ids,
-	EInstantMessage dialog)
-{
-	if ( dialog == IM_SESSION_GROUP_START )
-	{
-		session_starter_helper(
-			temp_session_id,
-			other_participant_id,
-			dialog);
-
-		switch(dialog)
-		{
-		case IM_SESSION_GROUP_START:
-			gMessageSystem->addBinaryDataFast(
-				_PREHASH_BinaryBucket,
-				EMPTY_BINARY_BUCKET,
-				EMPTY_BINARY_BUCKET_SIZE);
-			break;
-		default:
-			break;
-		}
-		gAgent.sendReliableMessage();
 
-		return true;
-	}
-	else if ( dialog == IM_SESSION_CONFERENCE_START )
-	{
-		LLSD agents;
-		for (int i = 0; i < (S32) ids.size(); i++)
-		{
-			agents.append(ids[i]);
-		}
-
-		//we have a new way of starting conference calls now
-		LLViewerRegion* region = gAgent.getRegion();
-		if (region)
-		{
-			std::string url = region->getCapability(
-				"ChatSessionRequest");
-			LLSD data;
-			data["method"] = "start conference";
-			data["session-id"] = temp_session_id;
-
-			data["params"] = agents;
-
-			LLHTTPClient::post(
-				url,
-				data,
-				new LLStartConferenceChatResponder(
-					temp_session_id,
-					gAgent.getID(),
-					other_participant_id,
-					data["params"]));
-		}
-		else
-		{
-			start_deprecated_conference_chat(
-				temp_session_id,
-				gAgent.getID(),
-				other_participant_id,
-				agents);
-		}
-	}
-
-	return false;
-}
 
 class LLVoiceCallCapResponder : public LLHTTPClient::Responder
 {
@@ -1200,7 +1016,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(const std::string& session_label,
 
 	if ( !mSessionInitialized )
 	{
-		if ( !send_start_session_messages(
+		if ( !LLIMModel::instance().sendStartSession(
 				 mSessionUUID,
 				 mOtherParticipantUUID,
 				 mSessionInitialTargetIDs,
@@ -1542,19 +1358,21 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
 		prepend_newline = false;
 	}
 
+	std::string separator_string(": ");
+	
 	// 'name' is a sender name that we want to hotlink so that clicking on it opens a profile.
 	if (!name.empty()) // If name exists, then add it to the front of the message.
 	{
 		// Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text.
 		if (name == SYSTEM_FROM)
 		{
-			mHistoryEditor->appendColoredText(name,false,prepend_newline,color);
+			mHistoryEditor->appendColoredText(name + separator_string, false, prepend_newline, color);
 		}
 		else
 		{
 			// Convert the name to a hotlink and add to message.
 			const LLStyleSP &source_style = LLStyleMap::instance().lookupAgent(source);
-			mHistoryEditor->appendStyledText(name,false,prepend_newline,source_style);
+			mHistoryEditor->appendStyledText(name + separator_string, false, prepend_newline, source_style);
 		}
 		prepend_newline = false;
 	}
@@ -1565,9 +1383,9 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
 	{
 		std::string histstr;
 		if (gSavedPerAccountSettings.getBOOL("IMLogTimestamp"))
-			histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + name + utf8msg;
+			histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + name + separator_string + utf8msg;
 		else
-			histstr = name + utf8msg;
+			histstr = name + separator_string + utf8msg;
 
 		LLLogChat::saveHistory(getTitle(),histstr);
 	}
@@ -1620,7 +1438,6 @@ void LLFloaterIMPanel::selectNone()
 	mInputEditor->deselect();
 }
 
-
 BOOL LLFloaterIMPanel::handleKeyHere( KEY key, MASK mask )
 {
 	BOOL handled = FALSE;
@@ -1847,23 +1664,8 @@ void LLFloaterIMPanel::onClose(bool app_quitting)
 {
 	setTyping(FALSE);
 
-	if(mSessionUUID.notNull())
-	{
-		std::string name;
-		gAgent.buildFullname(name);
-		pack_instant_message(
-			gMessageSystem,
-			gAgent.getID(),
-			FALSE,
-			gAgent.getSessionID(),
-			mOtherParticipantUUID,
-			name, 
-			LLStringUtil::null,
-			IM_ONLINE,
-			IM_SESSION_LEAVE,
-			mSessionUUID);
-		gAgent.sendReliableMessage();
-	}
+	LLIMModel::instance().sendLeaveSession(mSessionUUID, mOtherParticipantUUID);
+
 	gIMMgr->removeSession(mSessionUUID);
 
 	// *HACK hide the voice floater
@@ -1884,79 +1686,6 @@ void LLFloaterIMPanel::onVisibilityChange(BOOL new_visibility)
 		mSessionUUID);
 }
 
-void deliver_message(const std::string& utf8_text,
-					 const LLUUID& im_session_id,
-					 const LLUUID& other_participant_id,
-					 EInstantMessage dialog)
-{
-	std::string name;
-	bool sent = false;
-	gAgent.buildFullname(name);
-
-	const LLRelationship* info = NULL;
-	info = LLAvatarTracker::instance().getBuddyInfo(other_participant_id);
-	
-	U8 offline = (!info || info->isOnline()) ? IM_ONLINE : IM_OFFLINE;
-	
-	if((offline == IM_OFFLINE) && (LLVoiceClient::getInstance()->isOnlineSIP(other_participant_id)))
-	{
-		// User is online through the OOW connector, but not with a regular viewer.  Try to send the message via SLVoice.
-		sent = gVoiceClient->sendTextMessage(other_participant_id, utf8_text);
-	}
-	
-	if(!sent)
-	{
-		// Send message normally.
-
-		// default to IM_SESSION_SEND unless it's nothing special - in
-		// which case it's probably an IM to everyone.
-		U8 new_dialog = dialog;
-
-		if ( dialog != IM_NOTHING_SPECIAL )
-		{
-			new_dialog = IM_SESSION_SEND;
-		}
-		pack_instant_message(
-			gMessageSystem,
-			gAgent.getID(),
-			FALSE,
-			gAgent.getSessionID(),
-			other_participant_id,
-			name.c_str(),
-			utf8_text.c_str(),
-			offline,
-			(EInstantMessage)new_dialog,
-			im_session_id);
-		gAgent.sendReliableMessage();
-	}
-
-	// If there is a mute list and this is not a group chat...
-	if ( LLMuteList::getInstance() )
-	{
-		// ... the target should not be in our mute list for some message types.
-		// Auto-remove them if present.
-		switch( dialog )
-		{
-		case IM_NOTHING_SPECIAL:
-		case IM_GROUP_INVITATION:
-		case IM_INVENTORY_OFFERED:
-		case IM_SESSION_INVITE:
-		case IM_SESSION_P2P_INVITE:
-		case IM_SESSION_CONFERENCE_START:
-		case IM_SESSION_SEND: // This one is marginal - erring on the side of hearing.
-		case IM_LURE_USER:
-		case IM_GODLIKE_LURE_USER:
-		case IM_FRIENDSHIP_OFFERED:
-			LLMuteList::getInstance()->autoRemove(other_participant_id, LLMuteList::AR_IM);
-			break;
-		default: ; // do nothing
-		}
-	}
-
-	// Add the recipient to the recent people list.
-	LLRecentPeople::instance().add(other_participant_id);
-}
-
 void LLFloaterIMPanel::sendMsg()
 {
 	if (!gAgent.isGodlike() 
@@ -1978,7 +1707,7 @@ void LLFloaterIMPanel::sendMsg()
 			
 			if ( mSessionInitialized )
 			{
-				deliver_message(utf8_text,
+				LLIMModel::sendMessage(utf8_text,
 								mSessionUUID,
 								mOtherParticipantUUID,
 								mDialog);
@@ -2084,7 +1813,7 @@ void LLFloaterIMPanel::sessionInitReplyReceived(const LLUUID& session_id)
 		  iter != mQueuedMsgsForInit.endArray();
 		  ++iter)
 	{
-		deliver_message(
+		LLIMModel::sendMessage(
 			iter->asString(),
 			mSessionUUID,
 			mOtherParticipantUUID,
@@ -2135,23 +1864,10 @@ void LLFloaterIMPanel::sendTypingState(BOOL typing)
 	// much network traffic.  Only send in person-to-person IMs.
 	if (mDialog != IM_NOTHING_SPECIAL) return;
 
-	std::string name;
-	gAgent.buildFullname(name);
-
-	pack_instant_message(
-		gMessageSystem,
-		gAgent.getID(),
-		FALSE,
-		gAgent.getSessionID(),
-		mOtherParticipantUUID,
-		name,
-		std::string("typing"),
-		IM_ONLINE,
-		(typing ? IM_TYPING_START : IM_TYPING_STOP),
-		mSessionUUID);
-	gAgent.sendReliableMessage();
+	LLIMModel::instance().sendTypingState(mSessionUUID, mOtherParticipantUUID, typing);
 }
 
+
 void LLFloaterIMPanel::processIMTyping(const LLIMInfo* im_info, BOOL typing)
 {
 	if (typing)
@@ -2320,3 +2036,80 @@ bool LLFloaterIMPanel::onConfirmForceCloseError(const LLSD& notification, const
 }
 
 
+std::map<LLUUID, LLIMFloater*> LLIMFloater::sIMFloaterMap;
+
+LLIMFloater::LLIMFloater(const LLUUID& session_id,
+					 const std::string title,
+					 EInstantMessage dialog)
+:	mSessionID(session_id),
+	mIndex(0)
+{
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_im_session.xml");
+	sIMFloaterMap[mSessionID] = this;
+
+	setTitle(title);
+}
+
+LLIMFloater::~LLIMFloater()
+{
+	sIMFloaterMap.erase(mSessionID);
+}
+
+
+void LLIMFloater::show(const LLUUID& session_id, S32 center_x)
+{
+
+	LLIMFloater* floater = get_if_there(sIMFloaterMap, session_id, (LLIMFloater*)NULL);
+	
+	if (floater == NULL)
+	{
+		floater = new LLIMFloater(session_id, LLIMModel::instance().getName(session_id), IM_NOTHING_SPECIAL);
+	}
+
+	//hide all
+	for (std::map<LLUUID, LLIMFloater*>::iterator iter = sIMFloaterMap.begin();
+		 iter != sIMFloaterMap.end(); ++iter)
+	{
+		LLIMFloater* floater = (*iter).second;
+		floater->setVisible(false);
+	}
+
+	floater->setVisibleAndFrontmost(true);
+
+	floater->updateMessages(session_id);
+
+	floater->translate(center_x - floater->getRect().getCenterX(), gFloaterView->getRect().mBottom - floater->getRect().mBottom);
+
+}
+
+void LLIMFloater::updateMessages(const LLUUID& session_id)
+{
+
+	LLTextEditor* text_editor = getChild<LLTextEditor>("im_text", true, false);
+
+	if (!text_editor) 
+	{
+		llwarns << "Text editor not found! " << llendl;
+		return;
+	}
+
+	std::list<LLSD> messages = LLIMModel::instance().getMessages(mSessionID, mIndex);
+
+	if (messages.size())
+	{
+		std::ostringstream message;
+		std::list<LLSD>::const_reverse_iterator iter = messages.rbegin();
+		std::list<LLSD>::const_reverse_iterator iter_end = messages.rend();
+	    for (; iter != iter_end; ++iter)
+		{
+			LLSD msg = *iter;
+			
+			message << msg["from"].asString() << " : " << msg["time"].asString() << "\n   " << msg["message"].asString() << "\n"; 
+			
+			mIndex = msg["index"].asInteger();
+		}
+
+		text_editor->setText(message.str());
+	}
+
+}
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index 7cd19d4872..88f21864b5 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -356,10 +356,28 @@ private:
 	LLFrameTimer mLastKeystrokeTimer;
 
 	void disableWhileSessionStarting();
+};
+
+
+class LLIMFloater : public LLFloater
+{
+public:
+	LLIMFloater(const LLUUID& session_id,
+			  const std::string title,
+			  EInstantMessage dialog);
 
-	typedef std::map<LLUUID, LLStyleSP> styleMap;
-	static styleMap mStyleMap;
+	virtual ~LLIMFloater();
+
+	static void show(const LLUUID& session_id, S32 center_x);
+	void updateMessages(const LLUUID& session_id);
+
+	static std::map<LLUUID, LLIMFloater*> sIMFloaterMap;
+
+	LLUUID mSessionID;
+	U32 mIndex;
 };
 
 
+
+
 #endif  // LL_IMPANEL_H
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index bc98b609ec..a31d7daff7 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -91,16 +91,494 @@ std::map<std::string,std::string> LLFloaterIM::sEventStringsMap;
 std::map<std::string,std::string> LLFloaterIM::sErrorStringsMap;
 std::map<std::string,std::string> LLFloaterIM::sForceCloseSessionMap;
 
+std::map<LLUUID, LLIMModel::LLIMSession*> LLIMModel::sSessionsMap;
+
+
+
+void toast_callback(const LLSD& msg){
+	
+	//we send notifications to reset counter also
+	if (msg["num_unread"].asInteger())
+	{
+		LLSD args;
+		args["MESSAGE"] = msg["message"];
+		args["TIME"] = msg["time"];
+		args["FROM"] = msg["from"];
+
+		LLNotifications::instance().add("IMToast", args, LLSD(), boost::bind(&LLFloaterChatterBox::onOpen, LLFloaterChatterBox::getInstance(), msg["session_id"].asUUID()));
+	}
+}
+
+LLIMModel::LLIMModel() 
+{
+	addChangedCallback(toast_callback);
+}
+
+
+void LLIMModel::testMessages()
+{
+	static LLUUID bot1_id, bot1_session_id;
+	if (bot1_id.isNull()) bot1_id.generate();
+	std::string from = "Bot1 TestLinden";
+	bot1_session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, bot1_id);
+	newSession(bot1_session_id, from, IM_NOTHING_SPECIAL, bot1_id);
+	addMessage(bot1_session_id, from, "Test Message: Hi from testerbot land!");
+
+	LLUUID bot2_id;
+	std::string firstname[] = {"Roflcopter", "Joe"};
+	std::string lastname[] = {"Linden", "Tester", "Resident", "Schmoe"};
+
+	S32 rand1 = ll_rand(sizeof firstname)/(sizeof firstname[0]);
+	S32 rand2 = ll_rand(sizeof lastname)/(sizeof lastname[0]);
+	
+	from = firstname[rand1] + " " + lastname[rand2];
+	bot2_id.generate(from);
+	LLUUID bot2_session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, bot2_id);
+	newSession(bot2_session_id, from, IM_NOTHING_SPECIAL, bot2_id);
+	addMessage(bot2_session_id, from, "Test Message: Can I haz bear? ");
+	addMessage(bot2_session_id, from, "Test Message: OMGWTFBBQ.");
+}
+
+
+bool LLIMModel::newSession(LLUUID session_id, std::string name, EInstantMessage type, LLUUID other_participant_id)
+{
+	if (is_in_map(sSessionsMap, session_id))
+	{
+		llwarns << "IM Session " << session_id << " already exists" << llendl;
+		return false;
+	}
+
+	LLIMSession* session = new LLIMSession(name, type, other_participant_id);
+	sSessionsMap[session_id] = session;
+
+	LLIMMgr::getInstance()->notifyObserverSessionAdded(session_id, name, other_participant_id);
+
+	return true;
+
+}
+
+std::list<LLSD> LLIMModel::getMessages(LLUUID session_id, int index)
+{
+	std::list<LLSD> return_list;
+
+	LLIMSession* session = get_if_there(sSessionsMap, session_id, (LLIMSession*)NULL);
+
+	if (!session) 
+	{
+		llwarns << "session " << session_id << "does not exist " << llendl;
+		return return_list;
+	}
+
+	int i = session->mMsgs.size() - index;
+
+	for (std::list<LLSD>::iterator iter = session->mMsgs.begin(); 
+		iter != session->mMsgs.end() && i > 0;
+		iter++)
+	{
+		LLSD msg;
+		msg = *iter;
+		return_list.push_back(*iter);
+		i--;
+	}
+
+	session->mNumUnread = 0;
+	
+	LLSD arg;
+	arg["session_id"] = session_id;
+	arg["num_unread"] = 0;
+	mChangedSignal(arg);
+
+    // TODO: in the future is there a more efficient way to return these
+	return return_list;
+
+}
+
+bool LLIMModel::addToHistory(LLUUID session_id, std::string from, std::string utf8_text) { 
+	
+	LLIMSession* session = get_if_there(sSessionsMap, session_id, (LLIMSession*)NULL);
+
+	if (!session) 
+	{
+		llwarns << "session " << session_id << "does not exist " << llendl;
+		return false;
+	}
+
+	LLSD message;
+	message["from"] = from;
+	message["message"] = utf8_text;
+	message["time"] = LLLogChat::timestamp(false);  //might want to add date separately
+	message["index"] = (LLSD::Integer)session->mMsgs.size(); 
+
+	session->mMsgs.push_front(message); 
+
+	return true;
+
+}
+
+		
+bool LLIMModel::addMessage(LLUUID session_id, std::string from, std::string utf8_text) { 
+
+	LLIMSession* session = get_if_there(sSessionsMap, session_id, (LLIMSession*)NULL);
+
+	if (!session) 
+	{
+		llwarns << "session " << session_id << "does not exist " << llendl;
+		return false;
+	}
+
+	addToHistory(session_id, from, utf8_text);
+
+	std::string agent_name;
+	gAgent.buildFullname(agent_name);
+	
+	session->mNumUnread++;
+
+	// notify listeners
+	LLSD arg;
+	arg["session_id"] = session_id;
+	arg["num_unread"] = session->mNumUnread;
+	arg["message"] = utf8_text;
+	mChangedSignal(arg);
+
+	return true;
+}
+
+
+const std::string& LLIMModel::getName(LLUUID session_id)
+{
+	LLIMSession* session = get_if_there(sSessionsMap, session_id, (LLIMSession*)NULL);
+
+	if (!session) 
+	{
+		llwarns << "session " << session_id << "does not exist " << llendl;
+		return LLStringUtil::null;
+	}
+
+	return session->mName;
+}
+
+
+// TODO get rid of other participant ID
+void LLIMModel::sendTypingState(LLUUID session_id, LLUUID other_participant_id, BOOL typing) 
+{
+	std::string name;
+	gAgent.buildFullname(name);
+
+	pack_instant_message(
+		gMessageSystem,
+		gAgent.getID(),
+		FALSE,
+		gAgent.getSessionID(),
+		other_participant_id,
+		name,
+		std::string("typing"),
+		IM_ONLINE,
+		(typing ? IM_TYPING_START : IM_TYPING_STOP),
+		session_id);
+	gAgent.sendReliableMessage();
+}
+
+void LLIMModel::sendLeaveSession(LLUUID session_id, LLUUID other_participant_id) 
+{
+	if(session_id.notNull())
+	{
+		std::string name;
+		gAgent.buildFullname(name);
+		pack_instant_message(
+			gMessageSystem,
+			gAgent.getID(),
+			FALSE,
+			gAgent.getSessionID(),
+			other_participant_id,
+			name, 
+			LLStringUtil::null,
+			IM_ONLINE,
+			IM_SESSION_LEAVE,
+			session_id);
+		gAgent.sendReliableMessage();
+	}
+}
+
+
+
+void LLIMModel::sendMessage(const std::string& utf8_text,
+					 const LLUUID& im_session_id,
+					 const LLUUID& other_participant_id,
+					 EInstantMessage dialog)
+{
+	std::string name;
+	bool sent = false;
+	gAgent.buildFullname(name);
+
+	const LLRelationship* info = NULL;
+	info = LLAvatarTracker::instance().getBuddyInfo(other_participant_id);
+	
+	U8 offline = (!info || info->isOnline()) ? IM_ONLINE : IM_OFFLINE;
+	
+	if((offline == IM_OFFLINE) && (LLVoiceClient::getInstance()->isOnlineSIP(other_participant_id)))
+	{
+		// User is online through the OOW connector, but not with a regular viewer.  Try to send the message via SLVoice.
+		sent = gVoiceClient->sendTextMessage(other_participant_id, utf8_text);
+	}
+	
+	if(!sent)
+	{
+		// Send message normally.
+
+		// default to IM_SESSION_SEND unless it's nothing special - in
+		// which case it's probably an IM to everyone.
+		U8 new_dialog = dialog;
+
+		if ( dialog != IM_NOTHING_SPECIAL )
+		{
+			new_dialog = IM_SESSION_SEND;
+		}
+		pack_instant_message(
+			gMessageSystem,
+			gAgent.getID(),
+			FALSE,
+			gAgent.getSessionID(),
+			other_participant_id,
+			name.c_str(),
+			utf8_text.c_str(),
+			offline,
+			(EInstantMessage)new_dialog,
+			im_session_id);
+		gAgent.sendReliableMessage();
+	}
+
+	// If there is a mute list and this is not a group chat...
+	if ( LLMuteList::getInstance() )
+	{
+		// ... the target should not be in our mute list for some message types.
+		// Auto-remove them if present.
+		switch( dialog )
+		{
+		case IM_NOTHING_SPECIAL:
+		case IM_GROUP_INVITATION:
+		case IM_INVENTORY_OFFERED:
+		case IM_SESSION_INVITE:
+		case IM_SESSION_P2P_INVITE:
+		case IM_SESSION_CONFERENCE_START:
+		case IM_SESSION_SEND: // This one is marginal - erring on the side of hearing.
+		case IM_LURE_USER:
+		case IM_GODLIKE_LURE_USER:
+		case IM_FRIENDSHIP_OFFERED:
+			LLMuteList::getInstance()->autoRemove(other_participant_id, LLMuteList::AR_IM);
+			break;
+		default: ; // do nothing
+		}
+	}
+
+	if((dialog == IM_NOTHING_SPECIAL) && 
+	   (other_participant_id.notNull()))
+	{
+		// Do we have to replace the /me's here?
+		std::string from;
+		gAgent.buildFullname(from);
+		LLIMModel::instance().addToHistory(im_session_id, from, utf8_text);
+	}
+
+	// Add the recipient to the recent people list.
+	LLRecentPeople::instance().add(other_participant_id);
+}
+										  
+boost::signals2::connection LLIMModel::addChangedCallback( boost::function<void (const LLSD& data)> cb )
+{
+	return mChangedSignal.connect(cb);
+}
+
+void session_starter_helper(
+	const LLUUID& temp_session_id,
+	const LLUUID& other_participant_id,
+	EInstantMessage im_type)
+{
+	LLMessageSystem *msg = gMessageSystem;
+
+	msg->newMessageFast(_PREHASH_ImprovedInstantMessage);
+	msg->nextBlockFast(_PREHASH_AgentData);
+	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+
+	msg->nextBlockFast(_PREHASH_MessageBlock);
+	msg->addBOOLFast(_PREHASH_FromGroup, FALSE);
+	msg->addUUIDFast(_PREHASH_ToAgentID, other_participant_id);
+	msg->addU8Fast(_PREHASH_Offline, IM_ONLINE);
+	msg->addU8Fast(_PREHASH_Dialog, im_type);
+	msg->addUUIDFast(_PREHASH_ID, temp_session_id);
+	msg->addU32Fast(_PREHASH_Timestamp, NO_TIMESTAMP); // no timestamp necessary
+
+	std::string name;
+	gAgent.buildFullname(name);
+
+	msg->addStringFast(_PREHASH_FromAgentName, name);
+	msg->addStringFast(_PREHASH_Message, LLStringUtil::null);
+	msg->addU32Fast(_PREHASH_ParentEstateID, 0);
+	msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null);
+	msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent());
+}
+
+void start_deprecated_conference_chat(
+	const LLUUID& temp_session_id,
+	const LLUUID& creator_id,
+	const LLUUID& other_participant_id,
+	const LLSD& agents_to_invite)
+{
+	U8* bucket;
+	U8* pos;
+	S32 count;
+	S32 bucket_size;
+
+	// *FIX: this could suffer from endian issues
+	count = agents_to_invite.size();
+	bucket_size = UUID_BYTES * count;
+	bucket = new U8[bucket_size];
+	pos = bucket;
+
+	for(S32 i = 0; i < count; ++i)
+	{
+		LLUUID agent_id = agents_to_invite[i].asUUID();
+		
+		memcpy(pos, &agent_id, UUID_BYTES);
+		pos += UUID_BYTES;
+	}
+
+	session_starter_helper(
+		temp_session_id,
+		other_participant_id,
+		IM_SESSION_CONFERENCE_START);
+
+	gMessageSystem->addBinaryDataFast(
+		_PREHASH_BinaryBucket,
+		bucket,
+		bucket_size);
+
+	gAgent.sendReliableMessage();
+ 
+	delete[] bucket;
+}
+
+class LLStartConferenceChatResponder : public LLHTTPClient::Responder
+{
+public:
+	LLStartConferenceChatResponder(
+		const LLUUID& temp_session_id,
+		const LLUUID& creator_id,
+		const LLUUID& other_participant_id,
+		const LLSD& agents_to_invite)
+	{
+		mTempSessionID = temp_session_id;
+		mCreatorID = creator_id;
+		mOtherParticipantID = other_participant_id;
+		mAgents = agents_to_invite;
+	}
+
+	virtual void error(U32 statusNum, const std::string& reason)
+	{
+		//try an "old school" way.
+		if ( statusNum == 400 )
+		{
+			start_deprecated_conference_chat(
+				mTempSessionID,
+				mCreatorID,
+				mOtherParticipantID,
+				mAgents);
+		}
+
+		//else throw an error back to the client?
+		//in theory we should have just have these error strings
+		//etc. set up in this file as opposed to the IMMgr,
+		//but the error string were unneeded here previously
+		//and it is not worth the effort switching over all
+		//the possible different language translations
+	}
+
+private:
+	LLUUID mTempSessionID;
+	LLUUID mCreatorID;
+	LLUUID mOtherParticipantID;
+
+	LLSD mAgents;
+};
+
+// Returns true if any messages were sent, false otherwise.
+// Is sort of equivalent to "does the server need to do anything?"
+bool LLIMModel::sendStartSession(
+	const LLUUID& temp_session_id,
+	const LLUUID& other_participant_id,
+	const std::vector<LLUUID>& ids,
+	EInstantMessage dialog)
+{
+	if ( dialog == IM_SESSION_GROUP_START )
+	{
+		session_starter_helper(
+			temp_session_id,
+			other_participant_id,
+			dialog);
+
+		switch(dialog)
+		{
+		case IM_SESSION_GROUP_START:
+			gMessageSystem->addBinaryDataFast(
+				_PREHASH_BinaryBucket,
+				EMPTY_BINARY_BUCKET,
+				EMPTY_BINARY_BUCKET_SIZE);
+			break;
+		default:
+			break;
+		}
+		gAgent.sendReliableMessage();
+
+		return true;
+	}
+	else if ( dialog == IM_SESSION_CONFERENCE_START )
+	{
+		LLSD agents;
+		for (int i = 0; i < (S32) ids.size(); i++)
+		{
+			agents.append(ids[i]);
+		}
+
+		//we have a new way of starting conference calls now
+		LLViewerRegion* region = gAgent.getRegion();
+		if (region)
+		{
+			std::string url = region->getCapability(
+				"ChatSessionRequest");
+			LLSD data;
+			data["method"] = "start conference";
+			data["session-id"] = temp_session_id;
+
+			data["params"] = agents;
+
+			LLHTTPClient::post(
+				url,
+				data,
+				new LLStartConferenceChatResponder(
+					temp_session_id,
+					gAgent.getID(),
+					other_participant_id,
+					data["params"]));
+		}
+		else
+		{
+			start_deprecated_conference_chat(
+				temp_session_id,
+				gAgent.getID(),
+				other_participant_id,
+				agents);
+		}
+	}
+
+	return false;
+}
+
+
+
 //
 // Helper Functions
 //
 
-// returns true if a should appear before b
-//static BOOL group_dictionary_sort( LLGroupData* a, LLGroupData* b )
-//{
-//	return (LLStringUtil::compareDict( a->mName, b->mName ) < 0);
-//}
-
 class LLViewerChatterBoxInvitationAcceptResponder :
 	public LLHTTPClient::Responder
 {
@@ -613,26 +1091,6 @@ bool inviteUserResponse(const LLSD& notification, const LLSD& response)
 	return false;
 }
 
-//
-// Public Static Member Functions
-//
-
-// This is a helper function to determine what kind of im session
-// should be used for the given agent.
-// static
-EInstantMessage LLIMMgr::defaultIMTypeForAgent(const LLUUID& agent_id)
-{
-	EInstantMessage type = IM_NOTHING_SPECIAL;
-	if(is_agent_friend(agent_id))
-	{
-		if(LLAvatarTracker::instance().isBuddyOnline(agent_id))
-		{
-			type = IM_SESSION_CONFERENCE_START;
-		}
-	}
-	return type;
-}
-
 //
 // Member Functions
 //
@@ -725,7 +1183,9 @@ void LLIMMgr::addMessage(
 			dialog,
 			FALSE);
 
-		notifyObserverSessionAdded(floater->getSessionID(), name, other_participant_id);
+		
+		LLIMModel::instance().newSession(new_session_id, name, dialog, other_participant_id);
+
 
 		// When we get a new IM, and if you are a god, display a bit
 		// of information about the source. This is to help liaisons
@@ -746,6 +1206,7 @@ void LLIMMgr::addMessage(
 			//<< "*** position: " << position << std::endl;
 
 			floater->addHistoryLine(bonus_info.str(), LLUIColorTable::instance().getColor("SystemChatColor"));
+			LLIMModel::instance().addMessage(new_session_id, from, bonus_info.str());
 		}
 
 		make_ui_sound("UISndNewIncomingIMSession");
@@ -765,6 +1226,8 @@ void LLIMMgr::addMessage(
 		floater->addHistoryLine(msg, color, true, other_participant_id, from); // Insert linked name to front of message
 	}
 
+	LLIMModel::instance().addMessage(new_session_id, from, msg);
+
 	if( !LLFloaterReg::instanceVisible("communicate") && !floater->getVisible())
 	{
 		LLFloaterChatterBox* chat_floater = LLFloaterChatterBox::getInstance();
@@ -1652,7 +2115,7 @@ public:
 			{
 				saved = llformat("(Saved %s) ", formatted_time(timestamp).c_str());
 			}
-			std::string buffer = separator_string + saved + message.substr(message_offset);
+			std::string buffer = saved + message.substr(message_offset);
 
 			BOOL is_this_agent = FALSE;
 			if(from_id == gAgentID)
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 37dcd1593f..6a354dfe92 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -38,6 +38,7 @@
 #include "llinstantmessage.h"
 #include "lluuid.h"
 #include "llmultifloater.h"
+#include "llrecentpeople.h"
 
 class LLFloaterChatterBox;
 class LLUUID;
@@ -45,6 +46,47 @@ class LLFloaterIMPanel;
 class LLFriendObserver;
 class LLFloaterIM;
 
+class LLIMModel :  public LLSingleton<LLIMModel>
+{
+public:
+
+	struct LLIMSession
+	{
+		LLIMSession(std::string name, EInstantMessage type, LLUUID other_participant_id) 
+			:mName(name), mType(type), mNumUnread(0), mOtherPraticipantID(other_participant_id) {}
+		
+		std::string mName;
+		EInstantMessage mType;
+		LLUUID mOtherPraticipantID;
+		S32 mNumUnread;
+		std::list<LLSD> mMsgs;
+	};
+	
+
+	LLIMModel();
+
+	static std::map<LLUUID, LLIMSession*> sSessionsMap;  //mapping session_id to session
+	boost::signals2::signal<void(const LLSD&)> mChangedSignal;
+	boost::signals2::connection addChangedCallback( boost::function<void (const LLSD& data)> cb );
+
+	bool newSession(LLUUID session_id, std::string name, EInstantMessage type, LLUUID other_participant_id);
+	std::list<LLSD> getMessages(LLUUID session_id, int index = 0);
+	bool addMessage(LLUUID session_id, std::string from, std::string utf8_text);
+	bool addToHistory(LLUUID session_id, std::string from, std::string utf8_text); 
+    //used to get the name of the session, for use as the title
+    //currently just the other avatar name
+	const std::string& getName(LLUUID session_id);
+	
+	static void sendLeaveSession(LLUUID session_id, LLUUID other_participant_id);
+	static bool sendStartSession(const LLUUID& temp_session_id, const LLUUID& other_participant_id,
+						  const std::vector<LLUUID>& ids, EInstantMessage dialog);
+	static void sendTypingState(LLUUID session_id, LLUUID other_participant_id, BOOL typing);
+	static void sendMessage(const std::string& utf8_text, const LLUUID& im_session_id,
+								const LLUUID& other_participant_id, EInstantMessage dialog);
+
+	void testMessages();
+};
+
 class LLIMSessionObserver
 {
 public:
@@ -53,8 +95,11 @@ public:
 	virtual void sessionRemoved(const LLUUID& session_id) = 0;
 };
 
+
 class LLIMMgr : public LLSingleton<LLIMMgr>
 {
+	friend class LLIMModel;
+
 public:
 	enum EInvitationType
 	{
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index af653238d3..9d1b24ae11 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -34,7 +34,7 @@
 
 #include <utility> // for std::pair<>
 
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llinventorybridge.h"
 
 #include "message.h"
@@ -184,6 +184,13 @@ PermissionMask LLInvFVBridge::getPermissionMask() const
 	return PERM_ALL;
 }
 
+// virtual
+LLAssetType::EType LLInvFVBridge::getPreferredType() const
+{
+	return LLAssetType::AT_NONE;
+}
+
+
 // Folders don't have creation dates.
 time_t LLInvFVBridge::getCreationDate() const
 {
@@ -195,7 +202,7 @@ BOOL LLInvFVBridge::isItemRemovable()
 {
 	LLInventoryModel* model = getInventoryModel();
 	if(!model) return FALSE;
-	if(model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID()))
+	if(model->isObjectDescendentOf(mUUID, gInventory.getRootFolderID()))
 	{
 		return TRUE;
 	}
@@ -660,8 +667,8 @@ BOOL LLInvFVBridge::isAgentInventory() const
 {
 	LLInventoryModel* model = getInventoryModel();
 	if(!model) return FALSE;
-	if(gAgent.getInventoryRootID() == mUUID) return TRUE;
-	return model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID());
+	if(gInventory.getRootFolderID() == mUUID) return TRUE;
+	return model->isObjectDescendentOf(mUUID, gInventory.getRootFolderID());
 }
 
 BOOL LLInvFVBridge::isItemPermissive() const
@@ -1020,7 +1027,7 @@ PermissionMask LLItemBridge::getPermissionMask() const
 	}
 	return perm_mask;
 }
-	
+
 const std::string& LLItemBridge::getDisplayName() const
 {
 	if(mDisplayName.empty())
@@ -1062,10 +1069,11 @@ LLFontGL::StyleFlags LLItemBridge::getLabelStyle() const
 
 std::string LLItemBridge::getLabelSuffix() const
 {
-	// assume that this won't be called before string table is loaded
-	static const char* NO_COPY =LLTrans::getString("NO_COPY").c_str();
-	static const char* NO_MOD = LLTrans::getString("NO_MOD").c_str();
-	static const char* NO_XFER = LLTrans::getString("NO_XFER").c_str();
+	// String table is loaded before login screen and inventory items are
+	// loaded after login, so LLTrans should be ready.
+	static std::string NO_COPY =LLTrans::getString("no_copy");
+	static std::string NO_MOD = LLTrans::getString("no_modify");
+	static std::string NO_XFER = LLTrans::getString("no_transfer");
 
 	std::string suffix;
 	LLInventoryItem* item = getItem();
@@ -1075,26 +1083,26 @@ std::string LLItemBridge::getLabelSuffix() const
 		if(LLAssetType::AT_CALLINGCARD != item->getType()
 		   && item->getPermissions().getOwner() == gAgent.getID())
 		{
-			BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID());
-			BOOL mod = item->getPermissions().allowModifyBy(gAgent.getID());
-			BOOL xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER,
-																gAgent.getID());
 			BOOL link = (item->getActualType() == LLAssetType::AT_LINK);
-
-			const char* EMPTY = "";
 			const char* LINK = " (link)"; // *TODO: Seraph translate
 			if (link) return LINK;
 
-			const char* scopy;
-			if(copy) scopy = EMPTY;
-			else scopy = NO_COPY;
-			const char* smod;
-			if(mod) smod = EMPTY;
-			else smod = NO_MOD;
-			const char* sxfer;
-			if(xfer) sxfer = EMPTY;
-			else sxfer = NO_XFER;
-			suffix = llformat("%s%s%s",scopy,smod,sxfer);
+			BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID());
+			if (!copy)
+			{
+				suffix += NO_COPY;
+			}
+			BOOL mod = item->getPermissions().allowModifyBy(gAgent.getID());
+			if (!mod)
+			{
+				suffix += NO_MOD;
+			}
+			BOOL xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER,
+																gAgent.getID());
+			if (!xfer)
+			{
+				suffix += NO_XFER;
+			}
 		}
 	}
 	return suffix;
@@ -1269,7 +1277,7 @@ BOOL LLFolderBridge::isItemRemovable()
 		return FALSE;
 	}
 
-	if(!model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID()))
+	if(!model->isObjectDescendentOf(mUUID, gInventory.getRootFolderID()))
 	{
 		return FALSE;
 	}
@@ -2525,9 +2533,9 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 			// everything in the active window so that we don't follow
 			// the selection to its new location (which is very
 			// annoying).
-			if (LLInventoryView::getActiveInventory())
+			if (LLFloaterInventory::getActiveInventory())
 			{
-				LLInventoryPanel* active_panel = LLInventoryView::getActiveInventory()->getPanel();
+				LLInventoryPanel* active_panel = LLFloaterInventory::getActiveInventory()->getPanel();
 				LLInventoryPanel* panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get());
 				if (active_panel && (panel != active_panel))
 				{
@@ -3348,7 +3356,7 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
 		LLUUID object_id = mUUID;
 		LLViewerInventoryItem* item;
 		item = (LLViewerInventoryItem*)gInventory.getItem(object_id);
-		if(item && gInventory.isObjectDescendentOf(object_id, gAgent.getInventoryRootID()))
+		if(item && gInventory.isObjectDescendentOf(object_id, gInventory.getRootFolderID()))
 		{
 			rez_attachment(item, NULL);
 		}
@@ -3815,7 +3823,7 @@ void LLOutfitObserver::done()
 		}
 		if(pid.isNull())
 		{
-			pid = gAgent.getInventoryRootID();
+			pid = gInventory.getRootFolderID();
 		}
 		
 		LLUUID cat_id = gInventory.createNewCategory(
@@ -3922,7 +3930,7 @@ void wear_outfit_by_name(const std::string& name)
 	LLInventoryModel::cat_array_t cat_array;
 	LLInventoryModel::item_array_t item_array;
 	LLNameCategoryCollector has_name(name);
-	gInventory.collectDescendentsIf(gAgent.getInventoryRootID(),
+	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
 									cat_array,
 									item_array,
 									LLInventoryModel::EXCLUDE_TRASH,
@@ -4960,8 +4968,8 @@ BOOL LLWearableBridgeAction::isInTrash() const
 BOOL LLWearableBridgeAction::isAgentInventory() const
 {
 	if(!mModel) return FALSE;
-	if(gAgent.getInventoryRootID() == mUUID) return TRUE;
-	return mModel->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID());
+	if(gInventory.getRootFolderID() == mUUID) return TRUE;
+	return mModel->isObjectDescendentOf(mUUID, gInventory.getRootFolderID());
 }
 
 void LLWearableBridgeAction::wearOnAvatar()
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 016eb701d6..a37b7969ed 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -38,7 +38,8 @@
 #include "llviewercontrol.h"
 #include "llcallingcard.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
+#include "llfoldervieweventlistener.h"
 
 enum EInventoryIcon
 {
@@ -147,6 +148,7 @@ public:
 	virtual const std::string& getName() const;
 	virtual const std::string& getDisplayName() const;
 	virtual PermissionMask getPermissionMask() const;
+	virtual LLAssetType::EType getPreferredType() const;
 	virtual time_t getCreationDate() const;
 	virtual LLFontGL::StyleFlags getLabelStyle() const
 	{
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
new file mode 100644
index 0000000000..9cbe11f5c9
--- /dev/null
+++ b/indra/newview/llinventoryfilter.cpp
@@ -0,0 +1,631 @@
+/** 
+* @file llinventoryfilter.cpp
+* @brief Support for filtering your inventory to only display a subset of the
+* available items.
+*
+* $LicenseInfo:firstyear=2005&license=viewergpl$
+* 
+* Copyright (c) 2005-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+#include "llviewerprecompiledheaders.h"
+
+#include "llinventoryfilter.h"
+
+// viewer includes
+#include "llfoldervieweventlistener.h"
+#include "llfolderviewitem.h"
+#include "llinventorymodel.h"	// gInventory.backgroundFetchActive()
+#include "llviewercontrol.h"
+
+// linden library includes
+#include "lltrans.h"
+
+///----------------------------------------------------------------------------
+/// Class LLInventoryFilter
+///----------------------------------------------------------------------------
+LLInventoryFilter::LLInventoryFilter(const std::string& name)
+:	mName(name),
+	mModified(FALSE),
+	mNeedTextRebuild(TRUE)
+{
+	mFilterOps.mFilterTypes = 0xffffffff;
+	mFilterOps.mMinDate = time_min();
+	mFilterOps.mMaxDate = time_max();
+	mFilterOps.mHoursAgo = 0;
+	mFilterOps.mShowFolderState = SHOW_NON_EMPTY_FOLDERS;
+	mFilterOps.mPermissions = PERM_NONE;
+
+	mOrder = SO_FOLDERS_BY_NAME; // This gets overridden by a pref immediately
+
+	mSubStringMatchOffset = 0;
+	mFilterSubString.clear();
+	mFilterGeneration = 0;
+	mMustPassGeneration = S32_MAX;
+	mMinRequiredGeneration = 0;
+	mFilterCount = 0;
+	mNextFilterGeneration = mFilterGeneration + 1;
+
+	mLastLogoff = gSavedPerAccountSettings.getU32("LastLogoff");
+	mFilterBehavior = FILTER_NONE;
+
+	// copy mFilterOps into mDefaultFilterOps
+	markDefault();
+}
+
+LLInventoryFilter::~LLInventoryFilter()
+{
+}
+
+BOOL LLInventoryFilter::check(LLFolderViewItem* item) 
+{
+	time_t earliest;
+
+	earliest = time_corrected() - mFilterOps.mHoursAgo * 3600;
+	if (mFilterOps.mMinDate > time_min() && mFilterOps.mMinDate < earliest)
+	{
+		earliest = mFilterOps.mMinDate;
+	}
+	else if (!mFilterOps.mHoursAgo)
+	{
+		earliest = 0;
+	}
+	LLFolderViewEventListener* listener = item->getListener();
+	mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
+	BOOL passed = (0x1 << listener->getInventoryType() & mFilterOps.mFilterTypes || listener->getInventoryType() == LLInventoryType::IT_NONE)
+		&& (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos)
+		&& ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
+		&& (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
+	return passed;
+}
+
+const std::string LLInventoryFilter::getFilterSubString(BOOL trim)
+{
+	return mFilterSubString;
+}
+
+std::string::size_type LLInventoryFilter::getStringMatchOffset() const
+{
+	return mSubStringMatchOffset;
+}
+
+// has user modified default filter params?
+BOOL LLInventoryFilter::isNotDefault()
+{
+	return mFilterOps.mFilterTypes != mDefaultFilterOps.mFilterTypes 
+		|| mFilterSubString.size() 
+		|| mFilterOps.mPermissions != mDefaultFilterOps.mPermissions
+		|| mFilterOps.mMinDate != mDefaultFilterOps.mMinDate 
+		|| mFilterOps.mMaxDate != mDefaultFilterOps.mMaxDate
+		|| mFilterOps.mHoursAgo != mDefaultFilterOps.mHoursAgo;
+}
+
+BOOL LLInventoryFilter::isActive()
+{
+	return mFilterOps.mFilterTypes != 0xffffffff 
+		|| mFilterSubString.size() 
+		|| mFilterOps.mPermissions != PERM_NONE 
+		|| mFilterOps.mMinDate != time_min()
+		|| mFilterOps.mMaxDate != time_max()
+		|| mFilterOps.mHoursAgo != 0;
+}
+
+BOOL LLInventoryFilter::isModified()
+{
+	return mModified;
+}
+
+BOOL LLInventoryFilter::isModifiedAndClear()
+{
+	BOOL ret = mModified;
+	mModified = FALSE;
+	return ret;
+}
+
+void LLInventoryFilter::setFilterTypes(U32 types)
+{
+	if (mFilterOps.mFilterTypes != types)
+	{
+		// keep current items only if no type bits getting turned off
+		BOOL fewer_bits_set = (mFilterOps.mFilterTypes & ~types);
+		BOOL more_bits_set = (~mFilterOps.mFilterTypes & types);
+
+		mFilterOps.mFilterTypes = types;
+		if (more_bits_set && fewer_bits_set)
+		{
+			// neither less or more restrive, both simultaneously
+			// so we need to filter from scratch
+			setModified(FILTER_RESTART);
+		}
+		else if (more_bits_set)
+		{
+			// target is only one of all requested types so more type bits == less restrictive
+			setModified(FILTER_LESS_RESTRICTIVE);
+		}
+		else if (fewer_bits_set)
+		{
+			setModified(FILTER_MORE_RESTRICTIVE);
+		}
+
+	}
+}
+
+void LLInventoryFilter::setFilterSubString(const std::string& string)
+{
+	if (mFilterSubString != string)
+	{
+		// hitting BACKSPACE, for example
+		BOOL less_restrictive = mFilterSubString.size() >= string.size() && !mFilterSubString.substr(0, string.size()).compare(string);
+		// appending new characters
+		BOOL more_restrictive = mFilterSubString.size() < string.size() && !string.substr(0, mFilterSubString.size()).compare(mFilterSubString);
+		mFilterSubString = string;
+		LLStringUtil::toUpper(mFilterSubString);
+		LLStringUtil::trimHead(mFilterSubString);
+
+		if (less_restrictive)
+		{
+			setModified(FILTER_LESS_RESTRICTIVE);
+		}
+		else if (more_restrictive)
+		{
+			setModified(FILTER_MORE_RESTRICTIVE);
+		}
+		else
+		{
+			setModified(FILTER_RESTART);
+		}
+	}
+}
+
+void LLInventoryFilter::setFilterPermissions(PermissionMask perms)
+{
+	if (mFilterOps.mPermissions != perms)
+	{
+		// keep current items only if no perm bits getting turned off
+		BOOL fewer_bits_set = (mFilterOps.mPermissions & ~perms);
+		BOOL more_bits_set = (~mFilterOps.mPermissions & perms);
+		mFilterOps.mPermissions = perms;
+
+		if (more_bits_set && fewer_bits_set)
+		{
+			setModified(FILTER_RESTART);
+		}
+		else if (more_bits_set)
+		{
+			// target must have all requested permission bits, so more bits == more restrictive
+			setModified(FILTER_MORE_RESTRICTIVE);
+		}
+		else if (fewer_bits_set)
+		{
+			setModified(FILTER_LESS_RESTRICTIVE);
+		}
+	}
+}
+
+void LLInventoryFilter::setDateRange(time_t min_date, time_t max_date)
+{
+	mFilterOps.mHoursAgo = 0;
+	if (mFilterOps.mMinDate != min_date)
+	{
+		mFilterOps.mMinDate = min_date;
+		setModified();
+	}
+	if (mFilterOps.mMaxDate != llmax(mFilterOps.mMinDate, max_date))
+	{
+		mFilterOps.mMaxDate = llmax(mFilterOps.mMinDate, max_date);
+		setModified();
+	}
+}
+
+void LLInventoryFilter::setDateRangeLastLogoff(BOOL sl)
+{
+	if (sl && !isSinceLogoff())
+	{
+		setDateRange(mLastLogoff, time_max());
+		setModified();
+	}
+	if (!sl && isSinceLogoff())
+	{
+		setDateRange(0, time_max());
+		setModified();
+	}
+}
+
+BOOL LLInventoryFilter::isSinceLogoff()
+{
+	return (mFilterOps.mMinDate == (time_t)mLastLogoff) &&
+		(mFilterOps.mMaxDate == time_max());
+}
+
+void LLInventoryFilter::setHoursAgo(U32 hours)
+{
+	if (mFilterOps.mHoursAgo != hours)
+	{
+		// *NOTE: need to cache last filter time, in case filter goes stale
+		BOOL less_restrictive = (mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max() && hours > mFilterOps.mHoursAgo);
+		BOOL more_restrictive = (mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max() && hours <= mFilterOps.mHoursAgo);
+		mFilterOps.mHoursAgo = hours;
+		mFilterOps.mMinDate = time_min();
+		mFilterOps.mMaxDate = time_max();
+		if (less_restrictive)
+		{
+			setModified(FILTER_LESS_RESTRICTIVE);
+		}
+		else if (more_restrictive)
+		{
+			setModified(FILTER_MORE_RESTRICTIVE);
+		}
+		else
+		{
+			setModified(FILTER_RESTART);
+		}
+	}
+}
+void LLInventoryFilter::setShowFolderState(EFolderShow state)
+{
+	if (mFilterOps.mShowFolderState != state)
+	{
+		mFilterOps.mShowFolderState = state;
+		if (state == SHOW_NON_EMPTY_FOLDERS)
+		{
+			// showing fewer folders than before
+			setModified(FILTER_MORE_RESTRICTIVE);
+		}
+		else if (state == SHOW_ALL_FOLDERS)
+		{
+			// showing same folders as before and then some
+			setModified(FILTER_LESS_RESTRICTIVE);
+		}
+		else
+		{
+			setModified();
+		}
+	}
+}
+
+void LLInventoryFilter::setSortOrder(U32 order)
+{
+	if (mOrder != order)
+	{
+		mOrder = order;
+		setModified();
+	}
+}
+
+void LLInventoryFilter::markDefault()
+{
+	mDefaultFilterOps = mFilterOps;
+}
+
+void LLInventoryFilter::resetDefault()
+{
+	mFilterOps = mDefaultFilterOps;
+	setModified();
+}
+
+void LLInventoryFilter::setModified(EFilterBehavior behavior)
+{
+	mModified = TRUE;
+	mNeedTextRebuild = TRUE;
+	mFilterGeneration = mNextFilterGeneration++;
+
+	if (mFilterBehavior == FILTER_NONE)
+	{
+		mFilterBehavior = behavior;
+	}
+	else if (mFilterBehavior != behavior)
+	{
+		// trying to do both less restrictive and more restrictive filter
+		// basically means restart from scratch
+		mFilterBehavior = FILTER_RESTART;
+	}
+
+	if (isNotDefault())
+	{
+		// if not keeping current filter results, update last valid as well
+		switch(mFilterBehavior)
+		{
+		case FILTER_RESTART:
+			mMustPassGeneration = mFilterGeneration;
+			mMinRequiredGeneration = mFilterGeneration;
+			break;
+		case FILTER_LESS_RESTRICTIVE:
+			mMustPassGeneration = mFilterGeneration;
+			break;
+		case FILTER_MORE_RESTRICTIVE:
+			mMinRequiredGeneration = mFilterGeneration;
+			// must have passed either current filter generation (meaningless, as it hasn't been run yet)
+			// or some older generation, so keep the value
+			mMustPassGeneration = llmin(mMustPassGeneration, mFilterGeneration);
+			break;
+		default:
+			llerrs << "Bad filter behavior specified" << llendl;
+		}
+	}
+	else
+	{
+		// shortcut disabled filters to show everything immediately
+		mMinRequiredGeneration = 0;
+		mMustPassGeneration = S32_MAX;
+	}
+}
+
+BOOL LLInventoryFilter::isFilterWith(LLInventoryType::EType t)
+{
+	return mFilterOps.mFilterTypes & (0x01 << t);
+}
+
+std::string LLInventoryFilter::getFilterText()
+{
+	if (!mNeedTextRebuild)
+	{
+		return mFilterText;
+	}
+
+	mNeedTextRebuild = FALSE;
+	std::string filtered_types;
+	std::string not_filtered_types;
+	BOOL filtered_by_type = FALSE;
+	BOOL filtered_by_all_types = TRUE;
+	S32 num_filter_types = 0;
+	mFilterText.clear();
+
+	if (isFilterWith(LLInventoryType::IT_ANIMATION))
+	{
+		//filtered_types += " Animations,";
+		filtered_types += LLTrans::getString("Animations");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Animations,";
+		not_filtered_types += LLTrans::getString("Animations");
+
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_CALLINGCARD))
+	{
+		//filtered_types += " Calling Cards,";
+		filtered_types += LLTrans::getString("Calling Cards");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Calling Cards,";
+		not_filtered_types += LLTrans::getString("Calling Cards");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_WEARABLE))
+	{
+		//filtered_types += " Clothing,";
+		filtered_types +=  LLTrans::getString("Clothing");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Clothing,";
+		not_filtered_types +=  LLTrans::getString("Clothing");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_GESTURE))
+	{
+		//filtered_types += " Gestures,";
+		filtered_types +=  LLTrans::getString("Gestures");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Gestures,";
+		not_filtered_types +=  LLTrans::getString("Gestures");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_LANDMARK))
+	{
+		//filtered_types += " Landmarks,";
+		filtered_types +=  LLTrans::getString("Landmarks");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Landmarks,";
+		not_filtered_types +=  LLTrans::getString("Landmarks");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_NOTECARD))
+	{
+		//filtered_types += " Notecards,";
+		filtered_types +=  LLTrans::getString("Notecards");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Notecards,";
+		not_filtered_types +=  LLTrans::getString("Notecards");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_OBJECT) && isFilterWith(LLInventoryType::IT_ATTACHMENT))
+	{
+		//filtered_types += " Objects,";
+		filtered_types +=  LLTrans::getString("Objects");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Objects,";
+		not_filtered_types +=  LLTrans::getString("Objects");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_LSL))
+	{
+		//filtered_types += " Scripts,";
+		filtered_types +=  LLTrans::getString("Scripts");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Scripts,";
+		not_filtered_types +=  LLTrans::getString("Scripts");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_SOUND))
+	{
+		//filtered_types += " Sounds,";
+		filtered_types +=  LLTrans::getString("Sounds");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Sounds,";
+		not_filtered_types +=  LLTrans::getString("Sounds");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_TEXTURE))
+	{
+		//filtered_types += " Textures,";
+		filtered_types +=  LLTrans::getString("Textures");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Textures,";
+		not_filtered_types +=  LLTrans::getString("Textures");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (isFilterWith(LLInventoryType::IT_SNAPSHOT))
+	{
+		//filtered_types += " Snapshots,";
+		filtered_types +=  LLTrans::getString("Snapshots");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		//not_filtered_types += " Snapshots,";
+		not_filtered_types +=  LLTrans::getString("Snapshots");
+		filtered_by_all_types = FALSE;
+	}
+
+	if (!gInventory.backgroundFetchActive()
+		&& filtered_by_type
+		&& !filtered_by_all_types)
+	{
+		mFilterText += " - ";
+		if (num_filter_types < 5)
+		{
+			mFilterText += filtered_types;
+		}
+		else
+		{
+			//mFilterText += "No ";
+			mFilterText += LLTrans::getString("No Filters");
+			mFilterText += not_filtered_types;
+		}
+		// remove the ',' at the end
+		mFilterText.erase(mFilterText.size() - 1, 1);
+	}
+
+	if (isSinceLogoff())
+	{
+		//mFilterText += " - Since Logoff";
+		mFilterText += LLTrans::getString("Since Logoff");
+	}
+	return mFilterText;
+}
+
+void LLInventoryFilter::toLLSD(LLSD& data)
+{
+	data["filter_types"] = (LLSD::Integer)getFilterTypes();
+	data["min_date"] = (LLSD::Integer)getMinDate();
+	data["max_date"] = (LLSD::Integer)getMaxDate();
+	data["hours_ago"] = (LLSD::Integer)getHoursAgo();
+	data["show_folder_state"] = (LLSD::Integer)getShowFolderState();
+	data["permissions"] = (LLSD::Integer)getFilterPermissions();
+	data["substring"] = (LLSD::String)getFilterSubString();
+	data["sort_order"] = (LLSD::Integer)getSortOrder();
+	data["since_logoff"] = (LLSD::Boolean)isSinceLogoff();
+}
+
+void LLInventoryFilter::fromLLSD(LLSD& data)
+{
+	if(data.has("filter_types"))
+	{
+		setFilterTypes((U32)data["filter_types"].asInteger());
+	}
+
+	if(data.has("min_date") && data.has("max_date"))
+	{
+		setDateRange(data["min_date"].asInteger(), data["max_date"].asInteger());
+	}
+
+	if(data.has("hours_ago"))
+	{
+		setHoursAgo((U32)data["hours_ago"].asInteger());
+	}
+
+	if(data.has("show_folder_state"))
+	{
+		setShowFolderState((EFolderShow)data["show_folder_state"].asInteger());
+	}
+
+	if(data.has("permissions"))
+	{
+		setFilterPermissions((PermissionMask)data["permissions"].asInteger());
+	}
+
+	if(data.has("substring"))
+	{
+		setFilterSubString(std::string(data["substring"].asString()));
+	}
+
+	if(data.has("sort_order"))
+	{
+		setSortOrder((U32)data["sort_order"].asInteger());
+	}
+
+	if(data.has("since_logoff"))
+	{
+		setDateRangeLastLogoff((bool)data["since_logoff"].asBoolean());
+	}
+}
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
new file mode 100644
index 0000000000..7c5f6681cf
--- /dev/null
+++ b/indra/newview/llinventoryfilter.h
@@ -0,0 +1,150 @@
+/** 
+* @file llinventoryfilter.h
+* @brief Support for filtering your inventory to only display a subset of the
+* available items.
+*
+* $LicenseInfo:firstyear=2005&license=viewergpl$
+* 
+* Copyright (c) 2005-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+#ifndef LLINVENTORYFILTER_H
+#define LLINVENTORYFILTER_H
+
+// lots of includes here
+#include "llinventorytype.h"
+#include "llpermissionsflags.h"		// PermissionsMask
+
+class LLFolderViewItem;
+
+class LLInventoryFilter
+{
+public:
+	typedef enum e_folder_show
+	{
+		SHOW_ALL_FOLDERS,
+		SHOW_NON_EMPTY_FOLDERS,
+		SHOW_NO_FOLDERS
+	} EFolderShow;
+
+	typedef enum e_filter_behavior
+	{
+		FILTER_NONE,				// nothing to do, already filtered
+		FILTER_RESTART,				// restart filtering from scratch
+		FILTER_LESS_RESTRICTIVE,	// existing filtered items will certainly pass this filter
+		FILTER_MORE_RESTRICTIVE		// if you didn't pass the previous filter, you definitely won't pass this one
+	} EFilterBehavior;
+
+	static const U32 SO_DATE = 1;
+	static const U32 SO_FOLDERS_BY_NAME = 2;
+	static const U32 SO_SYSTEM_FOLDERS_TO_TOP = 4;
+
+	LLInventoryFilter(const std::string& name);
+	virtual ~LLInventoryFilter();
+
+	void setFilterTypes(U32 types);
+	U32 getFilterTypes() const { return mFilterOps.mFilterTypes; }
+
+	void setFilterSubString(const std::string& string);
+	const std::string getFilterSubString(BOOL trim = FALSE);
+
+	void setFilterPermissions(PermissionMask perms);
+	PermissionMask getFilterPermissions() const { return mFilterOps.mPermissions; }
+
+	void setDateRange(time_t min_date, time_t max_date);
+	void setDateRangeLastLogoff(BOOL sl);
+	time_t getMinDate() const { return mFilterOps.mMinDate; }
+	time_t getMaxDate() const { return mFilterOps.mMaxDate; }
+
+	void setHoursAgo(U32 hours);
+	U32 getHoursAgo() const { return mFilterOps.mHoursAgo; }
+
+	void setShowFolderState( EFolderShow state);
+	EFolderShow getShowFolderState() { return mFilterOps.mShowFolderState; }
+
+	void setSortOrder(U32 order);
+	U32 getSortOrder() { return mOrder; }
+
+	BOOL check(LLFolderViewItem* item);
+	std::string::size_type getStringMatchOffset() const;
+	BOOL isActive();
+	BOOL isNotDefault();
+	BOOL isModified();
+	BOOL isModifiedAndClear();
+	BOOL isSinceLogoff();
+	void clearModified() { mModified = FALSE; mFilterBehavior = FILTER_NONE; }
+	const std::string getName() const { return mName; }
+	std::string getFilterText();
+
+	void setFilterCount(S32 count) { mFilterCount = count; }
+	S32 getFilterCount() { return mFilterCount; }
+	void decrementFilterCount() { mFilterCount--; }
+
+	void markDefault();
+	void resetDefault();
+
+	BOOL isFilterWith(LLInventoryType::EType t);
+
+	S32 getCurrentGeneration() const { return mFilterGeneration; }
+	S32 getMinRequiredGeneration() const { return mMinRequiredGeneration; }
+	S32 getMustPassGeneration() const { return mMustPassGeneration; }
+
+	//RN: this is public to allow system to externally force a global refilter
+	void setModified(EFilterBehavior behavior = FILTER_RESTART);
+
+	void toLLSD(LLSD& data);
+	void fromLLSD(LLSD& data);
+
+protected:
+	struct filter_ops
+	{
+		U32			mFilterTypes;
+		time_t		mMinDate;
+		time_t		mMaxDate;
+		U32			mHoursAgo;
+		EFolderShow	mShowFolderState;
+		PermissionMask	mPermissions;
+	};
+	filter_ops		mFilterOps;
+	filter_ops		mDefaultFilterOps;
+	std::string::size_type	mSubStringMatchOffset;
+	std::string		mFilterSubString;
+	U32				mOrder;
+	const std::string	mName;
+	S32				mFilterGeneration;
+	S32				mMustPassGeneration;
+	S32				mMinRequiredGeneration;
+	S32				mFilterCount;
+	S32				mNextFilterGeneration;
+	EFilterBehavior mFilterBehavior;
+
+private:
+	U32 mLastLogoff;
+	BOOL mModified;
+	BOOL mNeedTextRebuild;
+	std::string mFilterText;
+};
+
+#endif
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 5a14bdd55e..2c281a4615 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -46,7 +46,7 @@
 #include "llfloater.h"
 #include "llfocusmgr.h"
 #include "llinventorybridge.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llviewerinventory.h"
 #include "llviewermessage.h"
 #include "llviewerwindow.h"
@@ -155,9 +155,20 @@ bool LLCanCache::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 LLInventoryModel gInventory;
 
 // Default constructor
-LLInventoryModel::LLInventoryModel() :
-	mModifyMask(LLInventoryObserver::ALL),
+LLInventoryModel::LLInventoryModel()
+:	mModifyMask(LLInventoryObserver::ALL),
+	mChangedItemIDs(),
+	mCategoryMap(),
+	mItemMap(),
+	mCategoryLock(),
+	mItemLock(),
 	mLastItem(NULL),
+	mParentChildCategoryTree(),
+	mParentChildItemTree(),
+	mObservers(),
+	mRootFolderID(),
+	mLibraryRootFolderID(),
+	mLibraryOwnerID(),
 	mIsAgentInvUsable(false)
 {
 }
@@ -299,7 +310,7 @@ LLUUID LLInventoryModel::findCategoryUUIDForType(LLAssetType::EType t, bool crea
 	LLUUID rv = findCatUUID(t);
 	if(rv.isNull() && isInventoryUsable() && create_folder)
 	{
-		LLUUID root_id = gAgent.getInventoryRootID();
+		LLUUID root_id = gInventory.getRootFolderID();
 		if(root_id.notNull())
 		{
 			rv = createNewCategory(root_id, t, LLStringUtil::null);
@@ -312,7 +323,7 @@ LLUUID LLInventoryModel::findCategoryUUIDForType(LLAssetType::EType t, bool crea
 // preferred type. Returns LLUUID::null if not found.
 LLUUID LLInventoryModel::findCatUUID(LLAssetType::EType preferred_type)
 {
-	LLUUID root_id = gAgent.getInventoryRootID();
+	LLUUID root_id = gInventory.getRootFolderID();
 	if(LLAssetType::AT_CATEGORY == preferred_type)
 	{
 		return root_id;
@@ -469,7 +480,7 @@ void LLInventoryModel::collectLinkedItems(const LLUUID& id,
 {
 	LLInventoryModel::cat_array_t cat_array;
 	LLLinkedItemIDMatches is_linked_item_match(id);
-	collectDescendentsIf(gAgent.getInventoryRootID(),
+	collectDescendentsIf(gInventory.getRootFolderID(),
 						 cat_array,
 						 items,
 						 LLInventoryModel::INCLUDE_TRASH,
@@ -500,7 +511,7 @@ void LLInventoryModel::appendPath(const LLUUID& id, std::string& path)
 bool LLInventoryModel::isInventoryUsable()
 {
 	bool result = false;
-	if(gAgent.getInventoryRootID().notNull() && mIsAgentInvUsable)
+	if(gInventory.getRootFolderID().notNull() && mIsAgentInvUsable)
 	{
 		result = true;
 	}
@@ -1478,8 +1489,8 @@ void LLInventoryModel::startBackgroundFetch(const LLUUID& cat_id)
 			if (!sFullFetchStarted)
 			{
 				sFullFetchStarted = TRUE;
-				sFetchQueue.push_back(gInventoryLibraryRoot);
-				sFetchQueue.push_back(gAgent.getInventoryRootID());
+				sFetchQueue.push_back(gInventory.getLibraryRootFolderID());
+				sFetchQueue.push_back(gInventory.getRootFolderID());
 				gIdleCallbacks.addFunction(&LLInventoryModel::backgroundFetch, NULL);
 			}
 		}
@@ -2271,7 +2282,7 @@ void LLInventoryModel::buildParentChildMap()
 			else
 			{
 				// it's a protected folder.
-				cat->setParent(gAgent.getInventoryRootID());
+				cat->setParent(gInventory.getRootFolderID());
 			}
 			cat->updateServer(TRUE);
 			catsp = getUnlockedCatArray(cat->getParentUUID());
@@ -2371,7 +2382,7 @@ void LLInventoryModel::buildParentChildMap()
 		}
 	}
 
-	const LLUUID& agent_inv_root_id = gAgent.getInventoryRootID();
+	LLUUID agent_inv_root_id = gInventory.getRootFolderID();
 	if (agent_inv_root_id.notNull())
 	{
 		cat_array_t* catsp = get_ptr_in_map(mParentChildCategoryTree, agent_inv_root_id);
@@ -2821,7 +2832,7 @@ void LLInventoryModel::processUpdateInventoryFolder(LLMessageSystem* msg,
 	gInventory.notifyObservers();
 
 	// *HACK: Do the 'show' logic for a new item in the inventory.
-	LLInventoryView* view = LLInventoryView::getActiveInventory();
+	LLFloaterInventory* view = LLFloaterInventory::getActiveInventory();
 	if(view)
 	{
 		view->getPanel()->setSelection(lastfolder->getUUID(), TAKE_FOCUS_NO);
@@ -3030,13 +3041,13 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 	// The incoming inventory could span more than one BulkInventoryUpdate packet,
 	// so record the transaction ID for this purchase, then wear all clothing
 	// that comes in as part of that transaction ID.  JC
-	if (LLInventoryView::sWearNewClothing)
+	if (LLFloaterInventory::sWearNewClothing)
 	{
-		LLInventoryView::sWearNewClothingTransactionID = tid;
-		LLInventoryView::sWearNewClothing = FALSE;
+		LLFloaterInventory::sWearNewClothingTransactionID = tid;
+		LLFloaterInventory::sWearNewClothing = FALSE;
 	}
 
-	if (tid == LLInventoryView::sWearNewClothingTransactionID)
+	if (tid == LLFloaterInventory::sWearNewClothingTransactionID)
 	{
 		count = wearable_ids.size();
 		for (i = 0; i < count; ++i)
@@ -3054,7 +3065,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 		gInventoryCallbacks.fire(cbinfo.mCallback, cbinfo.mInvID);
 	}
 	// Don't show the inventory.  We used to call showAgentInventory here.
-	//LLInventoryView* view = LLInventoryView::getActiveInventory();
+	//LLFloaterInventory* view = LLFloaterInventory::getActiveInventory();
 	//if(view)
 	//{
 	//	const BOOL take_keyboard_focus = FALSE;
@@ -3064,10 +3075,10 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 	//	// HACK to open inventory offers that are accepted.  This information
 	//	// really needs to flow through the instant messages and inventory
 	//	// transfer/update messages.
-	//	if (LLInventoryView::sOpenNextNewItem)
+	//	if (LLFloaterInventory::sOpenNextNewItem)
 	//	{
 	//		view->openSelected();
-	//		LLInventoryView::sOpenNextNewItem = FALSE;
+	//		LLFloaterInventory::sOpenNextNewItem = FALSE;
 	//	}
 	//
 	//	// restore keyboard focus
@@ -3232,6 +3243,36 @@ void LLInventoryModel::removeItem(const LLUUID& item_id)
 	}
 }
 
+LLUUID LLInventoryModel::getRootFolderID() const
+{
+	return mRootFolderID;
+}
+
+void LLInventoryModel::setRootFolderID(const LLUUID& val)
+{
+	mRootFolderID = val;
+}
+
+LLUUID LLInventoryModel::getLibraryRootFolderID() const
+{
+	return mLibraryRootFolderID;
+}
+
+void LLInventoryModel::setLibraryRootFolderID(const LLUUID& val)
+{
+	mLibraryRootFolderID = val;
+}
+
+LLUUID LLInventoryModel::getLibraryOwnerID() const
+{
+	return mLibraryOwnerID;
+}
+
+void LLInventoryModel::setLibraryOwnerID(const LLUUID& val)
+{
+	mLibraryOwnerID = val;
+}
+
 //----------------------------------------------------------------------------
 
 // *NOTE: DEBUG functionality
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 46288700d2..950e8866bb 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -204,7 +204,7 @@ public:
 	// Calling this method with an inventory item will either change
 	// an existing item with a matching item_id, or will add the item
 	// to the current inventory. Returns the change mask generated by
-	// the update. No notifcation will be sent to observers. This
+	// the update. No notification will be sent to observers. This
 	// method will only generate network traffic if the item had to be
 	// reparented.
 	// *NOTE: In usage, you will want to perform cache accounting
@@ -231,7 +231,7 @@ public:
 
 	// delete a particular inventory object by ID. This will purge one
 	// object from the internal data structures maintaining a
-	// cosistent internal state. No cache accounting, observer
+	// consistent internal state. No cache accounting, observer
 	// notification, or server update is performed.  Purges linked items.
 	void deleteObject(const LLUUID& id);
 	
@@ -240,12 +240,12 @@ public:
 	void purgeObject(const LLUUID& id);
 	void purgeLinkedObjects(const LLUUID& id);
 
-	// This is a method which collects the descendents of the id
+	// This is a method which collects the descendants of the id
 	// provided. If the category is not found, no action is
 	// taken. This method goes through the long winded process of
 	// removing server representation of folders and items while doing
 	// cache accounting in a fairly efficient manner. This method does
-	// not notify observers (though maybe it shouldd...)
+	// not notify observers (though maybe it should...)
 	void purgeDescendentsOf(const LLUUID& id);
 
 	// This method optimally removes the referenced categories and
@@ -394,6 +394,22 @@ public:
 	static bool isEverythingFetched();
 	static void backgroundFetch(void*); // background fetch idle function
 	static void incrBulkFetch(S16 fetching) {  sBulkFetchCount+=fetching; if (sBulkFetchCount<0) sBulkFetchCount=0; }
+
+
+	// Data about the agent's root folder and root library folder
+	// are stored here, rather than in LLAgent where it used to be, because
+	// gInventory is a singleton and represents the agent's inventory.
+	// The "library" is actually the inventory of a special agent,
+	// usually Alexandria Linden.
+	LLUUID getRootFolderID() const;
+	LLUUID getLibraryOwnerID() const;
+	LLUUID getLibraryRootFolderID() const;
+
+	// These are set during login with data from the server
+	void setRootFolderID(const LLUUID& id);
+	void setLibraryOwnerID(const LLUUID& id);
+	void setLibraryRootFolderID(const LLUUID& id);
+
 protected:
 
 	// Internal methods which add inventory and make sure that all of
@@ -446,7 +462,7 @@ protected:
 	item_array_t* getUnlockedItemArray(const LLUUID& id);
 	
 protected:
-	// Varaibles used to track what has changed since the last notify.
+	// Variables used to track what has changed since the last notify.
 	U32 mModifyMask;
 	typedef std::set<LLUUID> changed_items_t;
 	changed_items_t mChangedItemIDs;
@@ -477,6 +493,11 @@ protected:
 	typedef std::set<LLInventoryObserver*> observer_list_t;
 	observer_list_t mObservers;
 
+	// Agent inventory folder information.
+	LLUUID mRootFolderID;
+	LLUUID mLibraryRootFolderID;
+	LLUUID mLibraryOwnerID;
+
 	// completing the fetch once per session should be sufficient
 	static BOOL sBackgroundFetchActive;
 	static BOOL sTimelyFetchPending;
diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp
index 8e6889a379..d63eebfcac 100644
--- a/indra/newview/lljoystickbutton.cpp
+++ b/indra/newview/lljoystickbutton.cpp
@@ -49,11 +49,11 @@
 
 #include "llglheaders.h"
 
-static LLDefaultWidgetRegistry::Register<LLJoystickAgentSlide> r1("joystick_slide");
-static LLDefaultWidgetRegistry::Register<LLJoystickAgentTurn> r2("joystick_turn");
-static LLDefaultWidgetRegistry::Register<LLJoystickCameraRotate> r3("joystick_rotate");
-static LLDefaultWidgetRegistry::Register<LLJoystickCameraZoom> r4("joystick_zoom");
-static LLDefaultWidgetRegistry::Register<LLJoystickCameraTrack> r5("joystick_track");
+static LLDefaultChildRegistry::Register<LLJoystickAgentSlide> r1("joystick_slide");
+static LLDefaultChildRegistry::Register<LLJoystickAgentTurn> r2("joystick_turn");
+static LLDefaultChildRegistry::Register<LLJoystickCameraRotate> r3("joystick_rotate");
+static LLDefaultChildRegistry::Register<LLJoystickCameraZoom> r4("joystick_zoom");
+static LLDefaultChildRegistry::Register<LLJoystickCameraTrack> r5("joystick_track");
 
 
 
diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h
index 954a8c481d..d0f63803ea 100644
--- a/indra/newview/lljoystickbutton.h
+++ b/indra/newview/lljoystickbutton.h
@@ -63,7 +63,7 @@ public:
 		Params()
 		:	quadrant("quadrant", JQ_ORIGIN)
 		{
-			label("");
+			label = "";
 		}
 	};
 	LLJoystick(const Params&);
diff --git a/indra/newview/lllistbrowser.cpp b/indra/newview/lllistbrowser.cpp
new file mode 100644
index 0000000000..edd8e9818f
--- /dev/null
+++ b/indra/newview/lllistbrowser.cpp
@@ -0,0 +1,37 @@
+/** 
+ * @file lllistbrowser.cpp
+ * @brief UI widget showing a search filter, list view, icon action buttons,
+ * and verb action buttons, as usually embedded in the side tray.
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+
+#include "lllistbrowser.h"
+
+// TODO
diff --git a/indra/newview/lllistbrowser.h b/indra/newview/lllistbrowser.h
new file mode 100644
index 0000000000..bc9498c514
--- /dev/null
+++ b/indra/newview/lllistbrowser.h
@@ -0,0 +1,36 @@
+/** 
+ * @file lllistbrowser.h
+ * @brief UI widget showing a search filter, list view, icon action buttons,
+ * and verb action buttons, as usually embedded in the side tray.
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLLISTBROWSER_H
+#define LLLISTBROWSER_H
+
+#endif // LLLISTBROWSER_H
diff --git a/indra/newview/lllistview.cpp b/indra/newview/lllistview.cpp
new file mode 100644
index 0000000000..568655b500
--- /dev/null
+++ b/indra/newview/lllistview.cpp
@@ -0,0 +1,73 @@
+/** 
+ * @file lllistview.cpp
+ * @brief UI widget containing a scrollable, possibly hierarchical list of 
+ * folders (LLListViewFolder) and items (LLListViewItem).
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+
+#include "lllistview.h"
+
+#include "lltextbox.h"
+#include "lluictrlfactory.h"	// LLDefaultWidgetRegistry
+
+// linker optimizes this out on Windows until there is a real reference
+// to this file
+static LLDefaultChildRegistry::Register<LLListView> r("list_view");
+
+LLListView::Params::Params()
+:	bg_color("bg_color"),
+	fg_selected_color("fg_selected_color"),
+	bg_selected_color("bg_selected_color")
+{}
+
+LLListView::LLListView(const Params& p)
+:	LLUICtrl(p),
+	mLabel(NULL),
+	mBgColor(p.bg_color()),
+	mFgSelectedColor(p.fg_selected_color()),
+	mBgSelectedColor(p.bg_selected_color())
+{
+	LLRect label_rect(0, 20, 300, 0);
+	LLTextBox::Params text_box_params;
+	text_box_params.rect(label_rect);
+	text_box_params.text("This is a list-view");
+	mLabel = LLUICtrlFactory::create<LLTextBox>(text_box_params);
+	addChild(mLabel);
+}
+
+LLListView::~LLListView()
+{}
+
+
+// placeholder for setting a property
+void LLListView::setString(const std::string& s)
+{
+	mLabel->setValue( LLSD(s) );
+}
diff --git a/indra/newview/lllistview.h b/indra/newview/lllistview.h
new file mode 100644
index 0000000000..501c0c9e1f
--- /dev/null
+++ b/indra/newview/lllistview.h
@@ -0,0 +1,66 @@
+/** 
+ * @file lllistview.h
+ * @brief UI widget containing a scrollable, possibly hierarchical list of 
+ * folders (LLListViewFolder) and items (LLListViewItem).
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLLISTVIEW_H
+#define LLLISTVIEW_H
+
+#include "llui.h"		// for LLUIColor, *TODO: use more specific header
+#include "lluictrl.h"
+
+class LLTextBox;
+
+class LLListView
+:	public LLUICtrl
+{
+public:
+	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+	{
+		Optional<LLUIColor>	bg_color,
+							fg_selected_color,
+							bg_selected_color;
+		Params();
+	};
+	LLListView(const Params& p);
+	virtual ~LLListView();
+
+	// placeholder for setting a property
+	void setString(const std::string& s);
+
+private:
+	// TODO: scroll container?
+	LLTextBox*	mLabel;		// just for testing
+	LLUIColor	mBgColor;
+	LLUIColor	mFgSelectedColor;
+	LLUIColor	mBgSelectedColor;
+};
+
+#endif // LLLISTVIEW_H
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 2cee9de1eb..c7ef6e16f7 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -167,7 +167,7 @@ private:
 //============================================================================
 
 
-static LLDefaultWidgetRegistry::Register<LLLocationInputCtrl> r("location_input");
+static LLDefaultChildRegistry::Register<LLLocationInputCtrl> r("location_input");
 
 LLLocationInputCtrl::Params::Params()
 :	add_landmark_image_enabled("add_landmark_image_enabled"),
@@ -459,7 +459,7 @@ void LLLocationInputCtrl::updateAddLandmarkButton()
 	LLInventoryModel::cat_array_t cats;
 	LLInventoryModel::item_array_t items;
 	LLIsAgentParcelLandmark is_current_parcel_landmark;
-	gInventory.collectDescendentsIf(gAgent.getInventoryRootID(),
+	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
 		cats,
 		items,
 		LLInventoryModel::EXCLUDE_TRASH,
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp
index f0bfbef565..c0225ebfca 100644
--- a/indra/newview/llmenucommands.cpp
+++ b/indra/newview/llmenucommands.cpp
@@ -51,7 +51,7 @@
 #include "llfloaterdirectory.h"
 #include "llfloaterworldmap.h"
 #include "llgivemoney.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llnotify.h"
 #include "llstatusbar.h"
 #include "llimview.h"
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 36ec2c779a..1ba8bdc37f 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -38,12 +38,14 @@
 #include "indra_constants.h"
 
 // Viewer includes
+
 #include "llagent.h"
-#include "llviewercontrol.h"
 #include "llbutton.h"
-#include "llviewerwindow.h"
+#include "llfloaterreg.h"
 #include "lljoystickbutton.h"
 #include "lluictrlfactory.h"
+#include "llviewerwindow.h"
+#include "llviewercontrol.h"
 
 //
 // Constants
@@ -59,12 +61,10 @@ const F32 NUDGE_TIME = 0.25f;		// in seconds
 
 // protected
 LLFloaterMove::LLFloaterMove(const LLSD& key)
-:	LLFloater()
+:	LLFloater(key)
 {
-	setIsChrome(TRUE);
 
-	const BOOL DONT_OPEN = FALSE;
-	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_moveview.xml", DONT_OPEN); 
+//	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_moveview.xml", DONT_OPEN); 
 
 }
 
@@ -81,6 +81,9 @@ void LLFloaterMove::onClose(bool app_quitting)
 // virtual
 BOOL LLFloaterMove::postBuild()
 {
+	setIsChrome(TRUE);
+	
+	
 	mForwardButton = getChild<LLJoystickAgentTurn>("forward btn"); 
 	mForwardButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
 
@@ -138,14 +141,20 @@ F32 LLFloaterMove::getYawRate( F32 time )
 // protected static 
 void LLFloaterMove::turnLeft(void *)
 {
-	F32 time = getInstance()->mTurnLeftButton->getHeldDownTime();
+	LLFloaterMove* instance = LLFloaterReg::getTypedInstance<LLFloaterMove>("moveview");
+	if(!instance) return;
+	
+	F32 time = instance->mTurnLeftButton->getHeldDownTime();
 	gAgent.moveYaw( getYawRate( time ) );
 }
 
 // protected static 
 void LLFloaterMove::turnRight(void *)
 {
-	F32 time = getInstance()->mTurnRightButton->getHeldDownTime();
+	LLFloaterMove* instance = LLFloaterReg::getTypedInstance<LLFloaterMove>("moveview");
+	if(!instance) return;
+	
+	F32 time = instance->mTurnRightButton->getHeldDownTime();
 	gAgent.moveYaw( -getYawRate( time ) );
 }
 
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index 8d7cdc881d..de5d1ac432 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -44,16 +44,15 @@ class LLJoystickAgentSlide;
 // Classes
 //
 class LLFloaterMove
-:	public LLFloater, 
-	public LLFloaterSingleton<LLFloaterMove>
+:	public LLFloater
 {
-	friend class LLUISingleton<LLFloaterMove, VisibilityPolicy<LLFloater> >;
-	
-protected:
+	friend class LLFloaterReg;
+
+private:
 	LLFloaterMove(const LLSD& key);
 	~LLFloaterMove() {}
-
 public:
+
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void onClose(bool app_quitting);
 	/*virtual*/	BOOL	postBuild();
diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp
index b85c1c759d..56648d3218 100644
--- a/indra/newview/llnamebox.cpp
+++ b/indra/newview/llnamebox.cpp
@@ -46,7 +46,7 @@
 // statics
 std::set<LLNameBox*> LLNameBox::sInstances;
 
-static LLDefaultWidgetRegistry::Register<LLNameBox> r("name_box");
+static LLDefaultChildRegistry::Register<LLNameBox> r("name_box");
 
 
 LLNameBox::LLNameBox(const Params& p)
diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp
index 7f9ba8ba5a..ccb33c770a 100644
--- a/indra/newview/llnameeditor.cpp
+++ b/indra/newview/llnameeditor.cpp
@@ -43,7 +43,7 @@
 #include "llstring.h"
 #include "llui.h"
 
-static LLDefaultWidgetRegistry::Register<LLNameEditor> r("name_editor");
+static LLDefaultChildRegistry::Register<LLNameEditor> r("name_editor");
 
 // statics
 std::set<LLNameEditor*> LLNameEditor::sInstances;
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 722113928b..d7066cb140 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -44,7 +44,7 @@
 #include "llscrolllistcolumn.h"
 #include "llsdparam.h"
 
-static LLDefaultWidgetRegistry::Register<LLNameListCtrl> r("name_list");
+static LLDefaultChildRegistry::Register<LLNameListCtrl> r("name_list");
 
 void LLNameListCtrl::NameTypeNames::declareValues()
 {
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index cf1d9a5d86..b4a6e63de8 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -231,7 +231,7 @@ BOOL LLNavigationBar::postBuild()
 	search_btn->setClickedCallback(boost::bind(&LLNavigationBar::onSearchCommit, this));
 
 	// Load the location field context menu
-	mLocationContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_navbar.xml", gMenuHolder);
+	mLocationContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_navbar.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	if (!mLocationContextMenu)
 	{
 		llwarns << "Error loading navigation bar context menu" << llendl;
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 1f623af434..510933a331 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -56,7 +56,7 @@
 #include "llworld.h"
 #include "llworldmapview.h"		// shared draw code
 
-static LLDefaultWidgetRegistry::Register<LLNetMap> r1("net_map");
+static LLDefaultChildRegistry::Register<LLNetMap> r1("net_map");
 
 const F32 MAP_SCALE_MIN = 64;
 const F32 MAP_SCALE_MID = 172;
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index 196a86b29c..60a86ed253 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -39,7 +39,7 @@
 // viewer includes
 #include "llvoiceclient.h"
 
-static LLDefaultWidgetRegistry::Register<LLOutputMonitorCtrl> r("output_monitor");
+static LLDefaultChildRegistry::Register<LLOutputMonitorCtrl> r("output_monitor");
 
 // The defaults will be initialized in the constructor.
 LLColor4	LLOutputMonitorCtrl::sColorMuted;
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index ee592ac22c..5c572b8fcd 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -115,7 +115,7 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 	return FALSE;
 }
 
-static LLDefaultWidgetRegistry::Register<LLDropTarget> r("drop_target");
+static LLDefaultChildRegistry::Register<LLDropTarget> r("drop_target");
 
 //////////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index c328bcb7f9..bd4625ab11 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -931,12 +931,12 @@ bool LLPanelClassified::confirmPublish(const LLSD& notification, const LLSD& res
 void LLPanelClassified::onClickTeleport(void* data)
 {
     LLPanelClassified* self = (LLPanelClassified*)data;
-
-    if (!self->mPosGlobal.isExactlyZero())
+	LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+	
+    if (!self->mPosGlobal.isExactlyZero()&&worldmap_instance)
     {
-        gAgent.teleportViaLocation(self->mPosGlobal);
-        LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
-
+        gAgent.teleportViaLocation(self->mPosGlobal);		
+        worldmap_instance->trackLocation(self->mPosGlobal);
 		self->sendClassifiedClickMessage("teleport");
     }
 }
@@ -946,9 +946,12 @@ void LLPanelClassified::onClickTeleport(void* data)
 void LLPanelClassified::onClickMap(void* data)
 {
 	LLPanelClassified* self = (LLPanelClassified*)data;
-	LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
-	LLFloaterReg::showInstance("world_map", "center");
-
+	LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+	if(worldmap_instance)
+	{
+		worldmap_instance->trackLocation(self->mPosGlobal);
+		LLFloaterReg::showInstance("world_map", "center");
+	}
 	self->sendClassifiedClickMessage("map");
 }
 
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index b7ec485872..5da646497b 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -193,5 +193,5 @@ void LLPanelContents::onClickNewScript(void *userdata)
 void LLPanelContents::onClickPermissions(void *userdata)
 {
 	LLPanelContents* self = (LLPanelContents*)userdata;
-	gFloaterView->getParentFloater(self)->addDependentFloater(LLFloaterBulkPermission::showInstance());
+	gFloaterView->getParentFloater(self)->addDependentFloater(LLFloaterReg::showInstance("bulk_perms"));
 }
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index ea092645e7..39a9f231b2 100644
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -247,9 +247,12 @@ void LLPanelGroupLandMoney::impl::onMapButton()
 	F64 global_z = gAgent.getPositionGlobal().mdV[VZ];
 
 	LLVector3d pos_global(global_x, global_y, global_z);
-	LLFloaterWorldMap::getInstance()->trackLocation(pos_global);
-
-	LLFloaterReg::showInstance("world_map", "center");
+	LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+    if(worldmap_instance)
+	{
+		worldmap_instance->trackLocation(pos_global);
+		LLFloaterReg::showInstance("world_map", "center");
+	}
 }
 
 bool LLPanelGroupLandMoney::impl::applyContribution()
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 201cf5a023..0e75681afa 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -39,7 +39,7 @@
 #include "llinventory.h"
 #include "llviewerinventory.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llagent.h"
 #include "lltooldraganddrop.h"
 
@@ -105,7 +105,7 @@ protected:
 	LLUUID	mGroupID;
 };
 
-static LLDefaultWidgetRegistry::Register<LLGroupDropTarget> r("group_drop_target");
+static LLDefaultChildRegistry::Register<LLGroupDropTarget> r("group_drop_target");
 
 LLGroupDropTarget::LLGroupDropTarget(const LLGroupDropTarget::Params& p) 
 :	LLView(p),
diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp
index 92fe082ef2..bce5525a40 100644
--- a/indra/newview/llpanelland.cpp
+++ b/indra/newview/llpanelland.cpp
@@ -40,6 +40,7 @@
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llfloaterland.h"
+#include "llfloaterreg.h"
 #include "lltextbox.h"
 #include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
@@ -262,7 +263,7 @@ void LLPanelLandInfo::onClickAbout(void*)
 		LLViewerParcelMgr::getInstance()->selectParcelInRectangle();
 	}
 
-	LLFloaterLand::showInstance();
+	LLFloaterReg::showInstance("about_land");
 }
 
 void LLPanelLandInfo::onShowOwnersHelp(void* user_data)
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 8c7e3e960a..d1164dafb8 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -31,12 +31,14 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llpanellandmarks.h"
+
 #include "llfloaterreg.h"
 #include "lllandmark.h"
 
 #include "llfloaterworldmap.h"
+#include "llfoldervieweventlistener.h"
 #include "lllandmarklist.h"
-#include "llpanellandmarks.h"
 #include "llsidetray.h"
 #include "lltabcontainer.h"
 #include "llworldmap.h"
@@ -138,9 +140,10 @@ void LLLandmarksPanel::onShowOnMap()
 	if (!landmark->getGlobalPos(landmark_global_pos))
 		return;
 	
-	if (!landmark_global_pos.isExactlyZero())
+	LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+	if (!landmark_global_pos.isExactlyZero() && worldmap_instance)
 	{
-		LLFloaterWorldMap::getInstance()->trackLocation(landmark_global_pos);
+		worldmap_instance->trackLocation(landmark_global_pos);
 		LLFloaterReg::showInstance("world_map", "center");
 	}
 }
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index 76333e4d85..8889a99925 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -33,7 +33,7 @@
 #ifndef LL_LLPANELLANDMARKS_H
 #define LL_LLPANELLANDMARKS_H
 
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llinventorymodel.h"
 #include "llpanelplacestab.h"
 
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 3f9f44bbf5..b6141384f7 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -375,10 +375,10 @@ BOOL LLPanelPeople::postBuild()
 	// Create menus.
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
 	registrar.add("People.Group.Plus.Action",  boost::bind(&LLPanelPeople::onGroupPlusMenuItemClicked,  this, _2));
-	LLMenuGL* plus_menu  = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_group_plus.xml",  gMenuHolder);
+	LLMenuGL* plus_menu  = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_group_plus.xml",  gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	mGroupPlusMenuHandle  = plus_menu->getHandle();
 	registrar.add("People.Group.Minus.Action", boost::bind(&LLPanelPeople::onGroupMinusMenuItemClicked, this, _2));
-	LLMenuGL* minus_menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_group_minus.xml", gMenuHolder);
+	LLMenuGL* minus_menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_group_minus.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	mGroupMinusMenuHandle = minus_menu->getHandle();
 
 	// Perform initial update.
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index c32af24423..f3adaded34 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -239,7 +239,7 @@ BOOL LLPanelPicks::postBuild(void)
 	mCommitCallbackRegistrar.add("Pick.Map", boost::bind(onClickMap, this));
 	mCommitCallbackRegistrar.add("Pick.Delete", boost::bind(onClickDelete, this));
 
-	mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_picks.xml", gMenuHolder);
+	mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_picks.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 
 	return TRUE;
 }
diff --git a/indra/newview/llpanelplace.cpp b/indra/newview/llpanelplace.cpp
index d4c2f4b6b2..2cb7fd8c14 100644
--- a/indra/newview/llpanelplace.cpp
+++ b/indra/newview/llpanelplace.cpp
@@ -355,16 +355,17 @@ void LLPanelPlace::onClickTeleport(void* data)
 	}
 	// LLFloater* parent_floaterp = (LLFloater*)self->getParent();
 	parent_viewp->setVisible(false);
-	if(self->mLandmarkAssetID.notNull())
+	LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+	if(self->mLandmarkAssetID.notNull() && worldmap_instance)
 	{
 		gAgent.teleportViaLandmark(self->mLandmarkAssetID);
-		LLFloaterWorldMap::getInstance()->trackLandmark(self->mLandmarkAssetID);
+		worldmap_instance->trackLandmark(self->mLandmarkAssetID);
 
 	}
-	else if (!self->mPosGlobal.isExactlyZero())
+	else if (!self->mPosGlobal.isExactlyZero() && worldmap_instance)
 	{
 		gAgent.teleportViaLocation(self->mPosGlobal);
-		LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
+		worldmap_instance->trackLocation(self->mPosGlobal);
 	}
 }
 
@@ -372,9 +373,11 @@ void LLPanelPlace::onClickTeleport(void* data)
 void LLPanelPlace::onClickMap(void* data)
 {
 	LLPanelPlace* self = (LLPanelPlace*)data;
-	if (!self->mPosGlobal.isExactlyZero())
+	LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+	
+	if (!self->mPosGlobal.isExactlyZero() && worldmap_instance)
 	{
-		LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
+		worldmap_instance->trackLocation(self->mPosGlobal);
 		LLFloaterReg::showInstance("world_map", "center");
 	}
 }
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 42b09a45c3..f23d839708 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -216,8 +216,13 @@ void LLPanelPlaces::onShowOnMapButtonClicked()
 		LLVector3d global_pos = gAgent.getPositionGlobal();
 		if (!global_pos.isExactlyZero())
 			{
-				LLFloaterWorldMap::getInstance()->trackLocation(global_pos);
-				LLFloaterReg::showInstance("world_map", "center");
+				LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance();
+				if(instance)
+				{
+					instance->trackLocation(global_pos);
+					LLFloaterReg::showInstance("world_map", "center");
+
+				}
 			}
 	}
 	else
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 676943ff87..9a987c8d7c 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -51,7 +51,7 @@
 #include "llagent.h"
 #include "llvoavatarself.h"
 #include "llselectmgr.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llviewerinventory.h"
 #include "llviewerwindow.h"
 #include "lltrans.h"
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
index 6857d14fff..c4037c94fe 100644
--- a/indra/newview/llpreviewanim.cpp
+++ b/indra/newview/llpreviewanim.cpp
@@ -36,7 +36,7 @@
 #include "llbutton.h"
 #include "llresmgr.h"
 #include "llinventory.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llvoavatarself.h"
 #include "llagent.h"          // gAgent
 #include "llkeyframemotion.h"
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp
index dc6ee44936..ac08fd23a4 100644
--- a/indra/newview/llpreviewgesture.cpp
+++ b/indra/newview/llpreviewgesture.cpp
@@ -559,7 +559,7 @@ void LLPreviewGesture::addAnimations()
 													PERM_ITEM_UNRESTRICTED,
 													gAgent.getID(),
 													gAgent.getGroupID());
-	gInventory.collectDescendentsIf(gAgent.getInventoryRootID(),
+	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
 									cats,
 									items,
 									LLInventoryModel::EXCLUDE_TRASH,
@@ -604,7 +604,7 @@ void LLPreviewGesture::addSounds()
 													PERM_ITEM_UNRESTRICTED,
 													gAgent.getID(),
 													gAgent.getGroupID());
-	gInventory.collectDescendentsIf(gAgent.getInventoryRootID(),
+	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
 									cats,
 									items,
 									LLInventoryModel::EXCLUDE_TRASH,
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 7c50bc5977..7883b1ab06 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -973,7 +973,7 @@ void LLPreviewLSL::loadAsset()
 	const LLInventoryItem* item = gInventory.getItem(mItemUUID);
 	BOOL is_library = item
 		&& !gInventory.isObjectDescendentOf(mItemUUID,
-											gAgent.getInventoryRootID());
+											gInventory.getRootFolderID());
 	if(!item)
 	{
 		// do the more generic search.
diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp
index 7e7be5b2c6..84f7562297 100644
--- a/indra/newview/llpreviewsound.cpp
+++ b/indra/newview/llpreviewsound.cpp
@@ -36,7 +36,7 @@
 #include "llagent.h"          // gAgent
 #include "llbutton.h"
 #include "llinventory.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "lllineeditor.h"
 #include "llpreviewsound.h"
 #include "llresmgr.h"
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 3204006e43..d6ecb42255 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -39,7 +39,7 @@
 #include "llfilepicker.h"
 #include "llfloaterreg.h"
 #include "llimagetga.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llinventory.h"
 #include "llresmgr.h"
 #include "lltrans.h"
diff --git a/indra/newview/llrootview.h b/indra/newview/llrootview.h
index af9517f922..f704fecddd 100644
--- a/indra/newview/llrootview.h
+++ b/indra/newview/llrootview.h
@@ -36,20 +36,16 @@
 #include "llview.h"
 #include "lluictrlfactory.h"
 
-class LLRootViewRegistry : public LLWidgetRegistry<LLRootViewRegistry>
+class LLRootViewRegistry : public LLChildRegistry<LLRootViewRegistry>
 {};
 
 class LLRootView : public LLView
 {
 public:
+	typedef LLRootViewRegistry child_registry_t;
+
 	LLRootView(const Params& p)
 	:	LLView(p)
 	{}
-
-	const widget_registry_t& getChildRegistry() const
-	{
-		// use default widget registry
-		return LLRootViewRegistry::instance();
-	}
 };
 #endif //LL_LLROOTVIEW_H
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index baa5f34849..b3b850441c 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -57,6 +57,7 @@
 #include "llfloaterinspect.h"
 #include "llfloaterproperties.h"
 #include "llfloaterreporter.h"
+#include "llfloaterreg.h"
 #include "llfloatertools.h"
 #include "llframetimer.h"
 #include "llhudeffecttrail.h"
@@ -4842,8 +4843,12 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 	}
 	if (mSelectedObjects->getNumNodes())
 	{
-		LLUUID inspect_item_id = LLFloaterInspect::getSelectedUUID();
-		
+		LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance<LLFloaterInspect>("inspect");
+		LLUUID inspect_item_id= LLUUID::null;
+		if(inspect_instance)
+		{
+			inspect_item_id = inspect_instance->getSelectedUUID();
+		}
 		for (S32 pass = 0; pass < 2; pass++)
 		{
 			for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
@@ -5400,7 +5405,11 @@ void dialog_refresh_all()
 	}
 
 	LLFloaterProperties::dirtyAll();
-	LLFloaterInspect::dirty();
+	LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance<LLFloaterInspect>("inspect");
+	if(inspect_instance)
+	{
+		inspect_instance->dirty();
+	}
 }
 
 S32 get_family_count(LLViewerObject *parent)
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 2871b16f5c..b7c4c74891 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -52,7 +52,7 @@
 using namespace std;
 
 static LLRootViewRegistry::Register<LLSideTray>	t1("side_tray");
-static LLDefaultWidgetRegistry::Register<LLSideTrayTab>	t2("sidetray_tab");
+static LLDefaultChildRegistry::Register<LLSideTrayTab>	t2("sidetray_tab");
 
 static const std::string COLLAPSED_NAME = "<<";
 static const std::string EXPANDED_NAME  = ">>";
@@ -103,7 +103,7 @@ LLSideTray* LLSideTray::getInstance()
 {
 	if (!sInstance)
 	{
-		sInstance = LLUICtrlFactory::createFromFile<LLSideTray>("panel_side_tray.xml",gViewerWindow->getRootView());
+		sInstance = LLUICtrlFactory::createFromFile<LLSideTray>("panel_side_tray.xml",gViewerWindow->getRootView(), LLRootView::child_registry_t::instance());
 	}
 
 	return sInstance;
@@ -156,7 +156,7 @@ bool LLSideTrayTab::addChild(LLView* view, S32 tab_group)
 //virtual 
 BOOL LLSideTrayTab::postBuild()
 {
-	LLPanel* title_panel = LLUICtrlFactory::getInstance()->createFromFile<LLPanel>("panel_side_tray_tab_caption.xml",this);
+	LLPanel* title_panel = LLUICtrlFactory::getInstance()->createFromFile<LLPanel>("panel_side_tray_tab_caption.xml",this, child_registry_t::instance());
 	string name = title_panel->getName();
 	LLPanel::addChild(title_panel);
 	
@@ -374,7 +374,7 @@ bool LLSideTray::selectTabByName	(const std::string& name)
 
 LLButton* LLSideTray::createButton	(const std::string& name,const std::string& image,LLUICtrl::commit_callback_t callback)
 {
-	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray::Params>());	
+	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>());	
 	
 	LLButton::Params bparams;
 
@@ -475,7 +475,7 @@ void LLSideTray::reflectCollapseChange()
 
 void LLSideTray::arrange			()
 {
-	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray::Params>());	
+	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>());	
 
 	calcMaxSideBarWidth();
 	
@@ -600,7 +600,7 @@ void LLSideTray::reshape			(S32 width, S32 height, BOOL called_from_parent)
 	if(!mActiveTab)
 		return;
 	
-	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray::Params>());	
+	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>());	
 
 	setPanelRect();
 
@@ -724,7 +724,7 @@ static const S32	fake_top_offset = 78;
 
 void	LLSideTray::setPanelRect	()
 {
-	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray::Params>());	
+	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>());	
 
 	const LLRect& parent_rect = gViewerWindow->getRootView()->getRect();
 
@@ -743,6 +743,6 @@ void	LLSideTray::setPanelRect	()
 
 S32	LLSideTray::getTrayWidth()
 {
-	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray::Params>());	
+	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>());	
 	return getRect().getWidth() - (sidetray_params.default_button_width + sidetray_params.default_button_margin);
 }
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 790669c07f..8b6124870d 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -94,9 +94,6 @@
 #include "llface.h"
 #include "llfeaturemanager.h"
 #include "llfirstuse.h"
-#include "llfloateractivespeakers.h"
-#include "llfloaterbeacons.h"
-#include "llfloatercamera.h"
 #include "llfloaterchat.h"
 #include "llfloatergesture.h"
 #include "llfloaterhud.h"
@@ -113,7 +110,7 @@
 #include "llimagebmp.h"
 #include "llinventorybridge.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llkeyboard.h"
 #include "llloginhandler.h"			// gLoginHandler, SLURL support
 #include "llpanellogin.h"
@@ -750,8 +747,10 @@ bool idle_startup()
 		std::string msg = LLTrans::getString("LoginInitializingBrowser");
 		set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());
 		display_startup();
+#if !defined(LL_WINDOWS) || !defined(LL_DEBUG)
+		// This generates an error in debug mode on Windows
 		LLViewerMedia::initBrowser();
-
+#endif
 		LLStartUp::setStartupState( STATE_LOGIN_SHOW );
 		return FALSE;
 	}
@@ -1466,8 +1465,7 @@ bool idle_startup()
 				it = options[0].find("folder_id");
 				if(it != options[0].end())
 				{
-					gAgent.getInventoryRootID().set((*it).second);
-					//gInventory.mock(gAgent.getInventoryRootID());
+					gInventory.setRootFolderID( LLUUID( (*it).second ) );
 				}
 			}
 
@@ -1555,7 +1553,7 @@ bool idle_startup()
 			   && gAgentSessionID.notNull()
 			   && gMessageSystem->mOurCircuitCode
 			   && first_sim.isOk()
-			   && gAgent.getInventoryRootID().notNull())
+			   && gInventory.getRootFolderID().notNull())
 			{
 				LLStartUp::setStartupState( STATE_WORLD_INIT );
 			}
@@ -1724,21 +1722,21 @@ bool idle_startup()
 
 		if (gSavedSettings.getBOOL("ShowCameraControls"))
 		{
-			LLFloaterCamera::showInstance();
+			LLFloaterReg::showInstance("camera");
 		}
 		if (gSavedSettings.getBOOL("ShowMovementControls"))
 		{
-			LLFloaterMove::showInstance();
+			LLFloaterReg::showInstance("moveview");
 		}
 
 		if (gSavedSettings.getBOOL("ShowActiveSpeakers"))
 		{
-			LLFloaterActiveSpeakers::showInstance();
+			LLFloaterReg::showInstance("active_speakers");
 		}
 
 		if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
 		{
-			LLFloaterBeacons::showInstance();
+			LLFloaterReg::showInstance("beacons");
 		}
 
 		if (!gNoRender)
@@ -1994,7 +1992,7 @@ bool idle_startup()
 			it = options[0].find("folder_id");
 			if(it != options[0].end())
 			{
-				gInventoryLibraryRoot.set((*it).second);
+				gInventory.setLibraryRootFolderID( LLUUID( (*it).second ) );
 			}
 		}
  		options.clear();
@@ -2006,14 +2004,14 @@ bool idle_startup()
 			it = options[0].find("agent_id");
 			if(it != options[0].end())
 			{
-				gInventoryLibraryOwner.set((*it).second);
+				gInventory.setLibraryOwnerID( LLUUID( (*it).second ) );
 			}
 		}
  		options.clear();
  		if(LLUserAuth::getInstance()->getOptions("inventory-skel-lib", options)
-			&& gInventoryLibraryOwner.notNull())
+			&& gInventory.getLibraryOwnerID().notNull())
  		{
- 			if(!gInventory.loadSkeleton(options, gInventoryLibraryOwner))
+ 			if(!gInventory.loadSkeleton(options, gInventory.getLibraryOwnerID()))
  			{
  				LL_WARNS("AppInit") << "Problem loading inventory-skel-lib" << LL_ENDL;
  			}
@@ -2087,10 +2085,9 @@ bool idle_startup()
 		// Either we want to show tutorial because this is the first login
 		// to a Linden Help Island or the user quit with the tutorial
 		// visible.  JC
-		if (show_hud
-			|| gSavedSettings.getBOOL("ShowTutorial"))
+		if (show_hud || gSavedSettings.getBOOL("ShowTutorial"))
 		{
-			LLFloaterHUD::showHUD();
+			LLFloaterReg::showInstance("hud", LLSD(), FALSE);
 		}
 
 		options.clear();
@@ -2465,9 +2462,11 @@ bool idle_startup()
 
 		// Let the map know about the inventory.
 		LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance();
-		floater_world_map->observeInventory(&gInventory);
-		floater_world_map->observeFriends();
-
+		if(floater_world_map)
+		{
+			floater_world_map->observeInventory(&gInventory);
+			floater_world_map->observeFriends();
+		}
 		gViewerWindow->showCursor();
 		gViewerWindow->getWindow()->resetBusyCount();
 		gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 58af603569..bc90fe7adc 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -47,7 +47,7 @@
 #include "llfloaterregioninfo.h"
 #include "llfloaterscriptdebug.h"
 #include "llhudicon.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
 #include "llmenugl.h"
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 3c9290acea..243ac7803e 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -45,9 +45,10 @@
 #include "llfocusmgr.h"
 #include "llviewerimage.h"
 #include "llfolderview.h"
+#include "llfoldervieweventlistener.h"
 #include "llinventory.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "lllineeditor.h"
 #include "llui.h"
 #include "llviewerinventory.h"
@@ -342,7 +343,7 @@ BOOL LLFloaterTexturePicker::handleKeyHere(KEY key, MASK mask)
 		{
 			if (!root_folder->getCurSelectedItem())
 			{
-				LLFolderViewItem* itemp = root_folder->getItemByID(gAgent.getInventoryRootID());
+				LLFolderViewItem* itemp = root_folder->getItemByID(gInventory.getRootFolderID());
 				if (itemp)
 				{
 					root_folder->setSelection(itemp, FALSE, FALSE);
@@ -858,7 +859,7 @@ void LLFloaterTexturePicker::onTextureSelect( const LLTextureEntry& te )
 ///////////////////////////////////////////////////////////////////////
 // LLTextureCtrl
 
-static LLDefaultWidgetRegistry::Register<LLTextureCtrl> r("texture_picker");
+static LLDefaultChildRegistry::Register<LLTextureCtrl> r("texture_picker");
 
 LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
 :	LLUICtrl(p),
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index d27958c2ac..477e452907 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -52,7 +52,7 @@
 #include "lluiconstants.h"
 #include "llvoavatarself.h"
 #include "lltooldraganddrop.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterfriends.h"
 #include "llfloatersnapshot.h"
@@ -157,7 +157,7 @@ BOOL LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 	LLButton* inventory_btn = getChild<LLButton>("inventory_btn");
 	if (!inventory_btn) return FALSE;
 
-	LLInventoryView* active_inventory = LLInventoryView::getActiveInventory();
+	LLFloaterInventory* active_inventory = LLFloaterInventory::getActiveInventory();
 
 	LLRect button_screen_rect;
 	inventory_btn->localRectToScreen(inventory_btn->getRect(),&button_screen_rect);
@@ -173,7 +173,7 @@ BOOL LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 			if (!(active_inventory && active_inventory->getVisible()) && 
 			mInventoryAutoOpenTimer.getElapsedTimeF32() > sInventoryAutoOpenTime)
 			{
-				LLInventoryView::showAgentInventory();
+				LLFloaterInventory::showAgentInventory();
 			}
 		}
 		else
@@ -332,8 +332,11 @@ void LLToolBar::updateCommunicateList()
 	communicate_button->addSeparator(ADD_TOP);
 	communicate_button->add(getString("Redock Windows"), LLSD("redock"), ADD_TOP);
 	communicate_button->addSeparator(ADD_TOP);
-	communicate_button->add(LLFloaterReg::getTypedInstance<LLFloaterMute>("mute")->getShortTitle(), LLSD("mute list"), ADD_TOP);
-	
+	LLFloaterMute* mute_instance = LLFloaterReg::getTypedInstance<LLFloaterMute>("mute");
+	if(mute_instance)
+	{
+		communicate_button->add(mute_instance->getShortTitle(), LLSD("mute list"), ADD_TOP);
+	}
 	std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it;
 
 	if (gIMMgr->getIMFloaterHandles().size() > 0)
@@ -385,25 +388,29 @@ void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, const LLSD& user_data)
 	}
 	else if (selected_option.asString() == "redock")
 	{
-		LLFloaterChatterBox::getInstance()->addFloater(LLFloaterMyFriends::getInstance(), FALSE);
-		LLFloaterChatterBox::getInstance()->addFloater(LLFloaterChat::getInstance(), FALSE);
-		LLUUID session_to_show;
-		
-		std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it;
-		for(floater_handle_it = gIMMgr->getIMFloaterHandles().begin(); floater_handle_it != gIMMgr->getIMFloaterHandles().end(); ++floater_handle_it)
+		LLFloaterChatterBox* chatterbox_instance = LLFloaterChatterBox::getInstance();
+		if(chatterbox_instance)
 		{
-			LLFloater* im_floaterp = floater_handle_it->get();
-			if (im_floaterp)
+			chatterbox_instance->addFloater(LLFloaterMyFriends::getInstance(), FALSE);
+		    chatterbox_instance->addFloater(LLFloaterChat::getInstance(), FALSE);
+		
+			LLUUID session_to_show;
+		
+			std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it;
+			for(floater_handle_it = gIMMgr->getIMFloaterHandles().begin(); floater_handle_it != gIMMgr->getIMFloaterHandles().end(); ++floater_handle_it)
 			{
-				if (im_floaterp->isFrontmost())
+				LLFloater* im_floaterp = floater_handle_it->get();
+				if (im_floaterp)
 				{
-					session_to_show = ((LLFloaterIMPanel*)im_floaterp)->getSessionID();
+					if (im_floaterp->isFrontmost())
+					{
+						session_to_show = ((LLFloaterIMPanel*)im_floaterp)->getSessionID();
+					}
+					chatterbox_instance->addFloater(im_floaterp, FALSE);
 				}
-				LLFloaterChatterBox::getInstance()->addFloater(im_floaterp, FALSE);
 			}
+			LLFloaterReg::showInstance("communicate", session_to_show);
 		}
-
-		LLFloaterReg::showInstance("communicate", session_to_show);
 	}
 	else if (selected_option.asString() == "mute list")
 	{
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 0c0253a76a..72ed8f8108 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -51,7 +51,7 @@
 #include "llhudmanager.h"
 #include "llinventorybridge.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llmutelist.h"
 #include "llnotify.h"
 #include "llpreviewnotecard.h"
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index a89e79c8b8..c71ed5ae47 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -44,6 +44,7 @@
 #include "llfirstuse.h"
 #include "llfloateravatarinfo.h"
 #include "llfloaterland.h"
+#include "llfloaterreg.h"
 #include "llfloaterscriptdebug.h"
 #include "llhoverview.h"
 #include "llhudeffecttrail.h"
@@ -142,7 +143,7 @@ BOOL LLToolPie::pickLeftMouseDownCallback()
 			else
 			{
 				// not selling passes, get info
-				LLFloaterLand::showInstance();
+				LLFloaterReg::showInstance("about_land");
 			}
 		}
 
@@ -425,7 +426,7 @@ void LLToolPie::selectionPropertiesReceived()
 				handle_give_money_dialog();
 				break;
 			case CLICK_ACTION_OPEN:
-				handle_object_open();
+				LLFloaterReg::showInstance("openobject");
 				break;
 			default:
 				break;
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index 6c8e7e1f69..acb7f927b6 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -36,11 +36,12 @@
 // viewer includes
 #include "llagent.h"			// teleportViaLocation()
 #include "llcommandhandler.h"
-#include "llfloaterurldisplay.h"
 #include "llfloaterdirectory.h"
 #include "llfloaterhtml.h"
-#include "llfloaterworldmap.h"
 #include "llfloaterhtmlhelp.h"
+#include "llfloaterreg.h"
+#include "llfloaterurldisplay.h"
+#include "llfloaterworldmap.h"
 #include "llpanellogin.h"
 #include "llslurl.h"
 #include "llstartup.h"			// gStartupState
@@ -201,8 +202,8 @@ bool LLURLDispatcherImpl::dispatchRegion(const std::string& url, bool right_mous
 	S32 z = 0;
 	LLURLSimString::parse(sim_string, &region_name, &x, &y, &z);
 
-	LLFloaterURLDisplay* url_displayp = LLFloaterURLDisplay::getInstance(LLSD());
-	url_displayp->setName(region_name);
+	LLFloaterURLDisplay* url_displayp = LLFloaterReg::getTypedInstance<LLFloaterURLDisplay>("preview_url",LLSD());
+	if(url_displayp) url_displayp->setName(region_name);
 
 	// Request a region handle by name
 	LLWorldMap::getInstance()->sendNamedRegionRequest(region_name,
@@ -280,21 +281,26 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str
 		LLVector3d global_pos = from_region_handle(region_handle);
 		global_pos += LLVector3d(local_pos);
 		gAgent.teleportViaLocation(global_pos);
-		LLFloaterWorldMap::getInstance()->trackLocation(global_pos);
+		LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance();
+		if(instance)
+		{
+			instance->trackLocation(global_pos);
+		}
 	}
 	else
 	{
 		// display informational floater, allow user to click teleport btn
-		LLFloaterURLDisplay* url_displayp = LLFloaterURLDisplay::getInstance(LLSD());
-
-
-		url_displayp->displayParcelInfo(region_handle, local_pos);
-		if(snapshot_id.notNull())
+		LLFloaterURLDisplay* url_displayp = LLFloaterReg::getTypedInstance<LLFloaterURLDisplay>("preview_url",LLSD());
+		if(url_displayp)
 		{
-			url_displayp->setSnapshotDisplay(snapshot_id);
+			url_displayp->displayParcelInfo(region_handle, local_pos);
+			if(snapshot_id.notNull())
+			{
+				url_displayp->setSnapshotDisplay(snapshot_id);
+			}
+			std::string locationString = llformat("%s %d, %d, %d", region_name.c_str(), x, y, z);
+			url_displayp->setLocationString(locationString);
 		}
-		std::string locationString = llformat("%s %d, %d, %d", region_name.c_str(), x, y, z);
-		url_displayp->setLocationString(locationString);
 	}
 }
 
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 03c4915e66..914f74ca78 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -39,28 +39,48 @@
 
 #include "llcompilequeue.h"
 #include "llfloaterabout.h"
+#include "llfloateractivespeakers.h"
 #include "llfloaterauction.h"
 #include "llfloateraddlandmark.h"
 #include "llfloateravatarinfo.h"
+#include "llfloaterbeacons.h"
+#include "llfloaterbulkpermission.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloaterbump.h"
+#include "llfloatercamera.h"
 #include "llfloaterchat.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterdirectory.h"
+#include "llfloaterfonttest.h"
+#include "llfloatergodtools.h"
+#include "llfloaterhtmlcurrency.h"
+#include "llfloaterhtmlhelp.h"
+#include "llfloaterhud.h"
+#include "llfloaterinspect.h"
 #include "llfloaterjoystick.h"
 #include "llfloaternotificationsconsole.h"
 #include "llfloaterlagmeter.h"
+#include "llfloaterland.h"
 #include "llfloatermap.h"
 #include "llfloatermemleak.h"
 #include "llfloatermute.h"
+#include "llfloaterobjectiminfo.h"
+#include "llfloateropenobject.h"
+#include "llfloaterperms.h"
 #include "llfloaterpreference.h"
+#include "llfloaterregioninfo.h"
 #include "llfloatersnapshot.h"
 #include "llfloatersettingsdebug.h"
+#include "llfloatertestlistview.h"
+#include "llfloatertopobjects.h"
 #include "llfloatertools.h"
 #include "llfloateruipreview.h"
+#include "llfloaterurldisplay.h"
 #include "llfloatervoicedevicesettings.h"
 #include "llfloaterworldmap.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
+#include "llmediaremotectrl.h"
+#include "llmoveview.h"
 #include "llnearbychathistory.h"
 
 #include "llpreviewanim.h"
@@ -72,6 +92,8 @@
 #include "llpreviewtexture.h"
 #include "llfloaterminiinspector.h"
 
+//class LLLLFloaterObjectIMInfo;
+
 void LLViewerFloaterReg::registerFloaters()
 {
 	LLFloaterReg::add("mini_inspector", "panel_mini_inspector.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMiniInspector>);
@@ -82,9 +104,15 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("build", "floater_tools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTools>);
 	LLFloaterReg::add("world_map", "floater_world_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWorldMap>);
 	LLFloaterReg::add("mini_map", "floater_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMap>);
-	LLFloaterReg::add("inventory", "floater_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLInventoryView>);
+	LLFloaterReg::add("inventory", "floater_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterInventory>);
 	LLFloaterReg::add("add_landmark", "floater_add_landmark.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAddLandmark>);
 	LLFloaterReg::add("mute", "floater_mute.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMute>);
+	LLFloaterReg::add("about_land", "floater_about_land.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLand>);
+	LLFloaterReg::add("perm_prefs", "floater_perm_prefs.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPerms>);
+	LLFloaterReg::add("region_info", "floater_region_info.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterRegionInfo>);
+	LLFloaterReg::add("preview_url", "floater_preview_url.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterURLDisplay>);
+	LLFloaterReg::add("font_test", "floater_font_test.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFontTest>);
+	LLFloaterReg::add("mem_leaking", "floater_mem_leaking.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMemLeak>);
 	
 	LLFloaterReg::add("auction", "floater_auction.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAuction>);
 	LLFloaterReg::add("build_options", "floater_build_options.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBuildOptions>);
@@ -92,9 +120,25 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("notifications_console", "floater_notifications_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationConsole>);
 	LLFloaterReg::add("settings_debug", "floater_settings_debug.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSettingsDebug>);
 	LLFloaterReg::add("lagmeter", "floater_lagmeter.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLagMeter>);
+	LLFloaterReg::add("moveview", "floater_moveview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMove>);
+	LLFloaterReg::add("active_speakers", "floater_active_speakers.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterActiveSpeakers>);
+	LLFloaterReg::add("beacons", "floater_beacons.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBeacons>);
+	LLFloaterReg::add("bulk_perms", "floater_bulk_perms.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBulkPermission>);
+	LLFloaterReg::add("camera", "floater_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>);
+	LLFloaterReg::add("god_tools", "floater_god_tools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGodTools>);
+	LLFloaterReg::add("media_browser", "floater_media_browser.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMediaBrowser>);
+	LLFloaterReg::add("html_currency", "floater_html_simple.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHtmlCurrency>);
+	LLFloaterReg::add("top_objects", "floater_top_objects.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTopObjects>);
+	LLFloaterReg::add("inspect", "floater_inspect.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterInspect>);
+	LLFloaterReg::add("hud", "floater_hud.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHUD>);
+	LLFloaterReg::add("openobject", "floater_openobject.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterOpenObject>);
 
-	LLFloaterReg::add("ui_preview", "floater_ui_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterUIPreview>);
-	LLFloaterReg::add("test_widgets", "floater_test_widgets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater>);
+	LLFloaterReg::add("ui_preview", "floater_ui_preview.xml",
+		&LLFloaterReg::build<LLFloaterUIPreview>);
+	LLFloaterReg::add("test_list_view", "floater_test_list_view.xml",
+		&LLFloaterReg::build<LLFloaterTestListView>);
+	LLFloaterReg::add("test_widgets", "floater_test_widgets.xml", 
+		&LLFloaterReg::build<LLFloater>);
 	
 	LLFloaterReg::add("pref_joystick", "floater_joystick.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterJoystick>);
 	LLFloaterReg::add("pref_voicedevicesettings", "floater_device_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterVoiceDeviceSettings>);
@@ -122,4 +166,10 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("preview_texture", "floater_preview_texture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewTexture>, "preview");
 	
 	LLFloaterReg::add("stats", "floater_stats.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater>);
+	
+	LLObjectIMInfo::register_floater();
+	// debug use only
+	LLFloaterReg::add("media_remote_ctrl", "floater_media_remote.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMediaRemoteCtrl>);
+
+	// *NOTE: Please keep these alphabetized for easier merges
 }
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 2c79e67ebc..54b0a4f568 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -45,7 +45,7 @@
 #include "llgesturemgr.h"
 
 #include "llinventorybridge.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 
 #include "llviewerregion.h"
 #include "llviewerobjectlist.h"
@@ -870,7 +870,7 @@ void menu_create_inventory_item(LLFolderView* folder, LLFolderBridge *bridge, co
 		}
 		else
 		{
-			category = gInventory.createNewCategory(gAgent.getInventoryRootID(), LLAssetType::AT_NONE, LLStringUtil::null);
+			category = gInventory.createNewCategory(gInventory.getRootFolderID(), LLAssetType::AT_NONE, LLStringUtil::null);
 		}
 		gInventory.notifyObservers();
 		folder->setSelectionByID(category, TRUE);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ae7099d382..70a6e24c8f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -87,14 +87,12 @@
 #include "llfloateractivespeakers.h"
 #include "llfloateranimpreview.h"
 #include "llfloateravatartextures.h"
-#include "llfloaterbeacons.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloaterbump.h"
 #include "llfloaterbuy.h"
 #include "llfloaterbuycontents.h"
 #include "llfloaterbuycurrency.h"
 #include "llfloaterbuyland.h"
-#include "llfloatercamera.h"
 #include "llfloaterchat.h"
 #include "llfloatercustomize.h"
 #include "llfloaterdaycycle.h"
@@ -146,7 +144,7 @@
 #include "llimagetga.h"
 #include "llinventorybridge.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llkeyboard.h"
 #include "llpanellogin.h"
 #include "llmenucommands.h"
@@ -500,23 +498,23 @@ void init_menus()
 	///
 	/// Pie menus
 	///
-	gPieSelf = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_self.xml", gMenuHolder);
+	gPieSelf = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_self.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 
 	// TomY TODO: what shall we do about these?
 	gDetachScreenPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Detach HUD", true);
 	gDetachPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Detach", true);
 
-	gPieAvatar = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_avatar.xml", gMenuHolder);
+	gPieAvatar = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_avatar.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 
-	gPieObject = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_object.xml", gMenuHolder);
+	gPieObject = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_object.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 
 	gAttachScreenPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Attach HUD");
 	gAttachPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Attach");
 	gPieRate = gMenuHolder->getChild<LLContextMenu>("Rate Menu");
 
-	gPieAttachment = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_attachment.xml", gMenuHolder);
+	gPieAttachment = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_attachment.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 
-	gPieLand = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_land.xml", gMenuHolder);
+	gPieLand = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_land.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 
 	///
 	/// set up the colors
@@ -544,7 +542,7 @@ void init_menus()
 	{
 		color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
 	}
-	gMenuBarView = LLUICtrlFactory::getInstance()->createFromFile<LLMenuBarGL>("menu_viewer.xml", gMenuHolder);
+	gMenuBarView = LLUICtrlFactory::getInstance()->createFromFile<LLMenuBarGL>("menu_viewer.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT));
 	gMenuBarView->setBackgroundColor( color );
 
@@ -575,7 +573,7 @@ void init_menus()
 	// Let land based option enable when parcel changes
 	gMenuParcelObserver = new LLMenuParcelObserver();
 
-	gLoginMenuBarView = LLUICtrlFactory::getInstance()->createFromFile<LLMenuBarGL>("menu_login.xml", gMenuHolder);
+	gLoginMenuBarView = LLUICtrlFactory::getInstance()->createFromFile<LLMenuBarGL>("menu_login.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	gLoginMenuBarView->arrangeAndClear();
 	LLRect menuBarRect = gLoginMenuBarView->getRect();
 	gLoginMenuBarView->setRect(LLRect(menuBarRect.mLeft, menuBarRect.mTop, gViewerWindow->getRootView()->getRect().getWidth() - menuBarRect.mLeft,  menuBarRect.mBottom));
@@ -612,11 +610,6 @@ class LLAdvancedToggleConsole : public view_listener_t
 			toggle_visibility( (void*)gDebugView->mMemoryView );
 		}
 #endif
-		else if ("notifications" == console_type)
-		{
-			//LLFloaterNotificationConsole::showInstance();
-			LLFloaterReg::showInstance("notifications_console");
-		}
 		return true;
 	}
 };
@@ -1117,30 +1110,6 @@ class LLAdvancedCheckFrameTest : public view_listener_t
 };
 
 
-	//
-/////////////////////////////
-//// HIDE SELECTED OBJECTS //
-/////////////////////////////
-//
-//
-//class LLAdvancedToggleHideSelectedObjects : public view_listener_t
-//{
-//	bool handleEvent(const LLSD& userdata)
-//	{
-//		LLSelectMgr::sHideSelectedObjects = !(LLSelectMgr::sHideSelectedObjects);
-//		return true;
-//	}
-//};
-	//
-//class LLAdvancedCheckHideSelectedObjects : public view_listener_t
-//{
-//	bool handleEvent(const LLSD& userdata)
-//	{
-//		bool new_value = gHideSelectedObjects;
-//		return new_value;
-//	}
-//};
-
 ///////////////////////////
 // SELECTED TEXTURE INFO //
 ///////////////////////////
@@ -1506,16 +1475,6 @@ class LLAdvancedCheckDebugWindowProc : public view_listener_t
 
 // ------------------------------XUI MENU ---------------------------
 
-
-class LLAdvancedShowFontTest : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		LLFloaterFontTest::show(NULL);
-		return true;
-	}
-};
-
 //////////////////////
 // LOAD UI FROM XML //
 //////////////////////
@@ -1547,6 +1506,15 @@ class LLAdvancedSaveUIToXML : public view_listener_t
 };
 
 
+class LLAdvancedSendTestIms : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLIMModel::instance().testMessages();
+		return true;
+}
+};
+
 
 ///////////////
 // XUI NAMES //
@@ -1987,18 +1955,6 @@ class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
 	}
 };
 
-////////////////////////////////
-// Memory Leaking Simulation  //
-////////////////////////////////
-class LLAdvancedMemoryLeakingSimulation : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		LLFloaterMemLeak::show(NULL);
-		return true;
-	}
-};
-
 #endif
 	
 /////////////////
@@ -2147,7 +2103,6 @@ class LLAdvancedShowDebugSettings : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-	//	LLFloaterSettingsDebug::showInstance(userdata);
 		LLFloaterReg::showInstance("settings_debug",userdata);
 		return true;
 	}
@@ -2414,14 +2369,6 @@ class LLAdminHandleRegionDumpTempAssetData: public view_listener_t
 	}
 };
 //Admin (Top Level)
-class LLAdminShowGodTools: public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		LLFloaterGodTools::showInstance(LLSD());
-		return true;
-	}
-};
 
 class LLAdminOnSaveState: public view_listener_t
 {
@@ -2581,7 +2528,7 @@ class LLObjectEnableTouch : public view_listener_t
 //		label.assign("Touch");
 //	}
 //}
-
+/*
 bool handle_object_open()
 {
 	LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
@@ -2598,7 +2545,7 @@ class LLObjectOpen : public view_listener_t
 		return handle_object_open();
 	}
 };
-
+*/
 class LLObjectEnableOpen : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -2715,16 +2662,6 @@ class LLObjectEdit : public view_listener_t
 	}
 };
 
-class LLObjectInspect : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		LLFloaterInspect::show();
-		return true;
-	}
-};
-
-
 //---------------------------------------------------------------------------
 // Land pie menu
 //---------------------------------------------------------------------------
@@ -4382,7 +4319,7 @@ void handle_take()
 			}
 
 			// check library
-			if(gInventory.isObjectDescendentOf(category_id, gInventoryLibraryRoot))
+			if(gInventory.isObjectDescendentOf(category_id, gInventory.getLibraryRootFolderID()))
 			{
 				category_id.setNull();
 			}
@@ -5612,35 +5549,10 @@ class LLShowFloater : public view_listener_t
 		{
 			LLToolBar::toggle(NULL);
 		}
-		else if (floater_name == "mute list")
-		{
-			 LLFloaterReg::toggleInstance("mute");
-		}
-		else if (floater_name == "camera controls")
-		{
-			LLFloaterCamera::toggleInstance();
-		}
-		else if (floater_name == "movement controls")
-		{
-			LLFloaterMove::toggleInstance();
-		}
 		else if (floater_name == "my land")
 		{
 			LLFloaterLandHoldings::show(NULL);
 		}
-		else if (floater_name == "about land")
-		{
-			if (LLViewerParcelMgr::getInstance()->selectionEmpty())
-			{
-				LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
-			}
-
-			LLFloaterLand::showInstance();
-		}
-		else if (floater_name == "about region")
-		{
-			LLFloaterRegionInfo::showInstance();
-		}
 		else if (floater_name == "buy land")
 		{
 			if (LLViewerParcelMgr::getInstance()->selectionEmpty())
@@ -5650,10 +5562,6 @@ class LLShowFloater : public view_listener_t
 			
 			LLViewerParcelMgr::getInstance()->startBuyLand();
 		}
-		else if (floater_name == "grid options")
-		{
-			LLFloaterReg::showInstance("build_options");
-		}
 		else if (floater_name == "script errors")
 		{
 			LLFloaterScriptDebug::show(LLUUID::null);
@@ -5662,48 +5570,16 @@ class LLShowFloater : public view_listener_t
 		{
 			gViewerHtmlHelp.show();
 		}
-		else if (floater_name == "help tutorial")
-		{
-			LLFloaterHUD::showHUD();
-		}
 		else if (floater_name == "complaint reporter")
 		{
 			// Prevent menu from appearing in screen shot.
 			gMenuHolder->hideMenus();
 			LLFloaterReporter::showFromMenu(COMPLAINT_REPORT);
 		}
-		else if (floater_name == "mean events")
-		{
-			if (!gNoRender)
-			{
-				//LLFloaterBump::showInstance();
-				LLFloaterReg::showInstance("bumps");
-			}
-		}
-		else if (floater_name == "lag meter")
-		{
-			LLFloaterReg::showInstance("lagmeter");
-		}
 		else if (floater_name == "buy currency")
 		{
 			LLFloaterBuyCurrency::buyCurrency();
 		}
-		else if (floater_name == "about")
-		{
-			LLFloaterReg::showInstance("sl_about");
-		}
-		else if (floater_name == "active speakers")
-		{
-			LLFloaterActiveSpeakers::toggleInstance(LLSD());
-		}
-		else if (floater_name == "beacons")
-		{
-			LLFloaterBeacons::toggleInstance(LLSD());
-		}
-		else if (floater_name == "perm prefs")
-		{
-			LLFloaterPerms::toggleInstance(LLSD());
-		}
 		else
 		{
 			LLFloaterReg::toggleInstance(floater_name);
@@ -5722,30 +5598,6 @@ class LLFloaterVisible : public view_listener_t
 		{
 			new_value = LLToolBar::visible(NULL);
 		}
-		else if (floater_name == "mute list")
-		{
-			new_value = LLFloaterReg::instanceVisible("mute");
-		}
-		else if (floater_name == "camera controls")
-		{
-			new_value = LLFloaterCamera::instanceVisible();
-		}
-		else if (floater_name == "movement controls")
-		{
-			new_value = LLFloaterMove::instanceVisible();
-		}
-		else if (floater_name == "stat bar")
-		{
-			new_value = gSavedSettings.getBOOL("ShowDebugStats");
-		}
-		else if (floater_name == "active speakers")
-		{
-			new_value = LLFloaterActiveSpeakers::instanceVisible(LLSD());
-		}
-		else if (floater_name == "beacons")
-		{
-			new_value = LLFloaterBeacons::instanceVisible(LLSD());
-		}
 		else
 		{
 			new_value = LLFloaterReg::instanceVisible(floater_name);
@@ -6440,8 +6292,8 @@ class LLToolsSelectedScriptAction : public view_listener_t
 			msg = "RunningNot";
 		}
 		LLUUID id; id.generate();
-		LLFloater* floater = LLFloaterReg::getInstance(name, LLSD(id));
-		LLFloaterScriptQueue* queue = dynamic_cast<LLFloaterScriptQueue*>(floater);
+		
+		LLFloaterScriptQueue* queue =LLFloaterReg::getTypedInstance<LLFloaterScriptQueue>(name, LLSD(id));
 		if (queue)
 		{
 			queue->setMono(mono);
@@ -6450,7 +6302,7 @@ class LLToolsSelectedScriptAction : public view_listener_t
 		else
 		{
 			llwarns << "Failed to generate LLFloaterScriptQueue with action: " << action << llendl;
-			delete floater;
+			delete queue;
 		}
 		return true;
 	}
@@ -7016,7 +6868,7 @@ void handle_grab_texture(void* data)
 			gInventory.updateItem(item);
 			gInventory.notifyObservers();
 
-			LLInventoryView* view = LLInventoryView::getActiveInventory();
+			LLFloaterInventory* view = LLFloaterInventory::getActiveInventory();
 
 			// Show the preview panel for textures to let
 			// user know that the image is now in inventory.
@@ -7026,7 +6878,7 @@ void handle_grab_texture(void* data)
 
 				view->getPanel()->setSelection(item_id, TAKE_FOCUS_NO);
 				view->getPanel()->openSelected();
-				//LLInventoryView::dumpSelectionInformation((void*)view);
+				//LLFloaterInventory::dumpSelectionInformation((void*)view);
 				// restore keyboard focus
 				gFocusMgr.setKeyboardFocus(focus_ctrl);
 			}
@@ -7261,10 +7113,14 @@ void handle_buy_currency_test(void*)
 
 	llinfos << "buy currency url " << url << llendl;
 
-	LLFloaterHtmlCurrency* floater = LLFloaterHtmlCurrency::showInstance(url);
-	// Needed so we can use secondlife:///app/floater/self/close SLURLs
-	floater->setTrusted(true);
-	floater->center();
+	LLFloaterHtmlCurrency* floater =LLFloaterReg::getTypedInstance<LLFloaterHtmlCurrency>("html_currency", LLSD(url));
+	if(floater)
+	{
+		LLFloaterReg::showInstance("html_currency", LLSD(url));
+		// Needed so we can use secondlife:///app/floater/self/close SLURLs
+		floater->setTrusted(true);
+		floater->center();
+	}
 }
 
 void handle_rebake_textures(void*)
@@ -7984,11 +7840,11 @@ void initialize_menus()
 
 	// Advanced > XUI
 	commit.add("Advanced.ReloadColorSettings", boost::bind(&LLUIColorTable::loadFromSettings, LLUIColorTable::getInstance()));
-	view_listener_t::addMenu(new LLAdvancedShowFontTest(), "Advanced.ShowFontTest");
 	view_listener_t::addMenu(new LLAdvancedLoadUIFromXML(), "Advanced.LoadUIFromXML");
 	view_listener_t::addMenu(new LLAdvancedSaveUIToXML(), "Advanced.SaveUIToXML");
 	view_listener_t::addMenu(new LLAdvancedToggleXUINames(), "Advanced.ToggleXUINames");
 	view_listener_t::addMenu(new LLAdvancedCheckXUINames(), "Advanced.CheckXUINames");
+	view_listener_t::addMenu(new LLAdvancedSendTestIms(), "Advanced.SendTestIMs");
 
 	// Advanced > Character > Grab Baked Texture
 	view_listener_t::addMenu(new LLAdvancedGrabBakedTexture(), "Advanced.GrabBakedTexture");
@@ -8024,7 +7880,6 @@ void initialize_menus()
 	#ifndef LL_RELEASE_FOR_DOWNLOAD
 	view_listener_t::addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
 	view_listener_t::addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
-	view_listener_t::addMenu(new LLAdvancedMemoryLeakingSimulation(), "Advanced.MemoryLeakingSimulation");
 	#endif
 	// Advanced > Network
 	view_listener_t::addMenu(new LLAdvancedEnableMessageLog(), "Advanced.EnableMessageLog");
@@ -8072,7 +7927,6 @@ void initialize_menus()
 	// Admin >Region
 	view_listener_t::addMenu(new LLAdminHandleRegionDumpTempAssetData(), "Admin.HandleRegionDumpTempAssetData");
 	// Admin top level
-	view_listener_t::addMenu(new LLAdminShowGodTools(), "Admin.ShowGodTools");
 	view_listener_t::addMenu(new LLAdminOnSaveState(), "Admin.OnSaveState");
 
 	// Self pie menu
@@ -8100,7 +7954,6 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLAvatarEnableFreezeEject(), "Avatar.EnableFreezeEject");
 
 	// Object pie menu
-	view_listener_t::addMenu(new LLObjectOpen(), "Object.Open");
 	view_listener_t::addMenu(new LLObjectBuild(), "Object.Build");
 	view_listener_t::addMenu(new LLObjectTouch(), "Object.Touch");
 	view_listener_t::addMenu(new LLObjectSitOrStand(), "Object.SitOrStand");
@@ -8111,7 +7964,6 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLObjectMute(), "Object.Mute");
 	view_listener_t::addMenu(new LLObjectBuy(), "Object.Buy");
 	view_listener_t::addMenu(new LLObjectEdit(), "Object.Edit");
-	view_listener_t::addMenu(new LLObjectInspect(), "Object.Inspect");
 
 	view_listener_t::addMenu(new LLObjectEnableOpen(), "Object.EnableOpen");
 	view_listener_t::addMenu(new LLObjectEnableTouch(), "Object.EnableTouch");
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index 99994bdf5b..13a1639917 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -101,7 +101,6 @@ void handle_toggle_flycam();
 
 bool handle_sit_or_stand();
 bool handle_give_money_dialog();
-bool handle_object_open();
 bool handle_go_to();
 
 // Export to XML or Collada
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a05bd30600..e46748edf0 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -94,7 +94,7 @@
 #include "llhudmanager.h"
 #include "llimpanel.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llmenugl.h"
 #include "llmutelist.h"
 #include "llnotifications.h"
@@ -912,17 +912,17 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 		//highlight item, if it's not in the trash or lost+found
 		
 		// Don't auto-open the inventory floater
-		LLInventoryView* view = NULL;
+		LLFloaterInventory* view = NULL;
 		if(gSavedSettings.getBOOL("ShowInInventory") &&
 		   asset_type != LLAssetType::AT_CALLINGCARD &&
 		   item->getInventoryType() != LLInventoryType::IT_ATTACHMENT &&
 		   !from_name.empty())
 		{
-			view = LLInventoryView::showAgentInventory();
+			view = LLFloaterInventory::showAgentInventory();
 		}
 		else
 		{
-			view = LLInventoryView::getActiveInventory();
+			view = LLFloaterInventory::getActiveInventory();
 		}
 		if(!view)
 		{
@@ -986,7 +986,8 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
 	if (LLMuteList::getInstance()->add(mute))
 	{
 		LLFloaterReg::showInstance("mute");
-		LLFloaterReg::getTypedInstance<LLFloaterMute>("mute")->selectMute(blocked_id);
+		LLFloaterMute* mute_instance = LLFloaterReg::getTypedInstance<LLFloaterMute>("mute");
+		if(mute_instance) mute_instance->selectMute(blocked_id);
 	}
 
 	// purge the message queue of any previously queued inventory offers from the same source.
@@ -1527,7 +1528,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 			// now store incoming IM in chat history
 
-			buffer = separator_string + message.substr(message_offset);
+			buffer = message.substr(message_offset);
 	
 			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
@@ -1577,7 +1578,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			{
 				saved = llformat("(Saved %s) ", formatted_time(timestamp).c_str());
 			}
-			buffer = separator_string + saved  + message.substr(message_offset);
+			buffer = saved + message.substr(message_offset);
 
 			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
@@ -1876,7 +1877,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		{
 			saved = llformat("(Saved %s) ", formatted_time(timestamp).c_str());
 		}
-		buffer = separator_string + saved + message.substr(message_offset);
+		buffer = saved + message.substr(message_offset);
 		BOOL is_this_agent = FALSE;
 		if(from_id == gAgentID)
 		{
@@ -4793,13 +4794,13 @@ void container_inventory_arrived(LLViewerObject* object,
 		gAgent.changeCameraToDefault();
 	}
 
-	LLInventoryView* view = LLInventoryView::getActiveInventory();
+	LLFloaterInventory* view = LLFloaterInventory::getActiveInventory();
 
 	if (inventory->size() > 2)
 	{
 		// create a new inventory category to put this in
 		LLUUID cat_id;
-		cat_id = gInventory.createNewCategory(gAgent.getInventoryRootID(),
+		cat_id = gInventory.createNewCategory(gInventory.getRootFolderID(),
 											  LLAssetType::AT_NONE,
 											  LLTrans::getString("AcquiredItems"));
 
@@ -5494,10 +5495,14 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
 	msg->getVector3("Data", "SimPosition", pos);
 	msg->getVector3("Data", "LookAt", look_at);
 
-	LLFloaterWorldMap::getInstance()->trackURL(
-		sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
-	LLFloaterReg::showInstance("world_map", "center");
-
+	LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance();
+	if(instance)
+	{
+		instance->trackURL(
+						   sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
+		LLFloaterReg::showInstance("world_map", "center");
+	}
+	
 	// remove above two lines and replace with below line
 	// to re-enable parcel browser for llMapDestination()
 	// LLURLDispatcher::dispatch(LLSLURL::buildSLURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]), FALSE);
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index f4989ec4fe..399b7c6bc1 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -39,7 +39,7 @@
 #include "llinventory.h"
 #include "llinventorybridge.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 
 #include "llviewertexteditor.h"
 
@@ -64,7 +64,7 @@
 
 #include "llappviewer.h" // for gPacificDaylightTime
 
-static LLDefaultWidgetRegistry::Register<LLViewerTextEditor> r("text_editor");
+static LLDefaultChildRegistry::Register<LLViewerTextEditor> r("text_editor");
 
 ///----------------------------------------------------------------------------
 /// Class LLEmbeddedNotecardOpener
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 569eba2f20..e4aaf2bf29 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -93,7 +93,6 @@
 #include "llfeaturemanager.h"
 #include "llfilepicker.h"
 #include "llfloater.h"
-#include "llfloateractivespeakers.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloaterbuyland.h"
 #include "llfloatercamera.h"
@@ -116,7 +115,7 @@
 #include "llhudview.h"
 #include "llimagebmp.h"
 #include "llimagej2c.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
 #include "llmenugl.h"
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index b38e71236d..e351c904e6 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -52,7 +52,7 @@
 #include "llheadrotmotion.h"
 #include "llhudeffecttrail.h"
 #include "llhudmanager.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llkeyframefallmotion.h"
 #include "llkeyframestandmotion.h"
 #include "llkeyframewalkmotion.h"
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index e7d7d74f62..ef02b509ba 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -54,7 +54,7 @@
 #include "llheadrotmotion.h"
 #include "llhudeffecttrail.h"
 #include "llhudmanager.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llkeyframefallmotion.h"
 #include "llkeyframestandmotion.h"
 #include "llkeyframewalkmotion.h"
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 082dcb50a2..fc639fbb21 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -4551,7 +4551,7 @@ void LLVoiceClient::messageEvent(
 	
 	if(messageHeader.find("text/html") != std::string::npos)
 	{
-		std::string rawMessage;
+		std::string message;
 
 		{
 			const std::string startMarker = "<body";
@@ -4563,7 +4563,7 @@ void LLVoiceClient::messageEvent(
 			std::string::size_type end;
 			
 			// Default to displaying the raw string, so the message gets through.
-			rawMessage = messageBody;
+			message = messageBody;
 
 			// Find the actual message text within the XML fragment
 			start = messageBody.find(startMarker);
@@ -4577,7 +4577,7 @@ void LLVoiceClient::messageEvent(
 				if(end != std::string::npos)
 					end -= start;
 					
-				rawMessage.assign(messageBody, start, end);
+				message.assign(messageBody, start, end);
 			}
 			else 
 			{
@@ -4593,24 +4593,24 @@ void LLVoiceClient::messageEvent(
 					if(end != std::string::npos)
 						end -= start;
 					
-					rawMessage.assign(messageBody, start, end);
+					message.assign(messageBody, start, end);
 				}			
 			}
 		}	
 		
-//		LL_DEBUGS("Voice") << "    raw message = \n" << rawMessage << LL_ENDL;
+//		LL_DEBUGS("Voice") << "    raw message = \n" << message << LL_ENDL;
 
 		// strip formatting tags
 		{
 			std::string::size_type start;
 			std::string::size_type end;
 			
-			while((start = rawMessage.find('<')) != std::string::npos)
+			while((start = message.find('<')) != std::string::npos)
 			{
-				if((end = rawMessage.find('>', start + 1)) != std::string::npos)
+				if((end = message.find('>', start + 1)) != std::string::npos)
 				{
 					// Strip out the tag
-					rawMessage.erase(start, (end + 1) - start);
+					message.erase(start, (end + 1) - start);
 				}
 				else
 				{
@@ -4626,31 +4626,31 @@ void LLVoiceClient::messageEvent(
 
 			// The text may contain text encoded with &lt;, &gt;, and &amp;
 			mark = 0;
-			while((mark = rawMessage.find("&lt;", mark)) != std::string::npos)
+			while((mark = message.find("&lt;", mark)) != std::string::npos)
 			{
-				rawMessage.replace(mark, 4, "<");
+				message.replace(mark, 4, "<");
 				mark += 1;
 			}
 			
 			mark = 0;
-			while((mark = rawMessage.find("&gt;", mark)) != std::string::npos)
+			while((mark = message.find("&gt;", mark)) != std::string::npos)
 			{
-				rawMessage.replace(mark, 4, ">");
+				message.replace(mark, 4, ">");
 				mark += 1;
 			}
 			
 			mark = 0;
-			while((mark = rawMessage.find("&amp;", mark)) != std::string::npos)
+			while((mark = message.find("&amp;", mark)) != std::string::npos)
 			{
-				rawMessage.replace(mark, 5, "&");
+				message.replace(mark, 5, "&");
 				mark += 1;
 			}
 		}
 		
 		// strip leading/trailing whitespace (since we always seem to get a couple newlines)
-		LLStringUtil::trim(rawMessage);
+		LLStringUtil::trim(message);
 		
-//		LL_DEBUGS("Voice") << "    stripped message = \n" << rawMessage << LL_ENDL;
+//		LL_DEBUGS("Voice") << "    stripped message = \n" << message << LL_ENDL;
 		
 		sessionState *session = findSession(sessionHandle);
 		if(session)
@@ -4674,14 +4674,12 @@ void LLVoiceClient::messageEvent(
 					quiet_chat = true;
 					// TODO: Question: Return busy mode response here?  Or maybe when session is started instead?
 				}
-				
-				std::string fullMessage = std::string(": ") + rawMessage;
-				
+								
 				LL_DEBUGS("Voice") << "adding message, name " << session->mName << " session " << session->mIMSessionID << ", target " << session->mCallerID << LL_ENDL;
 				gIMMgr->addMessage(session->mIMSessionID,
 						session->mCallerID,
 						session->mName.c_str(),
-						fullMessage.c_str(),
+						message.c_str(),
 						LLStringUtil::null,		// default arg
 						IM_NOTHING_SPECIAL,		// default arg
 						0,						// default arg
@@ -4689,7 +4687,7 @@ void LLVoiceClient::messageEvent(
 						LLVector3::zero,		// default arg
 						true);					// prepend name and make it a link to the user's profile
 
-				chat.mText = std::string("IM: ") + session->mName + std::string(": ") + rawMessage;
+				chat.mText = std::string("IM: ") + session->mName + std::string(": ") + message;
 				// If the chat should come in quietly (i.e. we're in busy mode), pretend it's from a local agent.
 				LLFloaterChat::addChat( chat, TRUE, quiet_chat );
 			}
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 781f8298f7..57f57f75d7 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -41,6 +41,7 @@
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
 #include "llfloaterhtmlhelp.h"
+#include "llfloaterreg.h"
 #include "llalertdialog.h"
 
 class URLLoader : public LLAlertDialog::URLLoader
@@ -75,7 +76,7 @@ void LLWeb::loadURL(const std::string& url)
 	}
 	else
 	{
-		LLFloaterMediaBrowser::showInstance(url);
+		LLFloaterReg::showInstance("media_browser",url);
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml
index 076332e062..32d3f4fd7e 100644
--- a/indra/newview/skins/default/xui/en/floater_auction.xml
+++ b/indra/newview/skins/default/xui/en/floater_auction.xml
@@ -48,7 +48,7 @@
      left_delta="0"
      name="snapshot_btn"
      top_pad="4"
-     width="96" >
+     width="96">
       <button.commit_callback
          function="ClickSnapshot" />
     </button>
diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
index 41ddec6395..049ea9ab14 100644
--- a/indra/newview/skins/default/xui/en/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/en/floater_beacons.xml
@@ -20,43 +20,64 @@
          control_name="scripttouchbeacon"
          label="Scripted Objects with Touch Only"
          layout="topleft"
-         name="touch_only" />
+         name="touch_only" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
         <check_box
          bottom_delta="20"
          control_name="scriptsbeacon"
          label="Scripted Objects"
          layout="topleft"
-         name="scripted" />
+         name="scripted">
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
         <check_box
          bottom_delta="20"
          control_name="physicalbeacon"
          label="Physical Objects"
          layout="topleft"
-         name="physical" />
+         name="physical" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
         <check_box
          bottom_delta="20"
          control_name="soundsbeacon"
          label="Sound Sources"
          layout="topleft"
-         name="sounds" />
+         name="sounds" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
         <check_box
          bottom_delta="20"
          control_name="particlesbeacon"
          label="Particle Sources"
          layout="topleft"
-         name="particles" />
+         name="particles" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
         <check_box
          bottom_delta="20"
          control_name="renderhighlights"
          label="Render Highlights"
          layout="topleft"
-         name="highlights" />
+         name="highlights" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
         <check_box
          bottom_delta="20"
          control_name="renderbeacons"
          label="Render Beacons"
          layout="topleft"
-         name="beacons" />
+         name="beacons" >
+          <check_box.commit_callback
+           function="Beacons.UICheck" />
+        </check_box>
         <text
          type="string"
          length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 6d7e3a9c45..843a8848bf 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -224,7 +224,10 @@
      left="8"
      name="check_all"
      top="257"
-     width="100" />
+     width="100">
+      <button.commit_callback
+       function="BulkPermission.CheckAll" />
+    </button>
     <button
      follows="left|top"
      height="20"
@@ -234,7 +237,10 @@
      left_delta="0"
      name="check_none"
      top_pad="4"
-     width="100" />
+     width="100" >
+      <button.commit_callback
+       function="BulkPermission.UncheckAll"/>
+    </button>
     <text
      type="string"
      length="1"
@@ -295,10 +301,13 @@
      left_delta="78"
      name="next_owner_copy"
      top_delta="0"
-     width="88" />
-    <check_box
+     width="88">
+      <check_box.commit_callback
+       function="BulkPermission.CommitCopy"/>
+     </check_box>
+     <check_box
      control_name="BulkChangeNextOwnerTransfer"
-     enabled="false"
+     enabled_control="BulkChangeNextOwnerCopy" 
      height="16"
      initial_value="true"
      label="Resell/Give away"
@@ -324,7 +333,10 @@
      left="65"
      name="apply"
      top_pad="10"
-     width="100" />
+     width="100">
+      <button.commit_callback
+       function="BulkPermission.Apply"/>
+    </button>
     <button
      follows="left|top"
      height="20"
@@ -333,5 +345,8 @@
      left_pad="5"
      name="close"
      top_delta="0"
-     width="100" />
+     width="100" >
+      <button.commit_callback
+       function="BulkPermission.Close"/>
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index e35ab3ea49..f3abad8cb2 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -34,7 +34,10 @@
              left="10"
              name="Kick all users"
              top="8"
-             width="100" />
+             width="100">
+				<button.commit_callback
+				function="GridTools.KickAll" />
+			</button>
             <button
              follows="left|top"
              height="20"
@@ -44,7 +47,10 @@
              left_delta="0"
              name="Flush This Region&apos;s Map Visibility Caches"
              top_pad="8"
-             width="250" />
+             width="250">
+				<button.commit_callback
+				function="GridTools.FlushMapVisibilityCaches" />
+			</button>
         </panel>
         <panel
          border="true"
@@ -79,7 +85,10 @@
              max_length="63"
              name="region name"
              top_delta="0"
-             width="208" />
+             width="208">
+			       <line_editor.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</line_editor>
             <check_box
              height="16"
              label="Prelude"
@@ -88,7 +97,10 @@
              name="check prelude"
              tool_tip="Set this to make the region a prelude."
              top="30"
-             width="180" />
+             width="180">
+			       <check_box.commit_callback
+					function="RegionTools.ChangePrelude" />
+			</check_box>
             <check_box
              height="16"
              label="Fixed Sun"
@@ -97,7 +109,10 @@
              name="check fixed sun"
              tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain."
              top_pad="4"
-             width="180" />
+             width="180">
+			       <check_box.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</check_box>
             <check_box
              height="16"
              label="Reset Home On Teleport"
@@ -106,7 +121,10 @@
              name="check reset home"
              tool_tip="When resident teleports out, reset their home to the destination position."
              top_pad="4"
-             width="180" />
+             width="180">
+			       <check_box.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</check_box>
             <check_box
              height="16"
              label="Visible"
@@ -115,7 +133,10 @@
              name="check visible"
              tool_tip="Set this to make the region visible to non-gods."
              top_pad="4"
-             width="180" />
+             width="180">
+			       <check_box.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</check_box>
             <check_box
              height="16"
              label="Damage"
@@ -124,7 +145,10 @@
              name="check damage"
              tool_tip="Set this to enable damage in this region."
              top_pad="4"
-             width="180" />
+             width="180">
+			       <check_box.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</check_box>
             <check_box
              height="16"
              label="Block Traffic Tracking"
@@ -133,7 +157,10 @@
              name="block dwell"
              tool_tip="Set this to make the region not compute traffic."
              top_pad="4"
-             width="180" />
+             width="180">
+			       <check_box.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</check_box>
             <check_box
              height="16"
              label="Block Terraform"
@@ -142,7 +169,10 @@
              name="block terraform"
              tool_tip="Set this to disallow people terraforming their land"
              top_pad="4"
-             width="180" />
+             width="180">
+			       <check_box.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</check_box>
             <check_box
              height="16"
              label="Sandbox"
@@ -151,7 +181,10 @@
              name="is sandbox"
              tool_tip="Toggle whether this is a sandbox region."
              top_pad="4"
-             width="180" />
+             width="180">
+			       <check_box.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</check_box>
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -163,7 +196,10 @@
              name="Bake Terrain"
              tool_tip="Save the current terrain as default."
              top_pad="32"
-             width="110" />
+             width="110">
+			       <button.commit_callback
+					function="RegionTools.BakeTerrain" />
+			</button>
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -175,7 +211,10 @@
              name="Revert Terrain"
              tool_tip="Replace the current terrain with default."
              top_pad="4"
-             width="110" />
+             width="110">
+			       <button.commit_callback
+					function="RegionTools.RevertTerrain" />
+			</button>
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -187,7 +226,10 @@
              name="Swap Terrain"
              tool_tip="Swap current terrain with default."
              top_pad="4"
-             width="110" />
+             width="110">
+			       <button.commit_callback
+					function="RegionTools.SwapTerrain" />
+			</button>
             <text
              type="string"
              length="1"
@@ -236,7 +278,10 @@
              name="parentestate"
              tool_tip="This is the parent estate for this region"
              top_delta="0"
-             width="50" />
+             width="50">
+			       <line_editor.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</line_editor>
             <text
              type="string"
              length="1"
@@ -260,7 +305,10 @@
              name="gridposx"
              tool_tip="This is the grid x position for this region"
              top_delta="0"
-             width="50" />
+             width="50">
+			       <line_editor.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</line_editor>
             <line_editor
              border_style="line"
              border_thickness="1"
@@ -272,7 +320,10 @@
              name="gridposy"
              tool_tip="This is the grid y position for this region"
              top_delta="0"
-             width="40" />
+             width="40">
+			       <line_editor.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</line_editor>
             <text
              type="string"
              length="1"
@@ -295,7 +346,10 @@
              max_length="10"
              name="redirectx"
              top_delta="0"
-             width="50" />
+             width="50">
+			       <line_editor.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</line_editor>
             <line_editor
              border_style="line"
              border_thickness="1"
@@ -306,7 +360,10 @@
              max_length="10"
              name="redirecty"
              top_delta="0"
-             width="40" />
+             width="40">
+			       <line_editor.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</line_editor>
             <spinner
              follows="top|right"
              height="16"
@@ -316,7 +373,10 @@
              max_val="4"
              name="billable factor"
              top="110"
-             width="80" />
+             width="80">
+			       <spinner.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</spinner>
             <text
              type="string"
              length="1"
@@ -340,7 +400,10 @@
              max_val="100"
              name="land cost"
              top="130"
-             width="80" />
+             width="80">
+			       <spinner.commit_callback
+					function="RegionTools.ChangeAnything" />
+			</spinner>
             <text
              type="string"
              length="1"
@@ -365,7 +428,10 @@
              name="Refresh"
              tool_tip="Click here to refresh the above information."
              top="150"
-             width="110" />
+             width="110">
+				<button.commit_callback
+				function="RegionTools.Refresh" />
+			</button>
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -377,7 +443,10 @@
              name="Apply"
              tool_tip="Click here to apply any changes from above."
              top_pad="36"
-             width="110" />
+             width="110">
+				<button.commit_callback
+				function="RegionTools.ApplyChanges" />
+			</button>
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -389,7 +458,10 @@
              name="Select Region"
              tool_tip="Select the whole region with the land tool."
              top="238"
-             width="110" />
+             width="110">
+				<button.commit_callback
+				function="RegionTools.SelectRegion" />
+			</button>
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -401,7 +473,10 @@
              name="Autosave now"
              tool_tip="Save gzipped state to autosave directory."
              top_pad="4"
-             width="110" />
+             width="110">
+				<button.commit_callback
+				function="RegionTools.SaveState" />
+			</button>
         </panel>
         <panel
          border="true"
@@ -450,7 +525,10 @@
              name="disable scripts"
              tool_tip="Set this to disable all scripts in this region"
              top="30"
-             width="110" />
+             width="110">
+				<check_box.commit_callback
+					function="ObjectTools.ChangeAnything" />
+			</check_box>
             <check_box
              height="16"
              label="Disable Collisions"
@@ -459,7 +537,10 @@
              name="disable collisions"
              tool_tip="Set this to disable non-agent collisions in this region"
              top_delta="0"
-             width="121" />
+             width="121">
+				<check_box.commit_callback
+					function="ObjectTools.ChangeAnything" />
+			</check_box>
             <check_box
              height="16"
              label="Disable Physics"
@@ -468,7 +549,10 @@
              name="disable physics"
              tool_tip="Set this to disable all physics in this region"
              top_delta="0"
-             width="130" />
+             width="130">
+				<check_box.commit_callback
+					function="ObjectTools.ChangeAnything" />
+			</check_box>
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -480,8 +564,11 @@
              name="Apply"
              tool_tip="Click here to apply any changes from above."
              top="54"
-             width="110" />
-            <button
+             width="110">
+				<button.commit_callback
+				function="ObjectTools.ApplyChanges" />
+			</button>            
+			<button
              follows="top|right"
              font="SansSerifSmall"
              height="20"
@@ -492,7 +579,10 @@
              name="Set Target"
              tool_tip="Set the target avatar for object deletion."
              top="78"
-             width="110" />
+             width="110">
+				<button.commit_callback
+				function="ObjectTools.Set" />
+			</button>  
             <text
              type="string"
              length="1"
@@ -516,7 +606,10 @@
              name="Delete Target&apos;s Scripted Objects On Others Land"
              tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."
              top="126"
-             width="380" />
+             width="380">
+				<button.commit_callback
+				function="ObjectTools.DeletePublicOwnedBy" />
+			</button>    
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -528,7 +621,10 @@
              name="Delete Target&apos;s Scripted Objects On *Any* Land"
              tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."
              top_pad="28"
-             width="380" />
+             width="380">
+				<button.commit_callback
+				function="ObjectTools.DeleteAllScriptedOwnedBy" />
+			</button>   
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -540,8 +636,11 @@
              name="Delete *ALL* Of Target&apos;s Objects"
              tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned."
              top_pad="28"
-             width="380" />
-            <button
+             width="380">
+				<button.commit_callback
+				function="ObjectTools.DeleteAllOwnedBy" />
+			</button>   
+			<button
              follows="top|right"
              font="SansSerifSmall"
              height="20"
@@ -552,7 +651,10 @@
              name="Get Top Colliders"
              tool_tip="Gets list of objects experiencing the most narrowphase callbacks."
              top_pad="28"
-             width="110" />
+             width="110">
+				<button.commit_callback
+				function="ObjectTools.GetTopColliders" />
+			</button>   
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -564,7 +666,10 @@
              name="Get Top Scripts"
              tool_tip="Gets list of objects spending the most time running scripts."
              top_pad="4"
-             width="110" />
+             width="110">
+				<button.commit_callback
+				function="ObjectTools.GetTopScripts" />
+			</button>  
             <button
              follows="top|right"
              font="SansSerifSmall"
@@ -576,7 +681,10 @@
              name="Scripts digest"
              tool_tip="Gets a list of all scripts and number of occurences of each."
              top_pad="4"
-             width="110" />
+             width="110" >
+				<button.commit_callback
+				function="ObjectTools.GetScriptDigest" />
+			</button>  
         </panel>
         <panel
          border="true"
@@ -679,7 +787,10 @@
              left="10"
              name="Make Request"
              top="96"
-             width="100" />
+             width="100">
+				<button.commit_callback
+					function="GodTools.Request" />
+			</button>
         </panel>
     </tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
new file mode 100644
index 0000000000..7c95fcd96a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="200"
+ layout="topleft"
+ left="0"
+ name="panel_im"
+ top="0"
+ width="300">
+  <text_editor
+   enabled="false"
+   type="string"
+   length="1"
+   top="20" 
+   follows="left|top|right"
+   font="SansSerif"
+   height="175"
+   layout="topleft"
+   left="5"
+   name="im_text"
+   width="290"
+   word_wrap="true">
+  </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index ed3b4f00f2..b11b3e4df5 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -40,6 +40,8 @@
          label="Creation Date"
          name="creation_date"
          width="150" />
+		 <scroll_list.commit_callback
+		   function="Inspect.SelectObject" />
     </scroll_list>
     <button
      follows="left|bottom"
@@ -50,7 +52,10 @@
      name="button owner"
      tool_tip="See profile of the highlighted object&apos;s owner"
      top_pad="5"
-     width="150" />
+     width="150">
+		<button.commit_callback
+		function="Inspect.OwnerProfilet" />
+	</button>
     <button
      follows="left|bottom"
      height="20"
@@ -60,5 +65,8 @@
      name="button creator"
      tool_tip="See profile of the highlighted object&apos;s original creator"
      top_delta="0"
-     width="150" />
+     width="150">
+		<button.commit_callback
+		function="Inspect.CreatorProfile" />
+	</button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
index 8af4f74aa3..a326cd006f 100644
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
@@ -201,7 +201,7 @@
         Client:
     </text>
     <text
-	 make_visible_control="LagMeterShrunk"
+	 visiblity_control="LagMeterShrunk"
      type="string"
      length="1"
      bottom="40"
@@ -215,7 +215,7 @@
         Normal
     </text>
     <text
-	 make_visible_control="LagMeterShrunk"	
+	 visiblity_control="LagMeterShrunk"	
      bottom="56"
      follows="left|top"
      height="16"
@@ -250,7 +250,7 @@
         Network:
     </text>
     <text
-	 make_visible_control="LagMeterShrunk"
+	 visiblity_control="LagMeterShrunk"
      type="string"
      length="1"
      bottom="80"
@@ -264,7 +264,7 @@
         Normal
     </text>
     <text
-	 make_visible_control="LagMeterShrunk"	
+	 visiblity_control="LagMeterShrunk"	
      bottom="96"
      follows="left|top"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index a073c3443a..15ec2e220f 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -34,7 +34,10 @@
              left="0"
              name="back"
              top="0"
-             width="55" />
+             width="55">
+				<button.commit_callback
+				function="MediaBrowser.Back" />
+			</button>
             <button
              follows="left|top"
              height="20"
@@ -43,7 +46,10 @@
              left_pad="3"
              name="forward"
              top_delta="0"
-             width="68" />
+             width="68">
+				<button.commit_callback
+				function="MediaBrowser.Forward" />
+			</button>
             <button
              enabled="false"
              follows="left|top"
@@ -53,7 +59,10 @@
              left_pad="2"
              name="reload"
              top_delta="0"
-             width="70" />
+             width="70">
+				<button.commit_callback
+				function="MediaBrowser.Refresh" />
+			</button>
             <combo_box
              allow_text_entry="true"
              follows="left|top|right"
@@ -63,7 +72,10 @@
              max_chars="255"
              name="address"
              top_delta="0"
-             width="540" />
+             width="540">
+				<combo_box.commit_callback
+				function="MediaBrowser.EnterAddress" />
+			</combo_box>
             <button
              enabled="false"
              follows="right|top"
@@ -73,7 +85,10 @@
              left_pad="5"
              name="go"
              top_delta="0"
-             width="55" />
+             width="55">
+				<button.commit_callback
+				function="MediaBrowser.Go" />
+			</button>
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -93,7 +108,10 @@
              left="0"
              name="assign"
              top="0"
-             width="200" />
+             width="200">
+				<button.commit_callback
+				function="MediaBrowser.Assign" />
+			</button>
         </layout_panel>
         <layout_panel
          height="20"
@@ -119,7 +137,10 @@
              left_delta="0"
              name="open_browser"
              top_pad="5"
-             width="185" />
+             width="185">
+				<button.commit_callback
+				function="MediaBrowser.OpenWebBrowser" />
+			</button>
             <check_box
              control_name="UseExternalBrowser"
              follows="bottom|left"
@@ -138,7 +159,10 @@
              left_pad="80"
              name="close"
              top_delta="0"
-             width="70" />
+             width="70">
+				<button.commit_callback
+				function="MediaBrowser.Close" />
+			</button>
         </layout_panel>
     </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
index e2a99e6614..da698f276b 100644
--- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
@@ -20,7 +20,10 @@
      max_val="4.29497e+009"
      name="leak_speed"
      top="30"
-     width="330" />
+     width="330">
+		<spinner.commit_callback
+		function="MemLeak.ChangeLeakingSpeed" />
+	</spinner>
     <spinner
      decimal_digits="0"
      follows="left|top"
@@ -34,7 +37,10 @@
      max_val="4096"
      name="max_leak"
      top_pad="5"
-     width="330" />
+     width="330">
+		<spinner.commit_callback
+		function="MemLeak.ChangeMaxMemLeaking" />
+	</spinner>
     <text
      type="string"
      length="1"
@@ -79,7 +85,10 @@
      left_delta="0"
      name="start_btn"
      top_delta="20"
-     width="70" />
+     width="70">
+		<button.commit_callback
+		function="MemLeak.Start" />
+	</button>
     <button
      follows="left|top"
      height="20"
@@ -88,7 +97,10 @@
      left_pad="7"
      name="stop_btn"
      top_delta="0"
-     width="70" />
+     width="70">
+		<button.commit_callback
+		function="MemLeak.Stop" />
+	</button>
     <button
      follows="left|top"
      height="20"
@@ -97,7 +109,10 @@
      left_pad="7"
      name="release_btn"
      top_delta="0"
-     width="70" />
+     width="70">
+		<button.commit_callback
+		function="MemLeak.Release" />
+	</button>
     <button
      follows="left|top"
      height="20"
@@ -106,5 +121,8 @@
      left_pad="36"
      name="close_btn"
      top_delta="0"
-     width="70" />
+     width="70">
+		<button.commit_callback
+		function="MemLeak.Close" />
+	</button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
index 742934b57b..e0ac2c1d51 100644
--- a/indra/newview/skins/default/xui/en/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/en/floater_openobject.xml
@@ -42,7 +42,10 @@
      name="copy_to_inventory_button"
      tab_group="1"
      top_pad="285"
-     width="120" />
+     width="120">
+        <button.commit_callback
+         function="OpenObject.MoveToInventory" />
+    </button>
     <button
      follows="bottom|left"
      font="SansSerifSmall"
@@ -53,5 +56,8 @@
      left_pad="10"
      name="copy_and_wear_button"
      top_delta="0"
-     width="120" />
+     width="120">
+        <button.commit_callback
+         function="OpenObject.MoveAndWear" />
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
index 430cb940e5..e4cb97035c 100644
--- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
@@ -24,7 +24,11 @@
          left="260"
          name="help"
          top="7"
-         width="22" />
+         width="22">
+            <button.commit_callback
+            function="Notification.Show" 
+			parameter="ClickUploadHelpPermissions" />
+        </button>
         <check_box
          control_name="ShareWithGroup"
          height="16"
@@ -72,8 +76,12 @@
          left_delta="78"
          name="next_owner_copy"
          top_delta="0"
-         width="88" />
+         width="88" >
+		    <check_box.commit_callback
+			function="Perms.Copy" />
+		</check_box>
         <check_box
+		 enabled_control="NextOwnerCopy"
          control_name="NextOwnerTransfer"
          enabled="false"
          height="16"
@@ -93,7 +101,10 @@
      left="90"
      name="ok"
      top="150"
-     width="100" />
+     width="100">
+		<button.commit_callback
+		function="Perms.OK" />
+	</button>
     <button
      height="20"
      label="Cancel"
@@ -102,5 +113,8 @@
      left_pad="5"
      name="cancel"
      top_delta="0"
-     width="100" />
+     width="100">
+		<button.commit_callback
+		function="Perms.Cancel" />
+	</button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
new file mode 100644
index 0000000000..3991a4a82b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ height="400"
+ layout="topleft"
+ name="floater_test_list_view"
+ width="400">
+    <list_view
+     height="300"
+     left="10"
+     name="test_list_view"
+     top="28"
+     width="300" />
+  <button
+    name="test_1_btn"
+    label="Test 1"
+    top="350"
+    left="10"
+    height="20"
+    width="80"
+    commit_callback.function="TestListView.Test1" />
+  <button
+    name="test_2_btn"
+    label="Test 2"
+    top_delta="0"
+    left_pad="10"
+    height="20"
+    width="80"
+    commit_callback.function="TestListView.Test2" />
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index 20e39beb6f..ecd64d08e6 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -87,6 +87,8 @@
          label="Mono Time"
          name="mono_time"
          width="55" />
+		<scroll_list.commit_callback
+          function="TopObjects.CommitObjectsList" />
     </scroll_list>
     <text
      type="string"
@@ -117,7 +119,10 @@
      left_pad="10"
      name="show_beacon_btn"
      top_delta="0"
-     width="100" />
+     width="100">
+      <button.commit_callback
+          function="TopObjects.ShowBeacon" />
+    </button>
     <text
      type="string"
      length="1"
@@ -146,7 +151,10 @@
      left_pad="10"
      name="filter_object_btn"
      top_delta="0"
-     width="100" />
+     width="100">
+      <button.commit_callback
+          function="TopObjects.GetByObjectName" />
+    </button>
     <text
      type="string"
      length="1"
@@ -175,7 +183,10 @@
      left_pad="10"
      name="filter_owner_btn"
      top_delta="0"
-     width="100" />
+     width="100">
+      <button.commit_callback
+          function="TopObjects.GetByOwnerName" />
+    </button>
     <button
      follows="bottom|left"
      height="20"
@@ -184,7 +195,10 @@
      left="10"
      name="return_selected_btn"
      top="295"
-     width="130" />
+     width="130">
+      <button.commit_callback
+          function="TopObjects.ReturnSelected" />
+    </button>
     <button
      follows="bottom|left"
      height="20"
@@ -193,7 +207,10 @@
      left_pad="10"
      name="return_all_btn"
      top_delta="0"
-     width="130" />
+     width="130">
+      <button.commit_callback
+          function="TopObjects.ReturnAll" />
+    </button>
     <button
      follows="bottom|left"
      height="20"
@@ -202,7 +219,10 @@
      left="10"
      name="disable_selected_btn"
      top="320"
-     width="130" />
+     width="130">
+      <button.commit_callback
+          function="TopObjects.DisableSelected" />
+    </button>
     <button
      follows="bottom|left"
      height="20"
@@ -211,7 +231,10 @@
      left_pad="10"
      name="disable_all_btn"
      top_delta="0"
-     width="130" />
+     width="130">
+      <button.commit_callback
+          function="TopObjects.DisableAll" />
+    </button>
     <button
      bottom="315"
      follows="bottom|right"
@@ -220,5 +243,8 @@
      layout="topleft"
      name="refresh_btn"
      right="-10"
-     width="100" />
+     width="100">
+      <button.commit_callback
+          function="TopObjects.Refresh" />
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 43f209546a..b179190819 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -144,7 +144,10 @@
      name="Go Home"
      tool_tip="Teleport to your home"
      top="34"
-     width="88" />
+     width="88" >
+		<button.commit_callback
+		function="WMap.GoHome" />
+	</button>
     <icon
      color="0 1 0 1"
      follows="top|right"
@@ -325,6 +328,8 @@
         <combo_box.item
          label="Online Friends"
          value="None" />
+		<combo_box.commit_callback
+		function="WMap.AvatarCombo"/>
     </combo_box>
     <icon
      color="0.5 0 0 1"
@@ -352,6 +357,8 @@
         <combo_box.item
          label="Landmarks"
          value="None" />
+		 <combo_box.commit_callback
+		function="WMap.Landmark" />
     </combo_box>
     <icon
      color="0.5 0 0 1"
@@ -384,7 +391,10 @@
      name="DoSearch"
      tool_tip="Search for region"
      top_delta="0"
-     width="60" />
+     width="60">
+		<button.commit_callback
+		function="WMap.Location" />
+	</button>
     <text
      type="string"
      length="1"
@@ -415,6 +425,8 @@
          label=""
          name="sim_name"
          width="206" />
+		<scroll_list.commit_callback
+		function="WMap.SearchResult" />
     </scroll_list>
     <text
      type="string"
@@ -441,7 +453,10 @@
      name="spin x"
      tool_tip="X coordinate of location to show on map"
      top_delta="0"
-     width="48" />
+     width="48">
+		<spinner.commit_callback
+		function="WMap.CommitLocation" />
+    </spinner>
     <spinner
      decimal_digits="0"
      follows="bottom|right"
@@ -454,7 +469,10 @@
      name="spin y"
      tool_tip="Y coordinate of location to show on map"
      top_delta="0"
-     width="48" />
+     width="48" >
+		<spinner.commit_callback
+		function="WMap.CommitLocation" />
+    </spinner>
     <spinner
      decimal_digits="0"
      follows="bottom|right"
@@ -467,7 +485,10 @@
      name="spin z"
      tool_tip="Z coordinate of location to show on map"
      top_delta="0"
-     width="48" />
+     width="48">
+		<spinner.commit_callback
+		function="WMap.CommitLocation" />
+    </spinner>
     <button
      follows="right|bottom"
      height="20"
@@ -478,7 +499,10 @@
      name="Teleport"
      tool_tip="Teleport to selected location"
      top="494"
-     width="90" />
+     width="90">
+		<button.commit_callback
+		function="WMap.Teleport" />
+    </button>
     <button
      follows="right|bottom"
      height="20"
@@ -489,7 +513,10 @@
      name="Show Destination"
      tool_tip="Center map on selected location"
      top_delta="0"
-     width="125" />
+     width="125">
+		<button.commit_callback
+		function="WMap.ShowTarget" />
+    </button>
     <button
      follows="right|bottom"
      height="20"
@@ -500,7 +527,10 @@
      name="Clear"
      tool_tip="Stop tracking"
      top="518"
-     width="90" />
+     width="90">
+		<button.commit_callback
+		function="WMap.Clear" />
+    </button>
     <button
      follows="right|bottom"
      height="20"
@@ -511,7 +541,10 @@
      name="Show My Location"
      tool_tip="Center map on your avatar&apos;s location"
      top_delta="0"
-     width="125" />
+     width="125" >
+		<button.commit_callback
+		function="WMap.ShowAgent" />
+    </button>
     <button
      enabled="false"
      follows="bottom|right"
@@ -522,7 +555,10 @@
      name="copy_slurl"
      tool_tip="Copies current location as SLURL to be used on the web."
      top="542"
-     width="222" />
+     width="222">
+		<button.commit_callback
+		function="WMap.CopySLURL" />
+    </button>
     <slider
      follows="right|bottom"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index eb3dcc225e..14c38f6f26 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -101,5 +101,13 @@
              function="ShowFloater"
              parameter="test_widgets" />
         </menu_item_call>
+        <menu_item_call
+         label="List View Test"
+         name="List View Test"
+         shortcut="control|shift|L">
+            <menu_item_call.on_click
+             function="ShowFloater"
+             parameter="test_list_view" />
+        </menu_item_call>
     </menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1d1a1c063e..4ce3c18dcc 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -15,8 +15,17 @@
          name="Preferences"
          shortcut="control|P">
             <menu_item_call.on_click
-             function="ShowFloater"
+             function="Floater.Show"
              parameter="preferences" />
+        </menu_item_call>
+		<menu_item_call
+         label="Media Remote Ctrl"
+         layout="topleft"
+         name="Preferences"
+         shortcut="control|A">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="media_remote_ctrl" />
         </menu_item_call>
         <menu_item_separator
          layout="topleft" />
@@ -221,22 +230,22 @@
          layout="topleft"
          name="Active Speakers">
             <menu_item_check.on_check
-             function="FloaterVisible"
-             parameter="active speakers" />
+             function="Floater.Visible"
+             parameter="active_speakers" />
             <menu_item_check.on_click
-             function="ShowFloater"
-             parameter="active speakers" />
+             function="Floater.Toggle"
+             parameter="active_speakers" />
         </menu_item_check>
         <menu_item_check
          label="Block List"
          layout="topleft"
          name="Mute List">
             <menu_item_check.on_check
-             function="FloaterVisible"
-             parameter="mute list" />
+             function="Floater.Visible"
+             parameter="mute" />
             <menu_item_check.on_click
-             function="ShowFloater"
-             parameter="mute list" />
+             function="Floater.Toggle"
+             parameter="mute" />
         </menu_item_check>
     </menu>
     <menu
@@ -249,22 +258,22 @@
          layout="topleft"
          name="Camera Controls">
             <menu_item_check.on_check
-             function="FloaterVisible"
-             parameter="camera controls" />
+             function="Floater.Visible"
+             parameter="camera" />
             <menu_item_check.on_click
-             function="ShowFloater"
-             parameter="camera controls" />
+             function="Floater.Toggle"
+             parameter="camera" />
         </menu_item_check>
         <menu_item_check
          label="Movement Controls"
          layout="topleft"
          name="Movement Controls">
             <menu_item_check.on_check
-             function="FloaterVisible"
-             parameter="movement controls" />
+             function="Floater.Visible"
+             parameter="moveview" />
             <menu_item_check.on_click
-             function="ShowFloater"
-             parameter="movement controls" />
+             function="Floater.Toggle"
+             parameter="moveview" />
         </menu_item_check>
         <menu_item_separator
          layout="topleft" />
@@ -273,16 +282,16 @@
          layout="topleft"
          name="About Land">
             <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="about land" />
+             function="Floater.Show"
+             parameter="about_land" />
         </menu_item_call>
         <menu_item_call
          label="Region/Estate"
          layout="topleft"
          name="Region/Estate">
             <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="about region" />
+             function="Floater.Show"
+             parameter="region_info" />
         </menu_item_call>
         <menu_item_separator
          layout="topleft" />
@@ -350,9 +359,10 @@
          name="Mini-Map"
          shortcut="control|shift|M">
             <menu_item_check.on_check
-             function="FloaterVisible" />
+             function="Floater.Visible"
+			 parameter="mini_map" />
             <menu_item_check.on_click
-             function="ShowFloater"
+             function="Floater.Show"
              parameter="mini_map" />
         </menu_item_check>
         <menu_item_separator
@@ -400,8 +410,8 @@
          layout="topleft"
          name="Tutorial">
             <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="help tutorial" />
+             function="Floater.Show"
+             parameter="hud" />
         </menu_item_call>
         <menu
          label="Report"
@@ -429,16 +439,16 @@
              layout="topleft"
              name="Bumps, Pushes &amp;amp; Hits">
                 <menu_item_call.on_click
-                 function="ShowFloater"
-                 parameter="mean events" />
+                 function="Floater.Show"
+                 parameter="bumps" />
             </menu_item_call>
             <menu_item_call
              label="About Second Life"
              layout="topleft"
              name="About Second Life">
                 <menu_item_call.on_click
-                 function="ShowFloater"
-                 parameter="about" />
+                 function="Floater.Show"
+                 parameter="sl_about" />
             </menu_item_call>
         </menu>
     </menu>
@@ -573,8 +583,8 @@
              layout="topleft"
              name="perm prefs">
                 <menu_item_call.on_click
-                 function="ShowFloater"
-                 parameter="perm prefs" />
+                 function="Floater.Toggle"
+                 parameter="perm_prefs" />
             </menu_item_call>
             <menu_item_call
              label="Show Script Warning/Error Window"
@@ -702,8 +712,8 @@
                  name="Grid Options"
                  shortcut="control|shift|B">
                     <menu_item_call.on_click
-                     function="ShowFloater"
-                     parameter="grid options" />
+                     function="Floater.Show"
+                     parameter="build_options" />
                     <menu_item_call.on_enable
                      function="Tools.EnableToolNotPie" />
                 </menu_item_call>
@@ -720,10 +730,10 @@
                  name="beacons"
                  shortcut="control|alt|shift|N">
                     <menu_item_check.on_check
-                     function="FloaterVisible"
+                     function="Floater.Visible"
                      parameter="beacons" />
                     <menu_item_check.on_click
-                     function="ShowFloater"
+                     function="Floater.Toggle"
                      parameter="beacons" />
                 </menu_item_check>
                 <menu_item_check
@@ -1312,8 +1322,8 @@
              layout="topleft"
              name="Lag Meter">
                 <menu_item_call.on_click
-                 function="ShowFloater"
-                 parameter="lag meter" />
+                 function="Floater.Show"
+                 parameter="lagmeter" />
             </menu_item_call>
             <menu_item_check
              label="Statistics Bar"
@@ -1894,8 +1904,8 @@
                  function="Advanced.CheckConsole"
                  parameter="notifications" />
                 <menu_item_check.on_click
-                 function="Advanced.ToggleConsole"
-                 parameter="notifications" />
+                 function="Floater.Show"
+                 parameter="notifications_console" />
             </menu_item_check>
             <menu_item_separator
              layout="topleft" />
@@ -1999,8 +2009,8 @@
          layout="topleft"
          name="Memory Leaking Simulation">
             <menu_item_call.on_click
-             function="Advanced.MemoryLeakingSimulation"
-             parameter="" />
+             function="Floater.Show"
+             parameter="mem_leaking" />
         </menu_item_call>
         <menu_item_separator
          layout="topleft" />
@@ -2843,7 +2853,8 @@
              layout="topleft"
              name="Show Font Test">
                 <menu_item_call.on_click
-                 function="Advanced.ShowFontTest" />
+                 function="Floater.Show"
+				 parameter="font_test" />
             </menu_item_call>
             <menu_item_call
              label="Load from XML..."
@@ -2869,6 +2880,13 @@
                 <menu_item_check.on_click
                  function="Advanced.ToggleXUINames" />
             </menu_item_check>
+          <menu_item_call
+           label="Send Test IMs"
+           layout="topleft"
+           name="Send Test IMs">
+            <menu_item_call.on_click
+             function="Advanced.SendTestIMs" />
+          </menu_item_call>
         </menu>
         <menu
          create_jump_keys="true"
@@ -3304,7 +3322,8 @@
          layout="topleft"
          name="God Tools">
             <menu_item_call.on_click
-             function="Admin.ShowGodTools" />
+             function="Floater.Show"
+			 parameter="god_tools" />
             <menu_item_call.on_enable
              function="EnableGodCustomerService" />
         </menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0a63da1463..d2c0ffd13d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -13,7 +13,7 @@
   <global name="implicitclosebutton">
 		Close
   </global>
-  
+    
   <template name="okbutton">
     <form>
       <button
@@ -4980,347 +4980,347 @@ The string [STRING_NAME] is missing from strings.xml
    icon="notifytip.tga"
    name="SystemMessageTip"
    type="notifytip">
-[MESSAGE]
+    [MESSAGE]
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="Cancelled"
    type="notifytip">
-Cancelled
+    Cancelled
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CancelledSit"
    type="notifytip">
-Cancelled Sit
+    Cancelled Sit
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CancelledAttach"
    type="notifytip">
-Cancelled Attach
+    Cancelled Attach
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="ReplacedMissingWearable"
    type="notifytip">
-Replaced missing clothing/body part with default.
+    Replaced missing clothing/body part with default.
   </notification>
 
   <notification
    icon="groupnotify"
    name="GroupNotice"
    type="groupnotify">
-Topic: [SUBJECT], Message: [MESSAGE]
+    Topic: [SUBJECT], Message: [MESSAGE]
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="FriendOnline"
    type="notifytip">
-[FIRST] [LAST] is Online
+    [FIRST] [LAST] is Online
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="FriendOffline"
    type="notifytip">
-[FIRST] [LAST] is Offline
+    [FIRST] [LAST] is Offline
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="AddSelfFriend"
    type="notifytip">
-You cannot add yourself as a friend.
+    You cannot add yourself as a friend.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="UploadingAuctionSnapshot"
    type="notifytip">
-Uploading in-world and web site snapshots...
-(Takes about 5 minutes.)
+    Uploading in-world and web site snapshots...
+    (Takes about 5 minutes.)
   </notification>
 
   <notification
    icon="notify.tga"
    name="UploadPayment"
    type="notify">
-You paid L$[AMOUNT] to upload.
+    You paid L$[AMOUNT] to upload.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="UploadWebSnapshotDone"
    type="notifytip">
-Web site snapshot upload done.
+    Web site snapshot upload done.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="UploadSnapshotDone"
    type="notifytip">
-In-world snapshot upload done
+    In-world snapshot upload done
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="TerrainDownloaded"
    type="notifytip">
-Terrain.raw downloaded
+    Terrain.raw downloaded
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="GestureMissing"
    type="notifytip">
-Gesture [NAME] is missing from database.
+    Gesture [NAME] is missing from database.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="UnableToLoadGesture"
    type="notifytip">
-Unable to load gesture [NAME].
-Please try again.
+    Unable to load gesture [NAME].
+    Please try again.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="LandmarkMissing"
    type="notifytip">
-Landmark is missing from database.
+    Landmark is missing from database.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="UnableToLoadLandmark"
    type="notifytip">
-Unable to load landmark.  Please try again.
+    Unable to load landmark.  Please try again.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CapsKeyOn"
    type="notifytip">
-Your Caps Lock key is on.
-As this will affect the password you type in, you will probably want to turn it off.
+    Your Caps Lock key is on.
+    As this will affect the password you type in, you will probably want to turn it off.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="NotecardMissing"
    type="notifytip">
-Notecard is missing from database.
+    Notecard is missing from database.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="NotecardNoPermissions"
    type="notifytip">
-Insufficient permissions to view notecard.
+    Insufficient permissions to view notecard.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="RezItemNoPermissions"
    type="notifytip">
-Insufficient permissions to rez object.
+    Insufficient permissions to rez object.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="UnableToLoadNotecard"
    type="notifytip">
-Unable to load notecard.
-Please try again.
+    Unable to load notecard.
+    Please try again.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="ScriptMissing"
    type="notifytip">
-Script is missing from database.
+    Script is missing from database.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="ScriptNoPermissions"
    type="notifytip">
-Insufficient permissions to view script.
+    Insufficient permissions to view script.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="UnableToLoadScript"
    type="notifytip">
-Unable to load script.  Please try again.
+    Unable to load script.  Please try again.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="IncompleteInventory"
    type="notifytip">
-The complete contents you are offering are not yet locally available. Please try offering those items again in a minute.
+    The complete contents you are offering are not yet locally available. Please try offering those items again in a minute.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CannotModifyProtectedCategories"
    type="notifytip">
-You cannot modify protected categories.
+    You cannot modify protected categories.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CannotRemoveProtectedCategories"
    type="notifytip">
-You cannot remove protected categories.
+    You cannot remove protected categories.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="OfferedCard"
    type="notifytip">
-You have offered a calling card to [FIRST] [LAST]
+    You have offered a calling card to [FIRST] [LAST]
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="UnableToBuyWhileDownloading"
    type="notifytip">
-Unable to buy while downloading object data.
-Please try again.
+    Unable to buy while downloading object data.
+    Please try again.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="UnableToLinkWhileDownloading"
    type="notifytip">
-Unable to link while downloading object data.
-Please try again.
+    Unable to link while downloading object data.
+    Please try again.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CannotBuyObjectsFromDifferentOwners"
    type="notifytip">
-Cannot buy objects from different owners at the same time.
-Please select a single object.
+    Cannot buy objects from different owners at the same time.
+    Please select a single object.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="ObjectNotForSale"
    type="notifytip">
-Object does not appear to be for sale.
+    Object does not appear to be for sale.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="EnteringGodMode"
    type="notifytip">
-Entering god mode, level [LEVEL]
+    Entering god mode, level [LEVEL]
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="LeavingGodMode"
    type="notifytip">
-Leaving god mode, level [LEVEL]
+    Leaving god mode, level [LEVEL]
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CopyFailed"
    type="notifytip">
-Copy failed because you lack copy permission
+    Copy failed because you lack copy permission
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="InventoryAccepted"
    type="notifytip">
-[NAME] accepted your inventory offer.
+    [NAME] accepted your inventory offer.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="InventoryDeclined"
    type="notifytip">
-[NAME] declined your inventory offer.
+    [NAME] declined your inventory offer.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="ObjectMessage"
    type="notifytip">
-[NAME]: [MESSAGE]
+    [NAME]: [MESSAGE]
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CallingCardAccepted"
    type="notifytip">
-Your calling card was accepted.
+    Your calling card was accepted.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CallingCardDeclined"
    type="notifytip">
-Your calling card was declined.
+    Your calling card was declined.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="TeleportToLandmark"
    type="notifytip">
-Now that you have reached the mainland, you can teleport to locations like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder.
-Double click on the landmark and click on Teleport to travel there.
+    Now that you have reached the mainland, you can teleport to locations like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder.
+    Double click on the landmark and click on Teleport to travel there.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="TeleportToPerson"
    type="notifytip">
-Now that you have reached the mainland, you can contact residents like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder.
-Double click on the card, click on Instant Message, and type a message.
+    Now that you have reached the mainland, you can contact residents like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder.
+    Double click on the card, click on Instant Message, and type a message.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="CantSelectLandFromMultipleRegions"
    type="notifytip">
-Can&apos;t select land across server boundaries.
-Try selecting a smaller piece of land.
+    Can&apos;t select land across server boundaries.
+    Try selecting a smaller piece of land.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="SearchWordBanned"
    type="notifytip">
-Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards.
+    Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="NoContentToSearch"
    type="notifytip">
-Please select at least one type of content to search (PG, Mature, or Adult).
+    Please select at least one type of content to search (PG, Mature, or Adult).
   </notification>
 
   <notification
    icon="notify.tga"
    name="GroupVote"
    type="notify">
-[NAME] has proposed to vote on:
-[MESSAGE]
+    [NAME] has proposed to vote on:
+    [MESSAGE]
     <form name="form">
       <button
        index="0"
@@ -5337,17 +5337,17 @@ Please select at least one type of content to search (PG, Mature, or Adult).
    icon="notify.tga"
    name="SystemMessage"
    type="notify">
-[MESSAGE]
+    [MESSAGE]
   </notification>
 
   <notification
    icon="notify.tga"
    name="EventNotification"
    type="notify">
-Event Notification:
+    Event Notification:
 
-[NAME]
-[DATE]
+    [NAME]
+    [DATE]
     <form name="form">
       <button
        index="0"
@@ -5368,9 +5368,9 @@ Event Notification:
    icon="notify.tga"
    name="TransferObjectsHighlighted"
    type="notify">
-All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted.
+    All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted.
 
-* Trees and grasses that will transfer are not highlighted.
+    * Trees and grasses that will transfer are not highlighted.
     <form name="form">
       <button
        index="0"
@@ -5383,61 +5383,61 @@ All objects on this parcel that will transfer to the purchaser of this parcel ar
    icon="notify.tga"
    name="DeactivatedGesturesTrigger"
    type="notify">
-Deactivated gestures with same trigger:
-[NAMES]
+    Deactivated gestures with same trigger:
+    [NAMES]
   </notification>
 
   <notification
    icon="notify.tga"
    name="NoQuickTime"
    type="notify">
-Apple&apos;s QuickTime software does not appear to be installed on your system.
-If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player.
+    Apple&apos;s QuickTime software does not appear to be installed on your system.
+    If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player.
   </notification>
 
   <notification
    icon="notify.tga"
    name="OwnedObjectsReturned"
    type="notify">
-The objects you own on the selected parcel of land have been returned back to your inventory.
+    The objects you own on the selected parcel of land have been returned back to your inventory.
   </notification>
 
   <notification
    icon="notify.tga"
    name="OtherObjectsReturned"
    type="notify">
-The objects on the selected parcel of land that is owned by [FIRST] [LAST] have been returned to his or her inventory.
+    The objects on the selected parcel of land that is owned by [FIRST] [LAST] have been returned to his or her inventory.
   </notification>
 
   <notification
    icon="notify.tga"
    name="OtherObjectsReturned2"
    type="notify">
-The objects on the selected parcel of land owned by the resident &apos;[NAME]&apos; have been returned to their owner.
+    The objects on the selected parcel of land owned by the resident &apos;[NAME]&apos; have been returned to their owner.
   </notification>
 
   <notification
    icon="notify.tga"
    name="GroupObjectsReturned"
    type="notify">
-The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner&apos;s inventory.
-Transferable deeded objects have been returned to their previous owners.
-Non-transferable objects that are deeded to the group have been deleted.
+    The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner&apos;s inventory.
+    Transferable deeded objects have been returned to their previous owners.
+    Non-transferable objects that are deeded to the group have been deleted.
   </notification>
 
   <notification
    icon="notify.tga"
    name="UnOwnedObjectsReturned"
    type="notify">
-The objects on the selected parcel that are NOT owned by you have been returned to their owners.
+    The objects on the selected parcel that are NOT owned by you have been returned to their owners.
   </notification>
 
   <notification
    icon="notify.tga"
    name="NotSafe"
    type="notify">
-This land has damage enabled (&apos;not safe&apos;).
-You can be hurt here. If you die, you will be teleported to your home location.
+    This land has damage enabled (&apos;not safe&apos;).
+    You can be hurt here. If you die, you will be teleported to your home location.
     <unique/>
   </notification>
 
@@ -5445,8 +5445,8 @@ You can be hurt here. If you die, you will be teleported to your home location.
    icon="notify.tga"
    name="NoFly"
    type="notify">
-This land has flying disabled (&apos;no fly&apos;).
-You cannot fly here.
+    This land has flying disabled (&apos;no fly&apos;).
+    You cannot fly here.
     <unique/>
   </notification>
 
@@ -5454,8 +5454,8 @@ You cannot fly here.
    icon="notify.tga"
    name="PushRestricted"
    type="notify">
-This land is &apos;No Pushing&apos;.
-You cannot push others here unless you own the land.
+    This land is &apos;No Pushing&apos;.
+    You cannot push others here unless you own the land.
     <unique/>
   </notification>
 
@@ -5463,7 +5463,7 @@ You cannot push others here unless you own the land.
    icon="notify.tga"
    name="NoVoice"
    type="notify">
-This land has voice disabled.
+    This land has voice disabled.
     <unique/>
   </notification>
 
@@ -5471,8 +5471,8 @@ This land has voice disabled.
    icon="notify.tga"
    name="NoBuild"
    type="notify">
-This land has building disabled (&apos;no build&apos;).
-You cannot create objects here.
+    This land has building disabled (&apos;no build&apos;).
+    You cannot create objects here.
     <unique/>
   </notification>
 
@@ -5480,222 +5480,222 @@ You cannot create objects here.
    icon="notify.tga"
    name="ScriptsStopped"
    type="notify">
-An administrator has temporarily stopped scripts in this region.
+    An administrator has temporarily stopped scripts in this region.
   </notification>
 
   <notification
    icon="notify.tga"
    name="ScriptsNotRunning"
    type="notify">
-This region is not running any scripts.
+    This region is not running any scripts.
   </notification>
 
   <notification
    icon="notify.tga"
    name="NoOutsideScripts"
    type="notify">
-This land has outside scripts disabled (&apos;no outside scripts&apos;).
-No scripts will run except those belonging to the land owner.
+    This land has outside scripts disabled (&apos;no outside scripts&apos;).
+    No scripts will run except those belonging to the land owner.
   </notification>
 
   <notification
    icon="notify.tga"
    name="ClaimPublicLand"
    type="notify">
-Can only claim public land in region you&apos;re in.
+    Can only claim public land in region you&apos;re in.
   </notification>
 
   <notification
    icon="notify.tga"
    name="RegionTPAccessBlocked"
    type="notify">
-You aren&apos;t allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer.
+    You aren&apos;t allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer.
 
-Please go to the Knowledge Base for details on accessing areas with this maturity Rating.  
+    Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="URBannedFromRegion"
 	type="notify">
-You are banned from the region.
+    You are banned from the region.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoTeenGridAccess"
 	type="notify">
-Your account cannot connect to this teen grid region.
+    Your account cannot connect to this teen grid region.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoHelpIslandTP"
 	type="notify">
-You cannot teleport back to Help Island.
-Go to &apos;Help Island Public&apos; to repeat the tutorial.
+    You cannot teleport back to Help Island.
+    Go to &apos;Help Island Public&apos; to repeat the tutorial.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="ImproperPaymentStatus"
 	type="notify">
-You do not have proper payment status to enter this region.
+    You do not have proper payment status to enter this region.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="MustGetAgeRgion"
 	type="notify">
-You must be age-verified to enter this region.
+    You must be age-verified to enter this region.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="MustGetAgeParcel"
 	type="notify">
-You must be age-verified to enter this parcel.
+    You must be age-verified to enter this parcel.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoDestRegion"
 	type="notify">
-No destination region found.
+    No destination region found.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NotAllowedInDest"
 	type="notify">
-You are not allowed into the destination.
+    You are not allowed into the destination.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="RegionParcelBan"
 	type="notify">
-Cannot region cross into banned parcel. Try another way.
+    Cannot region cross into banned parcel. Try another way.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="TelehubRedirect"
 	type="notify">
-You have been redirected to a telehub.
+    You have been redirected to a telehub.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="CouldntTPCloser"
 	type="notify">
-Could not teleport closer to destination.
+    Could not teleport closer to destination.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="TPCancelled"
 	type="notify">
-	Teleport cancelled.
+    Teleport cancelled.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="FullRegionTryAgain"
 	type="notify">
-The region you are attempting to enter is currently full.
-Please try again in a few moments.
+    The region you are attempting to enter is currently full.
+    Please try again in a few moments.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="GeneralFailure"
 	type="notify">
-General failure.
+    General failure.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="RoutedWrongRegion"
 	type="notify">
-Routed to wrong region. Please try again.
+    Routed to wrong region. Please try again.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoValidAgentID"
 	type="notify">
-No valid agent id.
+    No valid agent id.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoValidSession"
 	type="notify">
-No valid session id.
+    No valid session id.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoValidCircuit"
 	type="notify">
-No valid circuit code.
+    No valid circuit code.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoValidTimestamp"
 	type="notify">
-No valid timestamp.
+    No valid timestamp.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoPendingConnection"
 	type="notify">
-Unable to create pending connection.
+    Unable to create pending connection.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="InternalUsherError"
 	type="notify">
-Internal error attempting to connect agent usher.
+    Internal error attempting to connect agent usher.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoGoodTPDestination"
 	type="notify">
-Unable to find a good teleport destination in this region.
+    Unable to find a good teleport destination in this region.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="InternalErrorRegionResolver"
 	type="notify">
-Internal error attempting to activate region resolver.
+    Internal error attempting to activate region resolver.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoValidLanding"
 	type="notify">
-A valid landing point could not be found.
+    A valid landing point could not be found.
   </notification>
 
   <notification
 	icon="notify.tga"
 	name="NoValidParcel"
 	type="notify">
-No valid parcel could be found.
+    No valid parcel could be found.
   </notification>
 
   <notification
    icon="notify.tga"
    name="ObjectGiveItem"
    type="notify">
-An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME].
+    An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME].
     <form name="form">
       <button
        index="0"
@@ -5716,7 +5716,7 @@ An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECT
    icon="notify.tga"
    name="ObjectGiveItemUnknownUser"
    type="notify">
-An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].
+    An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].
     <form name="form">
       <button
        index="0"
@@ -5737,7 +5737,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    icon="notify.tga"
    name="UserGiveItem"
    type="notify">
-[NAME] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
+    [NAME] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
     <form name="form">
       <button
        index="0"
@@ -5758,15 +5758,15 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    icon="notify.tga"
    name="GodMessage"
    type="notify">
-[NAME]
-[MESSAGE]
+    [NAME]
+    [MESSAGE]
   </notification>
 
   <notification
    icon="notify.tga"
    name="JoinGroup"
    type="notify">
-[MESSAGE]
+    [MESSAGE]
     <form name="form">
       <button
        index="0"
@@ -5787,9 +5787,9 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    icon="notify.tga"
    name="TeleportOffered"
    type="notify">
-[NAME] has offered to teleport you to his or her location:
+    [NAME] has offered to teleport you to his or her location:
 
-[MESSAGE]
+    [MESSAGE]
     <form name="form">
       <button
        index="0"
@@ -5806,8 +5806,8 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    icon="notify.tga"
    name="GotoURL"
    type="notify">
-[MESSAGE]
-[URL]
+    [MESSAGE]
+    [URL]
     <form name="form">
       <button
        index="0"
@@ -5824,11 +5824,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    icon="notify.tga"
    name="OfferFriendship"
    type="notify">
-[NAME] is offering friendship.
+    [NAME] is offering friendship.
 
-[MESSAGE]
+    [MESSAGE]
 
-(By default, you will be able to see each other&apos;s online status.)
+    (By default, you will be able to see each other&apos;s online status.)
     <form name="form">
       <button
        index="0"
@@ -5845,9 +5845,9 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    icon="notify.tga"
    name="OfferFriendshipNoMessage"
    type="notify">
-[NAME] is offering friendship.
+    [NAME] is offering friendship.
 
-(By default, you will be able to see each other&apos;s online status.)
+    (By default, you will be able to see each other&apos;s online status.)
     <form name="form">
       <button
        index="0"
@@ -5864,22 +5864,22 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    icon="notify.tga"
    name="FriendshipAccepted"
    type="notify">
-[NAME] accepted your friendship offer.
+    [NAME] accepted your friendship offer.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FriendshipDeclined"
    type="notify">
-[NAME] declined your friendship offer.
+    [NAME] declined your friendship offer.
   </notification>
 
   <notification
    icon="notify.tga"
    name="OfferCallingCard"
    type="notify">
-[FIRST] [LAST] is offering their calling card.
-This will add a bookmark in your inventory so you can quickly IM this resident.
+    [FIRST] [LAST] is offering their calling card.
+    This will add a bookmark in your inventory so you can quickly IM this resident.
     <form name="form">
       <button
        index="0"
@@ -5898,8 +5898,8 @@ This will add a bookmark in your inventory so you can quickly IM this resident.
    priority="high"
    sound="UISndAlert"
    type="notify">
-Region is restarting in [MINUTES] minutes.
-If you remain in this region you will be logged out.
+    Region is restarting in [MINUTES] minutes.
+    If you remain in this region you will be logged out.
   </notification>
 
   <notification
@@ -5908,19 +5908,19 @@ If you remain in this region you will be logged out.
    priority="high"
    sound="UISndAlert"
    type="notify">
-Region is restarting in [SECONDS] seconds.
-If you remain in this region you will be logged out.
+    Region is restarting in [SECONDS] seconds.
+    If you remain in this region you will be logged out.
   </notification>
 
   <notification
    icon="notify.tga"
    name="LoadWebPage"
    type="notify">
-Load web page [URL]?
+    Load web page [URL]?
 
-[MESSAGE]
+    [MESSAGE]
 
-From object: [OBJECTNAME], owner: [NAME]?
+    From object: [OBJECTNAME], owner: [NAME]?
     <form name="form">
       <button
        index="0"
@@ -5937,14 +5937,14 @@ From object: [OBJECTNAME], owner: [NAME]?
    icon="notify.tga"
    name="FailedToFindWearableUnnamed"
    type="notify">
-Failed to find [TYPE] in database.
+    Failed to find [TYPE] in database.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FailedToFindWearable"
    type="notify">
-Failed to find [TYPE] named [DESC] in database.
+    Failed to find [TYPE] named [DESC] in database.
   </notification>
 
   <notification
@@ -5958,10 +5958,10 @@ Failed to find [TYPE] named [DESC] in database.
    icon="notify.tga"
    name="ScriptQuestion"
    type="notify">
-&apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+    &apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
 
-[QUESTIONS]
-Is this OK?
+    [QUESTIONS]
+    Is this OK?
     <form name="form">
       <button
        index="0"
@@ -5983,12 +5983,12 @@ Is this OK?
    name="ScriptQuestionCaution"
    priority="high"
    type="notify">
-&apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+    &apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
 
-[QUESTIONS]
-If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button.
+    [QUESTIONS]
+    If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button.
 
-Grant this request?
+    Grant this request?
     <form name="form">
       <button
        index="0"
@@ -6010,8 +6010,8 @@ Grant this request?
    icon="notify.tga"
    name="ScriptDialog"
    type="notify">
-[FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
-[MESSAGE]
+    [FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
+    [MESSAGE]
     <form name="form">
       <button
        index="-1"
@@ -6024,8 +6024,8 @@ Grant this request?
    icon="notify.tga"
    name="ScriptDialogGroup"
    type="notify">
-[GROUPNAME]&apos;s &apos;[TITLE]&apos;
-[MESSAGE]
+    [GROUPNAME]&apos;s &apos;[TITLE]&apos;
+    [MESSAGE]
     <form name="form">
       <button
        index="-1"
@@ -6038,142 +6038,142 @@ Grant this request?
    icon="notify.tga"
    name="FirstBalanceIncrease"
    type="notify">
-You just received L$[AMOUNT].
-Objects and other users may give you L$.
-Your balance is shown in the upper-right corner of the screen.
+    You just received L$[AMOUNT].
+    Objects and other users may give you L$.
+    Your balance is shown in the upper-right corner of the screen.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstBalanceDecrease"
    type="notify">
-You just paid L$[AMOUNT].
-Your balance is shown in the upper-right corner of the screen.
+    You just paid L$[AMOUNT].
+    Your balance is shown in the upper-right corner of the screen.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstSit"
    type="notify">
-You are sitting.
-Use the arrow keys (or AWSD) to change the view.
-Click the &apos;Stand Up&apos; button to get up.
+    You are sitting.
+    Use the arrow keys (or AWSD) to change the view.
+    Click the &apos;Stand Up&apos; button to get up.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstMap"
    type="notify">
-Click and drag to scroll the map.
-Double-click to teleport.
-Use the controls on the right to find things and display different backgrounds.
+    Click and drag to scroll the map.
+    Double-click to teleport.
+    Use the controls on the right to find things and display different backgrounds.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstBuild"
    type="notify">
-You can build new objects in some areas of [SECOND_LIFE].
-Use the tools in the upper left to build, and try holding down Ctrl or Alt to rapidly switch tools.
-Press Esc to stop building.
+    You can build new objects in some areas of [SECOND_LIFE].
+    Use the tools in the upper left to build, and try holding down Ctrl or Alt to rapidly switch tools.
+    Press Esc to stop building.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstLeftClickNoHit"
    type="notify">
-Left-clicking interacts with special objects.
-If the mouse pointer changes to a hand, you can interact with the object.
-Right-click always shows a menu of things you can do.
+    Left-clicking interacts with special objects.
+    If the mouse pointer changes to a hand, you can interact with the object.
+    Right-click always shows a menu of things you can do.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstTeleport"
    type="notify">
-This region doesn&apos;t allow point-to-point teleports, so you&apos;ve been transported to the nearest telehub.
-Your destination is marked with a tall beacon.
-Follow the red arrow to the beacon, or click the arrow to dismiss the beacon.
+    This region doesn&apos;t allow point-to-point teleports, so you&apos;ve been transported to the nearest telehub.
+    Your destination is marked with a tall beacon.
+    Follow the red arrow to the beacon, or click the arrow to dismiss the beacon.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstOverrideKeys"
    type="notify">
-Your movement keys are now being handled by an object.
-Try the arrow keys or AWSD to see what they do.
-Some objects (like guns) require you to go into mouselook  to use them.
-Press &apos;M&apos; to do this.
+    Your movement keys are now being handled by an object.
+    Try the arrow keys or AWSD to see what they do.
+    Some objects (like guns) require you to go into mouselook  to use them.
+    Press &apos;M&apos; to do this.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstAppearance"
    type="notify">
-You are editing your appearance.
-To rotate and zoom view, use the arrow keys.
-When you are finished, press &apos;Save All&apos; to save your look and exit.
-You can edit your appearance as often as you like.
+    You are editing your appearance.
+    To rotate and zoom view, use the arrow keys.
+    When you are finished, press &apos;Save All&apos; to save your look and exit.
+    You can edit your appearance as often as you like.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstInventory"
    type="notify">
-This is your inventory, which contains objects, notecards, clothing, and other things you own.
-* To wear an object or outfit folder, drag it onto yourself.
-* To bring an object into the world, drag it onto the ground.
-* To read a notecard, double-click it.
+    This is your inventory, which contains objects, notecards, clothing, and other things you own.
+    * To wear an object or outfit folder, drag it onto yourself.
+    * To bring an object into the world, drag it onto the ground.
+    * To read a notecard, double-click it.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstSandbox"
    type="notify">
-This is a sandbox region.
-Objects you build here may be deleted after you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name.
+    This is a sandbox region.
+    Objects you build here may be deleted after you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name.
 
-Sandbox regions are uncommon, and are marked with signs.
+    Sandbox regions are uncommon, and are marked with signs.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstFlexible"
    type="notify">
-This object is flexible.
-Flexible objects may not be physical and must be phantom until the flexible checkbox is unchecked.
+    This object is flexible.
+    Flexible objects may not be physical and must be phantom until the flexible checkbox is unchecked.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstDebugMenus"
    type="notify">
-You have enabled the Advanced menu.
-This menu contains features useful for developers debugging Second Life.
-To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
+    You have enabled the Advanced menu.
+    This menu contains features useful for developers debugging Second Life.
+    To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstSculptedPrim"
    type="notify">
-You are editing a sculpted prim.
-Sculpted prims require a special texture to specify their shape.
-You can find example sculpted textures in the inventory library.
+    You are editing a sculpted prim.
+    Sculpted prims require a special texture to specify their shape.
+    You can find example sculpted textures in the inventory library.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstMedia"
    type="notify">
-You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
+    You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="MaxListSelectMessage"
    type="notifytip">
-You may only select up to [MAX_SELECT] items from this list.
+    You may only select up to [MAX_SELECT] items from this list.
   </notification>
 
   <notification
@@ -6302,7 +6302,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block
    icon="notifytip.tga"
    name="VoiceChannelFull"
    type="notifytip">
-The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later.
+    The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -6312,7 +6312,7 @@ The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum
    icon="notifytip.tga"
    name="ProximalVoiceChannelFull"
    type="notifytip">
-We&apos;re sorry.  This area has reached maximum capacity for voice conversations.  Please try to use voice in another area.
+    We&apos;re sorry.  This area has reached maximum capacity for voice conversations.  Please try to use voice in another area.
     <unique/>
   </notification>
 
@@ -6320,7 +6320,7 @@ We&apos;re sorry.  This area has reached maximum capacity for voice conversation
    icon="notifytip.tga"
    name="VoiceChannelDisconnected"
    type="notifytip">
-You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to spatial voice chat.
+    You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to spatial voice chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -6330,7 +6330,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    icon="notifytip.tga"
    name="VoiceChannelDisconnectedP2P"
    type="notifytip">
-[VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to spatial voice chat.
+    [VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to spatial voice chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -6340,7 +6340,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    icon="notifytip.tga"
    name="P2PCallDeclined"
    type="notifytip">
-[VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to spatial voice chat.
+    [VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to spatial voice chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -6350,7 +6350,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    icon="notifytip.tga"
    name="P2PCallNoAnswer"
    type="notifytip">
-[VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
+    [VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -6360,7 +6360,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    icon="notifytip.tga"
    name="VoiceChannelJoinFailed"
    type="notifytip">
-Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
+    Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -6371,7 +6371,7 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now
    icon="notifytip.tga"
    name="VoiceLoginRetry"
    type="notifytip">
-We are creating a voice channel for you. This may take up to one minute.
+    We are creating a voice channel for you. This may take up to one minute.
     <unique/>
   </notification>
 
@@ -6379,28 +6379,28 @@ We are creating a voice channel for you. This may take up to one minute.
    icon="notifytip.tga"
    name="Cannot enter parcel: not a group member"
    type="notifytip">
-Cannot enter parcel, you are not a member of the appropriate group.
+    Cannot enter parcel, you are not a member of the appropriate group.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="Cannot enter parcel: banned"
    type="notifytip">
-Cannot enter parcel, you have been banned.
+    Cannot enter parcel, you have been banned.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="Cannot enter parcel: not on access list"
    type="notifytip">
-Cannot enter parcel, you are not on the access list.
+    Cannot enter parcel, you are not on the access list.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="VoiceNotAllowed"
    type="notifytip">
-You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
+    You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -6410,7 +6410,7 @@ You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
    icon="notifytip.tga"
    name="VoiceCallGenericError"
    type="notifytip">
-An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
+    An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
     <unique>
       <context key="VOICE_CHANNEL_NAME"/>
     </unique>
@@ -6422,7 +6422,7 @@ An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_N
    name="ServerVersionChanged"
    priority="high"
    type="notifytip">
-The region you have entered is running a different simulator version. Click this message for details.
+    The region you have entered is running a different simulator version. Click this message for details.
   </notification>
 
   <notification
@@ -6430,7 +6430,14 @@ The region you have entered is running a different simulator version. Click this
    name="UnableToOpenCommandURL"
    priority="high"
    type="notifytip">
-The URL you clicked cannot be opened from this web browser.
+    The URL you clicked cannot be opened from this web browser.
+  </notification>
+
+  <notification name="IMToast" type="notify">
+    [MESSAGE]
+    <form name="form">
+      <button index="0" name="respondbutton" text="Respond"/>
+    </form>
   </notification>
 
   <global name="UnsupportedCPU">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 7b802fb5b3..61ba76aa28 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -40,7 +40,7 @@
      width="100">
     </check_box>
     <combo_box
-	 make_visible_control="WindowFullScreen"
+	 visiblity_control="WindowFullScreen"
      allow_text_entry="true"
      height="16"
      layout="topleft"
@@ -208,7 +208,7 @@
         Ultra
     </text>
     <panel
-	 make_visible_control="ShowAdvancedGraphicsSettings"
+	 visiblity_control="ShowAdvancedGraphicsSettings"
      border="false"
 	 follows="top|left"
      height="260"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 90cc209a68..8ea1a05e97 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -310,7 +310,10 @@
      left="108"
      name="apply_btn"
      top="320"
-     width="100" />
+     width="100">
+        <button.commit_callback
+         function="RegionInfo.Cancel" />
+    </button>
    <button
      follows="left|top"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c21c691680..e8027b1b4b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -341,36 +341,39 @@
 		You do not have a copy of
 this texture in your inventory
 	</string>
-	<string name="no_transfer"> (no transfer)</string>
-	<string name="no_modify"> (no modify)</string>
-	<string name="no_copy"> (no copy)</string>
-	<string name="worn"> (worn)</string>
+    <!-- use value="" because they have preceding spaces -->
+	<string name="no_transfer" value=" (no transfer)" />
+	<string name="no_modify"   value=" (no modify)" />
+	<string name="no_copy"     value=" (no copy)" />
+	<string name="worn"        value=" (worn)" />
 	<string name="LoadingContents">Loading contents...</string>
 	<string name="NoContents">No contents</string>
 
 	<!-- Gestures labels -->
-	<string name="Chat"> Chat : </string>
-	<string name="Sound"> Sound : </string>
-	<string name="Wait"> --- Wait : </string>
-	<string name="AnimFlagStop"> Stop Animation :    </string>
-	<string name="AnimFlagStart"> Start Animation :   </string>
-	<string name="Wave"> Wave </string>
-	<string name="HelloAvatar"> Hello, avatar! </string>
+    <!-- use value="" because they have preceding spaces -->
+    <string name="Chat"          value=" Chat : " />
+    <string name="Sound"         value=" Sound : " />
+	<string name="Wait"          value=" --- Wait : " />
+	<string name="AnimFlagStop"  value=" Stop Animation :    " />
+	<string name="AnimFlagStart" value=" Start Animation :   " />
+	<string name="Wave"          value=" Wave " />
+	<string name="HelloAvatar"   value=" Hello, avatar! " />
 				
 	<!-- inventory filter -->
-	<string name="Animations"> Animations,</string>
-	<string name="Calling Cards">  Calling Cards,</string>
-	<string name="Clothing"> Clothing,</string>
-	<string name="Gestures">  Gestures,</string>
-	<string name="Landmarks"> Landmarks,</string>
-	<string name="Notecards">  Notecards,</string>
-	<string name="Objects"> Objects,</string>
-	<string name="Scripts">  Scripts,</string>
-	<string name="Sounds"> Sounds,</string>
-	<string name="Textures">  Textures,</string>
-	<string name="Snapshots"> Snapshots,</string>
-	<string name="No Filters"> No </string>
-	<string name="Since Logoff"> - Since Logoff</string>
+    <!-- use value="" because they have preceding spaces -->
+	<string name="Animations"    value=" Animations," />
+	<string name="Calling Cards" value=" Calling Cards," />
+	<string name="Clothing"      value=" Clothing," />
+	<string name="Gestures"      value=" Gestures," />
+	<string name="Landmarks"     value=" Landmarks," />
+	<string name="Notecards"     value=" Notecards," />
+	<string name="Objects"       value=" Objects," />
+	<string name="Scripts"       value=" Scripts," />
+	<string name="Sounds"        value=" Sounds," />
+	<string name="Textures"      value=" Textures," />
+	<string name="Snapshots"     value=" Snapshots," />
+	<string name="No Filters"    value="No " />
+	<string name="Since Logoff"  value=" - Since Logoff" />
 
 	<!-- inventory folder -->
 	<string name="InvFolder My Inventory">My Inventory</string>
@@ -397,10 +400,6 @@ this texture in your inventory
 	<string name="InvFolder favorite">Favorites</string>
 
 	<!-- inventory FVBridge -->
-	<string name="NO_COPY"> (no copy)</string>
-	<string name="NO_MOD"> (no modify)</string>
-	<string name="NO_XFER"> (no transfer)</string>
-	
 	<string name="Buy">Buy</string>
 	<string name="BuyforL$">Buy for L$</string>
 	
@@ -486,13 +485,11 @@ this texture in your inventory
 	
 	<!-- groups -->
 	<string name="GroupsNone">none</string>
-	<string name="Group"> (group)</string>
+	<string name="Group" value=" (group)" />
 	<string name="Unknown">(Unknown)</string>
-	<string name="SummaryForTheWeek">Summary for this week, beginning on </string>
-	<string name="NextStipendDay">The next stipend day is </string>
-	<string name="GroupIndividualShare">                      Group       Individual Share
-
-	</string>
+	<string name="SummaryForTheWeek"    value="Summary for this week, beginning on " />
+	<string name="NextStipendDay"       value="The next stipend day is " />
+	<string name="GroupIndividualShare" value="                      Group       Individual Share" />
 	<string name="Balance">Balance</string>
 	<string name="Credits">Credits</string>
 	<string name="Debits">Debits</string>
@@ -544,8 +541,8 @@ you managed for [OWNER]
 	<string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string>
 	<string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.</string>
 	<string name="covenant_last_modified">Last Modified:</string>
-	<string name="none_text"> (none) </string>
-	<string name="never_text"> (never) </string>
+	<string name="none_text"  value=" (none) " />
+	<string name="never_text" value=" (never) " />
 	
 	<!--Region Details-->
 	<string name="GroupOwned">Group Owned</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml
new file mode 100644
index 0000000000..c66aeb57a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<list_view
+  fg_selected_color="ListViewSelectedFgColor"
+  bg_selected_color="ListViewSelectedBgColor"
+  bg_color="ListViewBgColor"
+  />
-- 
cgit v1.3


From f26f7e3e29019abf3a10f6925e30baca19eb4e2d Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 8 Jul 2009 05:19:19 +0000
Subject: merge -r 889-936
 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0 Also: *
 Moved media remote shortcut to Communicate menu * Changed mini map menu to
 toggle instead of show

---
 indra/llcommon/llversionserver.h                   |   2 +-
 indra/newview/CMakeLists.txt                       |   4 +
 indra/newview/English.lproj/InfoPlist.strings      |   4 +-
 indra/newview/Info-SecondLife.plist                |   2 +-
 indra/newview/llavatarpropertiesprocessor.cpp      |   2 +-
 indra/newview/llbottomtray.cpp                     |  91 ++++--
 indra/newview/llbottomtray.h                       |  13 +-
 indra/newview/llchiclet.cpp                        |  41 ++-
 indra/newview/llchiclet.h                          |  14 +-
 indra/newview/llimview.cpp                         |   1 +
 indra/newview/lllocationinputctrl.cpp              |   6 +-
 indra/newview/llpanelavatar.cpp                    |  13 +-
 indra/newview/llpanelavatar.h                      |  48 +--
 indra/newview/llpanellandmarks.cpp                 |   2 +-
 indra/newview/llpanelpeople.cpp                    |  39 +--
 indra/newview/llpanelpeople.h                      |   2 -
 indra/newview/llpanelpick.cpp                      | 103 +++----
 indra/newview/llpanelpick.h                        |  17 +-
 indra/newview/llpanelpicks.cpp                     | 157 +++++++---
 indra/newview/llpanelpicks.h                       |  33 ++-
 indra/newview/llpanelplaceinfo.cpp                 |  56 +++-
 indra/newview/llpanelplaceinfo.h                   |  34 ++-
 indra/newview/llpanelplaces.cpp                    |  18 +-
 indra/newview/llpanelplaces.h                      |   9 +-
 indra/newview/llpanelprofile.cpp                   | 146 +++++++++
 indra/newview/llpanelprofile.h                     |  72 +++++
 indra/newview/llpanelprofileview.cpp               |  43 +--
 indra/newview/llpanelprofileview.h                 |  19 +-
 indra/newview/llpanelteleporthistory.cpp           |   2 +-
 indra/newview/llsidetray.cpp                       |   4 -
 indra/newview/llviewermedia.cpp                    |  70 ++++-
 indra/newview/llviewermedia.h                      |   8 +
 indra/newview/llviewermenu.cpp                     |  36 ++-
 indra/newview/llviewermenu.h                       |   2 -
 indra/newview/llviewerwindow.cpp                   |   6 +
 indra/newview/res/viewerRes.rc                     |   8 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |  22 +-
 .../newview/skins/default/xui/en/notifications.xml |  11 +
 .../skins/default/xui/en/panel_bottomtray.xml      | 328 +++++++++++++++++----
 .../skins/default/xui/en/panel_edit_pick.xml       |   9 +-
 .../skins/default/xui/en/panel_edit_profile.xml    |   2 +
 .../skins/default/xui/en/panel_landmark_info.xml   | 274 -----------------
 .../newview/skins/default/xui/en/panel_people.xml  |   3 +
 .../skins/default/xui/en/panel_pick_info.xml       |  28 +-
 .../skins/default/xui/en/panel_pick_list_item.xml  |   3 +-
 indra/newview/skins/default/xui/en/panel_picks.xml |   6 +-
 .../newview/skins/default/xui/en/panel_places.xml  |   8 +-
 .../skins/default/xui/en/panel_profile_view.xml    |   2 +-
 .../skins/default/xui/en/panel_side_tray.xml       |  26 +-
 49 files changed, 1131 insertions(+), 718 deletions(-)
 create mode 100644 indra/newview/llpanelprofile.cpp
 create mode 100644 indra/newview/llpanelprofile.h
 delete mode 100644 indra/newview/skins/default/xui/en/panel_landmark_info.xml

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index c0fc06ee6e..23e39ceb08 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 29;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 120909;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Server";
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 6ec4fbbcd5..9510dcd9cc 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -297,6 +297,7 @@ set(viewer_SOURCE_FILES
     llpanellandmarks.cpp
     llpanellandmedia.cpp
     llpanellogin.cpp
+    llpanelmedia.cpp
     llpanelmeprofile.cpp
     llpanelobject.cpp
     llpanelpeople.cpp
@@ -307,6 +308,7 @@ set(viewer_SOURCE_FILES
     llpanelplaceinfo.cpp
     llpanelplaces.cpp
     llpanelplacestab.cpp
+    llpanelprofile.cpp
     llpanelprofileview.cpp
     llpanelteleporthistory.cpp
     llpanelvolume.cpp
@@ -719,6 +721,7 @@ set(viewer_HEADER_FILES
     llpanellandmarks.h
     llpanellandmedia.h
     llpanellogin.h
+    llpanelmedia.h
     llpanelmeprofile.h
     llpanelobject.h
     llpanelpeople.h
@@ -729,6 +732,7 @@ set(viewer_HEADER_FILES
     llpanelplaceinfo.h
     llpanelplaces.h
     llpanelplacestab.h
+    llpanelprofile.h
     llpanelprofileview.h
     llpanelteleporthistory.h
     llpanelvolume.h
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 0a1235b85d..735424c647 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -2,6 +2,6 @@
 
 CFBundleName = "Second Life";
 
-CFBundleShortVersionString = "Second Life version 1.24.0.0";
-CFBundleGetInfoString = "Second Life version 1.24.0.0, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 2.0.0.0";
+CFBundleGetInfoString = "Second Life version 2.0.0.0, Copyright 2004-2009 Linden Research, Inc.";
 
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index baa5ccf1b9..7264044d37 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.24.0.0</string>
+	<string>2.0.0.0</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
index 5a92888cef..ecd67e44ae 100644
--- a/indra/newview/llavatarpropertiesprocessor.cpp
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -306,7 +306,7 @@ void LLAvatarPropertiesProcessor::processPickInfoReply(LLMessageSystem* msg, voi
 	msg->getS32(_PREHASH_Data, _PREHASH_SortOrder, pick_data.sort_order);
 	msg->getBOOL(_PREHASH_Data, _PREHASH_Enabled, pick_data.enabled);
 
-	notifyObservers(pick_data.agent_id, &pick_data, APT_PICK_INFO);
+	notifyObservers(pick_data.creator_id, &pick_data, APT_PICK_INFO);
 }
 
 void LLAvatarPropertiesProcessor::processAvatarGroupsReply(LLMessageSystem* msg, void**)
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 604a77dac0..136316fbbe 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -34,7 +34,8 @@
 #include "llbottomtray.h"
 #include "llagent.h"
 #include "llchiclet.h"
-#include "lllayoutstack.h"
+#include "llfloaterreg.h"
+#include "llflyoutbutton.h"
 #include "llkeyboard.h"
 #include "llgesturemgr.h"
 #include "llanimationstates.h"
@@ -54,15 +55,22 @@ LLBottomTray* gBottomTray = NULL;
 LLBottomTray::LLBottomTray()
 	: mLastSpecialChatChannel(0)
 	, mGestureLabelTimer()
+	, mChatBox(NULL)
+	, mChicletPanel(NULL)
+	, mIMWell(NULL)
+	, mSysWell(NULL)
+	, mTalkBtn(NULL)
+	, mGestureCombo(NULL)
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this,"panel_bottomtray.xml");
 
 	mChicletPanel = getChild<LLChicletPanel>("chiclet_list",TRUE,FALSE);
 	mIMWell = getChild<LLNotificationChiclet>("im_well",TRUE,FALSE);
 	mSysWell = getChild<LLNotificationChiclet>("sys_well",TRUE,FALSE);
-	mSeparator = getChild<LLViewBorder>("well_separator",TRUE,FALSE);
 	mChatBox = getChild<LLLineEditor>("chat_box",TRUE,FALSE);
 
+	mChicletPanel->setChicletClickCallback(boost::bind(&LLBottomTray::onChicletClick,this,_1));
+
 	if (mChatBox)
 	{
 		mChatBox->setCommitCallback(boost::bind(&LLBottomTray::onChatBoxCommit, this));
@@ -109,12 +117,20 @@ LLBottomTray::~LLBottomTray()
 	}
 }
 
+void LLBottomTray::onChicletClick(LLUICtrl* ctrl)
+{
+	LLIMChiclet* chiclet = dynamic_cast<LLIMChiclet*>(ctrl);
+	if (chiclet)
+	{
+		LLFloaterReg::showInstance("communicate", chiclet->getIMSessionId());
+	}
+}
+
 void LLBottomTray::onChatBoxCommit()
 {
 	if (mChatBox && mChatBox->getText().length() > 0)
 	{
 		sendChat(CHAT_TYPE_NORMAL);
-		mChatBox->setText(LLStringExplicit(""));
 	}
 
 	gAgent.stopTyping();
@@ -269,6 +285,17 @@ void LLBottomTray::refresh()
 	}
 }
 
+void LLBottomTray::updateRightPosition(const S32 new_right_position)
+{
+	LLRect rc = getRect();
+	if (new_right_position != rc.mRight)
+	{
+		rc.mRight = new_right_position;
+		reshape(rc.getWidth(), rc.getHeight(), FALSE);
+		setRect(rc);
+	}
+}
+
 void LLBottomTray::onCommitGesture(LLUICtrl* ctrl)
 {
 	LLCtrlListInterface* gestures = mGestureCombo ? mGestureCombo->getListInterface() : NULL;
@@ -357,15 +384,13 @@ void LLBottomTray::sessionAdded(const LLUUID& session_id, const std::string& nam
 {
 	if(getChicletPanel())
 	{
-		LLSD sid(session_id);
-
-		if(getChicletPanel()->findIMChiclet(&sid))
+		if(getChicletPanel()->findIMChiclet(session_id))
 		{
 
 		}
 		else
 		{
-			LLIMChiclet* chicklet = (LLIMChiclet *)getChicletPanel()->createChiclet(&sid);
+			LLIMChiclet* chicklet = (LLIMChiclet *)getChicletPanel()->createChiclet(session_id);
 			chicklet->setIMSessionName(name);
 			chicklet->setOtherParticipantId(other_participant_id);
 		}
@@ -377,8 +402,7 @@ void LLBottomTray::sessionRemoved(const LLUUID& session_id)
 {
 	if(getChicletPanel())
 	{
-		LLSD sid(session_id);
-		getChicletPanel()->removeIMChiclet(&sid);
+		getChicletPanel()->removeIMChiclet(session_id);
 	}
 }
 
@@ -391,25 +415,52 @@ void LLBottomTray::onFocusLost()
 	}
 }
 
+// virtual
+BOOL LLBottomTray::handleKeyHere( KEY key, MASK mask )
+{
+	BOOL handled = FALSE;
+
+	// ALT-RETURN is reserved for windowed/fullscreen toggle
+	if( KEY_RETURN == key && mask == MASK_CONTROL)
+	{
+		// shout
+		sendChat(CHAT_TYPE_SHOUT);
+		handled = TRUE;
+	}
+
+	return handled;
+}
+
 //virtual
-void LLBottomTray::onVisibilityChange(BOOL curVisibilityIn)
+// setVisible used instead of onVisibilityChange, since LLAgent calls it on entering/leaving mouselook mode.
+// If bottom tray is already visible in mouselook mode, then onVisibilityChange will not be called from setVisible(true),
+void LLBottomTray::setVisible(BOOL visible)
 {
+	LLPanel::setVisible(visible);
+
+	
 	BOOL visibility = gAgent.cameraMouselook() ? false : true;
 
-	if (mChicletPanel && mChicletPanel->getVisible() == visibility)
+	LLViewBorder* separator = getChild<LLViewBorder>("well_separator",TRUE,FALSE);
+
+	if (separator && separator->getVisible() == visibility)
 		return;
 
-	if (mChicletPanel)
-		mChicletPanel->setVisible(visibility);
+	if (separator)
+		separator->setVisible(visibility);
 
-	if (mIMWell)
-		mIMWell->setVisible(visibility);
+	LLPanel* p = getChild<LLPanel>("chiclet_list_panel",TRUE,FALSE);
+	if (p)
+		p->setVisible(visibility);
 
-	if (mSysWell)
-		mSysWell->setVisible(visibility);
+	p = getChild<LLPanel>("im_well_panel",TRUE,FALSE);
+	if (p)
+		p->setVisible(visibility);
+
+	p = getChild<LLPanel>("sys_well_panel",TRUE,FALSE);
+	if (p)
+		p->setVisible(visibility);
 
-	if (mSeparator)
-		mSeparator->setVisible(visibility);
 }
 
 void LLBottomTray::sendChat( EChatType type )
@@ -446,6 +497,8 @@ void LLBottomTray::sendChat( EChatType type )
 				sendChatFromViewer(utf8_revised_text, type, TRUE);
 			}
 		}
+
+		mChatBox->setText(LLStringExplicit(""));
 	}
 
 	gAgent.stopTyping();
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 7d842a0aad..9a773773e9 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -34,20 +34,19 @@
 #define LL_LLBOTTOMPANEL_H
 
 #include "llpanel.h"
-#include "llflyoutbutton.h"
 #include "llimview.h"
 #include "llchat.h"
 #include "llgesturemgr.h"
 
 class LLChicletPanel;
 class LLNotificationChiclet;
-class LLNotificationChiclet;
 class LLTalkButton;
+class LLComboBox;
 
 class LLBottomTray 
 	: public LLPanel
 	, public LLIMSessionObserver
-	, LLGestureManagerObserver
+	, public LLGestureManagerObserver
 {
 public:
 	LLBottomTray();
@@ -66,6 +65,7 @@ public:
 	static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata);
 
 	void refresh();
+	void updateRightPosition(const S32 new_right_position);
 
 	void onCommitGesture(LLUICtrl* ctrl);
 	void refreshGestures();
@@ -78,13 +78,16 @@ public:
 	virtual void changed() { refreshGestures(); }
 
 	virtual void onFocusLost();
-	virtual void onVisibilityChange(BOOL curVisibilityIn);
+	virtual BOOL handleKeyHere(KEY key, MASK mask);
+	virtual void setVisible(BOOL visible);
 
 protected:
 
 	void sendChat( EChatType type );
 	LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
 
+	void onChicletClick(LLUICtrl* ctrl);
+
 	// Which non-zero channel did we last chat on?
 	S32 mLastSpecialChatChannel;
 
@@ -92,13 +95,11 @@ protected:
 	LLChicletPanel* 	mChicletPanel;
 	LLNotificationChiclet* 	mIMWell;
 	LLNotificationChiclet* 	mSysWell;
-	LLViewBorder*		mSeparator;
 	LLTalkButton* 		mTalkBtn;
 	LLComboBox* 		mGestureCombo;
 	LLFrameTimer 		mGestureLabelTimer;
 };
 
 extern LLBottomTray* gBottomTray;
-extern S32 BOTTOM_TRAY_HEIGHT;
 
 #endif // LL_LLBOTTOMPANEL_H
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 29845fff5e..4413212361 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -32,7 +32,6 @@
 
 #include "llviewerprecompiledheaders.h" // must be first include
 #include "llchiclet.h"
-#include "llfloaterreg.h"
 #include "llvoiceclient.h"
 #include "llagent.h"
 #include "lltextbox.h"
@@ -165,7 +164,7 @@ LLIMChiclet::LLIMChiclet(const LLChiclet::Params& p)
 , mAvatar(NULL)
 , mCounterText(NULL)
 , mSpeaker(NULL)
-, mIMSessionId()
+, mIMSessionId(LLUUID::null)
 , mShowSpeaker(false)
 , mSpeakerStatus(SPEAKER_IDLE)
 {
@@ -204,10 +203,10 @@ LLIMChiclet::~LLIMChiclet()
 
 }
 
-LLChiclet* LLIMChiclet::create(LLSD* imSessionId /* = NULL */)
+LLChiclet* LLIMChiclet::create(const LLUUID& im_session_id /* = LLUUID::null */)
 {
 	LLIMChiclet* chiclet = new LLIMChiclet(LLChiclet::Params());
-	chiclet->setIMSessionId(imSessionId);
+	chiclet->setIMSessionId(im_session_id);
 	return chiclet;
 }
 
@@ -265,7 +264,7 @@ void LLIMChiclet::setShowSpeaker(bool show)
 void LLIMChiclet::draw()
 {
 	LLUICtrl::draw();
-	gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 1, LLColor4(0.0f,0.0f,0.0f,1.f), FALSE);
+	gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, LLColor4(0.0f,0.0f,0.0f,1.f), FALSE);
 }
 
 S32 LLIMChiclet::calcCounterWidth()
@@ -319,8 +318,9 @@ LLChicletPanel::~LLChicletPanel()
 }
 
 void im_chiclet_callback(LLChicletPanel* panel, const LLSD& data){
-
-	LLChiclet* chiclet = panel->findIMChiclet(&data["session_id"]);
+	
+	LLUUID session_id = data["session_id"].asUUID();
+	LLChiclet* chiclet = panel->findIMChiclet(session_id);
 
 	if (chiclet)
 	{
@@ -328,7 +328,7 @@ void im_chiclet_callback(LLChicletPanel* panel, const LLSD& data){
 	}
     else
     {
-    	llwarns << "Unable to set counter for chiclet " << data["session_id"].asUUID() << llendl;
+    	llwarns << "Unable to set counter for chiclet " << session_id << llendl;
     }
 }
 
@@ -341,9 +341,9 @@ BOOL LLChicletPanel::postBuild()
 	return TRUE;
 }
 
-LLChiclet* LLChicletPanel::createChiclet(LLSD* imSessionId, S32 pos)
+LLChiclet* LLChicletPanel::createChiclet(const LLUUID& im_session_id /* = LLUUID::null */, S32 pos /* = 0 */)
 {
-	LLChiclet* chiclet = LLIMChiclet::create(imSessionId);
+	LLChiclet* chiclet = LLIMChiclet::create(im_session_id);
 	if(!chiclet)
 	{
 		assert(false);
@@ -388,20 +388,15 @@ void LLChicletPanel::onChicletClick(LLUICtrl*ctrl,const LLSD&param)
 	LLIMChiclet* chiclet = dynamic_cast<LLIMChiclet*>(ctrl);
 	if (chiclet)
 	{
-		LLFloaterReg::showInstance("communicate", chiclet->getIMSessionId().asUUID());
+		S32 x, y;
+		LLRect rect = getRect();
+		localPointToScreen(rect.getCenterX(), 0, &x, &y);
+		LLIMFloater::show(chiclet->getIMSessionId(), x);
 	}
-    
-	S32 x, y;
-   	LLRect rect = chiclet->getRect();
-
-	localPointToScreen(rect.getCenterX(), 0, &x, &y);
-	LLIMFloater::show(chiclet->getIMSessionId().asUUID(), x);
-
 	mCommitSignal(ctrl,param);
 }
 
-
-LLChiclet* LLChicletPanel::findIMChiclet(const LLSD* imSessionId)
+LLChiclet* LLChicletPanel::findIMChiclet(const LLUUID& im_session_id)
 {
 	chiclet_list_t::const_iterator it = mChicletList.begin();
 	for( ; mChicletList.end() != it; ++it)
@@ -413,7 +408,7 @@ LLChiclet* LLChicletPanel::findIMChiclet(const LLSD* imSessionId)
 			continue;
 		}
 
-		if(chiclet->getIMSessionId().asUUID() == imSessionId->asUUID())
+		if(chiclet->getIMSessionId() == im_session_id)
 		{
 			return chiclet;
 		}
@@ -472,7 +467,7 @@ void LLChicletPanel::removeChiclet(LLChiclet*chiclet)
 	}
 }
 
-void LLChicletPanel::removeIMChiclet(const LLSD* imSessionId)
+void LLChicletPanel::removeIMChiclet(const LLUUID& im_session_id)
 {
 	chiclet_list_t::iterator it = mChicletList.begin();
 	for( ; mChicletList.end() != it; ++it)
@@ -484,7 +479,7 @@ void LLChicletPanel::removeIMChiclet(const LLSD* imSessionId)
 			continue;
 		}
 
-		if(chiclet->getIMSessionId().asUUID() == imSessionId->asUUID())
+		if(chiclet->getIMSessionId() == im_session_id)
 		{
 			removeChiclet(it);
 			return;
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index d861a528b5..ceda61adea 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -78,15 +78,15 @@ protected:
 class LLIMChiclet : public LLChiclet
 {
 public:
-	static LLChiclet* create(LLSD* imSessionId = NULL);
+	static LLChiclet* create(const LLUUID& im_session_id = LLUUID::null);
 
 	void setCounter(S32);
 
 	S32 getCounter() {return mCounter;};
 
-	const LLSD& getIMSessionId() const {return mIMSessionId;};
+	const LLUUID& getIMSessionId() const {return mIMSessionId;};
 
-	void setIMSessionId(LLSD* imSessionId) {if (imSessionId) mIMSessionId = *imSessionId;};
+	void setIMSessionId(const LLUUID& im_session_id) { mIMSessionId = im_session_id; }
 	void setIMSessionName(const std::string& name);
 	void setOtherParticipantId(const LLUUID& other_participant_id);
 
@@ -126,7 +126,7 @@ protected:
 	LLTextBox* mCounterText;
 	LLIconCtrl* mSpeaker;
 
-	LLSD mIMSessionId;
+	LLUUID mIMSessionId;
 	bool mShowSpeaker;
 	SpeakerStatus mSpeakerStatus;
 };
@@ -182,13 +182,13 @@ public:
 
 	~LLChicletPanel();
 
-	LLChiclet* createChiclet(LLSD* imSessionId = NULL, S32 pos = 0);
+	LLChiclet* createChiclet(const LLUUID& im_session_id = LLUUID::null, S32 pos = 0);
 
 	bool addChiclet(LLChiclet*, S32 pos);
 
 	LLChiclet* getChiclet(S32 pos);
 
-	LLChiclet* findIMChiclet(const LLSD* imSessionId);
+	LLChiclet* findIMChiclet(const LLUUID& im_session_id);
 
 	S32 getChicletCount() {return mChicletList.size();};
 
@@ -196,7 +196,7 @@ public:
 
 	void removeChiclet(LLChiclet*);
 
-	void removeIMChiclet(const LLSD* imSessionId);
+	void removeIMChiclet(const LLUUID& im_session_id);
 
 	void removeAll();
 
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a31d7daff7..f8dd35e956 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -51,6 +51,7 @@
 #include "llresmgr.h"
 #include "llfloaterchat.h"
 #include "llfloaterchatterbox.h"
+#include "llfriendactions.h"
 #include "llhttpnode.h"
 #include "llimpanel.h"
 #include "llresizebar.h"
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index c7ef6e16f7..99f6823ba1 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -50,7 +50,6 @@
 #include "llinventorymodel.h"
 #include "lllandmarklist.h"
 #include "lllocationhistory.h"
-#include "llpanelplaces.h"
 #include "llsidetray.h"
 #include "llviewerinventory.h"
 #include "llviewerparcelmgr.h"
@@ -352,10 +351,7 @@ void LLLocationInputCtrl::onFocusLost()
 
 void LLLocationInputCtrl::onInfoButtonClicked()
 {
-	LLSD key;
-	key["type"] = LLPanelPlaces::AGENT;
-
-	LLSideTray::getInstance()->showPanel("panel_places", key);
+	LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "agent"));
 }
 
 void LLLocationInputCtrl::onAddLandmarkButtonClicked()
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 5c572b8fcd..e3c4167d73 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -43,7 +43,6 @@
 #include "lltexteditor.h"
 #include "lltexturectrl.h"
 #include "lltooldraganddrop.h"
-#include "llviewermenu.h"		// *FIX: for is_agent_friend()
 #include "llscrollcontainer.h"
 #include "llweb.h"
 
@@ -140,7 +139,6 @@ LLPanelProfileTab::LLPanelProfileTab(const Params& params )
 
 LLPanelProfileTab::~LLPanelProfileTab()
 {
-	// *TODO Vadim: use notNull() instead. (there are several similar cases below)
 	if(mAvatarId.notNull())
 	{
 		LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
@@ -166,6 +164,11 @@ void LLPanelProfileTab::setProfileType()
 	mProfileType = (gAgentID == mAvatarId) ? PT_OWN : PT_OTHER;
 }
 
+void LLPanelProfileTab::onOpen(const LLSD& key)
+{
+	onActivate(key);
+}
+
 void LLPanelProfileTab::onActivate(const LLUUID& id)
 {
 	setAvatarId(id);
@@ -293,7 +296,7 @@ void LLPanelAvatarProfile::processProperties(void* data, EAvatarProcessorType ty
 
 
 			bool online = avatar_data->flags & AVATAR_ONLINE;
-			if(is_agent_friend(avatar_data->avatar_id))
+			if(LLFriendActions::isFriend(avatar_data->avatar_id))
 			{
 				// Online status NO could be because they are hidden
 				// If they are a friend, we may know the truth!
@@ -533,7 +536,7 @@ void LLPanelAvatarProfile::updateChildrenList()
 		childSetVisible("partner_edit_link", false);
 
 		//hide for friends
-		childSetEnabled("add_friend", !is_agent_friend(getAvatarId()));
+		childSetEnabled("add_friend", !LLFriendActions::isFriend(getAvatarId()));
 
 		//need to update profile view on every activate
 		mUpdated = false;
@@ -727,5 +730,5 @@ void LLPanelAvatarNotes::onActivate(const LLUUID& id)
 void LLPanelAvatarNotes::updateChildrenList()
 {
 	//hide for friends
-	childSetEnabled("add_friend", !is_agent_friend(getAvatarId()));
+	childSetEnabled("add_friend", !LLFriendActions::isFriend(getAvatarId()));
 }
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 8bfa386d55..2b0fbaf193 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -34,37 +34,10 @@
 #define LL_LLPANELAVATAR_H
 
 #include "llpanel.h"
-#include "v3dmath.h"
-#include "lluuid.h"
-#include "llwebbrowserctrl.h"
-
 #include "llavatarpropertiesprocessor.h"
 
-class LLButton;
-class LLCheckBoxCtrl;
 class LLComboBox;
-class LLDropTarget;
-class LLInventoryItem;
 class LLLineEditor;
-class LLNameEditor;
-class LLPanelAvatar;
-class LLScrollListCtrl;
-class LLTabContainer;
-class LLTextBox;
-class LLTextEditor;
-class LLTextureCtrl;
-class LLUICtrl;
-class LLViewerImage;
-class LLViewerObject;
-class LLMessageSystem;
-class LLIconCtrl;
-class LLWebBrowserCtrl;
-class LLVector3d;
-class LLFloaterReg;
-
-class LLPanelMeProfile;
-class LLPanelPick;
-class LLAgent;
 
 enum EOnlineStatus
 {
@@ -87,7 +60,9 @@ public:
 	const LLUUID& getAvatarId(){return mAvatarId;}
 
 	virtual void updateData() = 0;
-	
+
+	virtual void onOpen(const LLSD& key);
+
 	virtual void onActivate(const LLUUID& id);
 
 	typedef enum e_profile_type
@@ -138,16 +113,6 @@ public:
 	/*virtual*/ BOOL postBuild(void);
 	/*virtual*/ void onOpen(const LLSD& key);
 
-	void onAddFriendButtonClick();
-
-	void onIMButtonClick();
-
-	void onCallButtonClick();
-
-	void onTeleportButtonClick();
-
-	void onShareButtonClick();
-
 private:
 	bool isOwnProfile(){return PT_OWN == mProfileType;}
 	bool isEditMode(){return mEditMode;}
@@ -162,6 +127,13 @@ private:
 	void onMyAccountTextboxClicked();
 	void onPartnerEditTextboxClicked();
 
+	void onAddFriendButtonClick();
+	void onIMButtonClick();
+	void onCallButtonClick();
+	void onTeleportButtonClick();
+	void onShareButtonClick();
+
+
 protected:
 	bool mEditMode;
 
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index d1164dafb8..6fad582eee 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -262,7 +262,7 @@ void LLLandmarksPanel::onSelectorButtonClicked()
 	if (listenerp->getInventoryType() == LLInventoryType::IT_LANDMARK)
 	{
 		LLSD key;
-		key["type"] = LLPanelPlaces::LANDMARK;
+		key["type"] = "landmark";
 		key["id"] = listenerp->getUUID();
 
 		LLSideTray::getInstance()->showPanel("panel_places", key);
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index b6141384f7..82c8f97d4d 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -326,7 +326,6 @@ LLPanelPeople::~LLPanelPeople()
 	delete mGroupListUpdater;
 
 	LLView::deleteViewByHandle(mGroupPlusMenuHandle);
-	LLView::deleteViewByHandle(mGroupMinusMenuHandle);
 }
 
 BOOL LLPanelPeople::postBuild()
@@ -377,9 +376,6 @@ BOOL LLPanelPeople::postBuild()
 	registrar.add("People.Group.Plus.Action",  boost::bind(&LLPanelPeople::onGroupPlusMenuItemClicked,  this, _2));
 	LLMenuGL* plus_menu  = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_group_plus.xml",  gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	mGroupPlusMenuHandle  = plus_menu->getHandle();
-	registrar.add("People.Group.Minus.Action", boost::bind(&LLPanelPeople::onGroupMinusMenuItemClicked, this, _2));
-	LLMenuGL* minus_menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_group_minus.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
-	mGroupMinusMenuHandle = minus_menu->getHandle();
 
 	// Perform initial update.
 	mFriendListUpdater->forceUpdate();
@@ -430,7 +426,12 @@ bool LLPanelPeople::updateRecentList()
 
 bool LLPanelPeople::updateGroupList()
 {
-	return mGroupList->update(mFilterSubString);
+	bool have_names = mGroupList->update(mFilterSubString);
+
+	if (mGroupList->isEmpty())
+		mGroupList->setCommentText(getString("no_groups"));
+
+	return have_names;
 }
 
 bool LLPanelPeople::filterFriendList()
@@ -742,11 +743,9 @@ void LLPanelPeople::onGroupPlusButtonClicked()
 
 void LLPanelPeople::onGroupMinusButtonClicked()
 {
-	LLMenuGL* minus_menu = (LLMenuGL*)mGroupMinusMenuHandle.get();
-	if (!minus_menu)
-		return;
-
-	showGroupMenu(minus_menu);
+	LLUUID group_id = getCurrentItemID();
+	if (group_id.notNull())
+		LLGroupActions::leave(group_id);
 }
 
 void LLPanelPeople::onGroupPlusMenuItemClicked(const LLSD& userdata)
@@ -759,19 +758,6 @@ void LLPanelPeople::onGroupPlusMenuItemClicked(const LLSD& userdata)
 		LLGroupActions::create();
 }
 
-void LLPanelPeople::onGroupMinusMenuItemClicked(const LLSD& userdata)
-{
-	std::string chosen_item = userdata.asString();
-
-	LLUUID group_id = getCurrentItemID();
-	if (chosen_item == "leave_group")
-		LLGroupActions::leave(group_id);
-	/*
-	else if (chosen_item == "delete_group")
-		; // *TODO: how to delete a group?
-	*/
-}
-
 void LLPanelPeople::onCallButtonClicked()
 {
 	// *TODO: not implemented yet
@@ -794,5 +780,10 @@ void LLPanelPeople::onMoreButtonClicked()
 
 void	LLPanelPeople::onOpen(const LLSD& key)
 {
-	reSelectedCurrentTab();
+	std::string tab_name = key.asString();
+
+	if (!tab_name.empty())
+		mTabContainer->selectTabByName(tab_name);
+	else
+		reSelectedCurrentTab();
 }
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 4855096750..1131790106 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -96,7 +96,6 @@ private:
 	void					onGroupPlusButtonClicked();
 	void					onGroupMinusButtonClicked();
 	void					onGroupPlusMenuItemClicked(const LLSD& userdata);
-	void					onGroupMinusMenuItemClicked(const LLSD& userdata);
 
 	// misc callbacks
 	bool					onFriendListUpdate(U32 changed_mask);
@@ -113,7 +112,6 @@ private:
 	LLGroupList*			mGroupList;
 
 	LLHandle<LLView>		mGroupPlusMenuHandle;
-	LLHandle<LLView>		mGroupMinusMenuHandle;
 
 	Updater*				mFriendListUpdater;
 	Updater*				mNearbyListUpdater;
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index cb47759a49..2bcead425a 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -102,6 +102,11 @@ void LLPanelPick::reset()
 	setLocation("");
 	mSnapshotCtrl->setImageAssetID(LLUUID::null);
 
+	//*HACK just setting asset id to NULL not enough to clear 
+	//the texture controls, w/o setValid(FALSE) it continues to 
+	//draw the previously set image
+	mSnapshotCtrl->setValid(FALSE);
+
 	mDataReceived = FALSE;
 
 	mPosGlobal.clearVec();
@@ -113,25 +118,24 @@ BOOL LLPanelPick::postBuild()
 
 	if (mEditMode)
 	{
-		childSetAction("cancel_btn", onClickCancel, this);
-		childSetAction("set_to_curr_location_btn", onClickSet, this);
-		childSetAction(XML_BTN_SAVE, onClickSave, this);
+		childSetAction("cancel_btn", boost::bind(&LLPanelPick::onClickCancel, this));
+		childSetAction("set_to_curr_location_btn", boost::bind(&LLPanelPick::onClickSet, this));
+		childSetAction(XML_BTN_SAVE, boost::bind(&LLPanelPick::onClickSave, this));
 
 		mSnapshotCtrl->setMouseEnterCallback(boost::bind(&LLPanelPick::childSetVisible, this, "edit_icon", true));
 		mSnapshotCtrl->setMouseLeaveCallback(boost::bind(&LLPanelPick::childSetVisible, this, "edit_icon", false));
 	}
 	else
 	{
-		childSetAction("edit_btn", onClickEdit, this);
-		childSetAction("teleport_btn", onClickTeleport, this);
-		childSetAction("show_on_map_btn", onClickMap, this);
+		childSetAction("edit_btn", boost::bind(&LLPanelPick::onClickEdit, this));
+		childSetAction("teleport_btn", boost::bind(&LLPanelPick::onClickTeleport, this));
+		childSetAction("show_on_map_btn", boost::bind(&LLPanelPick::onClickMap, this));
 
-		if (mExitFunction && mExitData)
+		if (!mBackCb.empty())
 		{
-			childSetAction("back_btn", mExitFunction, mExitData);
+			LLButton* button = findChild<LLButton>("back_btn");
+			if (button) button->setClickedCallback(mBackCb);
 		}
-
-		//*TODO set on menu
 	}
 
 	return TRUE;
@@ -165,6 +169,9 @@ void LLPanelPick::init(LLPickData *pick_data)
 	setLocation(pick_data->location_text);
 	mSnapshotCtrl->setImageAssetID(pick_data->snapshot_id);
 
+	//*HACK see reset() where the texture control was set to FALSE
+	mSnapshotCtrl->setValid(TRUE);
+
 	mPosGlobal = pick_data->pos_global;
 	mSimName = pick_data->sim_name;
 	mParcelId = pick_data->parcel_id;
@@ -322,30 +329,23 @@ void LLPanelPick::sendUpdate()
 //-----------------------------------------
 
 //static
-void LLPanelPick::onClickEdit(void* data)
+void LLPanelPick::onClickEdit()
 {
-	LLPanelPick* self = (LLPanelPick*)data;
-	if (!self) return;
-	if (self->mEditMode) return;
-	if (!self->mDataReceived) return;
-
-	self->setEditMode(TRUE);
+	if (mEditMode) return;
+	if (!mDataReceived) return;
+	setEditMode(TRUE);
 }
 
 //static
-void LLPanelPick::onClickTeleport(void* data)
+void LLPanelPick::onClickTeleport()
 {
-	LLPanelPick* self = (LLPanelPick*)data;
-	if (!self) return;
-	teleport(self->mPosGlobal);
+	teleport(mPosGlobal);
 }
 
 //static
-void LLPanelPick::onClickMap(void* data)
+void LLPanelPick::onClickMap()
 {
-	LLPanelPick* self = (LLPanelPick*)data;
-	if (!self) return;
-	showOnMap(self->mPosGlobal);
+	showOnMap(mPosGlobal);
 }
 
 
@@ -354,49 +354,44 @@ void LLPanelPick::onClickMap(void* data)
 //-----------------------------------------
 
 //static
-void LLPanelPick::onClickCancel(void* data)
+void LLPanelPick::onClickCancel()
 {
-	LLPanelPick* self = (LLPanelPick*) data;
-	if (!self) return;
-	if (!self->mEditMode) return;
+	if (!mEditMode) return;
 	
-	LLUUID pick_id = self->mPickId;
-	LLUUID creator_id = self->mCreatorId;
-	self->reset();
-	self->init(creator_id, pick_id);
+	LLUUID pick_id = mPickId;
+	LLUUID creator_id = mCreatorId;
+	reset();
+	init(creator_id, pick_id);
 }
 
 // static
-void LLPanelPick::onClickSet(void* data)
+void LLPanelPick::onClickSet()
 {
-	LLPanelPick* self = (LLPanelPick*) data;
-	if (!self) return;
-	if (!self->mEditMode) return;
-	if (!self->mDataReceived) return;
+	if (!mEditMode) return;
+	if (!mDataReceived) return;
 
 	// Save location for later.
-	self->mPosGlobal = gAgent.getPositionGlobal();
+	mPosGlobal = gAgent.getPositionGlobal();
 
-	S32 region_x = llround((F32)self->mPosGlobal.mdV[VX]) % REGION_WIDTH_UNITS;
-	S32 region_y = llround((F32)self->mPosGlobal.mdV[VY]) % REGION_WIDTH_UNITS;
-	S32 region_z = llround((F32)self->mPosGlobal.mdV[VZ]);
+	S32 region_x = llround((F32)mPosGlobal.mdV[VX]) % REGION_WIDTH_UNITS;
+	S32 region_y = llround((F32)mPosGlobal.mdV[VY]) % REGION_WIDTH_UNITS;
+	S32 region_z = llround((F32)mPosGlobal.mdV[VZ]);
 
 	std::string location_text = "(will update after save), ";
-	location_text.append(self->mSimName);
+	location_text.append(mSimName);
 	location_text.append(llformat(" (%d, %d, %d)", region_x, region_y, region_z));
 
-	self->setLocation(location_text);
+	setLocation(location_text);
 }
 
 // static
-void LLPanelPick::onClickSave(void* data)
+void LLPanelPick::onClickSave()
 {
-	LLPanelPick* self = (LLPanelPick*)data;
-	if (!self->mEditMode) return;
-	if (!self->mDataReceived) return;
+	if (!mEditMode) return;
+	if (!mDataReceived) return;
 
-	self->sendUpdate();
-	self->setEditMode(FALSE);
+	sendUpdate();
+	setEditMode(FALSE);
 }
 
 void LLPanelPick::updateButtons()
@@ -422,13 +417,13 @@ void LLPanelPick::updateButtons()
 	}
 }
 
-void LLPanelPick::setExitCallback( boost::function<void(void*)> function, void* data )
+void LLPanelPick::setExitCallback(commit_callback_t cb)
 {
-	mExitFunction = function;
-	mExitData = data;
+	mBackCb = cb;
 	if (!mEditMode)
 	{
-		childSetAction("back_btn", function, data);
+		LLButton* button = findChild<LLButton>("back_btn");
+		if (button) button->setClickedCallback(mBackCb);
 	}
 }
 
diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h
index 36bced3849..fd07d9ef91 100644
--- a/indra/newview/llpanelpick.h
+++ b/indra/newview/llpanelpick.h
@@ -74,7 +74,7 @@ public:
 	// but that causes such a complication that we cannot set a callback for a "Back" button
 	// from the parent panel only once, so we have to preserve that callback
 	// in the pick panel and set it for the back button everytime postBuild() is called.
-	void setExitCallback(boost::function<void(void*)> function, void* value);
+	void setExitCallback(commit_callback_t cb);
 
 	static void teleport(const LLVector3d& position);
 	static void showOnMap(const LLVector3d& position);
@@ -100,16 +100,16 @@ protected:
 	//-----------------------------------------
 	// "PICK INFO" (VIEW MODE) BUTTON HANDLERS
 	//-----------------------------------------
-	static void onClickEdit(void* data);
-	static void onClickTeleport(void* data);
-	static void onClickMap(void* data);
+	void onClickEdit();
+	void onClickTeleport();
+	void onClickMap();
 
 	//-----------------------------------------
 	// "EDIT PICK" (EDIT MODE) BUTTON HANDLERS
 	//-----------------------------------------
-	static void onClickSet(void* data);
-	static void onClickSave(void* data);
-	static void onClickCancel(void* data);
+	void onClickSet();
+	void onClickSave();
+	void onClickCancel();
 
 protected:
 	BOOL mEditMode;
@@ -122,8 +122,7 @@ protected:
 	LLUUID mParcelId;
 	std::string mSimName;
 
-	boost::function<void(void*)> mExitFunction;
-	void* mExitData;
+	commit_callback_t mBackCb;
 };
 
 #endif // LL_LLPANELPICK_H
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index f3adaded34..778a2299f5 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -38,10 +38,12 @@
 #include "llviewergenericmessage.h"	// send_generic_message
 #include "llmenugl.h"
 #include "llviewermenu.h"
+#include "llregistry.h"
 
 #include "llpanelpicks.h"
 #include "llavatarpropertiesprocessor.h"
 #include "llpanelavatar.h"
+#include "llpanelprofile.h"
 #include "llpanelpick.h"
 
 static const std::string XML_BTN_NEW = "new_btn";
@@ -58,12 +60,13 @@ static const std::string XML_PICKS_LIST = "back_panel";
 //-----------------------------------------------------------------------------
 // LLPanelPicks
 //-----------------------------------------------------------------------------
-LLPanelPicks::LLPanelPicks(const LLUUID& avatar_id /* = LLUUID::null */)
-:	LLPanelProfileTab(avatar_id),
+LLPanelPicks::LLPanelPicks()
+:	LLPanelProfileTab(LLUUID::null),
 	mPopupMenu(NULL),
-	mSelectedPickItem(NULL)
+	mSelectedPickItem(NULL),
+	mProfilePanel(NULL),
+	mPickPanel(NULL)
 {
-	updateData();
 }
 
 LLPanelPicks::~LLPanelPicks()
@@ -76,12 +79,6 @@ LLPanelPicks::~LLPanelPicks()
 
 void* LLPanelPicks::create(void* data /* = NULL */)
 {
-	LLSD* id = NULL;
-	if(data)
-	{
-		id = static_cast<LLSD*>(data);
-		return new LLPanelPicks(LLUUID(id->asUUID()));
-	}
 	return new LLPanelPicks();
 }
 
@@ -125,6 +122,8 @@ void LLPanelPicks::processProperties(void* data, EAvatarProcessorType type)
 				std::string pick_name = it->second;
 
 				LLPickItem* picture = LLPickItem::create();
+				picture->childSetAction("info_chevron", boost::bind(&LLPanelPicks::onClickInfo, this));
+				
 				picks_list->addChild(picture);
 
 				picture->setPickName(pick_name);
@@ -228,24 +227,30 @@ LLView* LLPanelPicks::getPicksList() const
 	return getChild<LLView>(XML_PICKS_LIST, TRUE, FALSE);
 }
 
-BOOL LLPanelPicks::postBuild(void)
+BOOL LLPanelPicks::postBuild()
 {
-	childSetAction(XML_BTN_DELETE, onClickDelete, this);
+	childSetAction(XML_BTN_DELETE, boost::bind(&LLPanelPicks::onClickDelete, this));
 
-	childSetAction("teleport_btn", onClickTeleport, this);
-	childSetAction("show_on_map_btn", onClickMap, this);
-
-	mCommitCallbackRegistrar.add("Pick.Teleport", boost::bind(onClickTeleport, this));
-	mCommitCallbackRegistrar.add("Pick.Map", boost::bind(onClickMap, this));
-	mCommitCallbackRegistrar.add("Pick.Delete", boost::bind(onClickDelete, this));
+	childSetAction("teleport_btn", boost::bind(&LLPanelPicks::onClickTeleport, this));
+	childSetAction("show_on_map_btn", boost::bind(&LLPanelPicks::onClickMap, this));
 
+	childSetAction("info_btn", boost::bind(&LLPanelPicks::onClickInfo, this));
+	childSetAction("new_btn", boost::bind(&LLPanelPicks::onClickNew, this));
+	
+	CommitCallbackRegistry::ScopedRegistrar registar;
+	registar.add("Pick.Info", boost::bind(&LLPanelPicks::onClickInfo, this));
+	registar.add("Pick.Edit", boost::bind(&LLPanelPicks::onClickMenuEdit, this)); 
+	registar.add("Pick.Teleport", boost::bind(&LLPanelPicks::onClickTeleport, this));
+	registar.add("Pick.Map", boost::bind(&LLPanelPicks::onClickMap, this));
+	registar.add("Pick.Delete", boost::bind(&LLPanelPicks::onClickDelete, this));
 	mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_picks.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
-
+	
 	return TRUE;
 }
 
-void LLPanelPicks::onActivate(const LLUUID& id)
+void LLPanelPicks::onOpen(const LLSD& key)
 {
+	const LLUUID id(key.asUUID());
 	BOOL self = (gAgent.getID() == id);
 
 	// only agent can edit her picks 
@@ -267,21 +272,18 @@ void LLPanelPicks::onActivate(const LLUUID& id)
 		childSetVisible("pick_title_agent", self);
 	}
 
-	LLPanelProfileTab::onActivate(id);
+	LLPanelProfileTab::onOpen(key);
 }
 
 //static
-void LLPanelPicks::onClickDelete(void *data)
+void LLPanelPicks::onClickDelete()
 {
-	LLPanelPicks* self = (LLPanelPicks*) data;
-	if (!self) return;
-
-	LLPickItem* pick_item = self->getSelectedPickItem();
+	LLPickItem* pick_item = getSelectedPickItem();
 	if (!pick_item) return;
 
 	LLSD args; 
 	args["PICK"] = pick_item->getPickName(); 
-	LLNotifications::instance().add("DeleteAvatarPick", args, LLSD(), boost::bind(&LLPanelPicks::callbackDelete, self, _1, _2)); 
+	LLNotifications::instance().add("DeleteAvatarPick", args, LLSD(), boost::bind(&LLPanelPicks::callbackDelete, this, _1, _2)); 
 }
 
 bool LLPanelPicks::callbackDelete(const LLSD& notification, const LLSD& response) 
@@ -299,20 +301,29 @@ bool LLPanelPicks::callbackDelete(const LLSD& notification, const LLSD& response
 	return false;
 }
 
+bool LLPanelPicks::callbackTeleport( const LLSD& notification, const LLSD& response )
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+
+	if (0 == option)
+	{
+		onClickTeleport();
+	}
+	return false;
+}
+
 //static
-void LLPanelPicks::onClickTeleport(void* data)
+void LLPanelPicks::onClickTeleport()
 {
-	LLPanelPicks* self = (LLPanelPicks*)data;
-	LLPickItem* pick_item = self->getSelectedPickItem();
+	LLPickItem* pick_item = getSelectedPickItem();
 	if (!pick_item) return;
 	LLPanelPick::teleport(pick_item->getPosGlobal());
 }
 
 //static
-void LLPanelPicks::onClickMap(void* data)
+void LLPanelPicks::onClickMap()
 {
-	LLPanelPicks* self = (LLPanelPicks*)data;
-	LLPickItem* pick_item = self->getSelectedPickItem();
+	LLPickItem* pick_item = getSelectedPickItem();
 	if (!pick_item) return;
 	LLPanelPick::showOnMap(pick_item->getPosGlobal());
 }
@@ -336,10 +347,26 @@ BOOL LLPanelPicks::handleRightMouseDown(S32 x, S32 y, MASK mask)
 
 BOOL LLPanelPicks::handleMouseDown( S32 x, S32 y, MASK mask )
 {
-	if (isMouseInPick(x, y)) return TRUE;
+	isMouseInPick(x, y);
 	return LLPanel::handleMouseDown(x, y, mask);
 }
 
+BOOL LLPanelPicks::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+	if (isMouseInPick(x, y))
+	{
+		LLPickItem* pick_item = getSelectedPickItem();
+		if (pick_item) 
+		{
+			LLSD args; 
+			args["PICK"] = pick_item->getPickName(); 
+			LLNotifications::instance().add("TeleportToPick", args, LLSD(), boost::bind(&LLPanelPicks::callbackTeleport, this, _1, _2)); 
+		}
+		return TRUE;
+	}
+	return LLPanel::handleDoubleClick(x, y, mask);
+}
+
 void LLPanelPicks::updateButtons()
 {
 	int picks_num = mPickItemList.size();
@@ -361,7 +388,7 @@ void LLPanelPicks::updateButtons()
 
 }
 
-void LLPanelPicks::setSelectedPickItem( LLPickItem* item )
+void LLPanelPicks::setSelectedPickItem(LLPickItem* item)
 {
 	if (!item) return;
 	if (mSelectedPickItem == item) return;
@@ -395,6 +422,64 @@ BOOL LLPanelPicks::isMouseInPick( S32 x, S32 y )
 }
 
 
+void LLPanelPicks::setProfilePanel(LLPanelProfile* profile_panel)
+{
+	mProfilePanel = profile_panel;
+}
+
+
+void LLPanelPicks::buildPickPanel()
+{
+	if (mPickPanel == NULL)
+	{
+		mPickPanel = new LLPanelPick();
+		mPickPanel->setExitCallback(boost::bind(&LLPanelPicks::onClickBack, this));
+	}
+}
+
+void LLPanelPicks::onClickNew()
+{
+	buildPickPanel();
+	mPickPanel->setEditMode(TRUE);
+	mPickPanel->createNewPick();
+	getProfilePanel()->togglePanel(mPickPanel);
+}
+
+void LLPanelPicks::onClickInfo()
+{
+	LLPickItem* pick = getSelectedPickItem();
+	if (!pick) return;
+
+	buildPickPanel();
+	mPickPanel->reset();
+	mPickPanel->init(pick->getCreatorId(), pick->getPickId());
+	getProfilePanel()->togglePanel(mPickPanel);
+}
+
+void LLPanelPicks::onClickBack()
+{
+	getProfilePanel()->togglePanel(mPickPanel);
+}
+
+void LLPanelPicks::onClickMenuEdit()
+{
+	//*TODO, refactor - most of that is similar to onClickInfo
+	LLPickItem* pick = getSelectedPickItem();
+	if (!pick) return;
+
+	buildPickPanel();
+	mPickPanel->reset();
+	mPickPanel->init(pick->getCreatorId(), pick->getPickId());
+	mPickPanel->setEditMode(TRUE);
+	getProfilePanel()->togglePanel(mPickPanel);
+}
+
+inline LLPanelProfile* LLPanelPicks::getProfilePanel()
+{
+	llassert_always(NULL != mProfilePanel);
+	return mProfilePanel;
+}
+
 //-----------------------------------------------------------------------------
 // LLPanelPicks
 //-----------------------------------------------------------------------------
@@ -506,6 +591,6 @@ void LLPickItem::processProperties(void *data, EAvatarProcessorType type)
 	if (mPickID != pick_data->pick_id) return;
 
 	init(pick_data);
-	LLAvatarPropertiesProcessor::instance().removeObserver(pick_data->agent_id, this);
+	LLAvatarPropertiesProcessor::instance().removeObserver(mCreatorID, this);
 }
 
diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
index 5ec9809f0b..3bc79daeb3 100644
--- a/indra/newview/llpanelpicks.h
+++ b/indra/newview/llpanelpicks.h
@@ -38,7 +38,9 @@
 #include "lluuid.h"
 #include "llavatarpropertiesprocessor.h"
 #include "llpanelavatar.h"
+#include "llregistry.h"
 
+class LLPanelProfile;
 class LLMessageSystem;
 class LLVector3d;
 class LLPanelProfileTab;
@@ -52,14 +54,14 @@ class LLPanelPicks
 	: public LLPanelProfileTab
 {
 public:
-	LLPanelPicks(const LLUUID& avatar_id = LLUUID::null);
+	LLPanelPicks();
 	~LLPanelPicks();
 
 	static void* create(void* data);
 
 	/*virtual*/ BOOL postBuild(void);
 
-	/*virtual*/ void onActivate(const LLUUID& id);
+	/*virtual*/ void onOpen(const LLSD& key);
 
 	void processProperties(void* data, EAvatarProcessorType type);
 
@@ -75,13 +77,29 @@ public:
 
 	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+
+	//*NOTE top down approch when panel toggling is done only by 
+	// parent panels failed to work (picks related code was in me profile panel)
+	void setProfilePanel(LLPanelProfile* profile_panel);
 
 private:
-	static void onClickDelete(void* data);
-	static void onClickTeleport(void* data);
-	static void onClickMap(void* data);
+	void onClickDelete();
+	void onClickTeleport();
+	void onClickMap();
+
+	//------------------------------------------------
+	// Callbacks which require panel toggling
+	//------------------------------------------------
+	void onClickNew();
+	void onClickInfo();
+	void onClickBack();
+	void onClickMenuEdit();
+
+	void buildPickPanel();
 
 	bool callbackDelete(const LLSD& notification, const LLSD& response);
+	bool callbackTeleport(const LLSD& notification, const LLSD& response);
 
 	void reshapePicksList();
 	void reshapePickItem(LLView* const pick_item, const S32 last_bottom);
@@ -92,11 +110,16 @@ private:
 
 	BOOL isMouseInPick(S32 x, S32 y);
 
+	LLPanelProfile* getProfilePanel();
+
+
 	typedef std::list<LLPickItem*> picture_list_t;
 	picture_list_t mPickItemList;
 
 	LLMenuGL* mPopupMenu;
 	LLPickItem* mSelectedPickItem;
+	LLPanelProfile* mProfilePanel;
+	LLPanelPick* mPickPanel;
 };
 
 class LLPickItem : public LLPanel, public LLAvatarPropertiesObserver
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index d40e10478a..5bbcf4207f 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -43,29 +43,20 @@
 #include "llqueryflags.h"
 
 #include "llbutton.h"
-#include "llfloater.h"
-#include "llfloaterreg.h"
 #include "lllineeditor.h"
 #include "llscrollcontainer.h"
 #include "lltextbox.h"
-#include "lltrans.h"
-#include "llui.h"
-#include "lluictrlfactory.h"
 
 #include "llagent.h"
 #include "llfloaterworldmap.h"
 #include "llinventorymodel.h"
 #include "lltexturectrl.h"
-#include "lluiconstants.h"
-#include "llviewercontrol.h"
 #include "llviewerinventory.h"
 #include "llviewerregion.h"
 #include "llviewertexteditor.h"
-#include "llviewerwindow.h"
-#include "llweb.h"
 #include "llworldmap.h"
 
-static LLRegisterPanelClassWrapper<LLPanelPlaceInfo> t_places("panel_landmark_info");
+static LLRegisterPanelClassWrapper<LLPanelPlaceInfo> t_place_info("panel_place_info");
 
 LLPanelPlaceInfo::LLPanelPlaceInfo()
 :	LLPanel(),
@@ -86,6 +77,9 @@ LLPanelPlaceInfo::~LLPanelPlaceInfo()
 
 BOOL LLPanelPlaceInfo::postBuild()
 {
+	mTitle = getChild<LLTextBox>("panel_title");
+	mCurrentTitle = mTitle->getText();
+
 	// Since this is only used in the directory browser, always
 	// disable the snapshot control. Otherwise clicking on it will
 	// open a texture picker.
@@ -114,7 +108,8 @@ BOOL LLPanelPlaceInfo::postBuild()
 
 	mScrollingPanel = getChild<LLPanel>("scrolling_panel");
 
-	mInfoPanel = getChild<LLPanel>("info_panel");
+	mInfoPanel = getChild<LLPanel>("info_panel", TRUE, FALSE);
+	mMediaPanel = getChild<LLMediaPanel>("media_panel", TRUE, FALSE);
 
 	return TRUE;
 }
@@ -235,6 +230,45 @@ void LLPanelPlaceInfo::setParcelID(const LLUUID& parcel_id)
 	sendParcelInfoRequest();
 }
 
+void LLPanelPlaceInfo::setInfoType(INFO_TYPE type)
+{
+	if (!mInfoPanel)
+	    return;
+
+	if (type == PLACE)
+	{
+		mCurrentTitle = getString("title_place");
+	}
+	else
+	{
+		mCurrentTitle = getString("title_landmark");
+	}
+	
+	if (mInfoPanel->getVisible())
+	{
+		mTitle->setText(mCurrentTitle);
+	}
+}
+
+void LLPanelPlaceInfo::toggleMediaPanel()
+{
+    if (!(mMediaPanel && mInfoPanel))
+        return;
+
+    bool visible = mInfoPanel->getVisible();
+    if (visible)
+	{
+		mTitle->setText(getString("title_media"));
+	}
+	else
+	{
+		mTitle->setText(mCurrentTitle);
+	}
+
+    mInfoPanel->setVisible(!visible);
+    mMediaPanel->setVisible(visible);
+}
+
 void LLPanelPlaceInfo::sendParcelInfoRequest()
 {
 	if (mParcelID != mRequestedID)
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index cec9e7b80c..8b00507ba0 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -40,6 +40,7 @@
 
 #include "lliconctrl.h"
 
+#include "llpanelmedia.h"
 #include "llremoteparcelrequest.h"
 
 class LLButton;
@@ -52,19 +53,31 @@ class LLTextureCtrl;
 class LLPanelPlaceInfo : public LLPanel, LLRemoteParcelInfoObserver
 {
 public:
+	enum INFO_TYPE
+	{
+		PLACE,
+		LANDMARK
+	};
+
 	LLPanelPlaceInfo();
 	/*virtual*/ ~LLPanelPlaceInfo();
 
 	/*virtual*/ BOOL postBuild();
 
+	// Ignore all old location information, useful if you are 
+	// recycling an existing dialog and need to clear it.
 	void resetLocation();
-		// Ignore all old location information, useful if you are 
-		// recycling an existing dialog and need to clear it.
 
+	// Sends a request for data about the given parcel, which will
+	// only update the location if there is none already available.
 	/*virtual*/ void setParcelID(const LLUUID& parcel_id);
-		// Sends a request for data about the given parcel, which will
-		// only update the location if there is none already available.
 
+	// Depending on how the panel was triggered 
+	// (from landmark or current location, or other) 
+	// sets a corresponding title and contents.
+	void setInfoType(INFO_TYPE type);
+
+	void toggleMediaPanel();
 	void displayItemInfo(const LLInventoryItem* pItem);
 	/*virtual*/ void setErrorStatus(U32 status, const std::string& reason);
 
@@ -81,10 +94,10 @@ public:
 
 private:
 	enum LANDMARK_INFO_TYPE
-		{
-			TITLE,
-			NOTE
-		};
+	{
+		TITLE,
+		NOTE
+	};
 
 	void onCommitTitleOrNote(LANDMARK_INFO_TYPE type);
 
@@ -92,7 +105,10 @@ private:
 	LLUUID			mRequestedID;
 	LLUUID			mLandmarkID;
 	LLVector3		mPosRegion;
+	std::string		mCurrentTitle;
+	S32				mMinHeight;
 
+	LLTextBox*			mTitle;
 	LLTextureCtrl*		mSnapshotCtrl;
 	LLTextBox*			mRegionName;
 	LLTextBox*			mParcelName;
@@ -106,7 +122,7 @@ private:
 	LLTextBox*			mLocationEditor;
 	LLPanel*            mScrollingPanel;
 	LLPanel*			mInfoPanel;
-	S32					mMinHeight;
+	LLMediaPanel*		mMediaPanel;
 };
 
 #endif // LL_LLPANELPLACEINFO_H
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index f23d839708..f5e225c51b 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -80,7 +80,7 @@ BOOL LLPanelPlaces::postBuild()
 		mSearchEditor->setSearchCallback(boost::bind(&LLPanelPlaces::onSearchEdit, this, _1));
 	}
 
-	mPlaceInfo = dynamic_cast<LLPanelPlaceInfo*>(getChild<LLPanel>("panel_landmark_info"));
+	mPlaceInfo = getChild<LLPanelPlaceInfo>("panel_place_info", TRUE, FALSE);
 	if (mPlaceInfo)
 	{
 		LLButton* back_btn = mPlaceInfo->getChild<LLButton>("back_btn");
@@ -88,6 +88,9 @@ BOOL LLPanelPlaces::postBuild()
 		{
 			back_btn->setClickedCallback(boost::bind(&LLPanelPlaces::onBackButtonClicked, this));
 		}
+
+		// *TODO: Assign the action to an appropriate event.
+		childSetAction("overflow_btn", boost::bind(&LLPanelPlaceInfo::toggleMediaPanel, mPlaceInfo), this);
 	}
 
 	//childSetAction("share_btn", boost::bind(&LLPanelPlaces::onShareButtonClicked, this), this);
@@ -109,24 +112,26 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 
 	togglePlaceInfoPanel(TRUE);
 
-	mPlaceInfoType = key["type"].asInteger();
+	mPlaceInfoType = key["type"].asString();
 
-	if (mPlaceInfoType == AGENT)
+	if (mPlaceInfoType == "agent")
 	{
 		// We don't need to teleport to the current location so disable the button
 		getChild<LLButton>("teleport_btn")->setEnabled(FALSE);
 		getChild<LLButton>("map_btn")->setEnabled(TRUE);
 
+		mPlaceInfo->setInfoType(LLPanelPlaceInfo::PLACE);
 		mPlaceInfo->displayParcelInfo(gAgent.getPositionAgent(),
 									  gAgent.getRegion()->getRegionID(),
 									  gAgent.getPositionGlobal());
 	}
-	else if (mPlaceInfoType == LANDMARK)
+	else if (mPlaceInfoType == "landmark")
 	{
 		LLInventoryItem* item = gInventory.getItem(key["id"].asUUID());
 		if (!item)
 			return;
 
+		mPlaceInfo->setInfoType(LLPanelPlaceInfo::LANDMARK);
 		mPlaceInfo->displayItemInfo(item);
 
 		LLLandmark* landmark = gLandmarkList.getAsset(item->getAssetUUID());
@@ -142,7 +147,7 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 									  pos_global);
 
 	}
-	else if (mPlaceInfoType == TELEPORT_HISTORY)
+	else if (mPlaceInfoType == "teleport_history")
 	{
 		S32 index = key["id"].asInteger();
 
@@ -156,6 +161,7 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 
 		LLVector3 pos_local(region_x, region_y, (F32)pos_global.mdV[VZ]);
 
+		mPlaceInfo->setInfoType(LLPanelPlaceInfo::PLACE);
 		mPlaceInfo->displayParcelInfo(pos_local,
 									  hist_items[index].mRegionID,
 									  pos_global);
@@ -211,7 +217,7 @@ void LLPanelPlaces::onTeleportButtonClicked()
 
 void LLPanelPlaces::onShowOnMapButtonClicked()
 {
-	if (!mPlaceInfoType)
+	if (mPlaceInfoType == "agent")
 	{
 		LLVector3d global_pos = gAgent.getPositionGlobal();
 		if (!global_pos.isExactlyZero())
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index 533fb8dd82..89758fc34f 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -46,13 +46,6 @@ class LLTabContainer;
 class LLPanelPlaces : public LLPanel, LLInventoryObserver
 {
 public:
-	enum PLACE_INFO_TYPE
-	{
-		AGENT,
-		LANDMARK,
-		TELEPORT_HISTORY
-	};
-
 	LLPanelPlaces();
 	virtual ~LLPanelPlaces();
 
@@ -79,7 +72,7 @@ private:
 	std::string				mFilterSubString;
 
 	// Place information type currently shown in Information panel
-	S32						mPlaceInfoType;
+	std::string				mPlaceInfoType;
 };
 
 #endif //LL_LLPANELPLACES_H
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
new file mode 100644
index 0000000000..deca08050b
--- /dev/null
+++ b/indra/newview/llpanelprofile.cpp
@@ -0,0 +1,146 @@
+/** 
+* @file llpanelprofile.cpp
+* @brief Profile panel implementation
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+* 
+* Copyright (c) 2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+#include "llpanelprofile.h"
+#include "lltabcontainer.h"
+#include "llpanelpicks.h"
+#include "llagent.h"
+
+static const std::string PANEL_PICKS = "panel_picks";
+static const std::string PANEL_NOTES = "panel_notes";
+static const std::string PANEL_PROFILE = "panel_profile";
+
+static LLRegisterPanelClassWrapper<LLPanelAvatarProfile> t_panel_profile(PANEL_PROFILE);
+static LLRegisterPanelClassWrapper<LLPanelPicks> t_panel_picks(PANEL_PICKS);
+
+
+LLPanelProfile::LLPanelProfile()
+:	LLPanel(),
+	mTabContainer(NULL)
+{
+}
+
+LLPanelProfile::~LLPanelProfile()
+{
+}
+
+BOOL LLPanelProfile::postBuild()
+{
+	mTabContainer = getChild<LLTabContainer>("tabs");
+	mTabContainer->setCommitCallback(boost::bind(&LLPanelProfile::onTabSelected, this, _2));
+
+	LLPanelPicks* panel_picks = getChild<LLPanelPicks>(PANEL_PICKS);
+	panel_picks->setProfilePanel(this);
+	mTabs[PANEL_PICKS] = panel_picks;
+
+	mTabs[PANEL_PROFILE] = getChild<LLPanelAvatarProfile>(PANEL_PROFILE);
+
+	return TRUE;
+}
+
+void LLPanelProfile::onOpen(const LLSD& key)
+{
+	//*NOTE LLUUID::null in this context means Agent related stuff
+	LLUUID id(key.has("id") ? key["id"].asUUID() : gAgentID);
+	if (key.has("open_tab_name"))
+		mTabContainer->selectTabByName(key["open_tab_name"]);
+
+	if(id.notNull() && mAvatarId.notNull() && mAvatarId != id)
+	{
+		mTabs[PANEL_PROFILE]->clear();
+		mTabs[PANEL_PICKS]->clear();
+		mTabs[PANEL_NOTES]->clear();
+	}
+
+	mAvatarId = id;
+
+	mTabContainer->getCurrentPanel()->onOpen(mAvatarId);
+}
+
+//*TODO redo panel toggling
+void LLPanelProfile::togglePanel(LLPanel* panel)
+{
+	// TRUE - we need to open/expand "panel"
+	BOOL expand = this->getChildList()->back() != panel;  // mTabContainer->getVisible();
+
+	if (expand)
+	{
+		//*NOTE on view profile panel along with tabcontainer there is 
+		// a backbutton that will be shown when there will be a panel over it even 
+		//if that panel has visible backgroud
+		setAllChildrenVisible(FALSE);
+		
+		panel->setVisible(TRUE);
+		if (panel->getParent() != this)
+		{
+			addChildInBack(panel);
+		}
+		else
+		{
+			sendChildToBack(panel);
+		}
+
+		LLRect new_rect = getRect();
+		panel->reshape(new_rect.getWidth(), new_rect.getHeight());
+		new_rect.setLeftTopAndSize(0, new_rect.getHeight(), new_rect.getWidth(), new_rect.getHeight());
+		panel->setRect(new_rect);
+	}
+	else 
+	{
+		this->setAllChildrenVisible(TRUE);
+		if (panel->getParent() == this) removeChild(panel);
+		sendChildToBack(mTabContainer);
+		mTabContainer->getCurrentPanel()->onOpen(mAvatarId);
+	}
+}
+
+
+void LLPanelProfile::onTabSelected(const LLSD& param)
+{
+	std::string tab_name = param.asString();
+	if (NULL != mTabs[tab_name])
+	{
+		mTabs[tab_name]->onOpen(mAvatarId);
+	}
+}
+
+void LLPanelProfile::setAllChildrenVisible(BOOL visible)
+{
+	const child_list_t* child_list = getChildList();
+	for (child_list_const_iter_t child_it = child_list->begin(); child_it != child_list->end(); ++child_it)
+	{
+		LLView* viewp = *child_it;
+		viewp->setVisible(visible);
+	}
+}
+
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
new file mode 100644
index 0000000000..e8aea849df
--- /dev/null
+++ b/indra/newview/llpanelprofile.h
@@ -0,0 +1,72 @@
+/** 
+* @file llpanelprofile.h
+* @brief Profile panel
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+* 
+* Copyright (c) 2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLPANELPROFILE_H
+#define LL_LLPANELPROFILE_H
+
+#include "llviewerprecompiledheaders.h"
+#include "llpanel.h"
+#include "llpanelavatar.h"
+
+class LLTabContainer;
+
+class LLPanelProfile : public LLPanel
+{
+	LOG_CLASS(LLPanelProfile);
+
+public:
+	virtual BOOL postBuild();
+
+	virtual void onOpen(const LLSD& key);
+
+	virtual void togglePanel(LLPanel*);
+
+protected:
+	LLPanelProfile();
+	~LLPanelProfile();
+
+	void onTabSelected(const LLSD& param);
+
+	void setAllChildrenVisible(BOOL visible);
+
+
+	LLTabContainer* mTabContainer;
+	
+	typedef std::map<std::string, LLPanelProfileTab*> profile_tabs_t;
+	profile_tabs_t mTabs;
+
+	LLUUID mAvatarId;
+};
+
+
+
+#endif //LL_LLPANELPROFILE_H
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 495911c2e3..7d02c8ff0b 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -32,11 +32,10 @@
 
 #include "llviewerprecompiledheaders.h"
 #include "llpanelprofileview.h"
-#include <llfloaterreg.h>
-#include <lltabcontainer.h>
-#include <lluictrlfactory.h>
+
 #include "llpanelavatar.h"
 #include "llpanelpicks.h"
+#include "llpanelprofile.h"
 
 static LLRegisterPanelClassWrapper<LLPanelProfileView> t_panel_target_profile("panel_profile_view");
 static LLRegisterPanelClassWrapper<LLPanelAvatarNotes> t_panel_notes("panel_notes");
@@ -46,7 +45,7 @@ static std::string PANEL_PICKS = "panel_picks";
 static std::string PANEL_NOTES = "panel_notes";
 
 LLPanelProfileView::LLPanelProfileView()
-: LLPanel()
+:	LLPanelProfile()
 {
 }
 
@@ -57,35 +56,23 @@ LLPanelProfileView::~LLPanelProfileView(void)
 /*virtual*/ 
 void LLPanelProfileView::onOpen(const LLSD& key)
 {
-	if (!getVisible())
-		setVisible(TRUE);
-
-	LLUUID id(key.asUUID());
-	if(id.notNull() && mProfileId.notNull() && mProfileId != id)
-	{
-		mTabs[PANEL_PROFILE]->clear();
-		mTabs[PANEL_PICKS]->clear();
-		mTabs[PANEL_NOTES]->clear();
-	}
-
-	mProfileId = id;
-	mTabs[PANEL_PROFILE]->onOpen(mProfileId);
-	mTabs[PANEL_PICKS]->onActivate(mProfileId);
-	mTabs[PANEL_NOTES]->onActivate(mProfileId);
+	LLPanelProfile::onOpen(key);
+	
+	//*NOTE profile view panel doesn't have own side tray tab and 
+	//is usually opened over People side tray tab. By Back button
+	// Profile View panel just becomes invisible, see onBackBtnClick()
+	setVisible(TRUE);
 
 	std::string full_name;
-	gCacheName->getFullName(key,full_name);
+	gCacheName->getFullName(key["id"],full_name);
 	childSetValue("user_name",full_name);
 }
 
 
 BOOL LLPanelProfileView::postBuild()
 {
-	mTabContainer = getChild<LLTabContainer>("profile_tabs");
-	mTabContainer->setCommitCallback(boost::bind(&LLPanelProfileView::onTabSelected, this, _2));
+	LLPanelProfile::postBuild();
 
-	mTabs[PANEL_PROFILE] = (getChild<LLPanelAvatarProfile>(PANEL_PROFILE));
-	mTabs[PANEL_PICKS] = (getChild<LLPanelPicks>(PANEL_PICKS));
 	mTabs[PANEL_NOTES] = (getChild<LLPanelAvatarNotes>(PANEL_NOTES));
 
 	childSetCommitCallback("back",boost::bind(&LLPanelProfileView::onBackBtnClick,this),NULL);
@@ -96,14 +83,6 @@ BOOL LLPanelProfileView::postBuild()
 
 //private
 
-void LLPanelProfileView::initTabs(const LLSD& key)
-{
-}
-
-void LLPanelProfileView::onTabSelected(const LLSD& param)
-{
-}
-
 void LLPanelProfileView::onBackBtnClick()
 {
 	setVisible(FALSE);
diff --git a/indra/newview/llpanelprofileview.h b/indra/newview/llpanelprofileview.h
index 2d89f15fe4..6c5fc77951 100644
--- a/indra/newview/llpanelprofileview.h
+++ b/indra/newview/llpanelprofileview.h
@@ -33,12 +33,13 @@
 #ifndef LL_LLPANELPROFILEVIEW_H
 #define LL_LLPANELPROFILEVIEW_H
 
-#include <llpanel.h>
+#include "llpanel.h"
+#include "llpanelprofile.h"
 
+class LLPanelProfile;
 class LLPanelProfileTab;
-class LLTabContainer;
 
-class LLPanelProfileView : public LLPanel
+class LLPanelProfileView : public LLPanelProfile
 {
 	LOG_CLASS(LLPanelProfileView);
 	friend class LLUICtrlFactory;
@@ -48,22 +49,10 @@ public:
 
 	~LLPanelProfileView(void);
 
-	void onTabSelected(const LLSD& param);
-
 	void onOpen(const LLSD& key);
 	
 	BOOL postBuild();
-	
-	void initTabs(const LLSD& key);
-
 	void onBackBtnClick();
-
-private:
-	LLTabContainer*			mTabContainer;
-
-	typedef std::map<std::string, LLPanelProfileTab*> profile_tabs_t;
-	profile_tabs_t mTabs;
-	LLUUID mProfileId;
 };
 
 #endif //LL_LLPANELPROFILEVIEW_H
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index c271ca34b9..77edae261b 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -224,7 +224,7 @@ void LLTeleportHistoryPanel::onDoubleClickItem(void* user_data)
 		return;
 
 	LLSD key;
-	key["type"] = LLPanelPlaces::TELEPORT_HISTORY;
+	key["type"] = "teleport_history";
 	key["id"] = itemp->getColumn(LIST_INDEX)->getValue().asInteger();
 
 	LLSideTray::getInstance()->showPanel("panel_places", key);
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index b7c4c74891..53b88ba430 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -45,7 +45,6 @@
 #include "llfloater.h" //for gFloaterView
 #include "lliconctrl.h"//for Home tab icon
 #include "llwindow.h"//for SetCursor
-#include "llbottomtray.h"//for reshape
 
 //#include "llscrollcontainer.h"
 
@@ -733,9 +732,6 @@ void	LLSideTray::setPanelRect	()
 		panel_width+=mMaxBarWidth;
 
 	S32 panel_height = parent_rect.getHeight()-fake_top_offset;
-	if(gBottomTray)
-		panel_height -= gBottomTray->getRect().getHeight();
-
 	LLRect panel_rect;
 	panel_rect.setLeftTopAndSize( parent_rect.mRight-panel_width, parent_rect.mTop-fake_top_offset, panel_width, panel_height);
 	setRect(panel_rect);
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 1b3fd5d49b..5d1cb824a2 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -34,9 +34,15 @@
 
 #include "llviewermedia.h"
 
+#include "audioengine.h"
+
+#include "llparcel.h"
+
 #include "llmimetypes.h"
 #include "llviewercontrol.h"
 #include "llviewerimage.h"
+#include "llviewerparcelmedia.h"
+#include "llviewerparcelmgr.h"
 #include "llviewerwindow.h"
 #include "llversionviewer.h"
 #include "llviewerimagelist.h"
@@ -461,7 +467,7 @@ bool LLViewerMediaImpl::handleSkinCurrentChanged(const LLSD& /*newvalue*/)
 // Wrapper class
 //////////////////////////////////////////////////////////////////////////////////////////
 
-
+S32 LLViewerMedia::mMusicState = LLViewerMedia::STOPPED;
 //////////////////////////////////////////////////////////////////////////////////////////
 // The viewer takes a long time to load the start screen.  Part of the problem
 // is media initialization -- in particular, QuickTime loads many DLLs and
@@ -686,6 +692,13 @@ bool LLViewerMedia::isActiveMediaTexture(const LLUUID& id)
 		&& isMediaPlaying());
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+//static
+bool LLViewerMedia::isMusicPlaying()
+{
+	return mMusicState == PLAYING; 
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
 std::string LLViewerMedia::getMediaURL()
@@ -704,3 +717,58 @@ void LLViewerMedia::setMimeType(std::string mime_type)
 {
 	sViewerMediaImpl.mMimeType = mime_type;
 }
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//static
+void LLViewerMedia::toggleMusicPlay(void*)
+{
+	if (mMusicState != PLAYING)
+	{
+		mMusicState = PLAYING; // desired state
+		if (gAudiop)
+		{
+			LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+			if ( parcel )
+			{
+				gAudiop->startInternetStream(parcel->getMusicURL());
+			}
+		}
+	}
+	else
+	{
+		mMusicState = STOPPED; // desired state
+		if (gAudiop)
+		{
+			gAudiop->stopInternetStream();
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//static
+void LLViewerMedia::toggleMediaPlay(void*)
+{
+	if (LLViewerMedia::isMediaPaused())
+	{
+		LLViewerParcelMedia::start();
+	}
+	else if(LLViewerMedia::isMediaPlaying())
+	{
+		LLViewerParcelMedia::pause();
+	}
+	else
+	{
+		LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+		if (parcel)
+		{
+			LLViewerParcelMedia::play(parcel);
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//static
+void LLViewerMedia::mediaStop(void*)
+{
+	LLViewerParcelMedia::stop();
+}
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 600d7409e2..b3fb2c9031 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -67,6 +67,7 @@ class LLViewerMedia
 		static bool isMediaPaused();
 		static bool hasMedia();
 		static bool isActiveMediaTexture(const LLUUID& id);
+		static bool isMusicPlaying();
 
 		static std::string getMediaURL();
 		static std::string getMimeType();
@@ -74,9 +75,16 @@ class LLViewerMedia
 
 		static void updateImagesMediaStreams();
 
+		static void toggleMusicPlay(void*);
+		static void toggleMediaPlay(void*);
+		static void mediaStop(void*);
+
 	private:
 		// Fill in initialization data for LLMediaManager::initClass()
 		static void buildMediaManagerData( LLMediaManagerData* init_data );
+		
+		enum { STOPPED=0, PLAYING=1, PAUSED=2 };
+		static S32 mMusicState;
 };
 
 #endif	// LLVIEWERMEDIA_H
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 70a6e24c8f..da3c94225b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -159,6 +159,7 @@
 #include "llresmgr.h"
 #include "llrootview.h"
 #include "llselectmgr.h"
+#include "llsidetray.h"
 #include "llsky.h"
 #include "llstatusbar.h"
 #include "llstatview.h"
@@ -3451,6 +3452,26 @@ class LLSelfEnableStandUp : public view_listener_t
 	}
 };
 
+class LLSelfFriends : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		// Open "Friends" tab of the "People" panel in side tray.
+		LLSideTray::getInstance()->showPanel("panel_people", "friends_panel");
+		return true;
+	}
+};
+
+class LLSelfGroups : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		// Open "Groups" tab of the "People" panel in side tray.
+		LLSideTray::getInstance()->showPanel("panel_people", "groups_panel");
+		return true;
+	}
+};
+
 BOOL check_admin_override(void*)
 {
 	return gAgent.getAdminOverride();
@@ -3584,14 +3605,9 @@ bool LLHaveCallingcard::operator()(LLInventoryCategory* cat,
 }
 */
 
-BOOL is_agent_friend(const LLUUID& agent_id)
-{
-	return (LLAvatarTracker::instance().getBuddyInfo(agent_id) != NULL);
-}
-
 BOOL is_agent_mappable(const LLUUID& agent_id)
 {
-	return (is_agent_friend(agent_id) &&
+	return (LLFriendActions::isFriend(agent_id) &&
 		LLAvatarTracker::instance().getBuddyInfo(agent_id)->isOnline() &&
 		LLAvatarTracker::instance().getBuddyInfo(agent_id)->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION)
 		);
@@ -3604,7 +3620,7 @@ class LLAvatarEnableAddFriend : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
-		bool new_value = avatar && !is_agent_friend(avatar->getID());
+		bool new_value = avatar && !LLFriendActions::isFriend(avatar->getID());
 		return new_value;
 	}
 };
@@ -5360,7 +5376,7 @@ class LLAvatarAddFriend : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
-		if(avatar && !is_agent_friend(avatar->getID()))
+		if(avatar && !LLFriendActions::isFriend(avatar->getID()))
 		{
 			request_friendship(avatar->getID());
 		}
@@ -7936,6 +7952,10 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLSelfEnableStandUp(), "Self.EnableStandUp");
 	view_listener_t::addMenu(new LLSelfEnableRemoveAllAttachments(), "Self.EnableRemoveAllAttachments");
 
+	// we don't use boost::bind directly to delay side tray construction
+	view_listener_t::addMenu(new LLSelfFriends(), "Self.Friends");
+	view_listener_t::addMenu(new LLSelfGroups(), "Self.Groups");
+
 	 // Avatar pie menu
 	view_listener_t::addMenu(new LLObjectMute(), "Avatar.Mute");
 	view_listener_t::addMenu(new LLAvatarAddFriend(), "Avatar.AddFriend");
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index 13a1639917..e8d350b0b6 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -75,8 +75,6 @@ BOOL enable_deselect(void*);
 BOOL enable_undo(void*);
 BOOL enable_redo(void*);
 
-// returns TRUE if we have a friend relationship with agent_id
-BOOL is_agent_friend(const LLUUID& agent_id);
 BOOL is_agent_mappable(const LLUUID& agent_id);
 
 void confirm_replace_attachment(S32 option, void* user_data);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index e4aaf2bf29..ae8717971f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2395,6 +2395,12 @@ void LLViewerWindow::updateUI()
 
 	updateWorldViewRect();
 
+	if(gBottomTray && LLSideTray::instanceCreated())
+	{
+		S32 delta = llround((F32)LLSideTray::getInstance()->getTrayWidth() * mDisplayScale.mV[VX]);
+		gBottomTray->updateRightPosition(mWindowRect.mRight - delta);
+	}
+
 	LLView::sMouseHandlerMessage.clear();
 
 	S32 x = mCurrentMousePoint.mX;
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index a902a6dff0..87a8bd5787 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,24,0,0
- PRODUCTVERSION 1,24,0,0
+ FILEVERSION 2,0,0,0
+ PRODUCTVERSION 2,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.24.0.0"
+            VALUE "FileVersion", "2.0.0.0"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.24.0.0"
+            VALUE "ProductVersion", "2.0.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 04d4362130..84d54f9673 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -17,15 +17,6 @@
             <menu_item_call.on_click
              function="Floater.Show"
              parameter="preferences" />
-        </menu_item_call>
-		<menu_item_call
-         label="Media Remote Ctrl"
-         layout="topleft"
-         name="Preferences"
-         shortcut="control|A">
-            <menu_item_call.on_click
-             function="Floater.Toggle"
-             parameter="media_remote_ctrl" />
         </menu_item_call>
         <menu_item_separator
          layout="topleft" />
@@ -223,6 +214,17 @@
              function="Floater.Toggle"
              parameter="communicate" />
         </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />
+		<menu_item_call
+         label="Media Remote Ctrl"
+         layout="topleft"
+         name="Preferences"
+         shortcut="control|alt|M">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="media_remote_ctrl" />
+        </menu_item_call>
         <menu_item_separator
          layout="topleft" />
         <menu_item_check
@@ -362,7 +364,7 @@
              function="Floater.Visible"
 			 parameter="mini_map" />
             <menu_item_check.on_click
-             function="Floater.Show"
+             function="Floater.Toggle"
              parameter="mini_map" />
         </menu_item_check>
         <menu_item_separator
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 680226f44f..f8bb15dc24 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3062,6 +3062,17 @@ Are you sure you want to teleport?
      yestext="Teleport"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportToPick"
+   type="alertmodal">
+Teleport to [PICK]?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+  
   <notification
    icon="alert.tga"
    label="Message everyone in your Estate"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 539b656f34..fe23d58793 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -1,56 +1,274 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 
-<panel follows="left|bottom|right" name="bottom_tray" bg_opaque_color="0.25 0.25 0.25 1.0"
-		bg_alpha_color="0.25 0.25 0.25 1.0" background_visible="true" auto_resize="true"
-		left="0" bottom="0" width="1000" height="28" border_visible="false">
-	<panel.string name="gesture_label">
-        	Gestures
-	</panel.string>		
-	<layout_stack name="toolbar_stack" follows="left|right|bottom|top" 
-		bottom="0" left="0" width="1000" height="25" orientation="horizontal" border_size="0" auto_resize="false">
-	
-		<icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-	  <panel follows="left|right" auto_resize="true" width="250" height="28" min_height="28">
-		<line_editor name="chat_box"  follows="left|right" 
-			width="250" height="20" left="0" bottom="6" 
-			bevel_style="in" border_style="line" border_thickness="1"/>
-	  </panel>
-		<icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-		<view_border bevel_style="in" bottom="0" height="28" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/>
-		<icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-	  <panel follows="left|right" auto_resize="false" width="100" height="28" min_height="28">
-		<chiclet_talk name="talk" left="0" bottom="6" width="100" height="20" follows="left|right" auto_resize="false"/>	
-	  </panel>
-		<icon name="DUMMY" image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-	  <panel follows="left|right" auto_resize="true" width="90" height="28" min_height="28">
-		<combo_box follows="left" height="20" label="Gestures" left="0" bottom="6" name="Gesture" top_delta="0" width="90" />
-	  </panel>
-	  	<icon name="DUMMY" image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-	  <panel follows="left|right" auto_resize="true" width="250" height="28" min_height="28">
-		<chiclet_panel name="chiclet_list"  follows="left|right" 
-			width="250" height="25" left="0" bottom="2"/>
-	  </panel>
-		<icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-	  <panel follows="left|right" auto_resize="false" width="40" height="28" min_height="28">
-		<chiclet_notification name="im_well" follows="left|right" auto_resize="false"
-			left="0" bottom="4" width="40" height="25" 
-			image_unselected="im_notifications.tga" image_selected="im_notifications.tga">
-			<chiclet_notification.commit_callback
-				function="Notification.Show"
-				parameter="ClickUnimplemented" />
-		</chiclet_notification>
-	  </panel>
-		<icon image_name="spacer24.tga" left="0" width="10" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-		<view_border name="well_separator" bevel_style="in" bottom="0" height="30" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/>
-		<icon image_name="spacer24.tga" left="0" width="10" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-	  <panel follows="left|right" auto_resize="false" width="48" height="28" min_height="28">
-		<chiclet_notification name="sys_well" follows="left|right" auto_resize="false"
-			left="0" bottom="5" width="48" height="25" 
-			image_unselected="bottom_tray_sys_notifications.tga" image_selected="bottom_tray_sys_notifications.tga">
-			<chiclet_notification.commit_callback
-				function="Notification.Show"
-				parameter="ClickUnimplemented" />
-		</chiclet_notification>
-	  </panel>
-		<icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-	</layout_stack>	
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bg_alpha_color="0.25 0.25 0.25 1"
+ bg_opaque_color="0.25 0.25 0.25 1"
+ follows="left|bottom|right"
+ height="28"
+ layout="topleft"
+ left="0"
+ name="bottom_tray"
+ top="28"
+ border_visible="true"
+ width="1000">
+    <panel.string
+     name="gesture_label">
+        Gestures
+    </panel.string>
+    <layout_stack
+     border_size="0"
+     follows="left|right|bottom|top"
+     height="28"
+     layout="topleft"
+     left="0"
+     name="toolbar_stack"
+     orientation="horizontal"
+     top="0"
+     width="1000">
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5" 
+         min_width="5" />
+        <layout_panel
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         left="5"
+         min_height="28"
+         width="250"
+         top="0"
+         min_width="100">
+            <line_editor
+             border_style="line"
+             border_thickness="1"
+             follows="left|right"
+             height="20"
+             layout="topleft"
+             left="0"
+             name="chat_box"
+             top="3"
+             width="250" />
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5"
+         min_width="5" />
+        <view_border
+         auto_resize="false"
+         bevel_style="in"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         left="270"
+         top="0"
+         width="1" />
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5" 
+         min_width="5" />
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="100"
+         top="0"
+         min_width="100">
+            <chiclet_talk
+             follows="right"
+             height="20"
+             layout="topleft"
+             left="0"
+             name="talk"
+             top="3"
+             width="100" />
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         name="DUMMY"
+         top="0"
+         width="5" 
+         min_width="5"/>
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="90"
+         top="0"
+         min_width="90">
+            <combo_box
+             bottom="22"
+             follows="right"
+             height="20"
+             label="Gestures"
+             layout="topleft"
+             name="Gesture"
+             top="3"
+             width="90" />
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         name="DUMMY"
+         top="0"
+         width="5" 
+         min_width="5" />
+        <layout_panel
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         top="0"
+         name="chiclet_list_panel"
+         width="250"
+         min_width="100">
+            <chiclet_panel
+             follows="left|right"
+             height="25"
+             layout="topleft"
+             left="0"
+             name="chiclet_list"
+             top="1"
+             width="250" />
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5" 
+         min_width="5" />
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         name="im_well_panel"
+         width="40"
+         top="0"
+         min_width="40" >
+            <chiclet_notification
+             follows="right"
+             height="25"
+             image_selected="im_notifications.tga"
+             image_unselected="im_notifications.tga"
+             layout="topleft"
+             left="0"
+             name="im_well"
+             top="1"
+             width="40" >
+			  <chiclet_notification.commit_callback
+				 function="Notification.Show"
+				 parameter="ClickUnimplemented" />
+			</chiclet_notification>
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="10" 
+         min_width="10"/>
+        <view_border
+         auto_resize="false"
+         bevel_style="in"
+         follows="left|right"
+         height="30"
+         layout="topleft"
+         left="270"
+         name="well_separator"
+         top="0"
+         width="1" />
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="10" 
+         min_width="10" />
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         top="0"
+         name="sys_well_panel"
+         width="48"
+         min_width="48">
+            <chiclet_notification
+             follows="right"
+             height="25"
+             image_selected="bottom_tray_sys_notifications.tga"
+             image_unselected="bottom_tray_sys_notifications.tga"
+             layout="topleft"
+             left="0"
+             name="sys_well"
+             top="1"
+             width="48" >
+			  <chiclet_notification.commit_callback
+				 function="Notification.Show"
+				 parameter="ClickUnimplemented" />
+			</chiclet_notification>
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5" 
+         min_width="5" />
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index acbbde37c9..79833ea20b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -67,7 +67,8 @@
          height="16"
          layout="topleft"
          left="10"
-         name="Name:">
+         name="Name:"
+         text_color="white">
             Name:
         </text>
         <line_editor
@@ -78,6 +79,7 @@
          left="10"
          name="pick_name"
          right="-10"
+         text_color="black"
          width="290" />
         <text
          type="string"
@@ -87,6 +89,7 @@
          layout="topleft"
          left="10"
          name="description_label"
+         text_color="white"
          v_pad="15"
          valign="center">
             Description:
@@ -94,10 +97,12 @@
         <text_editor
          follows="left|top|right"
          height="100"
+         hide_scrollbar="true"
          layout="topleft"
          left="10"
          max_length="1023"
          name="pick_desc"
+         text_color="black"
          right="-10"
          word_wrap="true" />
         <text
@@ -108,6 +113,7 @@
          layout="topleft"
          left="10"
          name="description_label"
+         text_color="white"
          v_pad="15"
          valign="bottom">
             Location:
@@ -121,6 +127,7 @@
          left="10"
          name="pick_location"
          right="-10"
+         text_color="black"
          v_pad="10"
          valign="center"
          word_wrap="true">
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 5f51e8d22c..38049c896e 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -220,11 +220,13 @@
       </line_editor>
       <check_box
        follows="left|top"
+       font="SansSerifBold"
        label="Show me in Search results" 
        layout="topleft"
        left="9"
        name="show_in_search_checkbox"
        height="16"
+       text_enabled_color="white"
        top_pad="10" 
        width="250"/>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
deleted file mode 100644
index 7cdda126b9..0000000000
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- bg_alpha_color="0.3 0.3 0.3 1"
- height="560"
- label="Landmark"
- layout="topleft"
- left="0"
- name="landmark_info"
- top="800"
- width="355">
-    <panel.string
-     name="not_available">
-        (N\A)
-    </panel.string>
-    <panel.string
-     name="unknown">
-        (unknown)
-    </panel.string>
-    <panel.string
-     name="public">
-        (public)
-    </panel.string>
-    <panel.string
-     name="server_update_text">
-        Place information not available without server update.
-    </panel.string>
-    <panel.string
-     name="server_error_text">
-        Information about this location is unavailable at this time, please try again later.
-    </panel.string>
-    <panel.string
-     name="server_forbidden_text">
-        Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
-    </panel.string>
-    <panel.string
-     name="acquired_date">
-        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-    </panel.string>
-    <scroll_container
-     follows="all"
-     height="560"
-     layout="topleft"
-     left="0"
-     top="0"
-     width="355">
-        <panel
-         height="560"
-         layout="topleft"
-         left="0"
-         name="scrolling_panel"
-         top="0"
-         width="310">
-            <button
-             follows="top|left"
-             height="20"
-             image_overlay="navbar_back.tga"
-             image_selected="navbar_bg_button.tga"
-             image_unselected="navbar_bg_button.tga"
-             layout="topleft"
-             left="10"
-             name="back_btn"
-             picture_style="true"
-             top="20"
-             width="20" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerifHugeBold"
-             height="20"
-             layout="topleft"
-             left="50"
-             name="panel_title"
-             text_color="white"
-             top="20"
-             width="150">
-                Landmark
-            </text>
-            <texture_picker
-             follows="top|left"
-             height="128"
-             layout="topleft"
-             left="10"
-             name="logo"
-             top="60"
-             width="128" />
-            <text
-             follows="left|top|right"
-             font="SansSerifHugeBold"
-             height="20"
-             layout="topleft"
-             left="10"
-             name="region_name"
-             text_color="white"
-             top="180"
-             width="310" />
-            <text
-             follows="left|top|right"
-             font="SansSerifBold"
-             height="20"
-             layout="topleft"
-             left="10"
-             name="parcel_name"
-             text_color="white"
-             top="205"
-             width="310" />
-            <panel
-             follows="left|top|right|bottom"
-             height="335"
-             layout="topleft"
-             left="10"
-             name="info_panel"
-             top="225"
-             width="310">
-                <text_editor
-                 bg_focus_color="0.3 0.3 0.3 1"
-                 bg_readonly_color="0.3 0.3 0.3 1"
-                 follows="left|top|right"
-                 font="SansSerif"
-                 height="90"
-                 hide_border="true"
-                 hide_scrollbar="true"
-                 layout="topleft"
-                 left="0"
-                 max_length="1000"
-                 name="description"
-                 read_only="true"
-                 text_color="white"
-                 top="0"
-                 width="310" />
-                <icon
-                 follows="top|left"
-                 height="30"
-                 image_name=""
-                 layout="topleft"
-                 left="0"
-                 mouse_opaque="true"
-                 name="maturity"
-                 top="95"
-                 width="30" />
-                <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 font="SansSerif"
-                 height="15"
-                 layout="topleft"
-                 left="0"
-                 name="owner_lable"
-                 text_color="white"
-                 top="130"
-                 width="50"
-                 word_wrap="true">
-                    Owner:
-                </text>
-                <text
-                 follows="left|top|right"
-                 font="SansSerif"
-                 height="15"
-                 layout="topleft"
-                 left="70"
-                 name="owner"
-                 text_color="white"
-                 top="130"
-                 width="240"
-                 word_wrap="true" />
-                <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 font="SansSerif"
-                 height="15"
-                 layout="topleft"
-                 left="0"
-                 name="creator_lable"
-                 text_color="white"
-                 top="150"
-                 width="50"
-                 word_wrap="true">
-                    Creator:
-                </text>
-                <text
-                 follows="left|top|right"
-                 font="SansSerif"
-                 height="15"
-                 layout="topleft"
-                 left="70"
-                 name="creator"
-                 text_color="white"
-                 top="150"
-                 width="240"
-                 word_wrap="true" />
-                <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 font="SansSerif"
-                 height="15"
-                 layout="topleft"
-                 left="0"
-                 name="created_lable"
-                 text_color="white"
-                 top="170"
-                 width="50"
-                 word_wrap="true">
-                    Created:
-                </text>
-                <text
-                 follows="left|top|right"
-                 font="SansSerif"
-                 height="15"
-                 layout="topleft"
-                 left="70"
-                 name="created"
-                 text_color="white"
-                 top="170"
-                 width="240"
-                 word_wrap="true" />
-                <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 font="SansSerif"
-                 height="15"
-                 layout="topleft"
-                 left="0"
-                 name="title_lable"
-                 text_color="white"
-                 top="190"
-                 width="50"
-                 word_wrap="true">
-                    Title:
-                </text>
-                <line_editor
-                 follows="left|top|right"
-                 font="SansSerif"
-                 height="22"
-                 layout="topleft"
-                 left="0"
-                 max_length="255"
-                 name="title_editor"
-                 top="210"
-                 width="310" />
-                <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 font="SansSerif"
-                 height="15"
-                 layout="topleft"
-                 left="0"
-                 name="notes_lable"
-                 text_color="white"
-                 top="240"
-                 width="90"
-                 word_wrap="true">
-                    My Notes:
-                </text>
-                <text_editor
-                 follows="left|top|bottom|right"
-                 font="SansSerif"
-                 height="70"
-                 hide_scrollbar="true"
-                 layout="topleft"
-                 left="0"
-                 max_length="1000"
-                 name="notes_editor"
-                 top="260"
-                 width="310" />
-            </panel>
-        </panel>
-    </scroll_container>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index e2597b4700..63082d3150 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -428,6 +428,9 @@
   <string name="no_friends">
     No friends
   </string>
+  <string name="no_groups">
+    No groups
+  </string>
   <panel 
 	layout="topleft"
 	name="panel_profile_view" 
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 9fc1627cb9..576654b860 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -57,34 +57,36 @@
          type="string"
          length="1"
          follows="left|top"
-         height="16"
+         height="15"
          layout="topleft"
          left="10"
-         name="Name:">
+         name="Name:"
+         text_color="white">
             Name:
         </text>
         <text
          type="string"
          length="1"
          follows="left|top|right"
-         height="20"
+         height="15"
          layout="topleft"
          left="10"
          name="pick_name"
          right="-10"
-         text_color="white"
+         text_color="black"
          word_wrap="true">
             [name]
         </text>
         <text
          type="string"
-         length="1"
          follows="left|top"
-         height="20"
+         height="15"
          layout="topleft"
          left="10"
          name="description_label"
-         v_pad="15"
+         text_color="white"
+         top_pad="20"
+         v_pad="0"
          valign="center">
             Description:
         </text>
@@ -92,13 +94,12 @@
          type="string"
          length="1"
          follows="left|top|right"
-         height="40"
+         height="60"
          layout="topleft"
          left="10"
          name="pick_desc"
          right="-10"
-         text_color="white"
-         v_pad="15"
+         text_color="black"
          valign="center"
          word_wrap="true">
             [description]
@@ -111,20 +112,19 @@
          layout="topleft"
          left="10"
          name="description_label"
-         v_pad="15"
+         text_color="white"
+         top_pad="20"
          valign="bottom">
             Location:
         </text>
         <text
          type="string"
-         length="1"
          follows="left|top"
          height="30"
          layout="topleft"
          left="10"
          name="pick_location"
-         text_color="white"
-         v_pad="15"
+         text_color="black"
          valign="center">
             [loading...]
         </text>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index a4599bdf1e..6a819d0ef4 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -42,6 +42,7 @@
      name="picture_descr"
      text_color="white"
      top="25"
+     use_ellipses="true"
      width="170"
      word_wrap="true" />
     <button
@@ -53,7 +54,7 @@
      image_selected="navbar_bg_button.tga"
      image_unselected="navbar_bg_button.tga"
      layout="topleft"
-     name="inspector"
+     name="info_chevron"
      picture_style="true"
      right="-5"
      tab_stop="false"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index ed851452fe..c8a814887a 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -93,8 +93,6 @@
          follows="bottom|left"
          font="SansSerifBigBold"
          height="16"
-         image_disabled="plus.tga"
-         image_disabled_selected="plus.tga"
          image_hover_selected="plus.tga"
          image_selected="plus.tga"
          image_unselected="plus.tga"
@@ -109,8 +107,6 @@
          follows="bottom|right"
          font="SansSerifBigBold"
          height="16"
-         image_disabled="minus.tga"
-         image_disabled_selected="minus.tga"
          image_hover_selected="minus.tga"
          image_selected="minus.tga"
          image_unselected="minus.tga"
@@ -169,7 +165,7 @@
          height="25"
          label="Verb"
          layout="topleft"
-         left="280"
+         right="-15"
          name="verb_btn"
          top="0"
          width="50" />
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 272a7f4328..2aa566543f 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -31,13 +31,13 @@
      top_pad="19"
      width="335" />
     <panel
-     class="panel_landmark_info"
-     filename="panel_landmark_info.xml"
+     class="panel_place_info"
+     filename="panel_place_info.xml"
      follows="left|top|right|bottom"
      height="675"
      layout="topleft"
      left="0"
-     name="panel_landmark_info"
+     name="panel_place_info"
      top="-310"
      visible="false"
      width="355" />
@@ -73,7 +73,7 @@
      top_delta="0"
      width="60" />
     <button
-     enabled="false"
+     enabled="true"
      follows="bottom|right"
      font="SansSerifSmallBold"
      height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 428d071db2..9e95411929 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -38,7 +38,7 @@
      height="625"
      layout="topleft"
      left="0"
-     name="profile_tabs"
+     name="tabs"
      tab_position="top"
      top="35"
      width="355">
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 5ede1c2e9e..4f6f53e5b4 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -7,14 +7,14 @@
   collapsed="true"
 >
   <sidetray_tab 	
-    name="sidebarpanel2" 
+    name="sidebar_people"
+    tab_title="People"
+    description="Find your friends, contacts and people nearby."
+    image="icn_voice-groupfocus.tga"
     mouse_opaque="false" 
     background_opaque="false" 
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
-    image="icn_voice-groupfocus.tga"
-    tab_title="People"
-    description="Find your friends, contacts and people nearby."
   >
     <collapsible_ctrl 
       name="people_accordion" 
@@ -36,16 +36,16 @@
       />
     </collapsible_ctrl>
   </sidetray_tab>
-  
+  <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
-    name="sidebarpanel1" 
+    name="sidebar_places"
+    tab_title="Places"
+    label="Places"
+    description="Find places to go and places you've been."
+    image="inv_item_landmark.tga" 
     mouse_opaque="false" 
     background_visible="true" 
-    label="Places" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
-    image="inv_item_landmark.tga" 
-    tab_title="Places" 
-    description="Find places to go and places you've been."
   >
     <collapsible_ctrl 
       name="places_accordian" 
@@ -67,12 +67,12 @@
   
   <sidetray_tab 
     name="sidebar_me"
+    tab_title="Me"
+    description="Change your profile, your look and quick links to your outfits."
+    image="icn_voice-pvtfocus.tga"
     mouse_opaque="false" 
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
-    image="icn_voice-pvtfocus.tga"
-    tab_title="Me"
-    description="Change your profile, your look and quick links to your outfits."
   >
     <collapsible_ctrl 
       name="me_accordion" 
-- 
cgit v1.3


From e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 30 Jul 2009 23:22:41 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170
 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 ->
 viewer-2.0.0-3

---
 indra/llui/llmenugl.cpp                            |  10 +
 indra/llui/llmenugl.h                              |   6 +
 indra/llui/llnotifications.cpp                     |  18 +-
 indra/llui/llnotifications.h                       |   9 +
 indra/newview/CMakeLists.txt                       |   4 +
 indra/newview/app_settings/settings.xml            |  77 +++
 indra/newview/llagent.cpp                          |  48 +-
 indra/newview/llagent.h                            |   2 -
 indra/newview/llappviewer.cpp                      |   3 +
 indra/newview/llappviewer.h                        |   5 +
 indra/newview/llavataractions.cpp                  |   3 +
 indra/newview/llavatariconctrl.cpp                 |  82 ++-
 indra/newview/llavatariconctrl.h                   |  14 +
 indra/newview/llavatarlist.cpp                     | 134 ++++-
 indra/newview/llavatarlist.h                       |  18 +-
 indra/newview/llbottomtray.cpp                     | 543 +-------------------
 indra/newview/llbottomtray.h                       |  51 +-
 indra/newview/llchannelmanager.cpp                 |  46 +-
 indra/newview/llchannelmanager.h                   |   7 +
 indra/newview/llchatitemscontainerctrl.cpp         |  88 +++-
 indra/newview/llchatitemscontainerctrl.h           |   2 +
 indra/newview/llchatmsgbox.cpp                     |  21 +-
 indra/newview/llchatmsgbox.h                       |  11 +-
 indra/newview/llchiclet.cpp                        |  23 +-
 indra/newview/llchiclet.h                          |   5 +
 indra/newview/llfavoritesbar.cpp                   | 179 ++++---
 indra/newview/llfloaterbuy.cpp                     |   2 +-
 indra/newview/llgesturemgr.cpp                     |   4 +-
 indra/newview/llgrouplist.cpp                      |   6 +
 indra/newview/llgrouplist.h                        |   1 +
 indra/newview/lllandmarkactions.cpp                | 141 ++++++
 indra/newview/lllandmarkactions.h                  |  68 +++
 indra/newview/lllocationhistory.cpp                |   6 +-
 indra/newview/lllocationhistory.h                  |   5 +-
 indra/newview/lllocationinputctrl.cpp              |  48 +-
 indra/newview/lllocationinputctrl.h                |   3 +
 indra/newview/llmenucommands.cpp                   |  10 +-
 indra/newview/llnavigationbar.cpp                  |  15 +-
 indra/newview/llnavigationbar.h                    |   2 -
 indra/newview/llnearbychat.cpp                     | 173 ++++++-
 indra/newview/llnearbychat.h                       |   6 +-
 indra/newview/llnearbychatbar.cpp                  | 549 +++++++++++++++++++++
 indra/newview/llnearbychatbar.h                    | 104 ++++
 indra/newview/llnearbychathandler.cpp              |  10 +-
 indra/newview/llnotificationalerthandler.cpp       |   2 +-
 indra/newview/llnotificationgrouphandler.cpp       |   4 +-
 indra/newview/llnotificationhandler.h              |   2 +
 indra/newview/lloverlaybar.h                       |   1 -
 indra/newview/llpanelavatar.cpp                    |  15 +-
 indra/newview/llpanellandmarks.cpp                 |   3 +
 indra/newview/llpanelpeople.cpp                    |  24 +-
 indra/newview/llpanelpeople.h                      |   2 +
 indra/newview/llpanelpicks.cpp                     |   9 +-
 indra/newview/llpanelpicks.h                       |   2 +-
 indra/newview/llpanelplaceinfo.cpp                 |  55 ++-
 indra/newview/llpanelplaceinfo.h                   |   9 +
 indra/newview/llpanelplaces.cpp                    | 254 +++++++---
 indra/newview/llpanelplaces.h                      |  55 ++-
 indra/newview/llpanelplacestab.cpp                 |   8 +
 indra/newview/llpanelplacestab.h                   |   2 +
 indra/newview/llpanelteleporthistory.cpp           |   3 +
 indra/newview/llscreenchannel.cpp                  |  92 +++-
 indra/newview/llscreenchannel.h                    |  17 +-
 indra/newview/llsidetray.cpp                       | 151 ++----
 indra/newview/llsidetray.h                         |   9 +-
 indra/newview/llstartup.cpp                        |   4 +-
 indra/newview/lltoast.cpp                          |   3 +-
 indra/newview/lltoast.h                            |   1 +
 indra/newview/lltoastgroupnotifypanel.cpp          |  79 ++-
 indra/newview/lltoastgroupnotifypanel.h            |   1 +
 indra/newview/lltooldraganddrop.cpp                |   5 +
 indra/newview/llurldispatcher.cpp                  |  47 +-
 indra/newview/llviewergesture.cpp                  |   4 +-
 indra/newview/llviewerkeyboard.cpp                 |  10 +-
 indra/newview/llviewermenu.cpp                     |  23 +-
 indra/newview/llviewermessage.cpp                  |   7 +
 indra/newview/llviewerparcelmgr.cpp                |   8 +-
 indra/newview/llviewertexteditor.cpp               |  19 +-
 indra/newview/llviewertexture.cpp                  |   5 +-
 indra/newview/llviewerwindow.cpp                   |  13 +-
 indra/newview/llvoiceclient.cpp                    |   5 +
 indra/newview/skins/default/colors.xml             |   9 +-
 .../skins/default/xui/en/floater_nearby_chat.xml   |  18 +-
 indra/newview/skins/default/xui/en/menu_navbar.xml |   3 +
 indra/newview/skins/default/xui/en/menu_viewer.xml |  60 +--
 .../newview/skins/default/xui/en/notifications.xml |   5 +
 .../skins/default/xui/en/panel_bottomtray.xml      | 118 +----
 .../skins/default/xui/en/panel_chat_item.xml       |   2 +-
 .../skins/default/xui/en/panel_group_notify.xml    |  10 +-
 .../skins/default/xui/en/panel_nearby_chat_bar.xml |  51 ++
 .../skins/default/xui/en/panel_pick_list_item.xml  |  21 +-
 .../skins/default/xui/en/panel_side_tray.xml       |  96 ++--
 .../default/xui/en/panel_sidetray_home_tab.xml     |  90 ++++
 indra/newview/skins/default/xui/en/panel_toast.xml |   6 +-
 indra/newview/skins/default/xui/en/strings.xml     |   3 +
 .../default/xui/en/widgets/location_input.xml      |   5 +-
 .../skins/default/xui/en/widgets/slider_bar.xml    |   1 -
 97 files changed, 2625 insertions(+), 1388 deletions(-)
 create mode 100644 indra/newview/lllandmarkactions.cpp
 create mode 100644 indra/newview/lllandmarkactions.h
 create mode 100644 indra/newview/llnearbychatbar.cpp
 create mode 100644 indra/newview/llnearbychatbar.h
 create mode 100644 indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index fdb4bdd5c1..ad2d8afe45 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -793,6 +793,16 @@ BOOL LLMenuItemCallGL::handleAcceleratorKey( KEY key, MASK mask )
 	return FALSE;
 }
 
+BOOL LLMenuItemCallGL::handleRightMouseUp(S32 x, S32 y, MASK mask)
+{
+	if (pointInView(x, y))
+	{
+		mRightClickSignal(this, getValue());
+	}
+
+	return TRUE;
+}
+
 ///============================================================================
 /// Class LLMenuItemCheckGL
 ///============================================================================
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 262f75f1e1..f786c891d7 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -283,6 +283,7 @@ public:
 
 	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
+	virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask);
 	
 	//virtual void draw();
 	
@@ -295,6 +296,11 @@ public:
 	{
 		return mEnableSignal.connect(cb);
 	}
+
+	boost::signals2::connection setRightClickedCallback( const commit_signal_t::slot_type& cb )
+	{
+		return mRightClickSignal.connect(cb);
+	}
 	
 private:
 	enable_signal_t mEnableSignal;
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 2b6ae1f67e..9845b7e2ce 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -710,6 +710,15 @@ LLBoundListener LLNotificationChannelBase::connectChangedImpl(const LLEventListe
 	return mChanged.connect(slot);
 }
 
+LLBoundListener LLNotificationChannelBase::connectAtFrontChangedImpl(const LLEventListener& slot)
+{
+	for (LLNotificationSet::iterator it = mItems.begin(); it != mItems.end(); ++it)
+	{
+		slot(LLSD().insert("sigtype", "load").insert("id", (*it)->id()));
+	}
+	return mChanged.connect(slot, boost::signals2::at_front);
+}
+
 LLBoundListener LLNotificationChannelBase::connectPassedFilterImpl(const LLEventListener& slot)
 {
 	// these two filters only fire for notifications added after the current one, because
@@ -1076,10 +1085,13 @@ void LLNotifications::createDefaultChannels()
 	// connect action methods to these channels
 	LLNotifications::instance().getChannel("Expiration")->
         connectChanged(boost::bind(&LLNotifications::expirationHandler, this, _1));
+	// uniqueHandler slot should be added as first slot of the signal due to
+	// usage LLStopWhenHandled combiner in LLStandardSignal
 	LLNotifications::instance().getChannel("Unique")->
-        connectChanged(boost::bind(&LLNotifications::uniqueHandler, this, _1));
-	LLNotifications::instance().getChannel("Unique")->
-        connectFailedFilter(boost::bind(&LLNotifications::failedUniquenessTest, this, _1));
+        connectAtFrontChanged(boost::bind(&LLNotifications::uniqueHandler, this, _1));
+// failedUniquenessTest slot isn't necessary
+//	LLNotifications::instance().getChannel("Unique")->
+//        connectFailedFilter(boost::bind(&LLNotifications::failedUniquenessTest, this, _1));
 	LLNotifications::instance().getChannel("Ignore")->
 		connectFailedFilter(&handleIgnoredNotification);
 }
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 63eae7278f..4da121c9c5 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -692,6 +692,14 @@ public:
                                   boost::bind(&LLNotificationChannelBase::connectChangedImpl,
                                               this,
                                               _1));
+    }
+	template <typename LISTENER>
+    LLBoundListener connectAtFrontChanged(const LISTENER& slot)
+    {
+        return LLEventDetail::visit_and_connect(slot,
+                                  boost::bind(&LLNotificationChannelBase::connectAtFrontChangedImpl,
+                                              this,
+                                              _1));
     }
     template <typename LISTENER>
 	LLBoundListener connectPassedFilter(const LISTENER& slot)
@@ -718,6 +726,7 @@ public:
 
 protected:
     LLBoundListener connectChangedImpl(const LLEventListener& slot);
+    LLBoundListener connectAtFrontChangedImpl(const LLEventListener& slot);
     LLBoundListener connectPassedFilterImpl(const LLEventListener& slot);
     LLBoundListener connectFailedFilterImpl(const LLEventListener& slot);
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 2e29a56e79..9a0c9d9c7b 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -243,6 +243,7 @@ set(viewer_SOURCE_FILES
     llinventoryfilter.cpp
     llinventorymodel.cpp
     lljoystickbutton.cpp
+    lllandmarkactions.cpp
     lllandmarklist.cpp
     lllistbrowser.cpp
     lllistview.cpp
@@ -269,6 +270,7 @@ set(viewer_SOURCE_FILES
     llnamelistctrl.cpp
     llnavigationbar.cpp
     llnearbychat.cpp
+    llnearbychatbar.cpp
     llnearbychathandler.cpp
     llnetmap.cpp
     llnotificationalerthandler.cpp
@@ -680,6 +682,7 @@ set(viewer_HEADER_FILES
     llinventoryfilter.h
     llinventorymodel.h
     lljoystickbutton.h
+    lllandmarkactions.h
     lllandmarklist.h
     lllightconstants.h
     lllistbrowser.h
@@ -707,6 +710,7 @@ set(viewer_HEADER_FILES
     llnamelistctrl.h
     llnavigationbar.h
     llnearbychat.h
+    llnearbychatbar.h
     llnearbychathandler.h
     llnetmap.h
     llnotificationhandler.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ab9b018150..edcd288b7d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4749,6 +4749,83 @@
       <key>Value</key>
       <integer>350</integer>
     </map>
+    <key>NotificationToastTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Width of notification messages</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>5</integer>
+    </map>
+    <key>StartUpToastTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Width of notification messages</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>10</integer>
+    </map>
+    <key>ToastMargin</key>
+    <map>
+      <key>Comment</key>
+      <string>Width of notification messages</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>5</integer>
+    </map>
+    <key>ChannelBottomPanelMargin</key>
+    <map>
+      <key>Comment</key>
+      <string>Width of notification messages</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>35</integer>
+    </map>
+    <key>NotificationChannelRightMargin</key>
+    <map>
+      <key>Comment</key>
+      <string>Width of notification messages</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>10</integer>
+    </map>
+    <key>NavBarMargin</key>
+    <map>
+      <key>Comment</key>
+      <string>Width of notification messages</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>60</integer>
+    </map>
+    <key>OverflowToastHeight</key>
+    <map>
+      <key>Comment</key>
+      <string>Width of notification messages</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>72</integer>
+    </map>
     <key>NotifyMoneyChange</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index afad88770e..f527719a7a 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -98,6 +98,7 @@
 #include "pipeline.h"
 #include "lltrans.h"
 #include "llbottomtray.h"
+#include "llnearbychatbar.h"
 #include "stringize.h"
 #include "llcapabilitylistener.h"
 
@@ -2721,7 +2722,7 @@ void LLAgent::startTyping()
 	{
 		sendAnimationRequest(ANIM_AGENT_TYPE, ANIM_REQUEST_START);
 	}
-	LLBottomTray::getInstance()->sendChatFromViewer("", CHAT_TYPE_START, FALSE);
+	LLNearbyChatBar::getInstance()->sendChatFromViewer("", CHAT_TYPE_START, FALSE);
 }
 
 //-----------------------------------------------------------------------------
@@ -2733,7 +2734,7 @@ void LLAgent::stopTyping()
 	{
 		clearRenderState(AGENT_STATE_TYPING);
 		sendAnimationRequest(ANIM_AGENT_TYPE, ANIM_REQUEST_STOP);
-		LLBottomTray::getInstance()->sendChatFromViewer("", CHAT_TYPE_STOP, FALSE);
+		LLNearbyChatBar::getInstance()->sendChatFromViewer("", CHAT_TYPE_STOP, FALSE);
 	}
 }
 
@@ -6575,49 +6576,6 @@ void LLAgent::parseTeleportMessages(const std::string& xml_filename)
 	}//end for (all message sets in xml file)
 }
 
-// static
-void LLAgent::createLandmarkHere()
-{
-	std::string landmark_name, landmark_desc;
-
-	gAgent.buildLocationString(landmark_name, LLAgent::LOCATION_FORMAT_LANDMARK);
-	gAgent.buildLocationString(landmark_desc, LLAgent::LOCATION_FORMAT_FULL);
-	LLUUID folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
-
-	createLandmarkHere(landmark_name, landmark_desc, folder_id);
-}
-
-// static
-void LLAgent::createLandmarkHere(const std::string& name, const std::string& desc, const LLUUID& folder_id)
-{
-	LLViewerRegion* agent_region = gAgent.getRegion();
-	if(!agent_region)
-	{
-		llwarns << "No agent region" << llendl;
-		return;
-	}
-	LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-	if (!agent_parcel)
-	{
-		llwarns << "No agent parcel" << llendl;
-		return;
-	}
-	if (!agent_parcel->getAllowLandmark()
-		&& !LLViewerParcelMgr::isParcelOwnedByAgent(agent_parcel, GP_LAND_ALLOW_LANDMARK))
-	{
-		LLNotifications::instance().add("CannotCreateLandmarkNotOwner");
-		return;
-	}
-
-	create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
-						  folder_id, LLTransactionID::tnull,
-						  name, desc,
-						  LLAssetType::AT_LANDMARK,
-						  LLInventoryType::IT_LANDMARK,
-						  NOT_WEARABLE, PERM_ALL, 
-						  NULL);
-}
-
 void LLAgent::sendAgentUpdateUserInfo(bool im_via_email, const std::string& directory_visibility )
 {
 	gMessageSystem->newMessageFast(_PREHASH_UpdateUserInfo);
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 22b3790c6b..e25bb0a578 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -263,8 +263,6 @@ public:
 	std::string		getSLURL() const;
 	BOOL			inPrelude();
 	BOOL 			buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK); // Utility to build a location string
-	static void		createLandmarkHere();
-	static void		createLandmarkHere(const std::string& name, const std::string& desc, const LLUUID& folder_id);
 private:
 	LLViewerRegion	*mRegionp;
 
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2299a439e6..245e358d80 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4034,5 +4034,8 @@ void LLAppViewer::handleLoginComplete()
 	{
 		gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
 	}
+
+	mOnLoginCompleted();
+
 	writeDebugInfo();
 }
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index bbc2b646c4..646b677264 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -161,6 +161,11 @@ public:
 
     LLAllocator & getAllocator() { return mAlloc; }
 
+	// On LoginCompleted callback
+	typedef boost::signals2::signal<void (void)> login_completed_signal_t;
+	login_completed_signal_t mOnLoginCompleted;
+	boost::signals2::connection setOnLoginCompletedCallback( const login_completed_signal_t::slot_type& cb ) { return mOnLoginCompleted.connect(cb); } 
+
 	void purgeCache(); // Clear the local cache. 
 	
 protected:
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 2cf7298569..281d73b18b 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -73,6 +73,9 @@ void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::strin
 	{
     	LLNotifications::instance().add("AddFriendWithMessage", args, payload, &callbackAddFriendWithMessage);
 	}
+
+	// add friend to recent people list
+	LLRecentPeople::instance().add(id);
 }
 
 // static
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index a3b8f6726d..f6eb7f6494 100644
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -42,12 +42,15 @@
 #include "lluictrlfactory.h"
 
 #include "llcachename.h"
+#include "llagentdata.h"
 
 #define MENU_ITEM_VIEW_PROFILE 0
 #define MENU_ITEM_SEND_IM 1
 
 static LLDefaultChildRegistry::Register<LLAvatarIconCtrl> r("avatar_icon");
 
+LLAvatarIconCtrl::avatar_image_map_t LLAvatarIconCtrl::sImagesCache;
+
 LLAvatarIconCtrl::LLAvatarIconCtrl(const LLAvatarIconCtrl::Params& p)
 :	LLIconCtrl(p),
 	mDrawTooltip(p.draw_tooltip)
@@ -137,7 +140,17 @@ void LLAvatarIconCtrl::setValue(const LLSD& value)
 			LLAvatarPropertiesProcessor::getInstance()->addObserver(value.asUUID(), this);
 			LLAvatarPropertiesProcessor::getInstance()->sendDataRequest(value.asUUID(),APT_PROPERTIES);
 			mAvatarId = value.asUUID();
+
+			// Check if cache already contains image_id for that avatar
+			avatar_image_map_t::iterator it;
+
+			it = sImagesCache.find(mAvatarId);
+			if (it != sImagesCache.end())
+			{
+				updateFromCache(it->second);
+			}
 		}
+
 	}
 	else
 	{
@@ -147,6 +160,37 @@ void LLAvatarIconCtrl::setValue(const LLSD& value)
 	gCacheName->get(mAvatarId, FALSE, boost::bind(&LLAvatarIconCtrl::nameUpdatedCallback, this, _1, _2, _3, _4));
 }
 
+void LLAvatarIconCtrl::updateFromCache(LLAvatarIconCtrl::LLImagesCacheItem data)
+{
+	// Update the avatar
+	if (data.image_id.notNull())
+	{
+		LLIconCtrl::setValue(data.image_id);
+	}
+	else
+	{
+		LLIconCtrl::setValue("default_profile_picture.j2c");
+	}
+
+	// Update color of status symbol and tool tip
+	if (data.flags & AVATAR_ONLINE)
+	{
+		mStatusSymbol->setColor(LLColor4::green);
+		if (mDrawTooltip)
+		{
+			setToolTip((LLStringExplicit)"Online");
+		}
+	}
+	else
+	{
+		mStatusSymbol->setColor(LLColor4::grey);
+		if (mDrawTooltip)
+		{
+			setToolTip((LLStringExplicit)"Offline");
+		}
+	}
+}
+
 //virtual
 void LLAvatarIconCtrl::processProperties(void* data, EAvatarProcessorType type)
 {
@@ -160,33 +204,10 @@ void LLAvatarIconCtrl::processProperties(void* data, EAvatarProcessorType type)
 				return;
 			}
 
-			// Update the avatar
-			if (avatar_data->image_id.notNull())
-			{
-				LLIconCtrl::setValue(avatar_data->image_id);
-			}
-			else
-			{
-				LLIconCtrl::setValue("default_profile_picture.j2c");
-			}
+			LLAvatarIconCtrl::LLImagesCacheItem data(avatar_data->image_id, avatar_data->flags);
 
-			// Update color of status symbol and tool tip
-			if (avatar_data->flags & AVATAR_ONLINE)
-			{
-				mStatusSymbol->setColor(LLColor4::green);
-				if (mDrawTooltip)
-				{
-					setToolTip((LLStringExplicit)"Online");
-				}
-			}
-			else
-			{
-				mStatusSymbol->setColor(LLColor4::grey);
-				if (mDrawTooltip)
-				{
-					setToolTip((LLStringExplicit)"Offline");
-				}
-			}
+			updateFromCache(data);
+			sImagesCache.insert(std::pair<LLUUID, LLAvatarIconCtrl::LLImagesCacheItem>(mAvatarId, data));
 		}
 	}
 }
@@ -198,10 +219,17 @@ BOOL LLAvatarIconCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	if(menu)
 	{
 		bool is_friend = LLAvatarTracker::instance().getBuddyInfo(mAvatarId) != NULL;
-
+		
 		menu->setItemEnabled("Add Friend", !is_friend);
 		menu->setItemEnabled("Remove Friend", is_friend);
 
+		if(gAgentID == mAvatarId)
+		{
+			menu->setItemEnabled("Add Friend", false);
+			menu->setItemEnabled("Send IM", false);
+			menu->setItemEnabled("Remove Friend", false);
+		}
+
 		menu->buildDrawLabels();
 		menu->updateParent(LLMenuGL::sMenuContainer);
 		LLMenuGL::showPopup(this, menu, x, y);
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h
index e34f2ff474..10ce827d6d 100644
--- a/indra/newview/llavatariconctrl.h
+++ b/indra/newview/llavatariconctrl.h
@@ -85,6 +85,20 @@ protected:
 	std::string			mLastName;
 	LLHandle<LLView>	mPopupMenuHandle;
 	bool				mDrawTooltip;
+
+	struct LLImagesCacheItem
+	{
+		LLUUID	image_id;
+		U32   	flags;
+
+		LLImagesCacheItem(LLUUID image_id_, U32 flags_) : image_id(image_id_), flags(flags_) {}
+	};
+
+	typedef std::map<LLUUID, LLAvatarIconCtrl::LLImagesCacheItem> avatar_image_map_t;
+	
+	static avatar_image_map_t sImagesCache;
+
+	void updateFromCache(LLAvatarIconCtrl::LLImagesCacheItem data);
 };
 
 #endif  // LL_LLAVATARICONCTRL_H
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 7b5ce765d3..a85f8710c7 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -37,24 +37,40 @@
 // newview
 #include "llcallingcard.h" // for LLAvatarTracker
 #include "llcachename.h"
+#include "lloutputmonitorctrl.h"
+#include "llvoiceclient.h"
 
 static LLDefaultChildRegistry::Register<LLAvatarList> r("avatar_list");
 
 LLAvatarList::Params::Params()
+:
+	volume_column_width("volume_column_width", 0)
+	, online_go_first("online_go_first", true)
 {
 	draw_heading	= true;
 	draw_stripes	= false;
 	multi_select	= false;
 	column_padding	= 0;
-	search_column	= LIST_NAME;
-	sort_column		= LIST_NAME;
+	search_column	= COL_NAME;
+	sort_column		= COL_NAME;
 }
 
 LLAvatarList::LLAvatarList(const Params& p)
 :	LLScrollListCtrl(p)
+	, mHaveVolumeColumn(p.volume_column_width > 0)
+	, mOnlineGoFirst(p.online_go_first)
 {
 	setCommitOnSelectionChange(TRUE); // there's no such param in LLScrollListCtrl::Params
 
+    // "volume" column
+    {
+    	LLScrollListColumn::Params col_params;
+    	col_params.name = "volume";
+    	col_params.header.label = "Volume"; // *TODO: localize or remove the header
+    	col_params.width.pixel_width = p.volume_column_width;
+    	addColumn(col_params);
+    }
+
     // "name" column
     {
     	LLScrollListColumn::Params col_params;
@@ -63,18 +79,42 @@ LLAvatarList::LLAvatarList(const Params& p)
     	col_params.width.dynamic_width = true;
     	addColumn(col_params);
     }
+
+    // "online status" column
+    {
+    	LLScrollListColumn::Params col_params;
+    	col_params.name = "online";
+    	col_params.header.label = "Online"; // *TODO: localize or remove the header
+    	col_params.width.pixel_width = 0; // invisible column
+    	addColumn(col_params);
+    }
+
     
     // invisible "id" column
     {
     	LLScrollListColumn::Params col_params;
     	col_params.name = "id";
+    	col_params.header.label = "ID"; // *TODO: localize or remove the header
     	col_params.width.pixel_width = 0;
     	addColumn(col_params);
     }
 
-    // The corresponding parameters don't work because we create columns dynamically.
-    sortByColumnIndex(LIST_NAME, TRUE);
-    setSearchColumn(LIST_NAME);
+	// Primary sort = online status, secondary sort = name
+	// The corresponding parameters don't work because we create columns dynamically.
+	sortByColumnIndex(COL_NAME, TRUE);
+	if (mOnlineGoFirst)
+		sortByColumnIndex(COL_ONLINE, FALSE);
+	setSearchColumn(COL_NAME);
+}
+
+// virtual
+void LLAvatarList::draw()
+{
+	LLScrollListCtrl::draw();
+	if (mHaveVolumeColumn)
+	{
+		updateVolume();
+	}
 }
 
 std::vector<LLUUID> LLAvatarList::getSelectedIDs()
@@ -97,17 +137,30 @@ void LLAvatarList::addItem(const LLUUID& id, const std::string& name, BOOL is_bo
 	LLSD element;
 	element["id"] = id;
 
-	LLSD& friend_column = element["columns"][LIST_NAME];
+	// Update volume column (if we have one)
+	{
+		std::string icon = mHaveVolumeColumn ? getVolumeIcon(id) : "";
+		LLSD& volume_column = element["columns"][COL_VOLUME];
+		volume_column["column"] = "volume";
+		volume_column["type"] = "icon";
+		volume_column["value"] = icon;
+	}
+
+	LLSD& friend_column = element["columns"][COL_NAME];
 	friend_column["column"] = "name";
 	friend_column["value"] = name;
 
+	LLSD& online_column = element["columns"][COL_ONLINE];
+	online_column["column"] = "online";
+	online_column["value"] = is_bold ? "1" : "0";
+
 	LLScrollListItem* new_itemp = addElement(element, pos);
 
 	// Indicate buddy online status.
 	// (looks like parsing font parameters from LLSD is broken)
 	if (is_bold)
 	{
-		LLScrollListText* name_textp = dynamic_cast<LLScrollListText*>(new_itemp->getColumn(LIST_NAME));
+		LLScrollListText* name_textp = dynamic_cast<LLScrollListText*>(new_itemp->getColumn(COL_NAME));
 		if (name_textp)
 			name_textp->setFontStyle(LLFontGL::BOLD);
 		else
@@ -169,3 +222,70 @@ BOOL LLAvatarList::update(const std::vector<LLUUID>& all_buddies, const std::str
 
 	return have_names;
 }
+
+// static
+std::string LLAvatarList::getVolumeIcon(const LLUUID& id)
+{
+	//
+	// Determine icon appropriate for the current avatar volume.
+	//
+	// *TODO: remove this in favor of LLOutputMonitorCtrl
+	// when ListView widget is implemented
+	// which is capable of containing arbitrary widgets.
+	//
+	static LLOutputMonitorCtrl::Params default_monitor_params(LLUICtrlFactory::getDefaultParams<LLOutputMonitorCtrl>());
+	bool		muted = gVoiceClient->getIsModeratorMuted(id) || gVoiceClient->getOnMuteList(id);
+	F32			power = gVoiceClient->getCurrentPower(id);
+	std::string	icon;
+
+	if (muted)
+	{
+		icon = default_monitor_params.image_mute.name;
+	}
+	else if (power == 0.f)
+	{
+		icon = default_monitor_params.image_off.name;
+	}
+	else if (power < LLVoiceClient::OVERDRIVEN_POWER_LEVEL)
+	{
+		S32 icon_image_idx = llmin(2, llfloor((power / LLVoiceClient::OVERDRIVEN_POWER_LEVEL) * 3.f));
+		switch(icon_image_idx)
+		{
+		default:
+		case 0:
+			icon = default_monitor_params.image_on.name;
+			break;
+		case 1:
+			icon = default_monitor_params.image_level_1.name;
+			break;
+		case 2:
+			icon = default_monitor_params.image_level_2.name;
+			break;
+		}
+	}
+	else
+	{
+		// overdriven
+		icon = default_monitor_params.image_level_3.name;
+	}
+
+	return icon;
+}
+
+// Update volume column for all list rows.
+void LLAvatarList::updateVolume()
+{
+	item_list& items = getItemList();
+
+	for (item_list::iterator item_it = items.begin();
+		item_it != items.end();
+		++item_it)
+	{
+		LLScrollListItem* itemp = (*item_it);
+		LLUUID speaker_id = itemp->getUUID();
+
+		LLScrollListCell* icon_cell = itemp->getColumn(COL_VOLUME);
+		if (icon_cell)
+			icon_cell->setValue(getVolumeIcon(speaker_id));
+	}
+}
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
index 9dba719fee..8b419dbb57 100644
--- a/indra/newview/llavatarlist.h
+++ b/indra/newview/llavatarlist.h
@@ -42,23 +42,37 @@ class LLAvatarList : public LLScrollListCtrl
 public:
 	struct Params : public LLInitParam::Block<Params, LLScrollListCtrl::Params>
 	{
+		Optional<S32> volume_column_width;
+		Optional<bool> online_go_first;
 		Params();
 	};
 
-	enum AVATAR_LIST_COLUMN_ORDER
+	enum EColumnOrder
 	{
-		LIST_NAME,
+		COL_VOLUME,
+		COL_NAME,
+		COL_ONLINE,
+		COL_ID,
 	};
 
 	LLAvatarList(const Params&);
 	virtual	~LLAvatarList() {}
 
+	/*virtual*/ void	draw();
+
 	BOOL update(const std::vector<LLUUID>& all_buddies,
 		const std::string& name_filter = LLStringUtil::null);
 
 protected:
 	std::vector<LLUUID> getSelectedIDs();
 	void addItem(const LLUUID& id, const std::string& name, BOOL is_bold, EAddPosition pos = ADD_BOTTOM);
+
+private:
+	static std::string getVolumeIcon(const LLUUID& id); /// determine volume icon from current avatar volume
+	void updateVolume(); // update volume for all avatars
+
+	bool mHaveVolumeColumn;
+	bool mOnlineGoFirst;
 };
 
 #endif // LL_LLAVATARLIST_H
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 963946e888..1781e6b3f1 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -37,174 +37,30 @@
 #include "llchiclet.h"
 #include "llfloaterreg.h"
 #include "llflyoutbutton.h"
-#include "llimpanel.h"
-#include "llkeyboard.h"
-#include "lllineeditor.h"
-#include "llgesturemgr.h"
-#include "llanimationstates.h"
-#include "llmultigesture.h"
-#include "llviewerstats.h"
-#include "llcommandhandler.h"
+#include "llnearbychatbar.h"
 
 //FIXME: temporary, for stand up proto
 #include "llselectmgr.h" 
 #include "llvoavatarself.h"
 
-S32 LLBottomTray::sLastSpecialChatChannel = 0;
-
-// legacy calllback glue
-void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
-
-static LLDefaultChildRegistry::Register<LLGestureComboBox> r("gesture_combo_box");
-
-LLGestureComboBox::LLGestureComboBox(const LLComboBox::Params& p)
-	: LLComboBox(p)
-	, mGestureLabelTimer()
-{
-	setCommitCallback(boost::bind(&LLGestureComboBox::onCommitGesture, this, _1));
-
-	// now register us as observer since we have a place to put the results
-	gGestureManager.addObserver(this);
-
-	// refresh list from current active gestures
-	refreshGestures();
-}
-
-LLGestureComboBox::~LLGestureComboBox()
-{
-	gGestureManager.removeObserver(this);
-}
-
-void LLGestureComboBox::refreshGestures()
-{
-	//store current selection so we can maintain it
-	std::string cur_gesture = getValue().asString();
-	selectFirstItem();
-	std::string label = getValue().asString();;
-	// clear
-	clearRows();
-
-	// collect list of unique gestures
-	std::map <std::string, BOOL> unique;
-	LLGestureManager::item_map_t::iterator it;
-	for (it = gGestureManager.mActive.begin(); it != gGestureManager.mActive.end(); ++it)
-	{
-		LLMultiGesture* gesture = (*it).second;
-		if (gesture)
-		{
-			if (!gesture->mTrigger.empty())
-			{
-				unique[gesture->mTrigger] = TRUE;
-			}
-		}
-	}
-
-	// add unique gestures
-	std::map <std::string, BOOL>::iterator it2;
-	for (it2 = unique.begin(); it2 != unique.end(); ++it2)
-	{
-		addSimpleElement((*it2).first);
-	}
-
-	sortByName();
-	// Insert label after sorting, at top, with separator below it
-	addSeparator(ADD_TOP);		
-	//FIXME: get it from xml
-	addSimpleElement("Gestures", ADD_TOP);	
-
-	if (!cur_gesture.empty())
-	{ 
-		selectByValue(LLSD(cur_gesture));
-	}
-	else
-	{
-		selectFirstItem();
-	}
-}
-
-void LLGestureComboBox::onCommitGesture(LLUICtrl* ctrl)
-{
-	LLCtrlListInterface* gestures = getListInterface();
-	if (gestures)
-	{
-		S32 index = gestures->getFirstSelectedIndex();
-		if (index == 0)
-		{
-			return;
-		}
-		const std::string& trigger = gestures->getSelectedValue().asString();
-
-		// pretend the user chatted the trigger string, to invoke
-		// substitution and logging.
-		std::string text(trigger);
-		std::string revised_text;
-		gGestureManager.triggerAndReviseString(text, &revised_text);
-
-		revised_text = utf8str_trim(revised_text);
-		if (!revised_text.empty())
-		{
-			// Don't play nodding animation
-			LLBottomTray::sendChatFromViewer(revised_text, CHAT_TYPE_NORMAL, FALSE);
-		}
-	}
-
-	mGestureLabelTimer.start();
-	// free focus back to chat bar
-	setFocus(FALSE);
-}
-
-//virtual
-void LLGestureComboBox::draw()
-{
-	// HACK: Leave the name of the gesture in place for a few seconds.
-	const F32 SHOW_GESTURE_NAME_TIME = 2.f;
-	if (mGestureLabelTimer.getStarted() && mGestureLabelTimer.getElapsedTimeF32() > SHOW_GESTURE_NAME_TIME)
-	{
-		LLCtrlListInterface* gestures = getListInterface();
-		if (gestures) gestures->selectFirstItem();
-		mGestureLabelTimer.stop();
-	}
-
-	LLComboBox::draw();
-}
-
 LLBottomTray::LLBottomTray(const LLSD&)
-	: mChatBox(NULL)
-	, mChicletPanel(NULL)
+	: mChicletPanel(NULL)
 	, mIMWell(NULL)
 	, mSysWell(NULL)
 	, mTalkBtn(NULL)
-	, mGestureCombo(NULL)
 	, mStandUpBtn(NULL)  ////FIXME: temporary, for stand up proto
+	, mNearbyChatBar(NULL)
 {
+	mFactoryMap["chat_bar"] = LLCallbackMap(LLBottomTray::createNearbyChatBar, NULL);
+
 	LLUICtrlFactory::getInstance()->buildPanel(this,"panel_bottomtray.xml");
 
 	mChicletPanel = getChild<LLChicletPanel>("chiclet_list",TRUE,FALSE);
 	mIMWell = getChild<LLNotificationChiclet>("im_well",TRUE,FALSE);
 	mSysWell = getChild<LLNotificationChiclet>("sys_well",TRUE,FALSE);
-	mChatBox = getChild<LLLineEditor>("chat_box",TRUE,FALSE);
 
 	mChicletPanel->setChicletClickedCallback(boost::bind(&LLBottomTray::onChicletClick,this,_1));
 
-	if (mChatBox)
-	{
-		mChatBox->setCommitCallback(boost::bind(&LLBottomTray::onChatBoxCommit, this));
-		mChatBox->setKeystrokeCallback(&onChatBoxKeystroke, this);
-		mChatBox->setFocusLostCallback(&onChatBoxFocusLost, this);
-
-		mChatBox->setIgnoreArrowKeys(TRUE);
-		mChatBox->setCommitOnFocusLost( FALSE );
-		mChatBox->setRevertOnEsc( FALSE );
-		mChatBox->setIgnoreTab(TRUE);
-		mChatBox->setPassDelete(TRUE);
-		mChatBox->setReplaceNewlinesWithSpaces(FALSE);
-		mChatBox->setMaxTextLength(1023);
-		mChatBox->setEnableLineHistory(TRUE);
-
-	}
-
-	mGestureCombo = getChild<LLGestureComboBox>( "Gesture", TRUE, FALSE);
-
 	////FIXME: temporary, for stand up proto
 	mStandUpBtn = getChild<LLButton> ("stand", TRUE, FALSE);
 	if (mStandUpBtn)
@@ -246,156 +102,15 @@ void LLBottomTray::onChicletClick(LLUICtrl* ctrl)
 	}
 }
 
-void LLBottomTray::onChatBoxCommit()
-{
-	if (mChatBox && mChatBox->getText().length() > 0)
-	{
-		sendChat(CHAT_TYPE_NORMAL);
-	}
-
-	gAgent.stopTyping();
-}
-
-void LLBottomTray::sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate)
-{
-	sendChatFromViewer(utf8str_to_wstring(utf8text), type, animate);
-}
-
-void LLBottomTray::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate)
-{
-	// Look for "/20 foo" channel chats.
-	S32 channel = 0;
-	LLWString out_text = stripChannelNumber(wtext, &channel);
-	std::string utf8_out_text = wstring_to_utf8str(out_text);
-	std::string utf8_text = wstring_to_utf8str(wtext);
-
-	utf8_text = utf8str_trim(utf8_text);
-	if (!utf8_text.empty())
-	{
-		utf8_text = utf8str_truncate(utf8_text, MAX_STRING - 1);
-	}
-
-	// Don't animate for chats people can't hear (chat to scripts)
-	if (animate && (channel == 0))
-	{
-		if (type == CHAT_TYPE_WHISPER)
-		{
-			lldebugs << "You whisper " << utf8_text << llendl;
-			gAgent.sendAnimationRequest(ANIM_AGENT_WHISPER, ANIM_REQUEST_START);
-		}
-		else if (type == CHAT_TYPE_NORMAL)
-		{
-			lldebugs << "You say " << utf8_text << llendl;
-			gAgent.sendAnimationRequest(ANIM_AGENT_TALK, ANIM_REQUEST_START);
-		}
-		else if (type == CHAT_TYPE_SHOUT)
-		{
-			lldebugs << "You shout " << utf8_text << llendl;
-			gAgent.sendAnimationRequest(ANIM_AGENT_SHOUT, ANIM_REQUEST_START);
-		}
-		else
-		{
-			llinfos << "send_chat_from_viewer() - invalid volume" << llendl;
-			return;
-		}
-	}
-	else
-	{
-		if (type != CHAT_TYPE_START && type != CHAT_TYPE_STOP)
-		{
-			lldebugs << "Channel chat: " << utf8_text << llendl;
-		}
-	}
-
-	send_chat_from_viewer(utf8_out_text, type, channel);
-}
-
-// static
-void LLBottomTray::onChatBoxKeystroke(LLLineEditor* caller, void* userdata)
-{
-	LLBottomTray* self = (LLBottomTray *)userdata;
-
-	LLWString raw_text;
-	if (self->getChatBox()) raw_text = self->getChatBox()->getWText();
-
-	// Can't trim the end, because that will cause autocompletion
-	// to eat trailing spaces that might be part of a gesture.
-	LLWStringUtil::trimHead(raw_text);
-
-	S32 length = raw_text.length();
-
-	if( (length > 0) && (raw_text[0] != '/') )  // forward slash is used for escape (eg. emote) sequences
-	{
-		gAgent.startTyping();
-	}
-	else
-	{
-		gAgent.stopTyping();
-	}
-
-	/* Doesn't work -- can't tell the difference between a backspace
-	   that killed the selection vs. backspace at the end of line.
-	if (length > 1 
-		&& text[0] == '/'
-		&& key == KEY_BACKSPACE)
-	{
-		// the selection will already be deleted, but we need to trim
-		// off the character before
-		std::string new_text = raw_text.substr(0, length-1);
-		self->mInputEditor->setText( new_text );
-		self->mInputEditor->setCursorToEnd();
-		length = length - 1;
-	}
-	*/
-
-	KEY key = gKeyboard->currentKey();
-
-	// Ignore "special" keys, like backspace, arrows, etc.
-	if (length > 1 
-		&& raw_text[0] == '/'
-		&& key < KEY_SPECIAL)
-	{
-		// we're starting a gesture, attempt to autocomplete
-
-		std::string utf8_trigger = wstring_to_utf8str(raw_text);
-		std::string utf8_out_str(utf8_trigger);
-
-		if (gGestureManager.matchPrefix(utf8_trigger, &utf8_out_str))
-		{
-			if (self->getChatBox())
-			{
-				std::string rest_of_match = utf8_out_str.substr(utf8_trigger.size());
-				self->getChatBox()->setText(utf8_trigger + rest_of_match); // keep original capitalization for user-entered part
-				S32 outlength = self->getChatBox()->getLength(); // in characters
-			
-				// Select to end of line, starting from the character
-				// after the last one the user typed.
-				self->getChatBox()->setSelection(length, outlength);
-			}
-		}
-
-		//llinfos << "GESTUREDEBUG " << trigger 
-		//	<< " len " << length
-		//	<< " outlen " << out_str.getLength()
-		//	<< llendl;
-	}
-}
-
-// static
-void LLBottomTray::onChatBoxFocusLost(LLFocusableElement* caller, void* userdata)
+void* LLBottomTray::createNearbyChatBar(void* userdata)
 {
-	// stop typing animation
-	gAgent.stopTyping();
-}
+	LLBottomTray *bt = LLBottomTray::getInstance();
+	if (!bt)
+		return NULL;
 
-BOOL LLBottomTray::inputEditorHasFocus()
-{
-	return mChatBox && mChatBox->hasFocus();
-}
+	bt->mNearbyChatBar = new LLNearbyChatBar();
 
-std::string LLBottomTray::getCurrentChat()
-{
-	return mChatBox ? mChatBox->getText() : LLStringUtil::null;
+	return bt->mNearbyChatBar;
 }
 
 //virtual
@@ -440,14 +155,9 @@ void LLBottomTray::sessionAdded(const LLUUID& session_id, const std::string& nam
 		}
 		else
 		{
-			LLIMChiclet* chicklet = getChicletPanel()->createChiclet<LLIMChiclet>(session_id);
-			chicklet->setIMSessionName(name);
-			chicklet->setOtherParticipantId(other_participant_id);
-
-			if(getChicletPanel()->getChicletCount())
-			{
-				setChicletPanelVisible(true);
-			}
+			LLIMChiclet* chiclet = getChicletPanel()->createChiclet<LLIMChiclet>(session_id);
+			chiclet->setIMSessionName(name);
+			chiclet->setOtherParticipantId(other_participant_id);
 		}
 	}
 }
@@ -458,27 +168,6 @@ void LLBottomTray::sessionRemoved(const LLUUID& session_id)
 	if(getChicletPanel())
 	{
 		getChicletPanel()->removeChiclet(session_id);
-
-		if(0 == getChicletPanel()->getChicletCount())
-		{
-			setChicletPanelVisible(false);
-		}
-	}
-}
-
-void LLBottomTray::setChicletPanelVisible(bool visible)
-{
-	// Chiclet panel is placed in layout_panel, which is child of layout_stack.
-	// To gide chiclet panel we need to also hide layout_panel to make layout_stack resize its
-	// content.
-	getChicletPanel()->getParent()->setVisible(visible);
-	if(visible)
-	{
-		// Reshape layout stack after making chiclet panel visible
-		LLView* layout = getChild<LLView>("toolbar_stack");
-		LLRect rc = layout->getRect();
-		layout->reshape(rc.getWidth(), rc.getHeight());
-		layout->setRect(rc);
 	}
 }
 
@@ -491,22 +180,6 @@ void LLBottomTray::onFocusLost()
 	}
 }
 
-// virtual
-BOOL LLBottomTray::handleKeyHere( KEY key, MASK mask )
-{
-	BOOL handled = FALSE;
-
-	// ALT-RETURN is reserved for windowed/fullscreen toggle
-	if( KEY_RETURN == key && mask == MASK_CONTROL)
-	{
-		// shout
-		sendChat(CHAT_TYPE_SHOUT);
-		handled = TRUE;
-	}
-
-	return handled;
-}
-
 //virtual
 // setVisible used instead of onVisibilityChange, since LLAgent calls it on entering/leaving mouselook mode.
 // If bottom tray is already visible in mouselook mode, then onVisibilityChange will not be called from setVisible(true),
@@ -514,192 +187,22 @@ void LLBottomTray::setVisible(BOOL visible)
 {
 	LLPanel::setVisible(visible);
 
-	
-	BOOL visibility = gAgent.cameraMouselook() ? false : true;
+	LLView* stack = getChild<LLView>("toolbar_stack",TRUE,FALSE);
 
-	LLViewBorder* separator = getChild<LLViewBorder>("well_separator",TRUE,FALSE);
-
-	if (separator && separator->getVisible() == visibility)
-		return;
-
-	if (separator)
-		separator->setVisible(visibility);
-
-	LLPanel* p = getChild<LLPanel>("chiclet_list_panel",TRUE,FALSE);
-	if (p)
-		p->setVisible(visibility);
-
-	p = getChild<LLPanel>("im_well_panel",TRUE,FALSE);
-	if (p)
-		p->setVisible(visibility);
-
-	p = getChild<LLPanel>("sys_well_panel",TRUE,FALSE);
-	if (p)
-		p->setVisible(visibility);
-
-}
-
-// static 
-void LLBottomTray::startChat(const char* line)
-{
-	LLBottomTray *bt = LLBottomTray::getInstance();
-
-	if(bt && bt->getChatBox())
+	if (stack)
 	{
-		bt->setVisible(TRUE);
-		bt->getChatBox()->setFocus(TRUE);
+		BOOL visibility = gAgent.cameraMouselook() ? false : true;
 
-		if (line)
+		for ( child_list_const_iter_t child_it = stack->getChildList()->begin(); child_it != stack->getChildList()->end(); child_it++)
 		{
-			std::string line_string(line);
-			bt->getChatBox()->setText(line_string);
-		}
-
-		bt->getChatBox()->setCursorToEnd();
-	}
-}
-
-// Exit "chat mode" and do the appropriate focus changes
-// static
-void LLBottomTray::stopChat()
-{
-	LLBottomTray *bt = LLBottomTray::getInstance();
-
-	if(bt && bt->getChatBox())
-	{
-		bt->getChatBox()->setFocus(FALSE);
-	}
-
- 	// stop typing animation
- 	gAgent.stopTyping();
-}
-
-void LLBottomTray::sendChat( EChatType type )
-{
-	if (mChatBox)
-	{
-		LLWString text = mChatBox->getConvertedText();
-		if (!text.empty())
-		{
-			// store sent line in history, duplicates will get filtered
-			mChatBox->updateHistory();
-			// Check if this is destined for another channel
-			S32 channel = 0;
-			stripChannelNumber(text, &channel);
+			LLView* viewp = *child_it;
 			
-			std::string utf8text = wstring_to_utf8str(text);
-			// Try to trigger a gesture, if not chat to a script.
-			std::string utf8_revised_text;
-			if (0 == channel)
-			{
-				// discard returned "found" boolean
-				gGestureManager.triggerAndReviseString(utf8text, &utf8_revised_text);
-			}
-			else
-			{
-				utf8_revised_text = utf8text;
-			}
-
-			utf8_revised_text = utf8str_trim(utf8_revised_text);
-
-			if (!utf8_revised_text.empty())
+			if ("chat_bar" == viewp->getName())
+				continue;
+			else 
 			{
-				// Chat with animation
-				sendChatFromViewer(utf8_revised_text, type, TRUE);
+				viewp->setVisible(visibility);
 			}
 		}
-
-		mChatBox->setText(LLStringExplicit(""));
 	}
-
-	gAgent.stopTyping();
 }
-
-// If input of the form "/20foo" or "/20 foo", returns "foo" and channel 20.
-// Otherwise returns input and channel 0.
-LLWString LLBottomTray::stripChannelNumber(const LLWString &mesg, S32* channel)
-{
-	if (mesg[0] == '/'
-		&& mesg[1] == '/')
-	{
-		// This is a "repeat channel send"
-		*channel = sLastSpecialChatChannel;
-		return mesg.substr(2, mesg.length() - 2);
-	}
-	else if (mesg[0] == '/'
-			 && mesg[1]
-			 && LLStringOps::isDigit(mesg[1]))
-	{
-		// This a special "/20" speak on a channel
-		S32 pos = 0;
-
-		// Copy the channel number into a string
-		LLWString channel_string;
-		llwchar c;
-		do
-		{
-			c = mesg[pos+1];
-			channel_string.push_back(c);
-			pos++;
-		}
-		while(c && pos < 64 && LLStringOps::isDigit(c));
-		
-		// Move the pointer forward to the first non-whitespace char
-		// Check isspace before looping, so we can handle "/33foo"
-		// as well as "/33 foo"
-		while(c && iswspace(c))
-		{
-			c = mesg[pos+1];
-			pos++;
-		}
-		
-		sLastSpecialChatChannel = strtol(wstring_to_utf8str(channel_string).c_str(), NULL, 10);
-		*channel = sLastSpecialChatChannel;
-		return mesg.substr(pos, mesg.length() - pos);
-	}
-	else
-	{
-		// This is normal chat.
-		*channel = 0;
-		return mesg;
-	}
-}
-
-void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel)
-{
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessageFast(_PREHASH_ChatFromViewer);
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->nextBlockFast(_PREHASH_ChatData);
-	msg->addStringFast(_PREHASH_Message, utf8_out_text);
-	msg->addU8Fast(_PREHASH_Type, type);
-	msg->addS32("Channel", channel);
-
-	gAgent.sendReliableMessage();
-
-	LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
-}
-
-class LLChatHandler : public LLCommandHandler
-{
-public:
-	// not allowed from outside the app
-	LLChatHandler() : LLCommandHandler("chat", true) { }
-
-    // Your code here
-	bool handle(const LLSD& tokens, const LLSD& query_map,
-				LLWebBrowserCtrl* web)
-	{
-		if (tokens.size() < 2) return false;
-		S32 channel = tokens[0].asInteger();
-		std::string mesg = tokens[1].asString();
-		send_chat_from_viewer(mesg, CHAT_TYPE_NORMAL, channel);
-		return true;
-	}
-};
-
-// Creating the object registers with the dispatcher.
-LLChatHandler gChatHandler;
-
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 08f5cb91d8..e5848f72dc 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -35,35 +35,12 @@
 
 #include "llpanel.h"
 #include "llimview.h"
-#include "llchat.h"
-#include "llgesturemgr.h"
-#include "llcombobox.h"
 
 class LLChicletPanel;
 class LLLineEditor;
 class LLNotificationChiclet;
 class LLTalkButton;
-
-class LLGestureComboBox
-	: public LLComboBox
-	, public LLGestureManagerObserver
-{
-protected:
-	LLGestureComboBox(const LLComboBox::Params&);
-	friend class LLUICtrlFactory;
-public:
-	~LLGestureComboBox();
-
-	void refreshGestures();
-	void onCommitGesture(LLUICtrl* ctrl);
-	virtual void draw();
-
-	// LLGestureManagerObserver trigger
-	virtual void changed() { refreshGestures(); }
-
-protected:
-	LLFrameTimer mGestureLabelTimer;
-};
+class LLNearbyChatBar;
 
 class LLBottomTray 
 	: public LLUISingleton<LLBottomTray>
@@ -74,19 +51,10 @@ class LLBottomTray
 public:
 	~LLBottomTray();
 
-	LLLineEditor*		getChatBox()	{return mChatBox;}
 	LLChicletPanel*		getChicletPanel()	{return mChicletPanel;}
 	LLNotificationChiclet*	getIMWell()	{return mIMWell;}
 	LLNotificationChiclet*	getSysWell()	{return mSysWell;}
-
-	void onChatBoxCommit();
-	static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate);
-	static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
-	static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata);
-	static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata);
-
-	BOOL inputEditorHasFocus();
-	std::string getCurrentChat();
+	LLNearbyChatBar*		getNearbyChatBar()	{return mNearbyChatBar;}
 
 	/*virtual*/void draw();
 	void refreshStandUp();
@@ -100,33 +68,22 @@ public:
 	virtual void sessionRemoved(const LLUUID& session_id);
 
 	virtual void onFocusLost();
-	virtual BOOL handleKeyHere(KEY key, MASK mask);
 	virtual void setVisible(BOOL visible);
 
-	static void startChat(const char* line);
-	static void stopChat();
-
 protected:
 
 	LLBottomTray(const LLSD& key = LLSD());
 
-	void sendChat( EChatType type );
-	static LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
-
 	void onChicletClick(LLUICtrl* ctrl);
 
-	void setChicletPanelVisible(bool visible);
-
-	// Which non-zero channel did we last chat on?
-	static S32 sLastSpecialChatChannel;
+	static void* createNearbyChatBar(void* userdata);
 
-	LLLineEditor*		mChatBox;
 	LLChicletPanel* 	mChicletPanel;
 	LLNotificationChiclet* 	mIMWell;
 	LLNotificationChiclet* 	mSysWell;
 	LLTalkButton* 		mTalkBtn;
-	LLGestureComboBox*	mGestureCombo;
 	LLButton*           mStandUpBtn;
+	LLNearbyChatBar*	mNearbyChatBar;
 };
 
 #endif // LL_LLBOTTOMPANEL_H
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp
index 723bf2a248..0eb0801a2c 100644
--- a/indra/newview/llchannelmanager.cpp
+++ b/indra/newview/llchannelmanager.cpp
@@ -34,6 +34,9 @@
 
 #include "llchannelmanager.h"
 
+#include "llappviewer.h"
+#include "llviewercontrol.h"
+
 #include <algorithm>
 
 using namespace LLNotificationsUI;
@@ -41,6 +44,7 @@ using namespace LLNotificationsUI;
 //--------------------------------------------------------------------------
 LLChannelManager::LLChannelManager()
 {
+	LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLChannelManager::onLoginCompleted, this));
 }
 
 //--------------------------------------------------------------------------
@@ -49,6 +53,45 @@ LLChannelManager::~LLChannelManager()
 	//All channels are being deleted by Parent View
 }
 
+//--------------------------------------------------------------------------
+void LLChannelManager::onLoginCompleted()
+{
+	S32 hidden_notifications = 0;
+
+	for(std::vector<ChannelElem>::iterator it = mChannelList.begin(); it !=  mChannelList.end(); ++it)
+	{
+		//(*it).channel->showToasts();
+		hidden_notifications +=(*it).channel->getNumberOfHiddenToasts();
+	}
+
+	if(!hidden_notifications)
+	{
+		LLScreenChannel::setStartUpToastShown();
+		return;
+	}
+	
+	LLChannelManager::Params p;
+	p.id = LLUUID(STARTUP_CHANNEL_ID);
+	p.channel_right_bound = getRootView()->getRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); 
+	p.channel_width = gSavedSettings.getS32("NotifyBoxWidth");
+	mStartUpChannel = NULL;
+	mStartUpChannel = createChannel(p);
+
+	if(!mStartUpChannel)
+		return;
+
+	static_cast<LLUICtrl*>(mStartUpChannel)->setCommitCallback(boost::bind(&LLChannelManager::enableShowToasts, this));
+	mStartUpChannel->setNumberOfHiddenToasts(hidden_notifications);
+	mStartUpChannel->createOverflowToast(gSavedSettings.getS32("ChannelBottomPanelMargin"), gSavedSettings.getS32("StartUpToastTime"));
+}
+
+//--------------------------------------------------------------------------
+void LLChannelManager::enableShowToasts()
+{
+	LLScreenChannel::setStartUpToastShown();
+	delete mStartUpChannel;
+}
+
 //--------------------------------------------------------------------------
 LLScreenChannel* LLChannelManager::createChannel(LLChannelManager::Params& p)
 {
@@ -67,7 +110,8 @@ LLScreenChannel* LLChannelManager::createChannel(LLChannelManager::Params& p)
 		return new_channel;
 
 	new_channel = new LLScreenChannel(); 
-	new_channel->init(p.channel_right_bound - p.channel_width, getRootView());
+	getRootView()->addChild(new_channel);
+	new_channel->init(p.channel_right_bound - p.channel_width, p.channel_right_bound);
 	new_channel->setToastAlignment(p.align);
 
 	ChannelElem new_elem;
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index 564535ff24..3914d20ebc 100644
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@@ -45,6 +45,8 @@
 namespace LLNotificationsUI
 {
 
+#define STARTUP_CHANNEL_ID		"AEED3193-8709-4693-8558-7452CCA97AE5"
+
 /**
  * Manager for screen channels.
  * Responsible for instantiating and retrieving screen channels.
@@ -98,6 +100,10 @@ public:
 	LLChannelManager();	
 	virtual ~LLChannelManager();
 
+	// On LoginCompleted - show StartUp toast
+	void onLoginCompleted();
+	void enableShowToasts();
+
 	//TODO: make protected? in order to be shure that channels are created only by notification handlers
 	LLScreenChannel*	createChannel(LLChannelManager::Params& p);
 
@@ -108,6 +114,7 @@ public:
 
 private:
 
+	LLScreenChannel*			mStartUpChannel;
 	std::vector<ChannelElem>	mChannelList;
 };
 
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index bb31b7f2e8..2b455485ca 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -41,6 +41,7 @@
 #include "lltrans.h"
 
 #include "llviewercontrol.h"
+#include "llagentdata.h"
 
 static const S32 BORDER_MARGIN = 2;
 static const S32 PARENT_BORDER_MARGIN = 0;
@@ -51,6 +52,9 @@ static const F32 MIN_AUTO_SCROLL_RATE = 120.f;
 static const F32 MAX_AUTO_SCROLL_RATE = 500.f;
 static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
 
+static const S32 msg_left_offset = 30;
+static const S32 msg_right_offset = 10;
+
 #define MAX_CHAT_HISTORY 100
 
 
@@ -89,8 +93,8 @@ void	LLChatItemCtrl::reshape		(S32 width, S32 height, BOOL called_from_parent )
 
 		
 		LLRect msg_text_rect = msg_text->getRect();
-		msg_text_rect.setLeftTopAndSize( 10, height - caption_rect.getHeight() , width - 20, height - caption_rect.getHeight());
-		msg_text->reshape( width - 20, height - caption_rect.getHeight(), 1);
+		msg_text_rect.setLeftTopAndSize( msg_left_offset, height - caption_rect.getHeight() , width - msg_left_offset - msg_right_offset, height - caption_rect.getHeight());
+		msg_text->reshape( width - msg_left_offset - msg_right_offset, height - caption_rect.getHeight(), 1);
 		msg_text->setRect(msg_text_rect);
 	}
 		
@@ -132,11 +136,22 @@ void	LLChatItemCtrl::setMessage	(const LLChat& msg)
 	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
 	if(!caption)
 		return;
-	caption->getChild<LLTextBox>("sender_name",false,false)->setText(msg.mFromName);
+
+	std::string str_sender;
+
+	
+	if(gAgentID != msg.mFromID)
+		str_sender = msg.mFromName;
+	else
+		str_sender = LLTrans::getString("You");;
+
+	caption->getChild<LLTextBox>("sender_name",false,false)->setText(str_sender);
+	
 	std::string tt = appendTime();
 	
 	caption->getChild<LLTextBox>("msg_time",false,false)->setText(tt);
 
+
 	caption->getChild<LLAvatarIconCtrl>("avatar_icon",false,false)->setValue(msg.mFromID);
 
 	mOriginalMessage = msg;
@@ -153,6 +168,28 @@ void	LLChatItemCtrl::setMessage	(const LLChat& msg)
 
 }
 
+void	LLChatItemCtrl::snapToMessageHeight	()
+{
+	LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text",false,false);
+	if(!text_box)
+		return;///actually assert fits better
+	S32 new_height = text_box->getTextPixelHeight();
+	LLRect panel_rect = getRect();
+
+	S32 caption_height = 0;
+	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
+	if(caption)
+		caption_height = caption->getRect().getHeight();
+
+
+	panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth()	, caption_height + new_height);
+	
+	reshape( getRect().getWidth(), caption_height + new_height, 1);
+	
+	setRect(panel_rect);
+
+}
+
 
 void	LLChatItemCtrl::setWidth(S32 width)
 {
@@ -160,7 +197,7 @@ void	LLChatItemCtrl::setWidth(S32 width)
 	if(!text_box)
 		return;///actually assert fits better
 
-	text_box->reshape(width - 20,100/*its not magic number, we just need any number*/);
+	text_box->reshape(width - msg_left_offset - msg_right_offset,100/*its not magic number, we just need any number*/);
 
 	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text",false,false);
 	if(msg_text && mOriginalMessage.mText.length())
@@ -169,13 +206,8 @@ void	LLChatItemCtrl::setWidth(S32 width)
 	for(size_t i=0;i<mMessages.size();++i)
 		msg_text->addText(mMessages[i]);
 
-	S32 new_height = text_box->getTextPixelHeight();
-	LLRect panel_rect = getRect();
-	panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, width	, 35 + new_height);
-	
-	reshape( width, panel_rect.getHeight(), 1);
-	
-	setRect(panel_rect);
+	setRect(LLRect(getRect().mLeft, getRect().mTop, getRect().mLeft + width	, getRect().mBottom));
+	snapToMessageHeight	();
 }
 
 void LLChatItemCtrl::onMouseLeave			(S32 x, S32 y, MASK mask)
@@ -190,6 +222,8 @@ void LLChatItemCtrl::onMouseLeave			(S32 x, S32 y, MASK mask)
 }
 void LLChatItemCtrl::onMouseEnter				(S32 x, S32 y, MASK mask)
 {
+	if(mOriginalMessage.mSourceType != CHAT_SOURCE_AGENT)
+		return;
 	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
 	if(!caption)
 		return;
@@ -200,8 +234,10 @@ void LLChatItemCtrl::onMouseEnter				(S32 x, S32 y, MASK mask)
 
 BOOL	LLChatItemCtrl::handleMouseDown	(S32 x, S32 y, MASK mask)
 {
+	if(mOriginalMessage.mSourceType != CHAT_SOURCE_AGENT)
+		return LLPanel::handleMouseDown(x,y,mask);
 	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
-	if(mOriginalMessage.mSourceType == CHAT_SOURCE_AGENT && caption)
+	if(caption)
 	{
 		LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
 		if(msg_inspector)
@@ -242,6 +278,23 @@ bool	LLChatItemCtrl::canAddText	()
 	return msg_text->getTextLinesNum()<10;
 }
 
+BOOL	LLChatItemCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
+	if(!caption)
+		return LLPanel::handleRightMouseDown(x,y,mask);
+	LLUICtrl* avatar_icon = caption->getChild<LLUICtrl>("avatar_icon",false,false);
+	if(!avatar_icon)
+		return LLPanel::handleRightMouseDown(x,y,mask);
+	S32 local_x = x - avatar_icon->getRect().mLeft - caption->getRect().mLeft;
+	S32 local_y = y - avatar_icon->getRect().mBottom - caption->getRect().mBottom;
+
+	//eat message for avatar icon if msg was from object
+	if(avatar_icon->pointInView(local_x, local_y) && mOriginalMessage.mSourceType != CHAT_SOURCE_AGENT)
+		return TRUE;
+	return LLPanel::handleRightMouseDown(x,y,mask);
+}
+
 
 //*******************************************************************************************************************
 //LLChatItemsContainerCtrl
@@ -264,13 +317,18 @@ void	LLChatItemsContainerCtrl::addMessage(const LLChat& msg)
 		LLChatItemCtrl* item = mItems[0];
 		removeChild(item);
 		delete item;
+		mItems.erase(mItems.begin());
 	}
 
 	
-	if(mItems.size() > 0 && msg.mFromID == mItems[mItems.size()-1]->getMessage().mFromID && mItems[mItems.size()-1]->canAddText())
+	if(mItems.size() > 0 
+		&& msg.mFromID == mItems[mItems.size()-1]->getMessage().mFromID 
+		&& (msg.mTime-mItems[mItems.size()-1]->getMessage().mTime)<60
+		&& mItems[mItems.size()-1]->canAddText()
+		)
 	{
 		mItems[mItems.size()-1]->addText(msg.mText);
-		mItems[mItems.size()-1]->setWidth(getRect().getWidth() - 16);
+		mItems[mItems.size()-1]->snapToMessageHeight();
 	}
 	else
 	{
@@ -279,6 +337,8 @@ void	LLChatItemsContainerCtrl::addMessage(const LLChat& msg)
 		addChild(item,0);
 		item->setWidth(getRect().getWidth() - 16);
 		item->setMessage(msg);
+		item->snapToMessageHeight();
+		
 		item->setHeaderVisibility((EShowItemHeader)gSavedSettings.getS32("nearbychat_showicons_and_names"));
 
 		item->setVisible(true);
diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h
index f5791078aa..de16cf9505 100644
--- a/indra/newview/llchatitemscontainerctrl.h
+++ b/indra/newview/llchatitemscontainerctrl.h
@@ -63,6 +63,7 @@ public:
 	void	addText		(const std::string& message);
 	void	setMessage	(const LLChat& msg);
 	void	setWidth		(S32 width);
+	void	snapToMessageHeight	();
 
 	bool	canAddText	();
 
@@ -75,6 +76,7 @@ public:
 	void	reshape		(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
 	void	setHeaderVisibility(EShowItemHeader e);
+	BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 private:
 	
 	std::string appendTime	();
diff --git a/indra/newview/llchatmsgbox.cpp b/indra/newview/llchatmsgbox.cpp
index 8fb4b78cb8..933d9b8771 100644
--- a/indra/newview/llchatmsgbox.cpp
+++ b/indra/newview/llchatmsgbox.cpp
@@ -51,9 +51,8 @@ LLChatMsgBox::Params::Params()
 	disabled_color("disabled_color"),
 	background_color("background_color"),
 	border_color("border_color"),
-	v_pad("v_pad", 0),
-	h_pad("h_pad", 0),
-	line_spacing("line_spacing", 0),
+	line_spacing("line_spacing", 4),
+	block_spacing("block_spacing",10),
 	text("text"),
 	font_shadow("font_shadow", LLFontGL::NO_SHADOW)
 {}
@@ -68,8 +67,6 @@ LLChatMsgBox::LLChatMsgBox(const LLChatMsgBox::Params& p)
 	mShadowType( p.font_shadow ),
 	mBorderDropShadowVisible( p.border_drop_shadow_visible ),
 	mUseEllipses( p.use_ellipses ),
-	mHPad(p.h_pad),
-	mVPad(p.v_pad),
 	mVAlign( LLFontGL::TOP ),
 	mClickedCallback(NULL),
 	mTextColor(p.text_color()),
@@ -79,6 +76,7 @@ LLChatMsgBox::LLChatMsgBox(const LLChatMsgBox::Params& p)
 	mHoverColor(p.hover_color()),
 	mHAlign(p.font_halign),
 	mLineSpacing(p.line_spacing),
+	mBlockSpasing(p.block_spacing),
 	mWordWrap( p.word_wrap ),
 	mFontStyle(LLFontGL::getStyleFromString(p.font.style))
 {
@@ -271,7 +269,7 @@ S32	LLChatMsgBox::getTextLinesNum()
 S32 LLChatMsgBox::getTextPixelHeight()
 {
 	S32 num_lines = getTextLinesNum();
-	return (S32)(num_lines * mFontGL->getLineHeight() + (num_lines-1)*4);
+	return (S32)(num_lines * mFontGL->getLineHeight() +  (num_lines-1)*mLineSpacing + mBlockSpasing*(mTextStrings.size()-1) + 2*mLineSpacing);//some extra space
 }
 
 void LLChatMsgBox::setValue(const LLSD& value )
@@ -305,17 +303,16 @@ void LLChatMsgBox::draw()
 	switch( mHAlign )
 	{
 	case LLFontGL::LEFT:	
-		text_x = mHPad;						
 		break;
 	case LLFontGL::HCENTER:
 		text_x = getRect().getWidth() / 2;
 		break;
 	case LLFontGL::RIGHT:
-		text_x = getRect().getWidth() - mHPad;
+		text_x = getRect().getWidth() ;
 		break;
 	}
 
-	S32 text_y = getRect().getHeight() - mVPad;
+	S32 text_y = getRect().getHeight() ;
 
 	if ( getEnabled() )
 	{
@@ -358,6 +355,7 @@ void LLChatMsgBox::reshape(S32 width, S32 height, BOOL called_from_parent)
 void LLChatMsgBox::drawText( S32 x, S32 y, const LLColor4& color )
 {
 	S32 width = getRect().getWidth()-10;
+
 	
 	for(std::vector< boost::shared_ptr<text_block> >::iterator it = mTextStrings.begin();
 			it!=mTextStrings.end();++it)
@@ -383,8 +381,9 @@ void LLChatMsgBox::drawText( S32 x, S32 y, const LLColor4& color )
 		if(next == mTextStrings.end())
 			break;
 		//separator
-		gl_line_2d(5,y-2,width,y-2,LLColor4::grey);
-		y-=4;
+		gl_line_2d(5,y-mBlockSpasing/2,width,y-mBlockSpasing/2,LLColor4::grey);
+		y-=mBlockSpasing;
 	}
+
 }
 
diff --git a/indra/newview/llchatmsgbox.h b/indra/newview/llchatmsgbox.h
index c0e1964afa..61035499c7 100644
--- a/indra/newview/llchatmsgbox.h
+++ b/indra/newview/llchatmsgbox.h
@@ -71,9 +71,9 @@ public:
 							background_color,
 							border_color;
 
-		Optional<S32>		v_pad,
-							h_pad,
-							line_spacing;
+		Optional<S32>		line_spacing;
+		
+		Optional<S32>		block_spacing;
 
 		Params();
 	};
@@ -104,8 +104,6 @@ public:
 	void			setBackgroundVisible(BOOL visible)		{ mBackgroundVisible = visible; }
 	void			setBorderVisible(BOOL visible)			{ mBorderVisible = visible; }
 	void			setBorderDropshadowVisible(BOOL visible){ mBorderDropShadowVisible = visible; }
-	void			setHPad(S32 pixels)						{ mHPad = pixels; }
-	void			setVPad(S32 pixels)						{ mVPad = pixels; }
 	void			setRightAlign()							{ mHAlign = LLFontGL::RIGHT; }
 	void			setHAlign( LLFontGL::HAlign align )		{ mHAlign = align; }
 	void			setClickedCallback( boost::function<void (void*)> cb, void* userdata = NULL ){ mClickedCallback = boost::bind(cb, userdata); }		// mouse down and up within button
@@ -145,9 +143,8 @@ private:
 	BOOL			mUseEllipses;
 
 	S32				mLineSpacing;
+	S32				mBlockSpasing;
 
-	S32				mHPad;
-	S32				mVPad;
 	LLFontGL::HAlign mHAlign;
 	LLFontGL::VAlign mVAlign;
 
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index bfa4e06d2e..f71ea9f8ad 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -428,9 +428,11 @@ LLChicletPanel::Params::Params()
 , scrolling_offset("scrolling_offset")
 , left_scroll_button("left_scroll_button")
 , right_scroll_button("right_scroll_button")
+, min_width("min_width")
 {
 	chiclet_padding = 3;
 	scrolling_offset = 40;
+	min_width = 70;
 
 	LLRect scroll_button_rect(0, 25, 19, 5);
 
@@ -458,6 +460,8 @@ LLChicletPanel::LLChicletPanel(const Params&p)
 , mRightScrollButton(NULL)
 , mChicletPadding(p.chiclet_padding)
 , mScrollingOffset(p.scrolling_offset)
+, mMinWidth(p.min_width)
+, mShowControls(true)
 {
 	LLButton::Params scroll_button_params = p.left_scroll_button;
 
@@ -660,6 +664,9 @@ void LLChicletPanel::reshape(S32 width, S32 height, BOOL called_from_parent )
 	mScrollArea->setRect(LLRect(scroll_button_rect.getWidth() + SCROLL_BUTTON_PAD,
 		height + 7, width - scroll_button_rect.getWidth() - SCROLL_BUTTON_PAD, 0));
 
+	mShowControls = width > mMinWidth;
+	mScrollArea->setVisible(mShowControls);
+
 	trimChiclets();
 
 	showScrollButtonsIfNeeded();
@@ -719,7 +726,7 @@ void LLChicletPanel::showScrollButtonsIfNeeded()
 	mLeftScrollButton->setEnabled(can_scroll_left);
 	mRightScrollButton->setEnabled(can_scroll_right);
 
-	bool show_scroll_buttons = can_scroll_left || can_scroll_right;
+	bool show_scroll_buttons = (can_scroll_left || can_scroll_right) && mShowControls;
 
 	mLeftScrollButton->setVisible(show_scroll_buttons);
 	mRightScrollButton->setVisible(show_scroll_buttons);
@@ -950,6 +957,11 @@ void LLTalkButton::draw()
 	LLUICtrl::draw();
 }
 
+void LLTalkButton::setSpeakBtnToggleState(bool state)
+{
+	mSpeakBtn->setToggleState(state);
+}
+
 void LLTalkButton::onClick_SpeakBtn()
 {
 	bool speaking = mSpeakBtn->getToggleState();
@@ -1012,7 +1024,14 @@ void LLChicletNotificationCounterCtrl::setCounter(S32 counter)
 
 	std::stringstream stream;
 	stream << getCounter();
-	setText(stream.str());
+	if(mCounter != 0)
+	{
+		setText(stream.str());
+	}
+	else
+	{
+		setText(std::string(""));
+	}
 }
 
 LLRect LLChicletNotificationCounterCtrl::getRequiredRect()
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 415ae59ca2..c20c81e052 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -390,6 +390,8 @@ public:
 		Optional<LLButton::Params> left_scroll_button,
 								   right_scroll_button;
 
+		Optional<S32> min_width;
+
 		Params();
 	};
 
@@ -558,6 +560,8 @@ protected:
 
 	S32 mChicletPadding;
 	S32 mScrollingOffset;
+	S32 mMinWidth;
+	bool mShowControls;
 };
 
 /*
@@ -580,6 +584,7 @@ public:
 	/*virtual*/ ~LLTalkButton();
 
 	/*virtual*/ void draw();
+	void setSpeakBtnToggleState(bool state);
 
 protected:
 	friend class LLUICtrlFactory;
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 00d4f80054..72bfac70fc 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -216,6 +216,8 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 		}
 	}
 
+	bool recreate_buttons = true;
+
 	// If inventory items are not changed up to mFirstDropDownItem, no need to recreate them
 	if (mFirstDropDownItem == first_drop_down_item && (mItemNamesCache.size() == count || mItemNamesCache.size() == mFirstDropDownItem))
 	{
@@ -229,97 +231,113 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 		}
 		if (i == mFirstDropDownItem)
 		{
-			// Chevron button should stay right aligned
-			LLView *chevron_button = getChildView(std::string(">>"), FALSE, FALSE);
-			if (chevron_button)
+			recreate_buttons = false;
+		}
+	}
+
+	if (recreate_buttons)
+	{
+		mFirstDropDownItem = first_drop_down_item;
+
+		mItemNamesCache.clear();
+		for (S32 i = 0; i < mFirstDropDownItem; i++)
+		{
+			mItemNamesCache.put(items.get(i)->getName());
+		}
+
+		// Rebuild the buttons only
+		// child_list_t is a linked list, so safe to erase from the middle if we pre-incrament the iterator
+		for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); )
+		{
+			child_list_const_iter_t cur_it = child_it++;
+			LLView* viewp = *cur_it;
+			LLButton* button = dynamic_cast<LLButton*>(viewp);
+			if (button)
 			{
-				LLRect rect;
-				rect.setOriginAndSize(bar_width - chevron_button_width - buttonHGap, buttonVGap, chevron_button_width, getRect().getHeight()-buttonVGap);
-				chevron_button->setRect(rect);
-				mChevronRect = rect;
+				removeChild(button);
+				delete button;
 			}
-			return;
 		}
-	}
 
-	mFirstDropDownItem = first_drop_down_item;
+		// Adding buttons
+		for(S32 i = mFirstDropDownItem -1; i >= 0; i--)
+		{
 
-	mItemNamesCache.clear();
-	for (S32 i = 0; i < mFirstDropDownItem; i++)
-	{
-		mItemNamesCache.put(items.get(i)->getName());
-	}
+			LLInventoryItem* item = items.get(i);
 
-        // Rebuild the buttons only
-        // child_list_t is a linked list, so safe to erase from the middle if we pre-incrament the iterator
-        for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); )
-        {
-                child_list_const_iter_t cur_it = child_it++;
-                LLView* viewp = *cur_it;
-                LLButton* button = dynamic_cast<LLButton*>(viewp);
-                if (button)
-                {
-                        removeChild(button);
-                        delete button;
-                }
-        }
-
-	// Adding buttons
-	for(S32 i = 0; i < mFirstDropDownItem; i++)
-	{
-	
-		LLInventoryItem* item = items.get(i);
-
-		S32 buttonWidth = mFont->getWidth(item->getName()) + buttonHPad * 2;
-
-		LLRect rect;
-		rect.setOriginAndSize(curr_x, buttonVGap, buttonWidth, getRect().getHeight()-buttonVGap);
-
-		LLButton::Params bparams;
-		bparams.image_unselected.name(flat_icon);
-		bparams.image_disabled.name(flat_icon);
-		bparams.image_selected.name(hover_icon_selected);
-		bparams.image_hover_selected.name(hover_icon_selected);
-		bparams.image_disabled_selected.name(hover_icon_selected);
-		bparams.image_hover_unselected.name(hover_icon);
-		bparams.follows.flags (FOLLOWS_LEFT | FOLLOWS_BOTTOM);
-		bparams.rect (rect);
-		bparams.tab_stop(false);
-		bparams.font(mFont);
-		bparams.name(item->getName());
-		bparams.tool_tip(item->getName());
-		bparams.click_callback.function(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
-		bparams.rightclick_callback.function(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID()));
-
-		addChildInBack(LLUICtrlFactory::create<LLButton> (bparams));
-
-		curr_x += buttonWidth + buttonHGap;
+			S32 buttonWidth = mFont->getWidth(item->getName()) + buttonHPad * 2;
+
+			LLRect rect;
+			rect.setOriginAndSize(curr_x, buttonVGap, buttonWidth, getRect().getHeight()-buttonVGap);
+
+			LLButton::Params bparams;
+			bparams.image_unselected.name(flat_icon);
+			bparams.image_disabled.name(flat_icon);
+			bparams.image_selected.name(hover_icon_selected);
+			bparams.image_hover_selected.name(hover_icon_selected);
+			bparams.image_disabled_selected.name(hover_icon_selected);
+			bparams.image_hover_unselected.name(hover_icon);
+			bparams.follows.flags (FOLLOWS_LEFT | FOLLOWS_BOTTOM);
+			bparams.rect (rect);
+			bparams.tab_stop(false);
+			bparams.font(mFont);
+			bparams.name(item->getName());
+			bparams.tool_tip(item->getName());
+			bparams.click_callback.function(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
+			bparams.rightclick_callback.function(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID()));
+
+			addChildInBack(LLUICtrlFactory::create<LLButton> (bparams));
+
+			curr_x += buttonWidth + buttonHGap;
+		}
 	}
 
 	// Chevron button
 	if (mFirstDropDownItem != count)
 	{
-		LLButton::Params bparams;
-
-		LLRect rect;
-		rect.setOriginAndSize(bar_width - chevron_button_width - buttonHGap, buttonVGap, chevron_button_width, getRect().getHeight()-buttonVGap);
-
-		bparams.follows.flags (FOLLOWS_LEFT | FOLLOWS_BOTTOM);
-		bparams.image_unselected.name(flat_icon);
-		bparams.image_disabled.name(flat_icon);
-		bparams.image_selected.name(hover_icon_selected);
-		bparams.image_hover_selected.name(hover_icon_selected);
-		bparams.image_disabled_selected.name(hover_icon_selected);
-		bparams.image_hover_unselected.name(hover_icon);
-		bparams.rect (rect);
-		bparams.tab_stop(false);
-		bparams.font(mFont);
-		bparams.name(">>");
-		bparams.click_callback.function(boost::bind(&LLFavoritesBarCtrl::showDropDownMenu, this));
-
-		addChildInBack(LLUICtrlFactory::create<LLButton> (bparams));
-
-		mChevronRect = rect;
+		// Chevron button should stay right aligned
+		LLView *chevron_button = getChildView(std::string(">>"), FALSE, FALSE);
+		if (chevron_button)
+		{
+			LLRect rect;
+			rect.setOriginAndSize(bar_width - chevron_button_width - buttonHGap, buttonVGap, chevron_button_width, getRect().getHeight()-buttonVGap);
+			chevron_button->setRect(rect);
+			chevron_button->setVisible(TRUE);
+			mChevronRect = rect;
+		}
+		else
+		{
+			LLButton::Params bparams;
+
+			LLRect rect;
+			rect.setOriginAndSize(bar_width - chevron_button_width - buttonHGap, buttonVGap, chevron_button_width, getRect().getHeight()-buttonVGap);
+
+			bparams.follows.flags (FOLLOWS_LEFT | FOLLOWS_BOTTOM);
+			bparams.image_unselected.name(flat_icon);
+			bparams.image_disabled.name(flat_icon);
+			bparams.image_selected.name(hover_icon_selected);
+			bparams.image_hover_selected.name(hover_icon_selected);
+			bparams.image_disabled_selected.name(hover_icon_selected);
+			bparams.image_hover_unselected.name(hover_icon);
+			bparams.rect (rect);
+			bparams.tab_stop(false);
+			bparams.font(mFont);
+			bparams.name(">>");
+			bparams.click_callback.function(boost::bind(&LLFavoritesBarCtrl::showDropDownMenu, this));
+
+			addChildInBack(LLUICtrlFactory::create<LLButton> (bparams));
+
+			mChevronRect = rect;
+		}
+	}
+	else
+	{
+		// Hide chevron button if all items are visible on bar
+		LLView *chevron_button = getChildView(std::string(">>"), FALSE, FALSE);
+		if (chevron_button)
+		{
+			chevron_button->setVisible(FALSE);
+		}
 	}
 }
 
@@ -444,6 +462,7 @@ void LLFavoritesBarCtrl::showDropDownMenu()
 			item_params.label(item_name);
 			
 			item_params.on_click.function(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
+			item_params.rightclick_callback.function(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID()));
 
 			LLMenuItemCallGL *menu_item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
 
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
index aba2402b0c..6cae4b8abc 100644
--- a/indra/newview/llfloaterbuy.cpp
+++ b/indra/newview/llfloaterbuy.cpp
@@ -276,7 +276,7 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
 		std::string text = obj->getName();
 		if (!(next_owner_mask & PERM_COPY))
 		{
-			text.append(getString("no_copy"));
+			text.append(LLTrans::getString("no_copy"));
 		}
 		if (!(next_owner_mask & PERM_MODIFY))
 		{
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index 8ec9eac196..eb2c6768f3 100644
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -56,7 +56,7 @@
 #include "llviewermessage.h"
 #include "llvoavatarself.h"
 #include "llviewerstats.h"
-#include "llbottomtray.h"
+#include "llnearbychatbar.h"
 
 LLGestureManager gGestureManager;
 
@@ -871,7 +871,7 @@ void LLGestureManager::runStep(LLMultiGesture* gesture, LLGestureStep* step)
 
 			const BOOL animate = FALSE;
 
-			LLBottomTray::getInstance()->sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate);
+			LLNearbyChatBar::getInstance()->sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate);
 
 			gesture->mCurrentStep++;
 			break;
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index 85da2eb2e3..278fd5b9f6 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -42,6 +42,12 @@
 
 static LLDefaultChildRegistry::Register<LLGroupList> r("group_list");
 
+LLGroupList::Params::Params()
+{
+	// Prevent the active group from being always first in the list.
+	online_go_first = false;
+}
+
 LLGroupList::LLGroupList(const Params& p)
 :	LLAvatarList(p)
 {
diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h
index a246650822..e893313f4b 100644
--- a/indra/newview/llgrouplist.h
+++ b/indra/newview/llgrouplist.h
@@ -44,6 +44,7 @@ class LLGroupList: public LLAvatarList
 public:
 	struct Params : public LLInitParam::Block<Params, LLAvatarList::Params>
 	{
+		Params();
 	};
 
 	LLGroupList(const Params&);
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp
new file mode 100644
index 0000000000..b51064f226
--- /dev/null
+++ b/indra/newview/lllandmarkactions.cpp
@@ -0,0 +1,141 @@
+/** 
+* @file lllandmarkactions.cpp
+* @brief LLLandmarkActions class implementation
+*
+* $LicenseInfo:firstyear=2001&license=viewergpl$
+* 
+* Copyright (c) 2001-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+#include "lllandmarkactions.h"
+
+#include "llagent.h"
+#include "llinventory.h"
+#include "llinventorymodel.h"
+#include "lllandmark.h"
+#include "lllandmarklist.h"
+#include "llnotifications.h"
+#include "llparcel.h"
+#include "llviewerinventory.h"
+#include "llviewerparcelmgr.h"
+#include "roles_constants.h"
+
+// Returns true if the given inventory item is a landmark pointing to the current parcel.
+// Used to filter inventory items.
+class LLIsAgentParcelLandmark : public LLInventoryCollectFunctor
+{
+public:
+	/*virtual*/ bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+	{
+		if (!item || item->getType() != LLAssetType::AT_LANDMARK)
+			return false;
+
+		LLLandmark* landmark = gLandmarkList.getAsset(item->getAssetUUID());
+		if (!landmark) // the landmark not been loaded yet
+			return false;
+
+		LLVector3d landmark_global_pos;
+		if (!landmark->getGlobalPos(landmark_global_pos))
+			return false;
+
+		return LLViewerParcelMgr::getInstance()->inAgentParcel(landmark_global_pos);
+	}
+};
+
+bool LLLandmarkActions::landmarkAlreadyExists()
+{
+	// Determine whether there are landmarks pointing to the current parcel.
+	LLInventoryModel::cat_array_t cats;
+	LLInventoryModel::item_array_t items;
+	LLIsAgentParcelLandmark is_current_parcel_landmark;
+	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
+		cats,
+		items,
+		LLInventoryModel::EXCLUDE_TRASH,
+		is_current_parcel_landmark);
+
+	return !items.empty();
+}
+
+bool LLLandmarkActions::canCreateLandmarkHere()
+{
+	LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+	if(!agent_parcel)
+	{
+		llwarns << "No agent region" << llendl;
+		return false;
+	}
+	if (agent_parcel->getAllowLandmark()
+		|| LLViewerParcelMgr::isParcelOwnedByAgent(agent_parcel, GP_LAND_ALLOW_LANDMARK))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+void LLLandmarkActions::createLandmarkHere(
+	const std::string& name, 
+	const std::string& desc, 
+	const LLUUID& folder_id)
+{
+	if(!gAgent.getRegion())
+	{
+		llwarns << "No agent region" << llendl;
+		return;
+	}
+	LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+	if (!agent_parcel)
+	{
+		llwarns << "No agent parcel" << llendl;
+		return;
+	}
+	if (!canCreateLandmarkHere())
+	{
+		LLNotifications::instance().add("CannotCreateLandmarkNotOwner");
+		return;
+	}
+
+	create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
+		folder_id, LLTransactionID::tnull,
+		name, desc,
+		LLAssetType::AT_LANDMARK,
+		LLInventoryType::IT_LANDMARK,
+		NOT_WEARABLE, PERM_ALL, 
+		NULL);
+}
+
+void LLLandmarkActions::createLandmarkHere()
+{
+	std::string landmark_name, landmark_desc;
+
+	gAgent.buildLocationString(landmark_name, LLAgent::LOCATION_FORMAT_LANDMARK);
+	gAgent.buildLocationString(landmark_desc, LLAgent::LOCATION_FORMAT_FULL);
+	LLUUID folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
+
+	createLandmarkHere(landmark_name, landmark_desc, folder_id);
+}
diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h
new file mode 100644
index 0000000000..e1e94edb75
--- /dev/null
+++ b/indra/newview/lllandmarkactions.h
@@ -0,0 +1,68 @@
+/** 
+* @file lllandmarkactions.h
+* @brief LLLandmark class declaration
+*
+* $LicenseInfo:firstyear=2000&license=viewergpl$
+* 
+* Copyright (c) 2000-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLLANDMARKACTIONS_H
+#define LL_LLLANDMARKACTIONS_H
+
+/**
+* @brief Provides helper functions to manage landmarks
+*/
+class LLLandmarkActions
+{
+public:
+
+	/**
+	* @brief Checks whether landmark exists for current parcel.
+	*/
+	static bool landmarkAlreadyExists();
+
+	/**
+	* @brief Checks whether agent has rights to create landmark for current parcel.
+	*/
+	static bool canCreateLandmarkHere();
+
+	/**
+	* @brief Creates landmark for current parcel.
+	*/
+	static void createLandmarkHere();
+
+	/**
+	* @brief Creates landmark for current parcel.
+	*/
+	static void createLandmarkHere(
+		const std::string& name, 
+		const std::string& desc, 
+		const LLUUID& folder_id);
+
+};
+
+#endif //LL_LLLANDMARKACTIONS_H
diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp
index ed56e3e195..471a0868bc 100644
--- a/indra/newview/lllocationhistory.cpp
+++ b/indra/newview/lllocationhistory.cpp
@@ -39,8 +39,7 @@
 #include "llui.h"
 
 LLLocationHistory::LLLocationHistory() :
-	mFilename("typed_locations.txt"),
-	mLoadedCallback(NULL)
+	mFilename("typed_locations.txt")
 {
 }
 
@@ -134,6 +133,5 @@ void LLLocationHistory::load()
 
 	file.close();
 	
-	if (mLoadedCallback)
-		mLoadedCallback();
+	mLoadedSignal();
 }
diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h
index b6552c12ca..19032686c1 100644
--- a/indra/newview/lllocationhistory.h
+++ b/indra/newview/lllocationhistory.h
@@ -46,6 +46,7 @@ class LLLocationHistory: public LLSingleton<LLLocationHistory>
 public:
 	typedef std::vector<std::string>	location_list_t;
 	typedef boost::function<void()>		loaded_callback_t;
+	typedef boost::signals2::signal<void()> loaded_signal_t;
 	
 	LLLocationHistory();
 	
@@ -54,7 +55,7 @@ public:
 	size_t					getItemCount() const	{ return mItems.size(); }
 	const location_list_t&	getItems() const		{ return mItems; }
 	bool					getMatchingItems(std::string substring, location_list_t& result) const;
-	void					setLoadedCallback(loaded_callback_t cb) { mLoadedCallback = cb; }
+	boost::signals2::connection	setLoadedCallback(loaded_callback_t cb) { return mLoadedSignal.connect(cb); }
 	
 	void					save() const;
 	void					load();
@@ -63,7 +64,7 @@ public:
 private:
 	std::vector<std::string>	mItems;
 	std::string					mFilename; /// File to store the history to.
-	loaded_callback_t			mLoadedCallback;
+	loaded_signal_t				mLoadedSignal;
 };
 
 #endif
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 99f6823ba1..94abd128c4 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -48,6 +48,7 @@
 #include "llagent.h"
 #include "llfloaterland.h"
 #include "llinventorymodel.h"
+#include "lllandmarkactions.h"
 #include "lllandmarklist.h"
 #include "lllocationhistory.h"
 #include "llsidetray.h"
@@ -83,28 +84,6 @@
  * and choose the appropriate image for the "Add landmark" button.
  */
 
-// Returns true if the given inventory item is a landmark pointing to the current parcel.
-// Used to filter inventory items.
-class LLIsAgentParcelLandmark : public LLInventoryCollectFunctor
-{
-public:
-	/*virtual*/ bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
-	{
-		if (!item || item->getType() != LLAssetType::AT_LANDMARK)
-			return false;
-
-		LLLandmark* landmark = gLandmarkList.getAsset(item->getAssetUUID());
-		if (!landmark) // the landmark not been loaded yet
-			return false;
-
-		LLVector3d landmark_global_pos;
-		if (!landmark->getGlobalPos(landmark_global_pos))
-			return false;
-
-		return LLViewerParcelMgr::getInstance()->inAgentParcel(landmark_global_pos);
-	}
-};
-
 /**
  * Initiates loading the landmarks that have been just added.
  *
@@ -213,10 +192,10 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	// - Make the "Add landmark" button updated when either current parcel gets changed
 	//   or a landmark gets created or removed from the inventory.
 	// - Update the location string on parcel change.
-	LLViewerParcelMgr::getInstance()->setAgentParcelChangedCallback(
+	mParcelMgrConnection = LLViewerParcelMgr::getInstance()->setAgentParcelChangedCallback(
 		boost::bind(&LLLocationInputCtrl::onAgentParcelChange, this));
 
-	LLLocationHistory::getInstance()->setLoadedCallback(
+	mLocationHistoryConnection = LLLocationHistory::getInstance()->setLoadedCallback(
 			boost::bind(&LLLocationInputCtrl::onLocationHistoryLoaded, this));
 
 	mRemoveLandmarkObserver	= new LLRemoveLandmarkObserver(this);
@@ -231,6 +210,9 @@ LLLocationInputCtrl::~LLLocationInputCtrl()
 	gInventory.removeObserver(mAddLandmarkObserver);
 	delete mRemoveLandmarkObserver;
 	delete mAddLandmarkObserver;
+
+	mParcelMgrConnection.disconnect();
+	mLocationHistoryConnection.disconnect();
 }
 
 void LLLocationInputCtrl::setEnabled(BOOL enabled)
@@ -356,6 +338,10 @@ void LLLocationInputCtrl::onInfoButtonClicked()
 
 void LLLocationInputCtrl::onAddLandmarkButtonClicked()
 {
+	LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
+	
+	// Floater "Add Landmark" functionality moved to Side Tray
+	// TODO* Disable floater "Add Landmark" call
 	LLFloaterReg::showInstance("add_landmark");
 }
 
@@ -450,19 +436,7 @@ void LLLocationInputCtrl::enableAddLandmarkButton(bool val)
 // depending on whether current parcel has been landmarked.
 void LLLocationInputCtrl::updateAddLandmarkButton()
 {
-	bool cur_parcel_landmarked = false;
-	// Determine whether there are landmarks pointing to the current parcel.
-	LLInventoryModel::cat_array_t cats;
-	LLInventoryModel::item_array_t items;
-	LLIsAgentParcelLandmark is_current_parcel_landmark;
-	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
-		cats,
-		items,
-		LLInventoryModel::EXCLUDE_TRASH,
-		is_current_parcel_landmark);
-	cur_parcel_landmarked = !items.empty();
-
-	enableAddLandmarkButton(!cur_parcel_landmarked);
+	enableAddLandmarkButton(!LLLandmarkActions::landmarkAlreadyExists());
 }
 
 void LLLocationInputCtrl::updateWidgetlayout()
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index 0a863f6dd8..2cc63a33b7 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -112,6 +112,9 @@ private:
 
 	LLAddLandmarkObserver*		mAddLandmarkObserver;
 	LLRemoveLandmarkObserver*	mRemoveLandmarkObserver;
+
+	boost::signals2::connection	mParcelMgrConnection;
+	boost::signals2::connection	mLocationHistoryConnection;
 };
 
 #endif
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp
index cfcb331912..efa15e05da 100644
--- a/indra/newview/llmenucommands.cpp
+++ b/indra/newview/llmenucommands.cpp
@@ -67,7 +67,7 @@
 #include "llworld.h"
 #include "llworldmap.h"
 #include "llfocusmgr.h"
-#include "llbottomtray.h"
+#include "llnearbychatbar.h"
 
 void handle_pay_by_id(const LLUUID& agent_id)
 {
@@ -85,13 +85,13 @@ void handle_chat(void*)
 {
 	// give focus to chatbar if it's open but not focused
 	if (gSavedSettings.getBOOL("ChatVisible") && 
-		gFocusMgr.childHasKeyboardFocus(LLBottomTray::getInstance()->getChatBox()))
+		gFocusMgr.childHasKeyboardFocus(LLNearbyChatBar::getInstance()->getChatBox()))
 	{
-		LLBottomTray::stopChat();
+		LLNearbyChatBar::stopChat();
 	}
 	else
 	{
-		LLBottomTray::startChat(NULL);
+		LLNearbyChatBar::startChat(NULL);
 	}
 }
 
@@ -107,5 +107,5 @@ void handle_slash_key(void*)
 	// menu accelerators that put input focus into a field.   And Mac works
 	// the same way.  JC
 
-	LLBottomTray::startChat(NULL);
+	LLNearbyChatBar::startChat(NULL);
 }
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index c0bddd101e..58ec2d24a8 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -42,6 +42,7 @@
 
 #include "llagent.h"
 #include "llfloaterhtmlhelp.h"
+#include "lllandmarkactions.h"
 #include "lllocationhistory.h"
 #include "lllocationinputctrl.h"
 #include "llteleporthistory.h"
@@ -175,7 +176,6 @@ LLNavigationBar::LLNavigationBar()
 	mBtnBack(NULL),
 	mBtnForward(NULL),
 	mBtnHome(NULL),
-	mBtnHelp(NULL),
 	mCmbLocation(NULL),
 	mLeSearch(NULL),
 	mPurgeTPHistoryItems(false)
@@ -202,12 +202,11 @@ BOOL LLNavigationBar::postBuild()
 	mBtnBack	= getChild<LLButton>("back_btn");
 	mBtnForward	= getChild<LLButton>("forward_btn");
 	mBtnHome	= getChild<LLButton>("home_btn");
-	mBtnHelp	= getChild<LLButton>("help_btn");
 	
 	mCmbLocation= getChild<LLLocationInputCtrl>("location_combo"); 
 	mLeSearch	= getChild<LLSearchEditor>("search_input");
 
-	if (!mBtnBack || !mBtnForward || !mBtnHome || !mBtnHelp ||
+	if (!mBtnBack || !mBtnForward || !mBtnHome ||
 		!mCmbLocation || !mLeSearch)
 	{
 		llwarns << "Malformed navigation bar" << llendl;
@@ -223,7 +222,6 @@ BOOL LLNavigationBar::postBuild()
 	mBtnForward->setHeldDownCallback(boost::bind(&LLNavigationBar::onBackOrForwardButtonHeldDown, this, _2));
 
 	mBtnHome->setClickedCallback(boost::bind(&LLNavigationBar::onHomeButtonClicked, this));
-	mBtnHelp->setClickedCallback(boost::bind(&LLNavigationBar::onHelpButtonClicked, this));
 
 	mCmbLocation->setSelectionCallback(boost::bind(&LLNavigationBar::onLocationSelection, this));
 	
@@ -297,11 +295,6 @@ void LLNavigationBar::onHomeButtonClicked()
 	gAgent.teleportHome();
 }
 
-void LLNavigationBar::onHelpButtonClicked()
-{
-	gViewerHtmlHelp.show();
-}
-
 void LLNavigationBar::onSearchCommit()
 {
 	invokeSearch(mLeSearch->getValue().asString());
@@ -523,6 +516,10 @@ bool LLNavigationBar::onLocationContextMenuItemEnabled(const LLSD& userdata)
 	{
 		return location_entry->canSelectAll();
 	}
+	else if(item == std::string("can_landmark"))
+	{
+		return !LLLandmarkActions::landmarkAlreadyExists();
+	}
 
 	return false;
 }
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index a82dfc73ff..a46c59306d 100644
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -80,7 +80,6 @@ private:
 	void onHelpButtonClicked();
 	void onLocationSelection();
 	void onLocationPrearrange(const LLSD& data);
-	void onLocationHistoryLoaded();
 	void onSearchCommit();
 	void onRegionNameResponse(
 			std::string typed_location,
@@ -96,7 +95,6 @@ private:
 	LLButton*				mBtnBack;
 	LLButton*				mBtnForward;
 	LLButton*				mBtnHome;
-	LLButton*				mBtnHelp;
 	LLSearchEditor*			mLeSearch;
 	LLLocationInputCtrl*	mCmbLocation;
 	bool					mPurgeTPHistoryItems;
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 411aa72690..847262ddfd 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -36,7 +36,7 @@
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
 #include "llrootview.h"
-#include "llchatitemscontainerctrl.h"
+//#include "llchatitemscontainerctrl.h"
 #include "lliconctrl.h"
 #include "llsidetray.h"
 #include "llfocusmgr.h"
@@ -45,6 +45,9 @@
 #include "llmenugl.h"
 #include "llviewermenu.h"//for gMenuHolder
 
+#include "llnearbychathandler.h"
+#include "llchannelmanager.h"
+
 static const S32 RESIZE_BAR_THICKNESS = 3;
 
 LLNearbyChat::LLNearbyChat(const LLSD& key) :
@@ -66,6 +69,11 @@ BOOL LLNearbyChat::postBuild()
 	mResizeBar[LLResizeBar::LEFT]->setVisible(false);
 	mResizeBar[LLResizeBar::RIGHT]->setVisible(false);
 
+	mResizeBar[LLResizeBar::BOTTOM]->setResizeLimits(120,500);
+	mResizeBar[LLResizeBar::TOP]->setResizeLimits(120,500);
+	mResizeBar[LLResizeBar::LEFT]->setResizeLimits(220,600);
+	mResizeBar[LLResizeBar::RIGHT]->setResizeLimits(220,600);
+
 	mResizeHandle[0]->setVisible(false);
 	mResizeHandle[1]->setVisible(false);
 	mResizeHandle[2]->setVisible(false);
@@ -86,24 +94,160 @@ BOOL LLNearbyChat::postBuild()
 
 	gSavedSettings.declareS32("nearbychat_showicons_and_names",2,"NearByChat header settings",true);
 
+	/*
 	LLChatItemsContainerCtrl* panel = getChild<LLChatItemsContainerCtrl>("chat_history",false,false);
 	if(panel)
 	{
 		panel->setHeaderVisibility((EShowItemHeader)gSavedSettings.getS32("nearbychat_showicons_and_names"));
 	}
+	*/
 	
 	reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
 	
 	return LLFloater::postBuild();
 }
 
-void	LLNearbyChat::addMessage(const LLChat& message)
+#include "llagent.h" 			// gAgent
+#include "llfloaterscriptdebug.h"
+#include "llviewertexteditor.h"
+#include "llstylemap.h"
+
+LLColor4 nearbychat_get_text_color(const LLChat& chat)
+{
+	LLColor4 text_color;
+
+	if(chat.mMuted)
+	{
+		text_color.setVec(0.8f, 0.8f, 0.8f, 1.f);
+	}
+	else
+	{
+		switch(chat.mSourceType)
+		{
+		case CHAT_SOURCE_SYSTEM:
+			text_color = LLUIColorTable::instance().getColor("SystemChatColor"); 
+			break;
+		case CHAT_SOURCE_AGENT:
+		    if (chat.mFromID.isNull())
+			{
+				text_color = LLUIColorTable::instance().getColor("SystemChatColor");
+			}
+			else
+			{
+				if(gAgentID == chat.mFromID)
+				{
+					text_color = LLUIColorTable::instance().getColor("UserChatColor");
+				}
+				else
+				{
+					text_color = LLUIColorTable::instance().getColor("AgentChatColor");
+				}
+			}
+			break;
+		case CHAT_SOURCE_OBJECT:
+			if (chat.mChatType == CHAT_TYPE_DEBUG_MSG)
+			{
+				text_color = LLUIColorTable::instance().getColor("ScriptErrorColor");
+			}
+			else if ( chat.mChatType == CHAT_TYPE_OWNER )
+			{
+				text_color = LLUIColorTable::instance().getColor("llOwnerSayChatColor");
+			}
+			else
+			{
+				text_color = LLUIColorTable::instance().getColor("ObjectChatColor");
+			}
+			break;
+		default:
+			text_color.setToWhite();
+		}
+
+		if (!chat.mPosAgent.isExactlyZero())
+		{
+			LLVector3 pos_agent = gAgent.getPositionAgent();
+			F32 distance = dist_vec(pos_agent, chat.mPosAgent);
+			if (distance > gAgent.getNearChatRadius())
+			{
+				// diminish far-off chat
+				text_color.mV[VALPHA] = 0.8f;
+			}
+		}
+	}
+
+	return text_color;
+}
+
+void nearbychat_add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4& color)
+{
+	std::string line = chat.mFromName;
+	line +=": ";
+	line +=chat.mText;
+
+	bool prepend_newline = true;
+	if (gSavedSettings.getBOOL("ChatShowTimestamps"))
+	{
+		edit->appendTime(prepend_newline);
+		prepend_newline = false;
+	}
+
+	// If the msg is from an agent (not yourself though),
+	// extract out the sender name and replace it with the hotlinked name.
+	if (chat.mSourceType == CHAT_SOURCE_AGENT &&
+		chat.mFromID != LLUUID::null)
+	{
+		chat.mURL = llformat("secondlife:///app/agent/%s/about",chat.mFromID.asString().c_str());
+	}
+
+	// If the chat line has an associated url, link it up to the name.
+	if (!chat.mURL.empty()
+		&& (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
+	{
+		std::string start_line = line.substr(0, chat.mFromName.length() + 1);
+		line = line.substr(chat.mFromName.length() + 1);
+		const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
+		edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
+		prepend_newline = false;
+	}
+	edit->appendColoredText(line, false, prepend_newline, color);
+}
+
+
+
+void	LLNearbyChat::addMessage(const LLChat& chat)
 {
+	/*
 	LLChatItemsContainerCtrl* panel = getChild<LLChatItemsContainerCtrl>("chat_history",false,false);
 	if(!panel)
 		return;
 	panel->addMessage(message);
+	*/
+
+	//"Chat History Editor" !!!!!
+
+	LLColor4 color = nearbychat_get_text_color(chat);
 	
+
+	if (chat.mChatType == CHAT_TYPE_DEBUG_MSG)
+	{
+		LLFloaterScriptDebug::addScriptLine(chat.mText,
+											chat.mFromName, 
+											color, 
+											chat.mFromID);
+		if (!gSavedSettings.getBOOL("ScriptErrorsAsChat"))
+		{
+			return;
+		}
+	}
+	
+	// could flash the chat button in the status bar here. JC
+
+	LLViewerTextEditor*	history_editor = getChild<LLViewerTextEditor>("Chat History Editor");
+
+	history_editor->setParseHTML(TRUE);
+	history_editor->setParseHighlights(TRUE);
+	
+	if (!chat.mMuted)
+		nearbychat_add_timestamped_line(history_editor, chat, color);
 }
 
 void LLNearbyChat::onNearbySpeakers()
@@ -166,7 +310,9 @@ void LLNearbyChat::reshape(S32 width, S32 height, BOOL called_from_parent)
 		caption->setRect(caption_rect);
 	}
 	
-	LLPanel* scroll_panel = getChild<LLPanel>("chat_history",false,false);
+	//LLPanel* scroll_panel = getChild<LLPanel>("chat_history",false,false);
+	LLViewerTextEditor*	scroll_panel = getChild<LLViewerTextEditor>("Chat History Editor");
+	
 	if (scroll_panel)
 	{
 		LLRect scroll_rect = scroll_panel->getRect();
@@ -305,10 +451,13 @@ void	LLNearbyChat::float_panel()
 	mResizeBar[LLResizeBar::BOTTOM]->setVisible(true);
 	mResizeBar[LLResizeBar::LEFT]->setVisible(true);
 	mResizeBar[LLResizeBar::RIGHT]->setVisible(true);
+
+	translate(4,4);
 }
 
 void LLNearbyChat::onNearbyChatContextMenuItemClicked(const LLSD& userdata)
 {
+	/*
 	LLChatItemsContainerCtrl* panel = getChild<LLChatItemsContainerCtrl>("chat_history",false,false);
 	if(!panel)
 		return;
@@ -322,15 +471,18 @@ void LLNearbyChat::onNearbyChatContextMenuItemClicked(const LLSD& userdata)
 		panel->setHeaderVisibility(CHATITEMHEADER_SHOW_BOTH);
 
 	gSavedSettings.setS32("nearbychat_showicons_and_names", (S32)panel->getHeaderVisibility());
-
-
+	*/
 }
 bool	LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata)
 {
+	std::string str = userdata.asString();
+	if(str == "nearby_people")
+		onNearbySpeakers();	
+	/*
 	LLChatItemsContainerCtrl* panel = getChild<LLChatItemsContainerCtrl>("chat_history",false,false);
 	if(!panel)
 		return false;
-	std::string str = userdata.asString();
+	
 	if(str == "show_buddy_icons")
 		return panel->getHeaderVisibility() == CHATITEMHEADER_SHOW_ONLY_ICON;
 	else if(str == "show_names")
@@ -339,6 +491,7 @@ bool	LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata)
 		return panel->getHeaderVisibility() == CHATITEMHEADER_SHOW_BOTH;
 	else if(str == "nearby_people")
 		onNearbySpeakers();
+	*/
 	return false;
 }
 
@@ -360,3 +513,11 @@ BOOL LLNearbyChat::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	return LLFloater::handleRightMouseDown(x, y, mask);
 }
 
+void	LLNearbyChat::onOpen(const LLSD& key )
+{
+	LLNotificationsUI::LLScreenChannel* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->getChannelByID(LLUUID(NEARBY_CHAT_ID));
+	if(chat_channel)
+	{
+		chat_channel->removeToastsFromChannel();
+	}
+}
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index 61ff8890ea..74e3710f40 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -77,8 +77,10 @@ public:
 	void	onNearbyChatContextMenuItemClicked(const LLSD& userdata);
 	bool	onNearbyChatCheckContextMenuItem(const LLSD& userdata);
 
-	virtual void	onClose(bool app_quitting) { if(app_quitting) destroy(); else setVisible(false); }
-	
+	virtual void	onClose		(bool app_quitting) { if(app_quitting) destroy(); else setVisible(false); }
+
+	virtual void	onOpen		(const LLSD& key);
+
 private:
 	
 	void	pinn_panel();
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
new file mode 100644
index 0000000000..7b67ae645c
--- /dev/null
+++ b/indra/newview/llnearbychatbar.cpp
@@ -0,0 +1,549 @@
+/** 
+ * @file llnearbychatbar.cpp
+ * @brief LLNearbyChatBar class implementation
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llnearbychatbar.h"
+#include "llbottomtray.h"
+#include "llagent.h"
+#include "llgesturemgr.h"
+#include "llmultigesture.h"
+#include "llkeyboard.h"
+#include "llanimationstates.h"
+#include "llviewerstats.h"
+#include "llcommandhandler.h"
+#include "llviewercontrol.h"
+
+S32 LLNearbyChatBar::sLastSpecialChatChannel = 0;
+
+// legacy calllback glue
+void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
+
+static LLDefaultChildRegistry::Register<LLGestureComboBox> r("gesture_combo_box");
+
+LLGestureComboBox::LLGestureComboBox(const LLComboBox::Params& p)
+	: LLComboBox(p)
+	, mGestureLabelTimer()
+	, mLabel(p.label)
+{
+	setCommitCallback(boost::bind(&LLGestureComboBox::onCommitGesture, this, _1));
+
+	// now register us as observer since we have a place to put the results
+	gGestureManager.addObserver(this);
+
+	// refresh list from current active gestures
+	refreshGestures();
+}
+
+LLGestureComboBox::~LLGestureComboBox()
+{
+	gGestureManager.removeObserver(this);
+}
+
+void LLGestureComboBox::refreshGestures()
+{
+	//store current selection so we can maintain it
+	std::string cur_gesture = getValue().asString();
+	selectFirstItem();
+	// clear
+	clearRows();
+
+	// collect list of unique gestures
+	std::map <std::string, BOOL> unique;
+	LLGestureManager::item_map_t::iterator it;
+	for (it = gGestureManager.mActive.begin(); it != gGestureManager.mActive.end(); ++it)
+	{
+		LLMultiGesture* gesture = (*it).second;
+		if (gesture)
+		{
+			if (!gesture->mTrigger.empty())
+			{
+				unique[gesture->mTrigger] = TRUE;
+			}
+		}
+	}
+
+	// add unique gestures
+	std::map <std::string, BOOL>::iterator it2;
+	for (it2 = unique.begin(); it2 != unique.end(); ++it2)
+	{
+		addSimpleElement((*it2).first);
+	}
+
+	sortByName();
+	// Insert label after sorting, at top, with separator below it
+	addSeparator(ADD_TOP);		
+	addSimpleElement(mLabel, ADD_TOP);
+
+	if (!cur_gesture.empty())
+	{ 
+		selectByValue(LLSD(cur_gesture));
+	}
+	else
+	{
+		selectFirstItem();
+	}
+}
+
+void LLGestureComboBox::onCommitGesture(LLUICtrl* ctrl)
+{
+	LLCtrlListInterface* gestures = getListInterface();
+	if (gestures)
+	{
+		S32 index = gestures->getFirstSelectedIndex();
+		if (index == 0)
+		{
+			return;
+		}
+		const std::string& trigger = gestures->getSelectedValue().asString();
+
+		// pretend the user chatted the trigger string, to invoke
+		// substitution and logging.
+		std::string text(trigger);
+		std::string revised_text;
+		gGestureManager.triggerAndReviseString(text, &revised_text);
+
+		revised_text = utf8str_trim(revised_text);
+		if (!revised_text.empty())
+		{
+			// Don't play nodding animation
+			LLNearbyChatBar::sendChatFromViewer(revised_text, CHAT_TYPE_NORMAL, FALSE);
+		}
+	}
+
+	mGestureLabelTimer.start();
+	// free focus back to chat bar
+	setFocus(FALSE);
+}
+
+//virtual
+void LLGestureComboBox::draw()
+{
+	// HACK: Leave the name of the gesture in place for a few seconds.
+	const F32 SHOW_GESTURE_NAME_TIME = 2.f;
+	if (mGestureLabelTimer.getStarted() && mGestureLabelTimer.getElapsedTimeF32() > SHOW_GESTURE_NAME_TIME)
+	{
+		LLCtrlListInterface* gestures = getListInterface();
+		if (gestures) gestures->selectFirstItem();
+		mGestureLabelTimer.stop();
+	}
+
+	LLComboBox::draw();
+}
+
+LLNearbyChatBar::LLNearbyChatBar() 
+	: LLPanel()
+	, mChatBox(NULL)
+{
+}
+
+//virtual
+BOOL LLNearbyChatBar::postBuild()
+{
+	mChatBox = getChild<LLLineEditor>("chat_box",TRUE,FALSE);
+
+	if (mChatBox)
+	{
+		mChatBox->setCommitCallback(boost::bind(&LLNearbyChatBar::onChatBoxCommit, this));
+		mChatBox->setKeystrokeCallback(&onChatBoxKeystroke, this);
+		mChatBox->setFocusLostCallback(&onChatBoxFocusLost, this);
+
+		mChatBox->setIgnoreArrowKeys(TRUE);
+		mChatBox->setCommitOnFocusLost( FALSE );
+		mChatBox->setRevertOnEsc( FALSE );
+		mChatBox->setIgnoreTab(TRUE);
+		mChatBox->setPassDelete(TRUE);
+		mChatBox->setReplaceNewlinesWithSpaces(FALSE);
+		mChatBox->setMaxTextLength(1023);
+		mChatBox->setEnableLineHistory(TRUE);
+	}
+
+	mTalkBtn = getChild<LLTalkButton>("talk",TRUE,FALSE);
+
+	return TRUE;
+}
+
+//static
+LLNearbyChatBar* LLNearbyChatBar::getInstance()
+{
+	return LLBottomTray::getInstance() ? LLBottomTray::getInstance()->getNearbyChatBar() : NULL;
+}
+
+std::string LLNearbyChatBar::getCurrentChat()
+{
+	return mChatBox ? mChatBox->getText() : LLStringUtil::null;
+}
+
+// virtual
+BOOL LLNearbyChatBar::handleKeyHere( KEY key, MASK mask )
+{
+	BOOL handled = FALSE;
+
+	// ALT-RETURN is reserved for windowed/fullscreen toggle
+	if( KEY_RETURN == key && mask == MASK_CONTROL)
+	{
+		// shout
+		sendChat(CHAT_TYPE_SHOUT);
+		handled = TRUE;
+	}
+
+	return handled;
+}
+
+void LLNearbyChatBar::onChatBoxKeystroke(LLLineEditor* caller, void* userdata)
+{
+	LLNearbyChatBar* self = (LLNearbyChatBar *)userdata;
+
+	LLWString raw_text;
+	if (self->mChatBox) raw_text = self->mChatBox->getWText();
+
+	// Can't trim the end, because that will cause autocompletion
+	// to eat trailing spaces that might be part of a gesture.
+	LLWStringUtil::trimHead(raw_text);
+
+	S32 length = raw_text.length();
+
+	if( (length > 0) && (raw_text[0] != '/') )  // forward slash is used for escape (eg. emote) sequences
+	{
+		gAgent.startTyping();
+	}
+	else
+	{
+		gAgent.stopTyping();
+	}
+
+	/* Doesn't work -- can't tell the difference between a backspace
+	   that killed the selection vs. backspace at the end of line.
+	if (length > 1 
+		&& text[0] == '/'
+		&& key == KEY_BACKSPACE)
+	{
+		// the selection will already be deleted, but we need to trim
+		// off the character before
+		std::string new_text = raw_text.substr(0, length-1);
+		self->mInputEditor->setText( new_text );
+		self->mInputEditor->setCursorToEnd();
+		length = length - 1;
+	}
+	*/
+
+	KEY key = gKeyboard->currentKey();
+
+	// Ignore "special" keys, like backspace, arrows, etc.
+	if (length > 1 
+		&& raw_text[0] == '/'
+		&& key < KEY_SPECIAL)
+	{
+		// we're starting a gesture, attempt to autocomplete
+
+		std::string utf8_trigger = wstring_to_utf8str(raw_text);
+		std::string utf8_out_str(utf8_trigger);
+
+		if (gGestureManager.matchPrefix(utf8_trigger, &utf8_out_str))
+		{
+			if (self->mChatBox)
+			{
+				std::string rest_of_match = utf8_out_str.substr(utf8_trigger.size());
+				self->mChatBox->setText(utf8_trigger + rest_of_match); // keep original capitalization for user-entered part
+				S32 outlength = self->mChatBox->getLength(); // in characters
+			
+				// Select to end of line, starting from the character
+				// after the last one the user typed.
+				self->mChatBox->setSelection(length, outlength);
+			}
+		}
+
+		//llinfos << "GESTUREDEBUG " << trigger 
+		//	<< " len " << length
+		//	<< " outlen " << out_str.getLength()
+		//	<< llendl;
+	}
+}
+
+// static
+void LLNearbyChatBar::onChatBoxFocusLost(LLFocusableElement* caller, void* userdata)
+{
+	// stop typing animation
+	gAgent.stopTyping();
+}
+
+void LLNearbyChatBar::sendChat( EChatType type )
+{
+	if (mChatBox)
+	{
+		LLWString text = mChatBox->getConvertedText();
+		if (!text.empty())
+		{
+			// store sent line in history, duplicates will get filtered
+			mChatBox->updateHistory();
+			// Check if this is destined for another channel
+			S32 channel = 0;
+			stripChannelNumber(text, &channel);
+			
+			std::string utf8text = wstring_to_utf8str(text);
+			// Try to trigger a gesture, if not chat to a script.
+			std::string utf8_revised_text;
+			if (0 == channel)
+			{
+				// discard returned "found" boolean
+				gGestureManager.triggerAndReviseString(utf8text, &utf8_revised_text);
+			}
+			else
+			{
+				utf8_revised_text = utf8text;
+			}
+
+			utf8_revised_text = utf8str_trim(utf8_revised_text);
+
+			if (!utf8_revised_text.empty())
+			{
+				// Chat with animation
+				sendChatFromViewer(utf8_revised_text, type, TRUE);
+			}
+		}
+
+		mChatBox->setText(LLStringExplicit(""));
+	}
+
+	gAgent.stopTyping();
+
+	// If the user wants to stop chatting on hitting return, lose focus
+	// and go out of chat mode.
+	if (gSavedSettings.getBOOL("CloseChatOnReturn"))
+	{
+		stopChat();
+	}
+}
+
+void LLNearbyChatBar::onChatBoxCommit()
+{
+	if (mChatBox && mChatBox->getText().length() > 0)
+	{
+		sendChat(CHAT_TYPE_NORMAL);
+	}
+
+	gAgent.stopTyping();
+}
+
+void LLNearbyChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate)
+{
+	sendChatFromViewer(utf8str_to_wstring(utf8text), type, animate);
+}
+
+void LLNearbyChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate)
+{
+	// Look for "/20 foo" channel chats.
+	S32 channel = 0;
+	LLWString out_text = stripChannelNumber(wtext, &channel);
+	std::string utf8_out_text = wstring_to_utf8str(out_text);
+	std::string utf8_text = wstring_to_utf8str(wtext);
+
+	utf8_text = utf8str_trim(utf8_text);
+	if (!utf8_text.empty())
+	{
+		utf8_text = utf8str_truncate(utf8_text, MAX_STRING - 1);
+	}
+
+	// Don't animate for chats people can't hear (chat to scripts)
+	if (animate && (channel == 0))
+	{
+		if (type == CHAT_TYPE_WHISPER)
+		{
+			lldebugs << "You whisper " << utf8_text << llendl;
+			gAgent.sendAnimationRequest(ANIM_AGENT_WHISPER, ANIM_REQUEST_START);
+		}
+		else if (type == CHAT_TYPE_NORMAL)
+		{
+			lldebugs << "You say " << utf8_text << llendl;
+			gAgent.sendAnimationRequest(ANIM_AGENT_TALK, ANIM_REQUEST_START);
+		}
+		else if (type == CHAT_TYPE_SHOUT)
+		{
+			lldebugs << "You shout " << utf8_text << llendl;
+			gAgent.sendAnimationRequest(ANIM_AGENT_SHOUT, ANIM_REQUEST_START);
+		}
+		else
+		{
+			llinfos << "send_chat_from_viewer() - invalid volume" << llendl;
+			return;
+		}
+	}
+	else
+	{
+		if (type != CHAT_TYPE_START && type != CHAT_TYPE_STOP)
+		{
+			lldebugs << "Channel chat: " << utf8_text << llendl;
+		}
+	}
+
+	send_chat_from_viewer(utf8_out_text, type, channel);
+}
+
+// static 
+void LLNearbyChatBar::startChat(const char* line)
+{
+	LLBottomTray *bt = LLBottomTray::getInstance();
+
+	if (!bt)
+		return;
+
+	LLNearbyChatBar* cb = bt->getNearbyChatBar();
+
+	if (!cb || !cb->mChatBox)
+		return;
+
+	bt->setVisible(TRUE);
+	cb->mChatBox->setFocus(TRUE);
+
+	if (line)
+	{
+		std::string line_string(line);
+		cb->mChatBox->setText(line_string);
+	}
+
+	cb->mChatBox->setCursorToEnd();
+}
+
+// Exit "chat mode" and do the appropriate focus changes
+// static
+void LLNearbyChatBar::stopChat()
+{
+	LLBottomTray *bt = LLBottomTray::getInstance();
+
+	if (!bt)
+		return;
+
+	LLNearbyChatBar* cb = bt->getNearbyChatBar();
+
+	if (!cb || !cb->mChatBox)
+		return;
+
+	cb->mChatBox->setFocus(FALSE);
+
+ 	// stop typing animation
+ 	gAgent.stopTyping();
+}
+
+// If input of the form "/20foo" or "/20 foo", returns "foo" and channel 20.
+// Otherwise returns input and channel 0.
+LLWString LLNearbyChatBar::stripChannelNumber(const LLWString &mesg, S32* channel)
+{
+	if (mesg[0] == '/'
+		&& mesg[1] == '/')
+	{
+		// This is a "repeat channel send"
+		*channel = sLastSpecialChatChannel;
+		return mesg.substr(2, mesg.length() - 2);
+	}
+	else if (mesg[0] == '/'
+			 && mesg[1]
+			 && LLStringOps::isDigit(mesg[1]))
+	{
+		// This a special "/20" speak on a channel
+		S32 pos = 0;
+
+		// Copy the channel number into a string
+		LLWString channel_string;
+		llwchar c;
+		do
+		{
+			c = mesg[pos+1];
+			channel_string.push_back(c);
+			pos++;
+		}
+		while(c && pos < 64 && LLStringOps::isDigit(c));
+		
+		// Move the pointer forward to the first non-whitespace char
+		// Check isspace before looping, so we can handle "/33foo"
+		// as well as "/33 foo"
+		while(c && iswspace(c))
+		{
+			c = mesg[pos+1];
+			pos++;
+		}
+		
+		sLastSpecialChatChannel = strtol(wstring_to_utf8str(channel_string).c_str(), NULL, 10);
+		*channel = sLastSpecialChatChannel;
+		return mesg.substr(pos, mesg.length() - pos);
+	}
+	else
+	{
+		// This is normal chat.
+		*channel = 0;
+		return mesg;
+	}
+}
+
+void LLNearbyChatBar::setPTTState(bool state)
+{
+	mTalkBtn->setSpeakBtnToggleState(state);
+}
+
+void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel)
+{
+	LLMessageSystem* msg = gMessageSystem;
+	msg->newMessageFast(_PREHASH_ChatFromViewer);
+	msg->nextBlockFast(_PREHASH_AgentData);
+	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+	msg->nextBlockFast(_PREHASH_ChatData);
+	msg->addStringFast(_PREHASH_Message, utf8_out_text);
+	msg->addU8Fast(_PREHASH_Type, type);
+	msg->addS32("Channel", channel);
+
+	gAgent.sendReliableMessage();
+
+	LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
+}
+
+class LLChatHandler : public LLCommandHandler
+{
+public:
+	// not allowed from outside the app
+	LLChatHandler() : LLCommandHandler("chat", true) { }
+
+    // Your code here
+	bool handle(const LLSD& tokens, const LLSD& query_map,
+				LLWebBrowserCtrl* web)
+	{
+		if (tokens.size() < 2) return false;
+		S32 channel = tokens[0].asInteger();
+		std::string mesg = tokens[1].asString();
+		send_chat_from_viewer(mesg, CHAT_TYPE_NORMAL, channel);
+		return true;
+	}
+};
+
+// Creating the object registers with the dispatcher.
+LLChatHandler gChatHandler;
+
+
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h
new file mode 100644
index 0000000000..d1f5fbff6b
--- /dev/null
+++ b/indra/newview/llnearbychatbar.h
@@ -0,0 +1,104 @@
+/** 
+ * @file llnearbychatbar.h
+ * @brief LLNearbyChatBar class definition
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLNEARBYCHATBAR_H
+#define LL_LLNEARBYCHATBAR_H
+
+#include "llpanel.h"
+#include "llcombobox.h"
+#include "llgesturemgr.h"
+#include "llchat.h"
+#include "llchiclet.h"
+
+class LLGestureComboBox
+	: public LLComboBox
+	, public LLGestureManagerObserver
+{
+protected:
+	LLGestureComboBox(const LLComboBox::Params&);
+	friend class LLUICtrlFactory;
+public:
+	~LLGestureComboBox();
+
+	void refreshGestures();
+	void onCommitGesture(LLUICtrl* ctrl);
+	virtual void draw();
+
+	// LLGestureManagerObserver trigger
+	virtual void changed() { refreshGestures(); }
+
+protected:
+	LLFrameTimer mGestureLabelTimer;
+	std::string mLabel;
+};
+
+class LLNearbyChatBar
+:	public LLPanel
+{
+public:
+	// constructor for inline chat-bars (e.g. hosted in chat history window)
+	LLNearbyChatBar();
+	~LLNearbyChatBar() {}
+
+	virtual BOOL postBuild();
+
+	static LLNearbyChatBar* getInstance();
+
+	LLLineEditor* getChatBox() { return mChatBox; }
+
+	std::string getCurrentChat();
+	virtual BOOL handleKeyHere( KEY key, MASK mask );
+
+	void setPTTState(bool state);
+	static void startChat(const char* line);
+	static void stopChat();
+
+	static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate);
+	static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
+
+protected:
+	static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata);
+	static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata);
+
+	void sendChat( EChatType type );
+	void onChatBoxCommit();
+
+	static LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
+
+	// Which non-zero channel did we last chat on?
+	static S32 sLastSpecialChatChannel;
+
+	LLLineEditor*		mChatBox;
+	LLTalkButton*		mTalkBtn;
+};
+
+#endif
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index ab66421d35..cb1b65a604 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -61,6 +61,7 @@ LLNearbyChatHandler::LLNearbyChatHandler(e_notification_type type, const LLSD& i
 	// Getting a Channel for our notifications
 	mChannel = LLChannelManager::getInstance()->createChannel(p);
 	mChannel->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_TOP); 
+	mChannel->setOverflowFormatString("You have %d unread nearby chat messages");
 	mChannel->setStoreToasts(false);
 }
 LLNearbyChatHandler::~LLNearbyChatHandler()
@@ -71,6 +72,9 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 	if(chat_msg.mSourceType == CHAT_SOURCE_AGENT && chat_msg.mFromID.notNull())
          LLRecentPeople::instance().add(chat_msg.mFromID);
 
+	if(chat_msg.mText.empty())
+		return;//don't process empty messages
+
 	LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
 	nearby_chat->addMessage(chat_msg);
 	if(nearby_chat->getVisible())
@@ -82,7 +86,9 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 	LLChatItemCtrl* item = LLChatItemCtrl::createInstance();
 	
 	item->setMessage(chat_msg);
-	item->setWidth(nearby_chat->getRect().getWidth() - 16);
+	//static S32 chat_item_width = nearby_chat->getRect().getWidth() - 16;
+	static S32 chat_item_width = 304;
+	item->setWidth(chat_item_width);
 	item->setHeaderVisibility((EShowItemHeader)gSavedSettings.getS32("nearbychat_showicons_and_names"));
 	
 	item->setVisible(true);
@@ -91,7 +97,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 	LLToast* toast = mChannel->addToast(id, item);
 	
 	toast->setOnMouseEnterCallback(boost::bind(&LLNearbyChatHandler::onToastDestroy, this, toast));
-	toast->setAndStartTimer(10); //TODO: set correct time
+	toast->setAndStartTimer(gSavedSettings.getS32("NotificationToastTime"));
 }
 
 void LLNearbyChatHandler::onToastDestroy(LLToast* toast)
diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
index 757a0e5999..06826998bf 100644
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/indra/newview/llnotificationalerthandler.cpp
@@ -49,7 +49,7 @@ LLAlertHandler::LLAlertHandler(e_notification_type type, const LLSD& id) : mIsMo
 
 	LLBottomTray* tray = LLBottomTray::getInstance();
 	LLChannelManager::Params p;
-	p.id = LLUUID("F3E07BC8-A973-476D-8C7F-F3B7293975D1");
+	p.id = LLUUID(ALERT_CHANNEL_ID);
 	p.channel_right_bound = tray->getRect().getWidth() / 2;
 	p.channel_width = 0;
 	p.align = NA_CENTRE;
diff --git a/indra/newview/llnotificationgrouphandler.cpp b/indra/newview/llnotificationgrouphandler.cpp
index cde7efe901..ad09f43c10 100644
--- a/indra/newview/llnotificationgrouphandler.cpp
+++ b/indra/newview/llnotificationgrouphandler.cpp
@@ -50,7 +50,7 @@ LLGroupHandler::LLGroupHandler(e_notification_type type, const LLSD& id)
 	mChiclet = tray->getSysWell();
 	LLChannelManager::Params p;
 	p.chiclet = mChiclet;
-	p.channel_right_bound = tray->getRect().mRight - 10; //HACK: need to correctly resolve SysWell's position
+	p.channel_right_bound = tray->getRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin");
 	p.channel_width = gSavedSettings.getS32("NotifyBoxWidth");
 
 	// Getting a Channel for our notifications
@@ -74,7 +74,7 @@ void LLGroupHandler::processNotification(const LLSD& notify)
 			toast = mChannel->addToast(notification->getID(), notify_box);
 			if(!toast)
 				return;			
-			toast->setAndStartTimer(5); 
+			toast->setAndStartTimer(gSavedSettings.getS32("NotificationToastTime")); 
 			toast->setOnToastDestroyCallback((boost::bind(&LLGroupHandler::onToastDestroy, this, toast)));
 			mChiclet->setCounter(mChiclet->getCounter() + 1);
 	}
diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index 7f53809c07..9037fc82ab 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -42,6 +42,8 @@
 
 namespace LLNotificationsUI
 {
+// ID for channel that displays Alert Notifications
+#define ALERT_CHANNEL_ID	"F3E07BC8-A973-476D-8C7F-F3B7293975D1"
 
 // ENotificationType enumerates all possible types of notifications that could be met
 // 
diff --git a/indra/newview/lloverlaybar.h b/indra/newview/lloverlaybar.h
index f0cf480458..ffdbd96f60 100644
--- a/indra/newview/lloverlaybar.h
+++ b/indra/newview/lloverlaybar.h
@@ -85,7 +85,6 @@ public:
 protected:	
 	static void* createMediaRemote(void* userdata);
 	static void* createVoiceRemote(void* userdata);
-	static void* createChatBar(void* userdata);
 
 	void enableMediaButtons();
 
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index bf6ecd6bf4..f57489934a 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -340,12 +340,17 @@ void LLPanelAvatarProfile::processProperties(void* data, EAvatarProcessorType ty
 		if(avatar_groups)
 		{
 			std::string groups;
-			LLAvatarGroups::group_list_t::const_iterator it = avatar_groups->group_list.begin();
-			for(; avatar_groups->group_list.end() != it; ++it)
-			{
+			if (!avatar_groups->group_list.empty()) {
+				LLAvatarGroups::group_list_t::const_iterator it = avatar_groups->group_list.begin();
 				LLAvatarGroups::LLGroupData group_data = *it;
-				groups += group_data.group_name;
-				groups += ", ";
+				groups+= group_data.group_name;
+				while (++it != avatar_groups->group_list.end())
+				{
+					group_data = *it;				
+					groups += ", ";
+					groups += group_data.group_name;
+					
+				}
 			}
 			childSetValue("sl_groups",groups);
 		}
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 0cbf10f7c2..7bf7ceb6d2 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -200,6 +200,9 @@ void LLLandmarksPanel::onCopySLURL()
 // virtual
 void LLLandmarksPanel::updateVerbs()
 {
+	if (!isTabVisible()) 
+		return;
+
 	BOOL enabled = FALSE;
 
 	LLFolderViewItem* current_item = mInventoryPanel->getRootFolder()->getCurSelectedItem();
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index d947003109..92a8653252 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -436,11 +436,13 @@ bool LLPanelPeople::updateGroupList()
 
 bool LLPanelPeople::filterFriendList()
 {
-	if (mFriendVec.size() > 0)
-		return mFriendList->update(mFriendVec, mFilterSubString);
+	// We must always update Friends list to clear the latest removed friend.
+	bool have_names = mFriendList->update(mFriendVec, mFilterSubString);
 
-	mFriendList->setCommentText(getString("no_friends"));
-	return true;
+	if (mFriendVec.size() == 0)
+		mFriendList->setCommentText(getString("no_friends"));
+
+	return have_names;
 }
 
 bool LLPanelPeople::filterNearbyList()
@@ -784,10 +786,22 @@ void LLPanelPeople::onMoreButtonClicked()
 
 void	LLPanelPeople::onOpen(const LLSD& key)
 {
-	std::string tab_name = key.asString();
+	// Profile View is activated through LLSideTray::showPanel(), 
+	// hide Profile View to be able to see Panel People content
+	hideProfileView();
 
+	std::string tab_name = key.asString();
 	if (!tab_name.empty())
 		mTabContainer->selectTabByName(tab_name);
 	else
 		reSelectedCurrentTab();
 }
+
+void LLPanelPeople::hideProfileView()
+{
+	LLView* view = getChildView("panel_profile_view",true,false);
+	if(view && view->getVisible())
+	{
+		view->setVisible(false);
+	}
+}
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 6c3b5e0664..2ac1bf424c 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -104,6 +104,8 @@ private:
 								const std::vector<LLUUID>& ids,
 								void*);
 
+	void					hideProfileView();
+
 	LLFilterEditor*			mFilterEditor;
 	LLTabContainer*			mTabContainer;
 	LLAvatarList*			mFriendList;
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 7bfe94043f..e8d6ff9ec9 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -45,6 +45,7 @@
 #include "llpanelavatar.h"
 #include "llpanelprofile.h"
 #include "llpanelpick.h"
+#include "llscrollcontainer.h"
 
 static const std::string XML_BTN_NEW = "new_btn";
 static const std::string XML_BTN_DELETE = "trash_btn";
@@ -203,7 +204,7 @@ void LLPanelPicks::reshapePicksList()
 			last_bottom -= childp->getRect().getHeight();
 			last_bottom -= PICK_ITEMS_BETWEEN;
 		}
-		reshapePickItem(childp, last_bottom);
+		reshapePickItem(childp, last_bottom,pickList->getRect().getWidth());
 	}
 
 	S32 height = pickList->getChildCount() * ((*child_first_it)->getRect().getHeight() + PICK_ITEMS_BETWEEN);
@@ -213,13 +214,13 @@ void LLPanelPicks::reshapePicksList()
 	pickList->setRect(rc);
 }
 
-void LLPanelPicks::reshapePickItem(LLView* const pick_item, const S32 last_bottom)
+void LLPanelPicks::reshapePickItem(LLView* const pick_item, const S32 last_bottom, const S32 newWidth)
 {
 	LLRect rc = pick_item->getRect();
 	rc.mBottom = last_bottom - rc.getHeight();
 	rc.mTop = last_bottom;
-	pick_item->reshape(rc.getWidth(), rc.getHeight());
 	pick_item->setRect(rc);
+	pick_item->reshape(newWidth, rc.getHeight());
 }
 
 LLView* LLPanelPicks::getPicksList() const
@@ -402,7 +403,7 @@ void LLPanelPicks::setSelectedPickItem(LLPickItem* item)
 
 BOOL LLPanelPicks::isMouseInPick( S32 x, S32 y )
 {
-	LLView* scroll = getChild<LLView>("profile_scroll");
+	LLScrollContainer* scroll = getChild<LLScrollContainer>("profile_scroll");
 	if (!scroll->parentPointInView(x, y)) return FALSE;
 
 	S32 x_l = x;
diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
index 3bc79daeb3..e0e7f69532 100644
--- a/indra/newview/llpanelpicks.h
+++ b/indra/newview/llpanelpicks.h
@@ -102,7 +102,7 @@ private:
 	bool callbackTeleport(const LLSD& notification, const LLSD& response);
 
 	void reshapePicksList();
-	void reshapePickItem(LLView* const pick_item, const S32 last_bottom);
+	void reshapePickItem(LLView* const pick_item, const S32 last_bottom, const S32 newWidth);
 	LLView* getPicksList() const;
 	void updateButtons();
 
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index 590eae555e..ea05b666db 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -39,6 +39,7 @@
 #include "llsecondlifeurls.h"
 
 #include "llinventory.h"
+#include "llparcel.h"
 
 #include "llqueryflags.h"
 
@@ -52,6 +53,7 @@
 #include "llinventorymodel.h"
 #include "lltexturectrl.h"
 #include "llviewerinventory.h"
+#include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "llviewertexteditor.h"
 #include "llworldmap.h"
@@ -221,6 +223,8 @@ void LLPanelPlaceInfo::resetLocation()
 	mCreated->setText(not_available);
 	mTitleEditor->setText(LLStringUtil::null);
 	mNotesEditor->setText(LLStringUtil::null);
+	mSnapshotCtrl->setImageAssetID(LLUUID::null);
+	mSnapshotCtrl->setFallbackImageName("default_land_picture.j2c");
 }
 
 //virtual
@@ -237,6 +241,12 @@ void LLPanelPlaceInfo::setInfoType(INFO_TYPE type)
 
 	switch(type)
 	{
+		case CREATE_LANDMARK:
+			mCurrentTitle = getString("title_create_landmark");
+
+			toggleMediaPanel(FALSE);
+		break;
+
 		case PLACE:
 			mCurrentTitle = getString("title_place");
 
@@ -362,21 +372,33 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data)
 		region_z = llround(parcel_data.global_z);
 	}
 
+	std::string name;
 	if (!parcel_data.sim_name.empty())
 	{
-		std::string name = llformat("%s (%d, %d, %d)",
-									parcel_data.sim_name.c_str(), region_x, region_y, region_z);
+		name = llformat("%s (%d, %d, %d)",
+						parcel_data.sim_name.c_str(), region_x, region_y, region_z);
 		mRegionName->setText(name);
 	}
+	
+	if (mCurrentTitle != getString("title_landmark"))
+	{
+		mTitleEditor->setText(parcel_data.name + "; " + name);
+		mNotesEditor->setText(LLStringUtil::null);
+	}
 }
 
 void LLPanelPlaceInfo::displayParcelInfo(const LLVector3& pos_region,
 									 const LLUUID& region_id,
 									 const LLVector3d& pos_global)
 {
-	LLSD body;
 	mPosRegion = pos_region;
-	std::string url = gAgent.getRegion()->getCapability("RemoteParcelRequest");
+
+	LLViewerRegion* region = gAgent.getRegion();
+	if (!region)
+		return;
+
+	LLSD body;
+	std::string url = region->getCapability("RemoteParcelRequest");
 	if (!url.empty())
 	{
 		body["location"] = ll_sd_from_vector3(pos_region);
@@ -395,8 +417,29 @@ void LLPanelPlaceInfo::displayParcelInfo(const LLVector3& pos_region,
 	{
 		mDescEditor->setText(getString("server_update_text"));
 	}
-	mSnapshotCtrl->setImageAssetID(LLUUID::null);
-	mSnapshotCtrl->setFallbackImageName("default_land_picture.j2c");
+}
+
+void LLPanelPlaceInfo::displayAgentParcelInfo()
+{
+	mPosRegion = gAgent.getPositionAgent();
+
+	LLViewerRegion* region = gAgent.getRegion();
+	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+	if (!region || !parcel)
+		return;
+
+	LLParcelData parcel_data;
+	parcel_data.desc = parcel->getDesc();
+	parcel_data.flags = parcel->getParcelFlags();
+	parcel_data.name = parcel->getName();
+	parcel_data.sim_name = gAgent.getRegion()->getName();
+	parcel_data.snapshot_id = parcel->getSnapshotID();
+	LLVector3d global_pos = gAgent.getPositionGlobal();
+	parcel_data.global_x = global_pos.mdV[0];
+	parcel_data.global_y = global_pos.mdV[1];
+	parcel_data.global_z = global_pos.mdV[2];
+
+	processParcelInfo(parcel_data);
 }
 
 void LLPanelPlaceInfo::onCommitTitleOrNote(LANDMARK_INFO_TYPE type)
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index 7f98b6cb76..f06a2d1fb7 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -55,6 +55,7 @@ class LLPanelPlaceInfo : public LLPanel, LLRemoteParcelInfoObserver
 public:
 	enum INFO_TYPE
 	{
+		CREATE_LANDMARK,
 		PLACE,
 		LANDMARK,
 		TELEPORT_HISTORY
@@ -84,9 +85,17 @@ public:
 	/*virtual*/ void setErrorStatus(U32 status, const std::string& reason);
 
 	void sendParcelInfoRequest();
+
+	// Displays information about a remote parcel.
+	// Sends a request to the server.
 	void displayParcelInfo(const LLVector3& pos_region,
 						   const LLUUID& region_id,
 						   const LLVector3d& pos_global);
+
+	// Displays information about the parcel the agent is currently on
+	// without sending a request to the server.
+	void displayAgentParcelInfo();
+
 	void nameUpdatedCallback(LLTextBox* text,
 							 const std::string& first,
 							 const std::string& last);
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 57c633dd74..b443cc4d5e 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -31,13 +31,16 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llassettype.h"
+
+#include "lllandmark.h"
+
 #include "llfloaterreg.h"
+#include "llnotifications.h"
 #include "llfiltereditor.h"
 #include "lltabcontainer.h"
 #include "lluictrlfactory.h"
 
-#include "lllandmark.h"
-
 #include "llagent.h"
 #include "lllandmarklist.h"
 #include "llfloaterworldmap.h"
@@ -48,18 +51,8 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 
-LLPanelPlaces::LLParcelUpdateTimer::LLParcelUpdateTimer(F32 period)
-:	LLEventTimer(period)
-{
-};
-
-// virtual
-BOOL LLPanelPlaces::LLParcelUpdateTimer::tick()
-{
-	LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "agent"));
-	
-	return TRUE;
-}
+// Helper function to get local position from global
+const LLVector3 get_pos_local_from_global(const LLVector3d &pos_global);
 
 static LLRegisterPanelClassWrapper<LLPanelPlaces> t_places("panel_places");
 
@@ -68,7 +61,9 @@ LLPanelPlaces::LLPanelPlaces()
 		mFilterSubString(LLStringUtil::null),
 		mActivePanel(NULL),
 		mFilterEditor(NULL),
-		mPlaceInfo(NULL)
+		mPlaceInfo(NULL),
+		mItem(NULL),
+		mPosGlobal()
 {
 	gInventory.addObserver(this);
 
@@ -86,6 +81,17 @@ LLPanelPlaces::~LLPanelPlaces()
 
 BOOL LLPanelPlaces::postBuild()
 {
+	mTeleportBtn = getChild<LLButton>("teleport_btn");
+	mTeleportBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onTeleportButtonClicked, this));
+	
+	mShowOnMapBtn = getChild<LLButton>("map_btn");
+	mShowOnMapBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onShowOnMapButtonClicked, this));
+	
+	//mShareBtn = getChild<LLButton>("share_btn");
+	//mShareBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onShareButtonClicked, this));
+
+	mOverflowBtn = getChild<LLButton>("overflow_btn");
+
 	mTabContainer = getChild<LLTabContainer>("Places Tabs");
 	if (mTabContainer)
 	{
@@ -108,13 +114,9 @@ BOOL LLPanelPlaces::postBuild()
 		}
 
 		// *TODO: Assign the action to an appropriate event.
-		childSetAction("overflow_btn", boost::bind(&LLPanelPlaces::toggleMediaPanel, this), this);
+		mOverflowBtn->setClickedCallback(boost::bind(&LLPanelPlaces::toggleMediaPanel, this));
 	}
 
-	//childSetAction("share_btn", boost::bind(&LLPanelPlaces::onShareButtonClicked, this), this);
-	childSetAction("teleport_btn", boost::bind(&LLPanelPlaces::onTeleportButtonClicked, this), this);
-	childSetAction("map_btn", boost::bind(&LLPanelPlaces::onShowOnMapButtonClicked, this), this);
-
 	return TRUE;
 }
 
@@ -124,19 +126,23 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 		return;
 
 	mPlaceInfoType = key["type"].asString();
-	
+	mPosGlobal.setZero();
 	togglePlaceInfoPanel(TRUE);
+	updateVerbs();
 
 	if (mPlaceInfoType == "agent")
 	{
-		// We don't need to teleport to the current location so disable the button
-		getChild<LLButton>("teleport_btn")->setEnabled(FALSE);
-		getChild<LLButton>("map_btn")->setEnabled(TRUE);
-
 		mPlaceInfo->setInfoType(LLPanelPlaceInfo::PLACE);
-		mPlaceInfo->displayParcelInfo(gAgent.getPositionAgent(),
-									  gAgent.getRegion()->getRegionID(),
-									  gAgent.getPositionGlobal());
+		mPlaceInfo->displayAgentParcelInfo();
+		
+		mPosGlobal = gAgent.getPositionGlobal();
+	}
+	else if (mPlaceInfoType == "create_landmark")
+	{
+		mPlaceInfo->setInfoType(LLPanelPlaceInfo::CREATE_LANDMARK);
+		mPlaceInfo->displayAgentParcelInfo();
+		
+		mPosGlobal = gAgent.getPositionGlobal();
 	}
 	else if (mPlaceInfoType == "landmark")
 	{
@@ -144,27 +150,19 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 		LLInventoryItem* item = gInventory.getItem(item_uuid);
 		if (!item)
 			return;
+		
+		setItem(item);
+	}
+	else if (mPlaceInfoType == "remote_place")
+	{
+		mPosGlobal = LLVector3d(key["x"].asReal(),
+								key["y"].asReal(),
+								key["z"].asReal());
 
-		mPlaceInfo->setInfoType(LLPanelPlaceInfo::LANDMARK);
-		mPlaceInfo->displayItemInfo(item);
-
-		LLLandmark* landmark = gLandmarkList.getAsset(item->getAssetUUID());
-		if (!landmark)
-			return;
-
-		// Select Landmarks tab and set selection to requested landmark so that
-		// context dependent Verbs buttons update properly.
-		mTabContainer->selectFirstTab(); // Assume that first tab is Landmarks tab.
-		LLLandmarksPanel* landmarks_panel = dynamic_cast<LLLandmarksPanel*>(mTabContainer->getCurrentPanel());
-		landmarks_panel->setSelectedItem(item_uuid);
-
-		LLUUID region_id;
-		landmark->getRegionID(region_id);
-		LLVector3d pos_global;
-		landmark->getGlobalPos(pos_global);
-		mPlaceInfo->displayParcelInfo(landmark->getRegionPos(),
-									  region_id,
-									  pos_global);
+		mPlaceInfo->setInfoType(LLPanelPlaceInfo::PLACE);
+		mPlaceInfo->displayParcelInfo(get_pos_local_from_global(mPosGlobal),
+									  LLUUID(),
+									  mPosGlobal);
 	}
 	else if (mPlaceInfoType == "teleport_history")
 	{
@@ -175,18 +173,47 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 
 		LLVector3d pos_global = hist_items[index].mGlobalPos;
 
-		F32 region_x = (F32)fmod( pos_global.mdV[VX], (F64)REGION_WIDTH_METERS );
-		F32 region_y = (F32)fmod( pos_global.mdV[VY], (F64)REGION_WIDTH_METERS );
-
-		LLVector3 pos_local(region_x, region_y, (F32)pos_global.mdV[VZ]);
-
 		mPlaceInfo->setInfoType(LLPanelPlaceInfo::TELEPORT_HISTORY);
-		mPlaceInfo->displayParcelInfo(pos_local,
+		mPlaceInfo->displayParcelInfo(get_pos_local_from_global(pos_global),
 									  hist_items[index].mRegionID,
 									  pos_global);
 	}
 }
 
+void LLPanelPlaces::setItem(LLInventoryItem* item)
+{
+	mItem = item;
+	
+	// If the item is a link get a linked item
+	if (mItem->getType() == LLAssetType::AT_LINK)
+	{
+		mItem = gInventory.getItem(mItem->getAssetUUID());
+		if (mItem.isNull())
+			return;
+	}
+
+	mPlaceInfo->setInfoType(LLPanelPlaceInfo::LANDMARK);
+	mPlaceInfo->displayItemInfo(mItem);
+
+	LLLandmark* lm = gLandmarkList.getAsset(mItem->getAssetUUID(),
+											boost::bind(&LLPanelPlaces::onLandmarkLoaded, this, _1));
+	if (lm)
+	{
+		onLandmarkLoaded(lm);
+	}
+}
+
+void LLPanelPlaces::onLandmarkLoaded(LLLandmark* landmark)
+{
+	LLUUID region_id;
+	landmark->getRegionID(region_id);
+	LLVector3d pos_global;
+	landmark->getGlobalPos(pos_global);
+	mPlaceInfo->displayParcelInfo(landmark->getRegionPos(),
+								  region_id,
+								  pos_global);
+}
+
 void LLPanelPlaces::onFilterEdit(const std::string& search_string)
 {
 	if (mFilterSubString != search_string)
@@ -212,12 +239,12 @@ void LLPanelPlaces::onTabSelected()
 	mActivePanel->updateVerbs();
 }
 
+/*
 void LLPanelPlaces::onShareButtonClicked()
 {
 	// TODO: Launch the "Things" Share wizard
 }
 
-/*
 void LLPanelPlaces::onAddLandmarkButtonClicked()
 {
 	LLFloaterReg::showInstance("add_landmark");
@@ -231,24 +258,64 @@ void LLPanelPlaces::onCopySLURLButtonClicked()
 
 void LLPanelPlaces::onTeleportButtonClicked()
 {
-	mActivePanel->onTeleport();
+	if (mPlaceInfo->getVisible())
+	{
+		if (mPlaceInfoType == "landmark")
+		{
+			LLSD payload;
+			payload["asset_id"] = mItem->getAssetUUID();
+			LLNotifications::instance().add("TeleportFromLandmark", LLSD(), payload);
+		}
+		else if (mPlaceInfoType == "remote_place")
+		{
+			LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+			if (!mPosGlobal.isExactlyZero() && worldmap_instance)
+			{
+				gAgent.teleportViaLocation(mPosGlobal);
+				worldmap_instance->trackLocation(mPosGlobal);
+			}
+		}
+	}
+	else
+	{
+		mActivePanel->onTeleport();
+	}
 }
 
 void LLPanelPlaces::onShowOnMapButtonClicked()
 {
-	if (mPlaceInfoType == "agent")
+	if (mPlaceInfo->getVisible())
 	{
-		LLVector3d global_pos = gAgent.getPositionGlobal();
-		if (!global_pos.isExactlyZero())
-			{
-				LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance();
-				if(instance)
-				{
-					instance->trackLocation(global_pos);
-					LLFloaterReg::showInstance("world_map", "center");
+		LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+		if(!worldmap_instance)
+			return;
 
-				}
+		if (mPlaceInfoType == "agent" ||
+			mPlaceInfoType == "create_landmark" ||
+			mPlaceInfoType == "remote_place")
+		{
+			if (!mPosGlobal.isExactlyZero())
+			{
+				worldmap_instance->trackLocation(mPosGlobal);
+				LLFloaterReg::showInstance("world_map", "center");
 			}
+		}
+		else if (mPlaceInfoType == "landmark")
+		{
+			LLLandmark* landmark = gLandmarkList.getAsset(mItem->getAssetUUID());
+			if (!landmark)
+				return;
+
+			LLVector3d landmark_global_pos;
+			if (!landmark->getGlobalPos(landmark_global_pos))
+				return;
+			
+			if (!landmark_global_pos.isExactlyZero())
+			{
+				worldmap_instance->trackLocation(landmark_global_pos);
+				LLFloaterReg::showInstance("world_map", "center");
+			}
+		}
 	}
 	else
 	{
@@ -259,6 +326,11 @@ void LLPanelPlaces::onShowOnMapButtonClicked()
 void LLPanelPlaces::onBackButtonClicked()
 {
 	togglePlaceInfoPanel(FALSE);
+
+	// Resetting mPlaceInfoType when Place Info panel is closed.
+	mPlaceInfoType = LLStringUtil::null;
+	
+	updateVerbs();
 }
 
 void LLPanelPlaces::toggleMediaPanel()
@@ -268,6 +340,7 @@ void LLPanelPlaces::toggleMediaPanel()
 
 	mPlaceInfo->toggleMediaPanel(!mPlaceInfo->isMediaPanelVisible());
 }
+
 void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
 {
 	if (!mPlaceInfo)
@@ -276,9 +349,6 @@ void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
 	mPlaceInfo->setVisible(visible);
 	mFilterEditor->setVisible(!visible);
 	mTabContainer->setVisible(!visible);
-	
-	// Enable overflow button only for the information about agent's current location.
-	getChild<LLButton>("overflow_btn")->setEnabled(visible && mPlaceInfoType == "agent");
 
 	if (visible)
 	{
@@ -331,10 +401,48 @@ void LLPanelPlaces::changed(U32 mask)
 
 void LLPanelPlaces::onAgentParcelChange()
 {
-	if (mPlaceInfo->getVisible() && mPlaceInfoType == "agent")
+	if (mPlaceInfo->getVisible() && (mPlaceInfoType == "agent" || mPlaceInfoType == "create_landmark"))
+	{
+		LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", mPlaceInfoType));
+	}
+	else
+	{
+		updateVerbs();
+	}
+}
+
+void LLPanelPlaces::updateVerbs()
+{
+	bool is_place_info_visible = mPlaceInfo->getVisible();
+	bool is_agent_place_info_visible = mPlaceInfoType == "agent";
+	if (is_place_info_visible)
+	{
+		if (is_agent_place_info_visible || mPlaceInfoType == "create_landmark")
+		{
+			// We don't need to teleport to the current location so disable the button
+			mTeleportBtn->setEnabled(FALSE);
+		}
+		else if (mPlaceInfoType == "landmark" || mPlaceInfoType == "remote_place")
+		{
+			mTeleportBtn->setEnabled(TRUE);
+		}
+
+		mShowOnMapBtn->setEnabled(TRUE);
+	}
+	else
 	{
-		// Using timer to delay obtaining agent's coordinates
-		// not to get the coordinates of previous parcel.
-		new LLParcelUpdateTimer(.5);
+		mActivePanel->updateVerbs();
 	}
+
+	// Enable overflow button only when showing the information about agent's current location.
+	mOverflowBtn->setEnabled(is_place_info_visible && is_agent_place_info_visible);
 }
+
+const LLVector3 get_pos_local_from_global(const LLVector3d &pos_global)
+{
+	F32 region_x = (F32)fmod( pos_global.mdV[VX], (F64)REGION_WIDTH_METERS );
+	F32 region_y = (F32)fmod( pos_global.mdV[VY], (F64)REGION_WIDTH_METERS );
+
+	LLVector3 pos_local(region_x, region_y, (F32)pos_global.mdV[VZ]);
+	return pos_local;
+}	
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index e2ba4f39cd..c100ace8cc 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -41,6 +41,8 @@
 #include "llinventorymodel.h"
 #include "llpanelplaceinfo.h"
 
+class LLInventoryItem;
+class LLLandmark;
 class LLPanelPlacesTab;
 class LLFilterEditor;
 class LLTabContainer;
@@ -55,38 +57,49 @@ public:
 	/*virtual*/ void changed(U32 mask);
 	/*virtual*/ void onOpen(const LLSD& key);
 
+	void setItem(LLInventoryItem* item);
+
+private:
+	void onLandmarkLoaded(LLLandmark* landmark);
 	void onFilterEdit(const std::string& search_string);
 	void onTabSelected();
+
 	//void onAddLandmarkButtonClicked();
 	//void onCopySLURLButtonClicked();
-	void onShareButtonClicked();
+	//void onShareButtonClicked();
 	void onTeleportButtonClicked();
 	void onShowOnMapButtonClicked();
 	void onBackButtonClicked();
+
 	void toggleMediaPanel();
 	void togglePlaceInfoPanel(BOOL visible);
+
 	void onAgentParcelChange();
+	void updateVerbs();
 
-private:
-	LLFilterEditor*			mFilterEditor;
-	LLPanelPlacesTab*		mActivePanel;
-	LLTabContainer*			mTabContainer;
-	LLPanelPlaceInfo*		mPlaceInfo;
-	std::string				mFilterSubString;
-
-	// Place information type currently shown in Information panel
-	std::string				mPlaceInfoType;
-
-	// Helper class to delay the coordinates update 
-	// when agent changes parcel
-	class LLParcelUpdateTimer : public LLEventTimer
-	{
-	public:
-		LLParcelUpdateTimer(F32 period);
-		virtual ~LLParcelUpdateTimer() {};
-
-		virtual BOOL tick();
-	};
+	LLFilterEditor*				mFilterEditor;
+	LLPanelPlacesTab*			mActivePanel;
+	LLTabContainer*				mTabContainer;
+	LLPanelPlaceInfo*			mPlaceInfo;
+
+	//LLButton*					mShareBtn;
+	LLButton*					mTeleportBtn;
+	LLButton*					mShowOnMapBtn;
+	LLButton*					mOverflowBtn;
+
+	// Pointer to a landmark item or to a linked landmark
+	LLPointer<LLInventoryItem>	mItem;
+	
+	// Absolute position of the location for teleport, may not
+	// be available (hence zero)
+	LLVector3d					mPosGlobal;
+
+	// Search string for filtering landmarks and teleport
+	// history locations
+	std::string					mFilterSubString;
+
+	// Information type currently shown in Place Information panel
+	std::string					mPlaceInfoType;
 };
 
 #endif //LL_LLPANELPLACES_H
diff --git a/indra/newview/llpanelplacestab.cpp b/indra/newview/llpanelplacestab.cpp
index e5b1f04064..7c0a7b0cc4 100644
--- a/indra/newview/llpanelplacestab.cpp
+++ b/indra/newview/llpanelplacestab.cpp
@@ -41,6 +41,14 @@
 #include "llslurl.h"
 #include "llworldmap.h"
 
+bool LLPanelPlacesTab::isTabVisible()
+{
+	LLUICtrl* parent = getParentUICtrl();
+	if (!parent) return false;
+	if (!parent->getVisible()) return false;
+	return true;
+}
+
 void LLPanelPlacesTab::setPanelPlacesButtons(LLPanelPlaces* panel)
 {
 	//mShareBtn = panel->getChild<LLButton>("share_btn");
diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h
index c098302d1a..1c70869414 100644
--- a/indra/newview/llpanelplacestab.h
+++ b/indra/newview/llpanelplacestab.h
@@ -49,6 +49,8 @@ public:
 	virtual void onTeleport() = 0;
 	//virtual void onCopySLURL() = 0;
 
+	bool isTabVisible(); // Check if parent TabContainer is visible.
+
 	void setPanelPlacesButtons(LLPanelPlaces* panel);
 	void onRegionResponse(const LLVector3d& landmark_global_pos,
 										U64 region_handle,
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 77edae261b..51cd05376a 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -143,6 +143,9 @@ void LLTeleportHistoryPanel::onCopySLURL()
 // virtual
 void LLTeleportHistoryPanel::updateVerbs()
 {
+	if (!isTabVisible()) 
+		return;
+
 	S32 index = 0;
 	S32 cur_item = 0;
 
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 78091ef05b..5dca12e06b 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -37,31 +37,36 @@
 #include "lltextbox.h"
 #include "llscreenchannel.h"
 
+#include "llviewercontrol.h"
+
 #include <algorithm>
 
 using namespace LLNotificationsUI;
 
-#define	TOAST_MARGIN		5
-#define	BOTTOMPANEL_MARGIN	35
-#define	NAVBAR_MARGIN		60
-
+bool LLScreenChannel::mWasStartUpToastShown = false;
 
 //--------------------------------------------------------------------------
 LLScreenChannel::LLScreenChannel(): mUnreadToastsPanel(NULL), 
 									mToastAlignment(NA_BOTTOM), 
 									mStoreToasts(true),
+									mHiddenToastsNum(0),
 									mOverflowToastHidden(false),
 									mIsHovering(false),
 									mControlHovering(false)
 {	
 	setFollows(FOLLOWS_RIGHT | FOLLOWS_BOTTOM | FOLLOWS_TOP);  
+
+	//TODO: load as a resource string
+	mOverflowFormatString = "You have %d more notification";
+
+	setMouseOpaque( false );
 }
 
-void LLScreenChannel::init(S32 channel_position, LLView* root_view)
+void LLScreenChannel::init(S32 channel_left, S32 channel_right)
 {
-	root_view->addChild(this);
-	setRect( LLRect(channel_position, root_view->getRect().getHeight() - NAVBAR_MARGIN,
-					channel_position, root_view->getRect().mBottom + BOTTOMPANEL_MARGIN));
+	S32 channel_top = getRootView()->getRect().getHeight() - gSavedSettings.getS32("NavBarMargin");
+	S32 channel_bottom = getRootView()->getRect().mBottom + gSavedSettings.getS32("ChannelBottomPanelMargin");
+	setRect(LLRect(channel_left, channel_top, channel_right, channel_bottom));
 
 }
 
@@ -79,7 +84,7 @@ void LLScreenChannel::reshape(S32 width, S32 height, BOOL called_from_parent)
 }
 
 //--------------------------------------------------------------------------
-LLToast* LLScreenChannel::addToast(LLUUID id, LLPanel* panel)
+LLToast* LLScreenChannel::addToast(LLUUID id, LLPanel* panel, bool is_not_tip)
 {	
 	ToastElem new_toast_elem(id, panel);
 
@@ -92,7 +97,29 @@ LLToast* LLScreenChannel::addToast(LLUUID id, LLPanel* panel)
 	{
 		new_toast_elem.toast->setOnToastHoverCallback(boost::bind(&LLScreenChannel::onToastHover, this, _1, _2));
 	}
-	showToasts();
+
+	// don't show toasts until StartUp toast will fade, but show alerts
+	if(!mWasStartUpToastShown && mToastAlignment != NA_CENTRE)
+	{
+		new_toast_elem.toast->stopTimer();
+		// Count and store only non tip notifications
+		if(is_not_tip)
+		{
+			mHiddenToastsNum++;			
+			storeToast(new_toast_elem);
+		}
+		else
+		{
+			// destroy tip toasts at once
+			new_toast_elem.toast->close();			
+		}
+		// remove toast from channel
+		mToastList.pop_back();
+	}
+	else
+	{
+		showToasts();
+	}
 
 	return new_toast_elem.toast;
 }
@@ -213,10 +240,20 @@ void LLScreenChannel::showToastsBottom()
 		}
 
 		toast_rect = (*it).toast->getRect();
-		toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+TOAST_MARGIN, toast_rect.getWidth() ,toast_rect.getHeight());
+		toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastMargin"), toast_rect.getWidth() ,toast_rect.getHeight());
 		(*it).toast->setRect(toast_rect);
 
-		if((*it).toast->getRect().mTop > getRect().getHeight())
+		bool stop_showing_toasts = (*it).toast->getRect().mTop > getRect().getHeight();
+
+		if(!stop_showing_toasts)
+		{
+			if( it != mToastList.rend()-1)
+			{
+				stop_showing_toasts = ((*it).toast->getRect().mTop + gSavedSettings.getS32("OverflowToastHeight") + gSavedSettings.getS32("ToastMargin")) > getRect().getHeight();
+			}
+		} 
+
+		if(stop_showing_toasts)
 			break;
 
 		(*it).toast->setVisible(TRUE);	
@@ -243,7 +280,7 @@ void LLScreenChannel::showToastsCentre()
 	for(it = mToastList.rbegin(); it != mToastList.rend(); ++it)
 	{
 		toast_rect = (*it).toast->getRect();
-		toast_rect.setLeftTopAndSize(getRect().mLeft - toast_rect.getWidth() / 2, bottom + toast_rect.getHeight() / 2 + TOAST_MARGIN, toast_rect.getWidth() ,toast_rect.getHeight());
+		toast_rect.setLeftTopAndSize(getRect().mLeft - toast_rect.getWidth() / 2, bottom + toast_rect.getHeight() / 2 + gSavedSettings.getS32("ToastMargin"), toast_rect.getWidth() ,toast_rect.getHeight());
 		(*it).toast->setRect(toast_rect);
 
 		(*it).toast->setVisible(TRUE);	
@@ -256,7 +293,7 @@ void LLScreenChannel::showToastsTop()
 }
 
 //--------------------------------------------------------------------------
-void LLScreenChannel::createOverflowToast(S32 bottom)
+void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
 {
 	LLRect toast_rect;
 	mUnreadToastsPanel = new LLToast(NULL);
@@ -266,21 +303,29 @@ void LLScreenChannel::createOverflowToast(S32 bottom)
 
 	mUnreadToastsPanel->setOnFadeCallback(boost::bind(&LLScreenChannel::onOverflowToastHide, this));
 
-	LLTextBox* text_box = mUnreadToastsPanel->getChild<LLTextBox>("text");
+	LLTextBox* text_box = mUnreadToastsPanel->getChild<LLTextBox>("toast_text");
 	LLIconCtrl* icon = mUnreadToastsPanel->getChild<LLIconCtrl>("icon");
+	std::string	text = llformat(mOverflowFormatString.c_str(),mHiddenToastsNum);
+	if(mHiddenToastsNum == 1)
+	{
+		text += ".";
+	}
+	else
+	{
+		text += "s.";
+	}
 
-	std::string toastsNumStr = llformat("%d", mHiddenToastsNum);
-	std::string	text = "You have " + toastsNumStr + " new notifications.";
+	toast_rect = mUnreadToastsPanel->getRect();
+	mUnreadToastsPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
+	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastMargin"), getRect().getWidth(), toast_rect.getHeight());	
+	mUnreadToastsPanel->setRect(toast_rect);
+	mUnreadToastsPanel->setAndStartTimer(timer ? timer : gSavedSettings.getS32("NotificationToastTime"));
+	getRootView()->addChild(mUnreadToastsPanel);
 
-	text_box->setText(text);
+	text_box->setValue(text);
 	text_box->setVisible(TRUE);
 	icon->setVisible(TRUE);
 
-	toast_rect = mUnreadToastsPanel->getRect();
-	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+TOAST_MARGIN, toast_rect.getWidth() ,toast_rect.getHeight());
-	mUnreadToastsPanel->setRect(toast_rect);
-	mUnreadToastsPanel->setAndStartTimer(5);
-	getRootView()->addChild(mUnreadToastsPanel);
 	mUnreadToastsPanel->setVisible(TRUE);
 }
 
@@ -288,6 +333,7 @@ void LLScreenChannel::createOverflowToast(S32 bottom)
 void LLScreenChannel::onOverflowToastHide()
 {
 	mOverflowToastHidden = true;
+	onCommit();
 }
 
 //--------------------------------------------------------------------------
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index 5a9946f772..f05c205e2a 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -54,14 +54,15 @@ typedef enum e_notification_toast_alignment
  */
 class LLScreenChannel : public LLUICtrl
 {
+	friend class LLChannelManager;
 public:
 	LLScreenChannel();
 	virtual ~LLScreenChannel();
 
 	void		reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
-	LLToast*	addToast(LLUUID id, LLPanel* panel);
-	void		init(S32 channel_position, LLView* root_view);
+	LLToast*	addToast(LLUUID id, LLPanel* panel, bool is_not_tip = true);
+	void		init(S32 channel_left, S32 channel_right);
 	
 	void		killToastByNotificationID(LLUUID id);
 	void		modifyToastByNotificationID(LLUUID id, LLPanel* panel);
@@ -79,8 +80,15 @@ public:
 	
 	void		showToasts();
 
+	S32			getNumberOfHiddenToasts() { return mHiddenToastsNum;}
+	void		setNumberOfHiddenToasts(S32 num) { mHiddenToastsNum = num;}
+
+	static void	setStartUpToastShown() { mWasStartUpToastShown = true; }
+
 	e_notification_toast_alignment getToastAlignment() {return mToastAlignment;}
 
+	void		setOverflowFormatString ( std::string str)  { mOverflowFormatString = str; }
+
 private:
 	struct ToastElem
 	{
@@ -117,9 +125,10 @@ private:
 	void	showToastsCentre();
 	void	showToastsTop();
 	
-	void	createOverflowToast(S32 bottom);
+	void	createOverflowToast(S32 bottom, F32 timer = 0);
 	void	onOverflowToastHide();
 
+	static bool	mWasStartUpToastShown;
 	bool		mControlHovering;
 	bool		mIsHovering;
 	bool		mStoreToasts;
@@ -130,6 +139,8 @@ private:
 	std::vector<ToastElem>	mStoredToastList;
 	e_notification_toast_alignment	mToastAlignment;
 	std::map<LLToast*, bool>	mToastEventStack;
+
+	std::string mOverflowFormatString;
 };
 
 }
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index abcff7cfb1..2688399139 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -63,24 +63,11 @@ LLSideTray* LLSideTray::sInstance = 0;
 
 class LLSideTrayInfoPanel: public LLPanel
 {
-protected:
-	LLSideTrayInfoPanel(){}
+	
 public:
-	static LLSideTrayInfoPanel* createInstance(const string& image, const string& name,const string& description)
-	{
-		LLSideTrayInfoPanel* panel = new LLSideTrayInfoPanel();
-		LLUICtrlFactory::getInstance()->buildPanel(panel,"panel_sidetray_tab_info.xml");
-		if(panel)
-			panel->setData(image, name,description);
-		panel->setBorderVisible(true);
-		return panel;
-
-	}
-	void setData(const string& image, const string& name,const string& description)
+	LLSideTrayInfoPanel():LLPanel()
 	{
-		getChild<LLTextBox>("tab_name",false,false)->setValue(name);
-		getChild<LLTextBox>("tab_description",false,false)->setValue(description);
-		getChild<LLIconCtrl>("tab_icon",false,false)->setValue(image);
+		setBorderVisible(true);
 	}
 
 	BOOL handleHover(S32 x, S32 y, MASK mask)
@@ -91,12 +78,19 @@ public:
 
 	BOOL handleMouseUp(S32 x, S32 y, MASK mask)
 	{
+		std::string name = getName();
 		onCommit();
+		LLSideTray::getInstance()->selectTabByName(name);
 		return LLPanel::handleMouseUp(x,y,mask);
 	}
+	void reshape		(S32 width, S32 height, BOOL called_from_parent )
+	{
+		return LLPanel::reshape(width, height, called_from_parent);
+	}
 
 };
 
+static LLRegisterPanelClassWrapper<LLSideTrayInfoPanel> t_people("panel_sidetray_home_info");
 
 LLSideTray* LLSideTray::getInstance()
 {
@@ -113,7 +107,7 @@ bool	LLSideTray::instanceCreated	()
 	return sInstance!=0;
 }
 
-LLSideTrayTab::LLSideTrayTab(const Params& params):mAccordionCtrl(0)
+LLSideTrayTab::LLSideTrayTab(const Params& params):mMainPanel(0)
 												
 {
 	mImagePath = params.image_path;
@@ -124,30 +118,12 @@ LLSideTrayTab::~LLSideTrayTab()
 {
 }
 
-void LLSideTrayTab::addPanel(LLPanel* panel)
-{
-	//addChild(panel,false);
-}
-
 bool LLSideTrayTab::addChild(LLView* view, S32 tab_group)
 {
-	if(mAccordionCtrl == 0)		
-	{
-		mAccordionCtrl = new LLAccordionCtrl();
-		mAccordionCtrl->setVisible(TRUE);
-		LLPanel::addChild(mAccordionCtrl,tab_group);
-	}
-
-	
-	bool res = true;
-	if(TAB_PANEL_CAPTION_NAME != view->getName())//skip our caption panel
-	{
-		mAccordionCtrl->addCollapsibleCtrl(view);
-	}
-	else
-		res = LLPanel::addChild(view,tab_group);
-
-	return res;
+	if(mMainPanel == 0 && TAB_PANEL_CAPTION_NAME != view->getName())//skip our caption panel
+		mMainPanel = view;
+	return LLPanel::addChild(view,tab_group);
+	//return res;
 }
 
 
@@ -185,17 +161,18 @@ void	LLSideTrayTab::arrange(S32 width, S32 height )
 		offset = title_panel->getRect().getHeight();
 	}
 
-	LLRect sRect = mAccordionCtrl->getRect();
+	LLRect sRect = mMainPanel->getRect();
 	sRect.setLeftTopAndSize( splitter_margin, height - offset - splitter_margin, width - 2*splitter_margin, height - offset - 2*splitter_margin);
-	mAccordionCtrl->setRect(sRect);
+	mMainPanel->reshape(sRect.getWidth(),sRect.getHeight());
+	mMainPanel->setRect(sRect);
+	
+
 	
-	mAccordionCtrl->setMaxWidth(sRect.getWidth());
-	mAccordionCtrl->arrange();
 }
 
 void LLSideTrayTab::reshape		(S32 width, S32 height, BOOL called_from_parent )
 {
-	if(!mAccordionCtrl)
+	if(!mMainPanel)
 		return;
 	S32 offset = 0;
 
@@ -210,12 +187,12 @@ void LLSideTrayTab::reshape		(S32 width, S32 height, BOOL called_from_parent )
 
 	
 
-	LLRect sRect = mAccordionCtrl->getRect();
+	LLRect sRect = mMainPanel->getRect();
 	sRect.setLeftTopAndSize( splitter_margin, height - offset - splitter_margin, width - 2*splitter_margin, height - offset - 2*splitter_margin);
-	mAccordionCtrl->setMaxWidth(sRect.getWidth());
-	mAccordionCtrl->reshape(sRect.getWidth(), sRect.getHeight());
+	//mMainPanel->setMaxWidth(sRect.getWidth());
+	mMainPanel->reshape(sRect.getWidth(), sRect.getHeight());
 	
-	mAccordionCtrl->setRect(sRect);
+	mMainPanel->setRect(sRect);
 
 }
 
@@ -231,7 +208,9 @@ void LLSideTrayTab::draw()
 
 void	LLSideTrayTab::onOpen		(const LLSD& key)
 {
-	mAccordionCtrl->onOpen(key);
+	LLPanel* panel = dynamic_cast<LLPanel*>(mMainPanel);
+	if(panel)
+		panel->onOpen(key);
 }
 
 LLSideTrayTab*  LLSideTrayTab::createInstance	()
@@ -251,7 +230,6 @@ LLSideTray::LLSideTray(Params& params)
 		,mCollapsed(false)
 		,mCollapseButton(0)
 	    ,mMaxBarWidth(params.rect.width)
-		,mHomeTab(0)
 {
 	mCollapsed=params.collapsed;
 }
@@ -261,10 +239,8 @@ BOOL LLSideTray::postBuild()
 {
 	createButtons();
 
-	createHomeTab();
-
 	arrange();
-	selectTabByName("home_tab");
+	selectTabByName("sidebar_home");
 
 	if(mCollapsed)
 		collapseSideBar();
@@ -333,8 +309,6 @@ bool LLSideTray::selectTabByIndex(size_t index)
 bool LLSideTray::selectTabByName	(const std::string& name)
 {
 	LLSideTrayTab* side_bar = getTab(name);
-	if(side_bar == 0 && name == "home_tab")
-		side_bar = mHomeTab;
 
 	if(side_bar == NULL || side_bar == mActiveTab)
 		return false;
@@ -416,9 +390,10 @@ void	LLSideTray::createButtons	()
 	mCollapseButton = createButton(EXPANDED_NAME,"",boost::bind(&LLSideTray::onToggleCollapse, this));
 
 	//create buttons for tabs
-	child_vector_const_iter_t child_it;
+	child_vector_const_iter_t child_it = mTabs.begin();
+	++child_it;
 
-	for ( child_it = mTabs.begin(); child_it != mTabs.end(); ++child_it)
+	for ( ; child_it != mTabs.end(); ++child_it)
 	{
 		LLSideTrayTab* sidebar_tab = dynamic_cast<LLSideTrayTab*>(*child_it);
 		if(sidebar_tab == NULL)
@@ -445,7 +420,7 @@ void		LLSideTray::onToggleCollapse()
 	if(mCollapsed)
 	{
 		expandSideBar();
-		selectTabByName("home_tab");
+		selectTabByName("sidebar_home");
 	}
 	else
 		collapseSideBar();
@@ -517,10 +492,6 @@ void LLSideTray::arrange			()
 		sidebar_tab->setRect(ctrl_rect);
 		sidebar_tab->arrange(mMaxBarWidth,getRect().getHeight());
 	}
-
-	mHomeTab->setRect(ctrl_rect);
-	mHomeTab->arrange(mMaxBarWidth,getRect().getHeight());
-	
 }
 
 void LLSideTray::collapseSideBar	()
@@ -619,19 +590,16 @@ void LLSideTray::reshape			(S32 width, S32 height, BOOL called_from_parent)
 		sidebar_tab->setRect(ctrl_rect);
 		
 	}
-	
-	mHomeTab->reshape(mMaxBarWidth,getRect().getHeight());
-	ctrl_rect.setLeftTopAndSize(sidetray_params.default_button_width,getRect().getHeight(),mMaxBarWidth,getRect().getHeight());
-	mHomeTab->setRect(ctrl_rect);
-
-	
 }
 
 /**
  * Activate tab with "panel_name" panel
- * if no such tab - return false, otherwise true
+ * if no such tab - return false, otherwise true.
+ * TODO* In some cases a pointer to a panel of
+ * a specific class may be needed so this method
+ * would need to use templates.
  */
-bool		LLSideTray::showPanel		(const std::string& panel_name, const LLSD& params)
+LLPanel*	LLSideTray::showPanel		(const std::string& panel_name, const LLSD& params)
 {
 	//arrange tabs
 	child_vector_const_iter_t child_it;
@@ -644,51 +612,12 @@ bool		LLSideTray::showPanel		(const std::string& panel_name, const LLSD& params)
 			LLPanel* panel = dynamic_cast<LLPanel*>(view);
 			if(panel)
 				panel->onOpen(params);
-			return true;
+			return panel;
 		}
 	}
-	return false;
+	return NULL;
 }
 
-void LLSideTray::createHomeTab()
-{
-	mHomeTab = LLSideTrayTab::createInstance();
-	child_vector_iter_t child_it;
-	for ( child_it = mTabs.begin(); child_it != mTabs.end(); ++child_it)
-	{
-		LLSideTrayTab* sidebar_tab = dynamic_cast<LLSideTrayTab*>(*child_it);
-		if(sidebar_tab == NULL)
-			continue;
-		
-		LLPanel* panel = LLSideTrayInfoPanel::createInstance(sidebar_tab->mImagePath,sidebar_tab->getTabTitle(),sidebar_tab->getDescription());
-
-		panel->setCommitCallback(boost::bind(&LLSideTray::onTabButtonClick, this, sidebar_tab->getName()));
-
-		LLAccordionCtrlTab::Params panel_params; 
-		panel_params.display_children(true);
-		panel_params.collapsible(false);
-		panel_params.header_visible(false);
-		panel_params.can_resize(false);
-		panel_params.min_height(200);
-		panel_params.padding_left(10);
-		panel_params.padding_right(10);
-		panel_params.padding_top(5);
-		panel_params.padding_bottom(5);
-		panel_params.name(sidebar_tab->getTabTitle());
-
-		LLAccordionCtrlTab* ctrl = LLUICtrlFactory::create<LLAccordionCtrlTab>(panel_params);
-
-		
-		ctrl->setPanel(panel);
-		ctrl->postBuild();
-		mHomeTab->addChild(ctrl,0);
-	}
-
-	mHomeTab->setBackgroundVisible(true);
-	mHomeTab->postBuild();
-
-	LLUICtrl::addChild(mHomeTab, 0);
-}
 static const S32	fake_offset = 132;
 static const S32	fake_top_offset = 78;
 
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h
index 7b1f4aee04..99e84f8141 100644
--- a/indra/newview/llsidetray.h
+++ b/indra/newview/llsidetray.h
@@ -65,7 +65,6 @@ protected:
 public:
 	virtual ~LLSideTrayTab();
 
-	void			addPanel	(LLPanel* panel);
     /*virtual*/ BOOL	postBuild	();
 	/*virtual*/ bool	addChild	(LLView* view, S32 tab_group);
 
@@ -87,7 +86,7 @@ private:
 	std::string mImagePath;
 	std::string	mDescription;
 
-	LLAccordionCtrl*	mAccordionCtrl;
+	LLView*	mMainPanel;
 };
 
 
@@ -163,9 +162,9 @@ public:
 
 	/**
 	 * Activate tab with "panel_name" panel
-	 * if no such tab - return false, otherwise true
+	 * if no such tab - return NULL, otherwise a pointer to the panel
 	 */
-	bool		showPanel		(const std::string& panel_name, const LLSD& params);
+    LLPanel*	showPanel		(const std::string& panel_name, const LLSD& params);
 
 	/*
      * collapse SideBar, hiding visible tab and moving tab buttons
@@ -209,7 +208,6 @@ protected:
 
 	void		createButtons	();
 	LLButton*	createButton	(const std::string& name,const std::string& image,LLUICtrl::commit_callback_t callback);
-	void		createHomeTab	();
 	void		arrange			();
 	void		reflectCollapseChange();
 
@@ -223,7 +221,6 @@ private:
 
 	std::map<std::string,LLButton*>	mTabButtons;
 	child_vector_t					mTabs;
-	LLSideTrayTab*					mHomeTab;
 	LLSideTrayTab*					mActiveTab;	
 	
 	LLButton*						mCollapseButton;
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index d0432e7961..3410a1eb68 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -871,8 +871,6 @@ bool idle_startup()
 		gDirUtilp->setLindenUserDir(firstname, lastname);
     	LLFile::mkdir(gDirUtilp->getLindenUserDir());
 
-		LLLocationHistory::getInstance()->load();
-
         // Set PerAccountSettingsFile to the default value.
 		gSavedSettings.setString("PerAccountSettingsFile",
 			gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, 
@@ -2517,6 +2515,8 @@ bool idle_startup()
 		// reset timers now that we are running "logged in" logic
 		LLFastTimer::reset();
 
+		LLLocationHistory::getInstance()->load();
+
 		return TRUE;
 	}
 
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 9144f9c3e0..6f5b25214e 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -104,6 +104,7 @@ bool LLToast::timerHasExpired()
 	if (mTimer.getStarted())
 	{
 		F32 elapsed_time = mTimer.getElapsedTimeF32();
+		// after 4 seconds a toast should start fade
 		if (elapsed_time > 4) 
 		{
 			setBackgroundOpaque(FALSE);
@@ -119,7 +120,7 @@ bool LLToast::timerHasExpired()
 //--------------------------------------------------------------------------
 void LLToast::hide()
 {
-	setVisible(FALSE);			//TODO: store in Chiclet's history
+	setVisible(FALSE);
 	mIsViewed = false;
 	mTimer.stop();
 	mOnFade(this, LLSD());
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index 2e2ac5b36c..018664f3d1 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -68,6 +68,7 @@ public:
 	void setAndStartTimer(F32 period);
 	//
 	void resetTimer() { mTimer.start(); }
+	void stopTimer() { mTimer.stop(); }
 	void close() { die(); }
 	virtual void draw();
 	virtual void setVisible(BOOL show);
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp
index 83c25ddc77..f5ed7f8710 100644
--- a/indra/newview/lltoastgroupnotifypanel.cpp
+++ b/indra/newview/lltoastgroupnotifypanel.cpp
@@ -51,6 +51,8 @@
 #include "llglheaders.h"
 #include "llagent.h"
 #include "llavatariconctrl.h"
+#include "llfloaterinventory.h"
+#include "llinventorytype.h"
 
 LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification)
 :	LLToastPanel(notification),
@@ -64,6 +66,8 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
 		llwarns << "Group notice for unkown group: " << payload["group_id"].asUUID() << llendl;
 	}
 
+	static const LLUIColor textColor = LLUIColorTable::instance().getColor("GroupNotifyTextColor");
+
 	//group icon
 	LLIconCtrl* pGroupIcon = getChild<LLIconCtrl>("group_icon", TRUE);
 	pGroupIcon->setValue(groupData.mInsigniaID);
@@ -76,11 +80,36 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
 	pTitleText->setValue(from.str());
 
 	//message body
+	const std::string& subject = payload["subject"].asString();
 	const std::string& message = payload["message"].asString();
+
 	LLTextEditor* pMessageText = getChild<	LLTextEditor>("message", TRUE, FALSE);
+	pMessageText->setValue("");
 	pMessageText->setEnabled(FALSE);
 	pMessageText->setTakesFocus(FALSE);
-	pMessageText->setValue(message);
+
+	static const LLStyleSP headerstyle(new LLStyle(true, textColor,
+			"SansSerifBig"));
+	static const LLStyleSP datestyle(new LLStyle(true, textColor, "serif"));
+
+	pMessageText->appendStyledText(subject + "\n",false,false,headerstyle);
+
+	std::string timeStr = "["+LLTrans::getString("UTCTimeWeek")+"],["
+							+LLTrans::getString("UTCTimeDay")+"] ["
+							+LLTrans::getString("UTCTimeMth")+"] ["
+							+LLTrans::getString("UTCTimeYr")+"] ["
+							+LLTrans::getString("UTCTimeHr")+"]:["
+							+LLTrans::getString("UTCTimeMin")+"]:["
+							+LLTrans::getString("UTCTimeSec")+"] ["
+							+LLTrans::getString("UTCTimeTimezone")+"]";
+	const LLDate timeStamp = notification->getDate();
+	LLDate notice_date = timeStamp.notNull() ? timeStamp : LLDate::now();
+	LLSD substitution;
+	substitution["datetime"] = (S32) notice_date.secondsSinceEpoch();
+	LLStringUtil::format(timeStr, substitution);
+	pMessageText->appendStyledText(timeStr, false, false, datestyle);
+	pMessageText->appendColoredText(std::string("\n\n") + message, false,
+			false, textColor);
 
 	//attachment
 	BOOL hasInventory = payload["inventory_offer"].isDefined();
@@ -91,6 +120,13 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
 		mInventoryOffer = new LLOfferInfo(payload["inventory_offer"]);
 		childSetActionTextbox("attachment", boost::bind(
 				&LLToastGroupNotifyPanel::onClickAttachment, this));
+
+		//attachment icon
+		LLIconCtrl* pAttachIcon = getChild<LLIconCtrl>("attachment_icon", TRUE);
+		LLUIImagePtr attachIconImg = get_item_icon(mInventoryOffer->mType,
+												LLInventoryType::IT_TEXTURE,
+												0, FALSE);
+		pAttachIcon->setValue(attachIconImg->getName());
 	}
 
 	//ok button
@@ -128,10 +164,43 @@ void LLToastGroupNotifyPanel::onClickOk()
 
 void LLToastGroupNotifyPanel::onClickAttachment()
 {
-	mInventoryOffer->forceResponse(IOR_ACCEPT);
+	if (mInventoryOffer != NULL) {
+		mInventoryOffer->forceResponse(IOR_ACCEPT);
 
-	mInventoryOffer = NULL;
+		LLTextBox * pAttachLink = getChild<LLTextBox> ("attachment", TRUE,
+				FALSE);
+		static const LLUIColor textColor = LLUIColorTable::instance().getColor(
+				"GroupNotifyDimmedTextColor");
+		pAttachLink->setColor(textColor);
 
-	LLTextBox * pAttachLink = getChild<LLTextBox>("attachment", TRUE, FALSE);
-	pAttachLink->setVisible(FALSE);
+		LLIconCtrl* pAttachIcon =
+				getChild<LLIconCtrl> ("attachment_icon", TRUE);
+		pAttachIcon->setEnabled(FALSE);
+
+		//if attachment isn't openable - notify about saving
+		if (!isAttachmentOpenable(mInventoryOffer->mType)) {
+			LLNotifications::instance().add("AttachmentSaved");
+		}
+
+		mInventoryOffer = NULL;
+	}
 }
+
+//static
+bool LLToastGroupNotifyPanel::isAttachmentOpenable(LLAssetType::EType type)
+{
+	switch(type)
+	{
+	case LLAssetType::AT_LANDMARK:
+	case LLAssetType::AT_FAVORITE:
+	case LLAssetType::AT_NOTECARD:
+	case LLAssetType::AT_IMAGE_JPEG:
+	case LLAssetType::AT_IMAGE_TGA:
+	case LLAssetType::AT_TEXTURE:
+	case LLAssetType::AT_TEXTURE_TGA:
+		return true;
+	default:
+		return false;
+	}
+}
+
diff --git a/indra/newview/lltoastgroupnotifypanel.h b/indra/newview/lltoastgroupnotifypanel.h
index f00f840e94..ba98531251 100644
--- a/indra/newview/lltoastgroupnotifypanel.h
+++ b/indra/newview/lltoastgroupnotifypanel.h
@@ -66,6 +66,7 @@ protected:
 	void onClickOk();
 	void onClickAttachment();
 private:
+	static bool isAttachmentOpenable(LLAssetType::EType);
 
 	LLButton* mSaveInventoryBtn;
 
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index dd37d41ff5..72812d0bb9 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1606,6 +1606,8 @@ void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent,
 		gIMMgr->addSystemMessage(im_session_id, "inventory_item_offered", args);
 	}
 
+	// add buddy to recent people list
+	LLRecentPeople::instance().add(to_agent);
 }
 
 void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent,
@@ -1730,6 +1732,9 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
 	llinfos << "LLToolDragAndDrop::commitGiveInventoryCategory() - "
 			<< cat->getUUID() << llendl;
 
+	// add buddy to recent people list
+	LLRecentPeople::instance().add(to_agent);
+
 	// Test out how many items are being given.
 	LLViewerInventoryCategory::cat_array_t cats;
 	LLViewerInventoryItem::item_array_t items;
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index acb7f927b6..9fb6d1c874 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -43,6 +43,7 @@
 #include "llfloaterurldisplay.h"
 #include "llfloaterworldmap.h"
 #include "llpanellogin.h"
+#include "llsidetray.h"
 #include "llslurl.h"
 #include "llstartup.h"			// gStartupState
 #include "llurlsimstring.h"
@@ -202,8 +203,9 @@ bool LLURLDispatcherImpl::dispatchRegion(const std::string& url, bool right_mous
 	S32 z = 0;
 	LLURLSimString::parse(sim_string, &region_name, &x, &y, &z);
 
-	LLFloaterURLDisplay* url_displayp = LLFloaterReg::getTypedInstance<LLFloaterURLDisplay>("preview_url",LLSD());
-	if(url_displayp) url_displayp->setName(region_name);
+	// LLFloaterURLDisplay functionality moved to LLPanelPlaces in Side Tray.
+	//LLFloaterURLDisplay* url_displayp = LLFloaterReg::getTypedInstance<LLFloaterURLDisplay>("preview_url",LLSD());
+	//if(url_displayp) url_displayp->setName(region_name);
 
 	// Request a region handle by name
 	LLWorldMap::getInstance()->sendNamedRegionRequest(region_name,
@@ -274,12 +276,11 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str
 	local_pos.mV[VY] = (F32)local_y;
 	local_pos.mV[VZ] = (F32)z;
 
-
+	LLVector3d global_pos = from_region_handle(region_handle);
+	global_pos += LLVector3d(local_pos);
 	
 	if (teleport)
-	{
-		LLVector3d global_pos = from_region_handle(region_handle);
-		global_pos += LLVector3d(local_pos);
+	{	
 		gAgent.teleportViaLocation(global_pos);
 		LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance();
 		if(instance)
@@ -289,18 +290,28 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str
 	}
 	else
 	{
-		// display informational floater, allow user to click teleport btn
-		LLFloaterURLDisplay* url_displayp = LLFloaterReg::getTypedInstance<LLFloaterURLDisplay>("preview_url",LLSD());
-		if(url_displayp)
-		{
-			url_displayp->displayParcelInfo(region_handle, local_pos);
-			if(snapshot_id.notNull())
-			{
-				url_displayp->setSnapshotDisplay(snapshot_id);
-			}
-			std::string locationString = llformat("%s %d, %d, %d", region_name.c_str(), x, y, z);
-			url_displayp->setLocationString(locationString);
-		}
+		LLSD key;
+		key["type"] = "remote_place";
+		key["x"] = global_pos.mdV[VX];
+		key["y"] = global_pos.mdV[VY];
+		key["z"] = global_pos.mdV[VZ];
+
+		LLSideTray::getInstance()->showPanel("panel_places", key);
+
+		// LLFloaterURLDisplay functionality moved to LLPanelPlaces in Side Tray.
+
+//		// display informational floater, allow user to click teleport btn
+//		LLFloaterURLDisplay* url_displayp = LLFloaterReg::getTypedInstance<LLFloaterURLDisplay>("preview_url",LLSD());
+//		if(url_displayp)
+//		{
+//			url_displayp->displayParcelInfo(region_handle, local_pos);
+//			if(snapshot_id.notNull())
+//			{
+//				url_displayp->setSnapshotDisplay(snapshot_id);
+//			}
+//			std::string locationString = llformat("%s %d, %d, %d", region_name.c_str(), x, y, z);
+//			url_displayp->setLocationString(locationString);
+//		}
 	}
 }
 
diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp
index 62ed861c86..4155a87e14 100644
--- a/indra/newview/llviewergesture.cpp
+++ b/indra/newview/llviewergesture.cpp
@@ -46,7 +46,7 @@
 #include "llviewermessage.h" // send_guid_sound_trigger
 #include "llviewernetwork.h"
 #include "llagent.h"
-#include "llbottomtray.h"
+#include "llnearbychatbar.h"
 
 // Globals
 LLViewerGestureList gGestureList;
@@ -136,7 +136,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat )
 	{
 		// Don't play nodding animation, since that might not blend
 		// with the gesture animation.
-		LLBottomTray::getInstance()->sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE);
+		LLNearbyChatBar::getInstance()->sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE);
 	}
 }
 
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index 63234c2990..4e0c4023fd 100644
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -36,7 +36,7 @@
 #include "llviewerkeyboard.h"
 #include "llmath.h"
 #include "llagent.h"
-#include "llbottomtray.h"
+#include "llnearbychatbar.h"
 #include "llviewercontrol.h"
 #include "llfocusmgr.h"
 #include "llmorphview.h"
@@ -500,7 +500,7 @@ void stop_moving( EKeystate s )
 void start_chat( EKeystate s )
 {
 	// start chat
-	LLBottomTray::startChat(NULL);
+	LLNearbyChatBar::startChat(NULL);
 }
 
 void start_gesture( EKeystate s )
@@ -508,15 +508,15 @@ void start_gesture( EKeystate s )
 	if (KEYSTATE_UP == s &&
 		!(gFocusMgr.getKeyboardFocus() && gFocusMgr.getKeyboardFocus()->acceptsTextInput()))
 	{
- 		if (LLBottomTray::getInstance()->getCurrentChat().empty())
+ 		if (LLNearbyChatBar::getInstance()->getCurrentChat().empty())
  		{
  			// No existing chat in chat editor, insert '/'
- 			LLBottomTray::getInstance()->startChat("/");
+ 			LLNearbyChatBar::startChat("/");
  		}
  		else
  		{
  			// Don't overwrite existing text in chat editor
- 			LLBottomTray::getInstance()->startChat(NULL);
+ 			LLNearbyChatBar::startChat(NULL);
  		}
 	}
 }
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index e06e180ed5..7071b65228 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -132,6 +132,7 @@
 #include "llfloatermemleak.h"
 #include "llfasttimerview.h"
 #include "llavataractions.h"
+#include "lllandmarkactions.h"
 #include "llmemoryview.h"
 #include "llgivemoney.h"
 #include "llgroupmgr.h"
@@ -5270,24 +5271,6 @@ class LLWorldSetBusy : public view_listener_t
 	}
 };
 
-bool can_create_landmark()
-{
-	BOOL can = FALSE;
-
-	LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-	if (agent_parcel)
-{
-
-		if (agent_parcel->getAllowLandmark()
-			|| LLViewerParcelMgr::isParcelOwnedByAgent(agent_parcel, GP_LAND_ALLOW_LANDMARK))
-	{
-			can = TRUE;
-		}
-	}
-
-	return can;
-}
-
 class LLWorldCreateLandmark : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -6675,9 +6658,7 @@ class LLWorldEnableCreateLandmark : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		bool new_value = can_create_landmark();
-		
-		return new_value;
+		return !LLLandmarkActions::landmarkAlreadyExists();
 	}
 };
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 74ded99124..25c00bb816 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -209,6 +209,10 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
 	LLUUID fid;
 	LLMessageSystem* msg = gMessageSystem;
 	const LLSD& payload = notification["payload"];
+
+	// add friend to recent people list
+	LLRecentPeople::instance().add(payload["from_id"]);
+
 	switch(option)
 	{
 	case 0:
@@ -1180,6 +1184,9 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 			{
 				opener = open_agent_offer;
 			}
+
+			// add buddy to recent people list
+			LLRecentPeople::instance().add(mFromID);
 		}
 			break;
 		case IM_TASK_INVENTORY_OFFERED:
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 65f341627a..3aefa84295 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -765,13 +765,17 @@ BOOL LLViewerParcelMgr::canHearSound(const LLVector3d &pos_global) const
 BOOL LLViewerParcelMgr::inAgentParcel(const LLVector3d &pos_global) const
 {
 	LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal(pos_global);
-	if (region != gAgent.getRegion())
+	LLViewerRegion* agent_region = gAgent.getRegion();
+	if (!region || !agent_region)
+		return FALSE;
+
+	if (region != agent_region)
 	{
 		// Can't be in the agent parcel if you're not in the same region.
 		return FALSE;
 	}
 
-	LLVector3 pos_region = gAgent.getRegion()->getPosRegionFromGlobal(pos_global);
+	LLVector3 pos_region = agent_region->getPosRegionFromGlobal(pos_global);
 	S32 row =    S32(pos_region.mV[VY] / PARCEL_GRID_STEP_METERS);
 	S32 column = S32(pos_region.mV[VX] / PARCEL_GRID_STEP_METERS);
 
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 902b59c732..0fadba1364 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -47,11 +47,13 @@
 #include "llfloateravatarinfo.h"
 #include "llfloaterworldmap.h"
 #include "llnotify.h"
+#include "llpanelplaces.h"
 #include "llpreview.h"
 #include "llpreviewtexture.h"
 #include "llpreviewnotecard.h"
 #include "llpreviewlandmark.h"
 #include "llscrollbar.h"
+#include "llsidetray.h"
 #include "lltooldraganddrop.h"
 #include "lltrans.h"
 #include "llviewercontrol.h"
@@ -1365,11 +1367,22 @@ void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item, llwchar wc
 {
 	if (!item)
 		return;
-	LLPreviewLandmark* preview = LLFloaterReg::showTypedInstance<LLPreviewLandmark>("preview_landmark", LLSD(item->getUUID()), TAKE_FOCUS_YES);
-	if (preview)
+
+	LLSD key;
+	key["type"] = "landmark";
+	key["id"] = item->getUUID();
+
+	LLPanelPlaces *panel = dynamic_cast<LLPanelPlaces*>(LLSideTray::getInstance()->showPanel("panel_places", key));
+	if (panel)
 	{
-		preview->setItem( item );
+		panel->setItem(item);
 	}
+
+//	LLPreviewLandmark* preview = LLFloaterReg::showTypedInstance<LLPreviewLandmark>("preview_landmark", LLSD(item->getUUID()), TAKE_FOCUS_YES);
+//	if (preview)
+//	{
+//		preview->setItem( item );
+//	}
 }
 
 void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, llwchar wc )
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index a949830dcf..533889b2f7 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -878,7 +878,10 @@ void LLViewerFetchedTexture::init(bool firstinit)
 
 LLViewerFetchedTexture::~LLViewerFetchedTexture()
 {
-	if (mHasFetcher)
+	//*NOTE getTextureFetch can return NULL when Viewer is shutting down.
+	// This is due to LLWearableList is singleton and is destroyed after 
+	// LLAppViewer::cleanup() was called. (see ticket EXT-177)
+	if (mHasFetcher && LLAppViewer::getTextureFetch())
 	{
 		LLAppViewer::getTextureFetch()->deleteRequest(getID(), true);
 	}
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 3e86f48cc5..f312cc0f63 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -184,6 +184,7 @@
 #include "llviewernetwork.h"
 #include "llpostprocess.h"
 #include "llbottomtray.h"
+#include "llnearbychatbar.h"
 
 #include "llnotificationmanager.h"
 
@@ -1559,10 +1560,12 @@ void LLViewerWindow::initWorldUI()
 	getRootView()->sendChildToFront(gSnapshotFloaterView);
 
 	// new bottom panel
+	getRootView()->addChild(LLBottomTray::getInstance());
+	// Make sure Bottom Tray is behind Side Tray regardless "addChild" order.
+	getRootView()->sendChildToBack(LLBottomTray::getInstance());
 	LLRect rc = LLBottomTray::getInstance()->getRect();
 	rc.mLeft = 0;
 	rc.mRight = mRootView->getRect().getWidth();
-	mRootView->addChild(LLBottomTray::getInstance());
 	LLBottomTray::getInstance()->reshape(rc.getWidth(),rc.getHeight(),FALSE);
 	LLBottomTray::getInstance()->setRect(rc);
 
@@ -1646,12 +1649,10 @@ void LLViewerWindow::initWorldUI()
 	getRootView()->sendChildToFront(gMenuHolder);
 
 	//Channel Manager
-	LLNotificationsUI::LLChannelManager * channel_manager
-			= LLNotificationsUI::LLChannelManager::getInstance();
+	LLNotificationsUI::LLChannelManager* channel_manager = LLNotificationsUI::LLChannelManager::getInstance();
 	getRootView()->addChild(channel_manager);
 	//Notification Manager
-	LLNotificationsUI::LLNotificationManager* notify_manager =
-			LLNotificationsUI::LLNotificationManager::getInstance();
+	LLNotificationsUI::LLNotificationManager* notify_manager = LLNotificationsUI::LLNotificationManager::getInstance();
 	getRootView()->addChild(notify_manager);
 }
 
@@ -2175,7 +2176,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 	LLUICtrl* keyboard_focus = gFocusMgr.getKeyboardFocus();
 	if( keyboard_focus )
 	{
-		LLLineEditor* chat_editor = LLBottomTray::instanceExists() ? LLBottomTray::getInstance()->getChatBox() : NULL;
+		LLLineEditor* chat_editor = LLBottomTray::instanceExists() ? LLBottomTray::getInstance()->getNearbyChatBar()->getChatBox() : NULL;
 		// arrow keys move avatar while chatting hack
 		if (chat_editor && chat_editor->hasFocus())
 		{
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index fc639fbb21..f1d4520370 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -67,6 +67,9 @@
 #include "llfloaterfriends.h"  //VIVOX, inorder to refresh communicate panel
 #include "llfloaterchat.h"		// for LLFloaterChat::addChat()
 
+// for Talk Button's state updating
+#include "llnearbychatbar.h"
+
 // for base64 decoding
 #include "apr_base64.h"
 
@@ -5783,6 +5786,7 @@ bool LLVoiceClient::getMuteMic() const
 void LLVoiceClient::setUserPTTState(bool ptt)
 {
 	mUserPTTState = ptt;
+	LLNearbyChatBar::getInstance()->setPTTState(ptt);
 }
 
 bool LLVoiceClient::getUserPTTState()
@@ -5793,6 +5797,7 @@ bool LLVoiceClient::getUserPTTState()
 void LLVoiceClient::toggleUserPTTState(void)
 {
 	mUserPTTState = !mUserPTTState;
+	LLNearbyChatBar::getInstance()->setPTTState(mUserPTTState);
 }
 
 void LLVoiceClient::setVoiceEnabled(bool enabled)
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 179c790aed..d55f9fa42f 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -304,7 +304,10 @@
      value="0.3344 0.5456 0.5159 1" />
     <color
      name="GroupNotifyTextColor"
-     value="0 0.12 0.24 1" />
+	 reference="White"/>
+    <color
+     name="GroupNotifyDimmedTextColor"
+	 reference="DkGray"/>	 
     <color
      name="GroupOverTierColor"
      value="0.43 0.06 0.06 1" />
@@ -493,10 +496,10 @@
      value="1 0.82 0.46 1" />
     <color
      name="NotifyCautionWarnColor"
-     reference="Black" />
+     reference="White" />
     <color
      name="NotifyTextColor"
-     reference="Black" />
+     reference="White" />
     <color
      name="ObjectChatColor"
      reference="LtGray" />
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 3052571b1e..2d67e3d5a9 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -28,5 +28,21 @@
       		color="1 1 1 1" enabled="true" image_name="closebox.tga"
       		name="close_btn"/>
 	</panel>
-  <chat_items_container bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_history" />
+            <text_editor
+             bg_readonly_color="ChatHistoryBgColor"
+             bg_writeable_color="ChatHistoryBgColor"
+             follows="left|top|right|bottom"
+             font="SansSerif"
+             layout="topleft"
+			 height="320"
+             max_length="2147483647"
+             name="Chat History Editor"
+             read_only="true"
+             text_color="ChatHistoryTextColor"
+             text_readonly_color="ChatHistoryTextColor"
+             bottom="0"
+             track_bottom="true"
+             width="250"
+             word_wrap="true" />
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
index 78dff0bd4a..013136a593 100644
--- a/indra/newview/skins/default/xui/en/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_navbar.xml
@@ -23,6 +23,9 @@
         <menu_item_call.on_click
          function="Navbar.Action"
          parameter="landmark" />
+        <menu_item_call.on_enable
+         function="Navbar.EnableMenuItem"
+         parameter="can_landmark" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e922e3b743..fe1baf22d0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -180,23 +180,11 @@
             <menu_item_call.on_click
              function="World.Chat" />
         </menu_item_call>
-        <menu_item_check
-         label="Local Chat"
-         layout="topleft"
-         name="Chat History"
-         shortcut="control|H">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="chat" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="chat" />
-        </menu_item_check>
         <menu_item_check
          label="Nearby Chat"
          layout="topleft"
          name="Nearby Chat"
-         shortcut="control|N">
+         shortcut="control|H">
             <menu_item_check.on_check
              function="Floater.Visible"
              parameter="nearby_chat" />
@@ -204,29 +192,6 @@
              function="Floater.Toggle"
              parameter="nearby_chat" />
         </menu_item_check>
-        <menu_item_check
-         label="Communicate"
-         layout="topleft"
-         name="Instant Message"
-         shortcut="control|T">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="communicate" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="communicate" />
-        </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
-		<menu_item_call
-         label="Media Remote Ctrl"
-         layout="topleft"
-         name="Preferences"
-         shortcut="control|alt|M">
-            <menu_item_call.on_click
-             function="Floater.Toggle"
-             parameter="media_remote_ctrl" />
-        </menu_item_call>
         <menu_item_separator
          layout="topleft" />
         <menu_item_check
@@ -251,6 +216,29 @@
              function="Floater.Toggle"
              parameter="mute" />
         </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_check
+         label="(Legacy) Communicate"
+         layout="topleft"
+         name="Instant Message"
+         shortcut="control|T">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="communicate" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="communicate" />
+        </menu_item_check>
+		<menu_item_call
+         label="(Temp) Media Remote Ctrl"
+         layout="topleft"
+         name="Preferences"
+         shortcut="control|alt|M">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="media_remote_ctrl" />
+        </menu_item_call>
     </menu>
     <menu
      label="World"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c89eed37ab..17bb961308 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4191,6 +4191,7 @@ Are you sure you want to quit?
      name="okcancelignore"
      notext="Don&apos;t Quit"
      yestext="Quit"/>
+     <unique/>
   </notification>
 
   <notification
@@ -6465,6 +6466,10 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block
      yestext="Create group for L$100"/>
   </notification>
 
+  <notification icon="notifytip.tga"
+		name="AttachmentSaved" type="notifytip">
+		Attachment has been saved.
+  </notification>
 
   <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index bbef5a8892..d42943d225 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -39,105 +39,12 @@
          layout="topleft"
          left="5"
          min_height="28"
-         width="250"
+         width="500"
          top="0"
-         min_width="100">
-            <line_editor
-             border_style="line"
-             border_thickness="1"
-             follows="left|right"
-             height="20"
-             layout="topleft"
-             left="0"
-             name="chat_box"
-             right="-39"
-             top="3"
-             width="250" />
-            <button follows="right" width="36" top="3" left="214" resize="false"
-               label="Hx" height="20">
-              <button.commit_callback function="Floater.Toggle" parameter="chat"/>
-          </button>
-        </layout_panel>
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         top="0"
-         width="5"
-         min_width="5" />
-        <view_border
-         auto_resize="false"
-         bevel_style="in"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         left="270"
-         top="0"
-         width="1" />
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         top="0"
-         width="5" 
-         min_width="5" />
-        <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="100"
-         top="0"
-         min_width="100">
-            <chiclet_talk
-             follows="right"
-             height="20"
-             layout="topleft"
-             left="0"
-             name="talk"
-             top="3"
-             width="100" />
-        </layout_panel>
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         name="DUMMY"
-         top="0"
-         width="5" 
-         min_width="5"/>
-        <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="90"
-         top="0"
-         min_width="90">
-            <gesture_combo_box
-             bottom="22"
-             follows="right"
-             height="20"
-             label="Gestures"
-             layout="topleft"
-             name="Gesture"
-             top="3"
-             width="90" />
-        </layout_panel>
+         min_width="305"
+         name="chat_bar"
+         user_resize="false"
+         filename="panel_nearby_chat_bar.xml"/>
 		 <icon
          auto_resize="false"
          color="0 0 0 0"
@@ -159,7 +66,8 @@
          min_height="28"
          width="90"
          top_delta="-10"
-         min_width="90">
+         min_width="90"
+         user_resize="false">
             <button
              bottom="22"
              follows="right"
@@ -190,7 +98,7 @@
          top="0"
          name="chiclet_list_panel"
          width="150"
-         min_width="70">
+         user_resize="false">
             <chiclet_panel
              follows="left|right"
              height="25"
@@ -222,14 +130,15 @@
          name="im_well_panel"
          width="40"
          top="0"
-         min_width="40" >
+         min_width="40" 
+         user_resize="false">
             <chiclet_notification
              follows="right"
              height="25"
              layout="topleft"
              left="0"
              name="im_well"
-             top="1"
+             top="2"
              width="40">
               <button
                image_selected="im_notifications.tga"
@@ -285,14 +194,15 @@
          top="0"
          name="sys_well_panel"
          width="48"
-         min_width="48">
+         min_width="48"
+         user_resize="false">
             <chiclet_notification
              follows="right"
              height="25"
              layout="topleft"
              left="0"
              name="sys_well"
-             top="1"
+             top="2"
              width="48">
               <button
                image_selected="bottom_tray_sys_notifications.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index b628ee3aa1..713c3a41a2 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -15,7 +15,7 @@
       		color="1 1 1 1" enabled="true" name="avatar_icon"
 		  />
     	<text
-        	width="160" top="25" left="40" height="20" follows="left|right|top"
+        	width="130" top="25" left="40" height="20" follows="left|right|top"
         	font="SansSerifBigBold" text_color="white" word_wrap="true"
         	mouse_opaque="true" name="sender_name" >
 	      Jerry Knight
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 1757197372..a39a681f83 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -9,21 +9,23 @@
 			top="5"  left="5" mouse_opaque="true" name="group_icon"/>
 		<text type="string" length="1" follows="left|top|right|bottom"
 			font="SansSerifBigBold" height="20" layout="topleft" left="60" name="title"
-			text_color="white" top="20" width="300">
+			text_color="GroupNotifyTextColor" top="20" width="300">
 			Sender Name / Group Name
         </text>
 	</panel>
 	<text_editor type="string" length="1" bg_readonly_color="0 0 0 0"
 		follows="left|top|right|bottom" height="70" hide_scrollbar="true"
 		hide_border="true" layout="topleft" top="55" left="25" name="message"
-		text_color="white" text_readonly_color="white" width="300" word_wrap="true">
+		text_color="GroupNotifyTextColor" text_readonly_color="GroupNotifyTextColor" width="300" word_wrap="true">
 		Message
 		Body
     </text_editor>
+	<icon follows="left|top|right|bottom" height="16" width="16"
+		layout="topleft" top="135" left="25" mouse_opaque="true" name="attachment_icon" />
 	<text font="SansSerif" font.style="UNDERLINE" font_shadow="hard"
 		type="string" length="1" follows="left|top|right|bottom" layout="topleft"
-		left="25" top="135" height="15" width="300" name="attachment"
-		text_color="white">
+		left="45" top="135" height="15" width="280" name="attachment"
+		text_color="GroupNotifyTextColor">
 		Attachment
         </text>
 	<button label="OK" layout="topleft" top="170" left="140" height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
new file mode 100644
index 0000000000..8b19f9a515
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ default_tab_group="1"
+ follows="left|bottom|right"
+ height="25"
+ layout="topleft"
+ left="0"
+ name="chat_bar"
+ top="24"
+ width="500">
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|right"
+     height="20"
+     label="Click here to chat."
+     layout="topleft"
+     left_delta="7"
+     left="0"
+     name="chat_box"
+     tool_tip="Press Enter to say, Ctrl-Enter to shout."
+     top="3"
+     width="250" />
+    <button 
+	   follows="right" 
+	   width="45" 
+	   top="3" 
+	   layout="topleft" 
+	   left_pad="5"
+       label="Log" 
+	   height="20">
+      <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/>
+    </button>
+    <chiclet_talk
+     follows="right"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     name="talk"
+     top="3"
+     width="100" />
+    <gesture_combo_box
+     follows="right"
+     height="20"
+     label="Gestures"
+     layout="topleft"
+     name="Gesture"
+     left_pad="5"
+     top="3"
+     width="90" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 686dc931d3..1a06e2bb06 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -9,7 +9,7 @@
  left="0"
  name="picture_item"
  top="80"
- width="310">
+ width="245">
     <texture_picker
      allow_no_texture="true"
      default_image_name="None"
@@ -22,32 +22,31 @@
      name="picture"
      tab_stop="false"
      top="7"
-     width="90" />
+     width="70" />
     <text
-     follows="right"
-     font="SansSerifBold"
+     follows="top|left|right"
+     font="SansSerif"
      height="20"
      layout="topleft"
-     left="100"
+     left="80"
      name="picture_name"
      text_color="black"
      top="5"
      use_ellipses="true"
-     width="170"/>
+     width="150"/>
     <text
-     follows="right"
-     font="SansSerif"
+     follows="top|left|right"
+     font="SansSerifSmall"
      height="40"
      layout="topleft"
-     left="100"
      name="picture_descr"
      text_color="white"
      top="25"
      use_ellipses="true"
-     width="170"
+     width="150"
      word_wrap="true" />
     <button
-     follows="right"
+     follows="top|right"
      height="20"
      image_disabled="navbar_bg_button.tga"
      image_disabled_selected="navbar_bg_button.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index b746fcf84b..096b60adb1 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -7,6 +7,26 @@
   width="305" 
   collapsed="true" 
 >
+  <sidetray_tab 	
+    name="sidebar_home"
+    tab_title="Home"
+    description="Home."
+    image="icn_voice-groupfocus.tga"
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+  >
+      <panel 
+        name="panel_home" 
+        filename="panel_sidetray_home_tab.xml" 
+        width="355" 
+        height="465" 
+        label="home" 
+        border="true" 
+      />
+  </sidetray_tab>
+
   <sidetray_tab 	
     name="sidebar_people"
     tab_title="People"
@@ -17,15 +37,6 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <accordion_tab 
-      name="people_accordion" 
-      title="People" 
-      collapsable="true" 
-      min_width="200" 
-      min_height="200" 
-      expanded="true" 
-      header_visible="false"
-    >
       <panel 
         class="panel_people" 
         name="panel_people" 
@@ -35,7 +46,6 @@
         label="People" 
         border="true" 
       />
-    </accordion_tab>
   </sidetray_tab>
   <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
@@ -48,14 +58,6 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <accordion_tab 
-      name="places_accordian" 
-      title="Places" 
-      collapsable="true" 
-      min_width="355" 
-      min_height="200" 
-      header_visible="false"
-    >
       <panel 
         class="panel_places" 
         name="panel_places" 
@@ -63,7 +65,6 @@
         label="Places" 
         border="true"
       />
-    </accordion_tab>
   </sidetray_tab>
   
   <sidetray_tab 
@@ -75,14 +76,6 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <accordion_tab 
-      name="me_accordion" 
-      title="Me" 
-      collapsable="false" 
-      min_width="200" 
-      min_height="200"
-      header_visible="false"
-    >
       <panel 
         class="panel_me_profile" 
         name="panel_me_profile" 
@@ -90,7 +83,6 @@
         label="Me" 
         border="true"
       />
-    </accordion_tab>
   </sidetray_tab>
   
   <!--
@@ -107,7 +99,7 @@
       name="group_accordion" 
       title="Group General"
       expanded="true"
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       header_visible="true"
@@ -187,7 +179,7 @@
     <accordion_tab 
       name="floater_preview_animation" 
       title="Preview Animation" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -206,7 +198,7 @@
     <accordion_tab 
       name="floater_preview_gesture" 
       title="Preview Gesture" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -225,7 +217,7 @@
     <accordion_tab 
       name="floater_preview_existing_landmark" 
       title="Preview Existing Landmark" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -244,7 +236,7 @@
     <accordion_tab 
       name="floater_preview_sound" 
       title="Preview Sound" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -263,7 +255,7 @@
     <accordion_tab 
       name="floater_preview_url" 
       title="Preview URL" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -282,7 +274,7 @@
     <accordion_tab 
       name="floater_URL_entry" 
       title="URL Entry" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -313,7 +305,7 @@
     <accordion_tab 
       name="panel_region_covenant" 
       title="Region Covenant" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -332,7 +324,7 @@
     <accordion_tab 
       name="panel_region_debug" 
       title="Region Debug" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -351,7 +343,7 @@
   <accordion_tab 
       name="panel_region_estate" 
       title="Region Estate" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -370,7 +362,7 @@
   <accordion_tab 
       name="panel_region_general" 
       title="Region General" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -389,7 +381,7 @@
   <accordion_tab 
       name="panel_region_terrain" 
       title="Region Terrain" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -408,7 +400,7 @@
   <accordion_tab 
       name="panel_region_texture" 
       title="Region Texture" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -427,7 +419,7 @@
   <accordion_tab 
       name="floater_region_info" 
       title="Region Info" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -458,7 +450,7 @@
     <accordion_tab 
       name="floater_tools" 
       title="Tools" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -477,7 +469,7 @@
     <accordion_tab 
       name="floater_bulk_perms" 
       title="Bulk Perms" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -496,7 +488,7 @@
     <accordion_tab 
       name="floater_build_options" 
       title="Build Options" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -528,7 +520,7 @@
     <accordion_tab 
       name="floater_gesture" 
       title="Gestures" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -548,7 +540,7 @@
     <accordion_tab 
       name="floater_buy_contents" 
       title="Buy Contents" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -567,7 +559,7 @@
     <accordion_tab 
       name="floater_buy_object" 
       title="Buy Object" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -586,7 +578,7 @@
     <accordion_tab 
       name="floater_inventory_view_finder" 
       title="Inventory View Finder" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -605,7 +597,7 @@
     <accordion_tab 
       name="floater_mute" 
       title="Mute" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -624,7 +616,7 @@
      <accordion_tab 
       name="floater_sell_land" 
       title="Sell Land" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -643,7 +635,7 @@
      <accordion_tab 
       name="floater_telehub" 
       title="Telehub" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
new file mode 100644
index 0000000000..a85662603d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+
+<panel
+  name="home_tab"
+  title="home_tab"
+  visible="true"
+  width="300"
+  height="420"
+  background_opaque="false"
+  background_visible="true"
+  bevel_style="in"
+  follows="left|top|right|bottom">
+		<panel 
+			left="10" width="280" height="130" 
+			background_visible="true" 
+			background_opaque="false" 
+			bg_alpha_color="0.3 0.3 0.3 1.0" 
+			name="sidebar_people"
+			follows="left|top|right"
+			class="panel_sidetray_home_info">
+    			<text
+        			top="-10" width="200" left="5" height="30" follows="left|right|top"
+        			font="SansSerifHugeBold" text_color="white" word_wrap="true"
+        			mouse_opaque="false" name="tab_name" >
+					People
+    			</text>
+    			<icon
+      				top="-10" right="-10" width="20" height="20" follows="top|right"
+      				color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga"
+      				mouse_opaque="false" name="tab_icon"/>
+  				<text
+      				top="-40" left="10" right="-10" height="120" follows="left|right|bottom"
+      				font="SansSerifBig" text_color="white" word_wrap="true"
+      				mouse_opaque="false" name="tab_description" >    
+					Find your friends, contacts and people nearby.
+  				</text>
+		</panel> 
+		<panel 
+			left="10" width="280" height="130" 
+			background_visible="true" 
+			background_opaque="false" 
+			bg_alpha_color="0.3 0.3 0.3 1.0" 
+			name="sidebar_places"
+			follows="left|top|right"
+			class="panel_sidetray_home_info">
+    			<text
+        			top="-10" width="200" left="5" height="30" follows="left|right|top"
+        			font="SansSerifHugeBold" text_color="white" word_wrap="true"
+        			mouse_opaque="false" name="tab_name" >
+					Places
+    			</text>
+    			<icon
+      				top="-10" right="-10" width="20" height="20" follows="top|right"
+      				color="1 1 1 1" enabled="true" image_name="inv_item_landmark.tga"
+      				mouse_opaque="false" name="tab_icon"/>
+  				<text
+      				top="-40" left="10" right="-10" height="120" follows="left|right|bottom|top"
+      				font="SansSerifBig" text_color="white" word_wrap="true"
+      				mouse_opaque="false" name="tab_description" >    
+					Find your friends, contacts and people nearby.
+  				</text>
+		</panel> 
+		<panel 
+			left="10" width="280" height="130" 
+			background_visible="true" 
+			background_opaque="false" 
+			bg_alpha_color="0.3 0.3 0.3 1.0" 
+			name="sidebar_me"
+			follows="left|top|right"
+			class="panel_sidetray_home_info">
+    			<text
+        			top="-10" width="200" left="5" height="30" follows="left|right|top"
+        			font="SansSerifHugeBold" text_color="white" word_wrap="true"
+        			mouse_opaque="false" name="tab_name" >
+					Me
+    			</text>
+    			<icon
+      				top="-10" right="-10" width="20" height="20" follows="top|right"
+      				color="1 1 1 1" enabled="true" image_name="icn_voice-pvtfocus.tga"
+      				mouse_opaque="false" name="tab_icon"/>
+  				<text
+      				top="-40" left="10" right="-10" height="120" follows="left|right|bottom"
+      				font="SansSerifBig" text_color="white" word_wrap="true"
+      				mouse_opaque="false" name="tab_description" >    
+					Change your profile, your look and quick links to your outfits.
+  				</text>
+		</panel> 
+</panel> 
+  
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 8952ea1307..ba4915e074 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -17,16 +17,16 @@
   bg_alpha_color="0.3 0.3 0.3 1.0">
 
   <text
-   type="string"
    visible="false"
    follows="left|top|right|bottom"
    font="SansSerifBold"
    height="40"
    layout="topleft"
    left="60"
-   name="text"
+   name="toast_text"
+   word_wrap="true"
    text_color="white"
-   top="30"
+   top="20"
    width="290">
     Toast text;
   </text>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 149da313a2..e5665b0194 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -652,6 +652,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="Stage">Stage</string>	
 	<string name="Other">Other</string>	
 	<string name="Any">Any</string>	
+	<string name="You">You</string>							
 						
 	<!-- puncutations -->
 	<string name=":">:</string>			
@@ -785,4 +786,6 @@ If you continue to receive this message, contact customer support.
 	<string name="UTCTimeMin">min,datetime,utc</string>
 	<string name="UTCTimeSec">second,datetime,utc</string>
 	<string name="UTCTimeTimezone">timezone,datetime,utc</string>							
+	
+	
 </strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index efb9a89c6a..eb9bb99b20 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -10,16 +10,13 @@
                 add_landmark_image_enabled="Favorite_Star_Active"
                 add_landmark_image_disabled="Favorite_Star_Off"
                 hover_glow_amount="0.15"
-                add_landmark_width="20"
-                add_landmark_height="20"
                 add_landmark_hpad="2"
                 allow_text_entry="true"
-                arrow_image="Combobox_Selected"
                 list_position="below"
       	        show_text_as_tentative="false"
                 max_chars="20"
                 follows="left|top"
-                background="TextField_Off">
+                >
   <info_button name="Place Information"
                           label=""
                           tool_tip="About current location"
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index 7004de8475..b33acf81cc 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -3,6 +3,5 @@
             thumb_outline_color="SliderThumbOutlineColor"
             thumb_center_color="SliderThumbCenterColor"
             thumb_image="SliderThumb_Off"
-            hover_glow_amount="0.15"
             track_image="SliderTrack_Horiz"
             track_highlight_image="SliderTrack_Horiz" />
-- 
cgit v1.3


From db5cda26676f376f18816013c0c5e3fbad5b20d0 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 3 Aug 2009 22:25:48 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 ->
 viewer-2.0.0-3 QA: New movement and camera controls. Test all movement and
 camera behavior against spec and expected behaviors, including sitting &
 standing. Many other changes to the bottom bar. Changes to local chat
 behavior.

---
 indra/newview/CMakeLists.txt                       |  12 +-
 indra/newview/app_settings/settings.xml            |  35 +-
 indra/newview/llagent.cpp                          | 100 +++--
 indra/newview/llagent.h                            |   6 +
 indra/newview/llappviewer.cpp                      |   2 -
 indra/newview/llavatarlist.cpp                     |  18 +
 indra/newview/llavatarlist.h                       |   8 +
 indra/newview/llbottomtray.cpp                     |  49 +-
 indra/newview/llbottomtray.h                       |   5 -
 indra/newview/llchannelmanager.cpp                 |   8 +-
 indra/newview/llchannelmanager.h                   |   2 +
 indra/newview/llfloatercamera.cpp                  | 286 +++++++++++-
 indra/newview/llfloatercamera.h                    |  80 +++-
 indra/newview/llfloaterinventory.cpp               |   1 -
 indra/newview/llgroupactions.cpp                   | 127 ++++++
 indra/newview/llgroupactions.h                     |   5 +
 indra/newview/lllocationhistory.cpp                |   8 +-
 indra/newview/lllocationinputctrl.cpp              |  15 +-
 indra/newview/lllocationinputctrl.h                |   1 +
 indra/newview/llmoveview.cpp                       | 498 +++++++++++++++++++--
 indra/newview/llmoveview.h                         |  98 +++-
 indra/newview/llnavigationbar.cpp                  |  46 +-
 indra/newview/llnavigationbar.h                    |   2 +-
 indra/newview/llnearbychat.cpp                     |   3 +-
 indra/newview/llnearbychatbar.cpp                  |  97 +++-
 indra/newview/llnearbychatbar.h                    |   2 +
 indra/newview/lloverlaybar.cpp                     |   2 +-
 indra/newview/llpanelavatar.cpp                    |  14 +-
 indra/newview/llpanelpeople.cpp                    |  27 +-
 indra/newview/llpanelpeople.h                      |   2 -
 indra/newview/llpanelplaceinfo.cpp                 |  21 +
 indra/newview/llpanelplaceinfo.h                   |   4 +
 indra/newview/llpanelplaces.cpp                    | 257 ++++++++++-
 indra/newview/llpanelplaces.h                      |  23 +-
 indra/newview/llpanelprofile.cpp                   |  48 +-
 indra/newview/llpanelprofile.h                     |   2 +-
 indra/newview/llpanelprofileview.cpp               |  29 +-
 indra/newview/llscreenchannel.cpp                  |  16 +-
 indra/newview/llscreenchannel.h                    |   3 +-
 indra/newview/llsidetray.cpp                       |  14 +
 indra/newview/llsidetray.h                         |   1 +
 indra/newview/llsidetraypanelcontainer.cpp         |  89 ++++
 indra/newview/llsidetraypanelcontainer.h           |  95 ++++
 indra/newview/llsplitbutton.cpp                    | 275 ++++++++++++
 indra/newview/llsplitbutton.h                      | 112 +++++
 indra/newview/lltoast.cpp                          |  24 +-
 indra/newview/lltoast.h                            |   2 +
 indra/newview/lltoolbar.cpp                        |   2 +-
 indra/newview/lltoolfocus.cpp                      |   8 +-
 indra/newview/lltoolpie.cpp                        |   5 +-
 indra/newview/llviewerfloaterreg.cpp               |   5 +-
 indra/newview/llviewerinventory.cpp                |  17 +-
 indra/newview/llviewerkeyboard.cpp                 |  35 +-
 indra/newview/llviewermenu.cpp                     |  38 +-
 indra/newview/llviewermessage.cpp                  |  12 +-
 indra/newview/llviewertexteditor.cpp               |   6 +-
 indra/newview/llviewerwindow.cpp                   |  34 +-
 indra/newview/llviewerwindow.h                     |   1 -
 indra/newview/llvoavatar.cpp                       |  23 +-
 indra/newview/llvoavatar.h                         |   5 +
 indra/newview/llvoavatarself.cpp                   |   9 +
 indra/newview/macview_Prefix.h                     |   1 -
 .../textures/quick_tips/avatar_free_mode.png       | Bin 0 -> 1447 bytes
 .../textures/quick_tips/camera_free_mode.png       | Bin 0 -> 2267 bytes
 .../textures/quick_tips/camera_orbit_mode.png      | Bin 0 -> 2381 bytes
 .../textures/quick_tips/camera_pan_mode.png        | Bin 0 -> 2418 bytes
 .../quick_tips/camera_preset_front_view.png        | Bin 0 -> 2365 bytes
 .../quick_tips/camera_preset_group_view.png        | Bin 0 -> 2595 bytes
 .../quick_tips/camera_preset_rear_view.png         | Bin 0 -> 2221 bytes
 .../default/textures/quick_tips/move_fly_first.png | Bin 0 -> 1528 bytes
 .../textures/quick_tips/move_fly_second.png        | Bin 0 -> 2128 bytes
 .../default/textures/quick_tips/move_run_first.png | Bin 0 -> 1554 bytes
 .../textures/quick_tips/move_run_second.png        | Bin 0 -> 2534 bytes
 .../textures/quick_tips/move_walk_first.png        | Bin 0 -> 2106 bytes
 .../textures/quick_tips/move_walk_second.png       | Bin 0 -> 3108 bytes
 .../skins/default/xui/en/floater_camera.xml        | 160 +++++--
 .../default/xui/en/floater_first_time_tip.xml      |  20 +
 .../skins/default/xui/en/floater_moveview.xml      | 286 +++++++-----
 indra/newview/skins/default/xui/en/menu_navbar.xml |  19 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |   9 +
 .../skins/default/xui/en/panel_bottomtray.xml      | 115 ++++-
 .../newview/skins/default/xui/en/panel_people.xml  |  12 -
 .../newview/skins/default/xui/en/panel_places.xml  | 102 +++--
 .../newview/skins/default/xui/en/panel_profile.xml |   2 +-
 .../skins/default/xui/en/panel_profile_view.xml    |   5 +-
 .../skins/default/xui/en/panel_side_tray.xml       |  15 +-
 .../default/xui/en/panel_stand_stop_flying.xml     |  28 ++
 indra/newview/skins/default/xui/en/strings.xml     |   2 +-
 .../skins/default/xui/en/widgets/split_button.xml  |  24 +
 89 files changed, 3010 insertions(+), 564 deletions(-)
 create mode 100644 indra/newview/llsidetraypanelcontainer.cpp
 create mode 100644 indra/newview/llsidetraypanelcontainer.h
 create mode 100644 indra/newview/llsplitbutton.cpp
 create mode 100644 indra/newview/llsplitbutton.h
 create mode 100644 indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/camera_free_mode.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/move_fly_first.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/move_fly_second.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/move_run_first.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/move_run_second.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/move_walk_first.png
 create mode 100644 indra/newview/skins/default/textures/quick_tips/move_walk_second.png
 create mode 100644 indra/newview/skins/default/xui/en/floater_first_time_tip.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/split_button.xml

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 9a0c9d9c7b..899d0a8293 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -130,13 +130,13 @@ set(viewer_SOURCE_FILES
     llfeaturemanager.cpp
     llfilepicker.cpp
     llfirstuse.cpp
+    llfirsttimetipmanager.cpp
     llflexibleobject.cpp
     llfloaterabout.cpp
     llfloateractivespeakers.cpp
     llfloateraddlandmark.cpp
     llfloateranimpreview.cpp
     llfloaterauction.cpp
-    llfloateravatarinfo.cpp
     llfloateravatarpicker.cpp
     llfloateravatartextures.cpp
     llfloaterbeacons.cpp
@@ -158,6 +158,7 @@ set(viewer_SOURCE_FILES
     llfloaterdirectory.cpp
     llfloaterenvsettings.cpp
     llfloaterevent.cpp
+    llfloaterfirsttimetip.cpp
     llfloaterfriends.cpp
     llfloaterfonttest.cpp
     llfloatergesture.cpp
@@ -283,6 +284,7 @@ set(viewer_SOURCE_FILES
     llpanelavatar.cpp
     llpanelavatarrow.cpp
     llpanelclassified.cpp
+    llsidetraypanelcontainer.cpp
     llpanelcontents.cpp
     llpaneldirbrowser.cpp
     llpaneldirclassified.cpp
@@ -308,6 +310,7 @@ set(viewer_SOURCE_FILES
     llpanellogin.cpp
     llpanelmedia.cpp
     llpanelmeprofile.cpp
+    llpanelmovetip.cpp
     llpanelobject.cpp
     llpanelpeople.cpp
     llpanelpermissions.cpp
@@ -345,6 +348,7 @@ set(viewer_SOURCE_FILES
     llsky.cpp
     llslurl.cpp
     llspatialpartition.cpp
+    llsplitbutton.cpp
     llsprite.cpp
     llsrv.cpp
     llstartup.cpp
@@ -569,13 +573,13 @@ set(viewer_HEADER_FILES
     llfeaturemanager.h
     llfilepicker.h
     llfirstuse.h
+    llfirsttimetipmanager.h
     llflexibleobject.h
     llfloaterabout.h
     llfloateractivespeakers.h
     llfloateraddlandmark.h
     llfloateranimpreview.h
     llfloaterauction.h
-    llfloateravatarinfo.h
     llfloateravatarpicker.h
     llfloateravatartextures.h
     llfloaterbeacons.h
@@ -597,6 +601,7 @@ set(viewer_HEADER_FILES
     llfloaterdirectory.h
     llfloaterenvsettings.h
     llfloaterevent.h
+    llfloaterfirsttimetip.h
     llfloaterfonttest.h
     llfloaterfriends.h
     llfloatergesture.h
@@ -721,6 +726,7 @@ set(viewer_HEADER_FILES
     llpanelavatar.h
     llpanelavatarrow.h
     llpanelclassified.h
+    llsidetraypanelcontainer.h
     llpanelcontents.h
     llpaneldirbrowser.h
     llpaneldirclassified.h
@@ -746,6 +752,7 @@ set(viewer_HEADER_FILES
     llpanellogin.h
     llpanelmedia.h
     llpanelmeprofile.h
+    llpanelmovetip.h
     llpanelobject.h
     llpanelpeople.h
     llpanelpermissions.h
@@ -785,6 +792,7 @@ set(viewer_HEADER_FILES
     llsky.h
     llslurl.h
     llspatialpartition.h
+    llsplitbutton.h
     llsprite.h
     llsrv.h
     llstartup.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index edcd288b7d..3baf37826f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4760,6 +4760,17 @@
       <key>Value</key>
       <integer>5</integer>
     </map>
+    <key>ToastOpaqueTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Width of notification messages</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>4</integer>
+    </map>
     <key>StartUpToastTime</key>
     <map>
       <key>Comment</key>
@@ -4769,7 +4780,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>10</integer>
+      <integer>5</integer>
     </map>
     <key>ToastMargin</key>
     <map>
@@ -6763,6 +6774,17 @@
       <integer>0</integer>
     </map>
     <key>ShowCrosshairs</key>
+    <map>
+      <key>Comment</key>
+      <string>Show Coordinates in  Location Input Field</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>ShowCoordinatesOption</key>
     <map>
       <key>Comment</key>
       <string>Display crosshairs when in mouselook mode</string>
@@ -9623,5 +9645,16 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>GroupTeleportMembersLimit</key>
+    <map>
+      <key>Comment</key>
+      <string>Max number of members of group to offer teleport</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>100</integer>
+    </map>
   </map>
 </llsd>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index f527719a7a..ce8b05d97a 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -42,7 +42,6 @@
 #include "llfirstuse.h"
 #include "llfloaterreg.h"
 #include "llfloateractivespeakers.h"
-#include "llfloateravatarinfo.h"
 #include "llfloatercamera.h"
 #include "llfloatercustomize.h"
 #include "llfloaterdirectory.h"
@@ -499,12 +498,16 @@ void LLAgent::resetView(BOOL reset_camera, BOOL change_camera)
 			LLViewerJoystick::getInstance()->moveAvatar(true);
 		}
 
-		LLFloaterReg::hideInstance("build");
+		//Camera Tool is needed for Free Camera Control Mode
+		if (!LLFloaterCamera::inFreeCameraMode())
+		{
+			LLFloaterReg::hideInstance("build");
+
+			// Switch back to basic toolset
+			LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
+		}
 		
 		gViewerWindow->showCursor();
-
-		// Switch back to basic toolset
-		LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
 	}
 
 
@@ -755,7 +758,7 @@ void LLAgent::setFlying(BOOL fly)
 		}
 
 		// don't allow taking off while sitting
-		if (fly && mAvatarObject->mIsSitting)
+		if (fly && mAvatarObject->isSitting())
 		{
 			return;
 		}
@@ -784,6 +787,11 @@ void LLAgent::setFlying(BOOL fly)
 		clearControlFlags(AGENT_CONTROL_FLY);
 		gSavedSettings.setBOOL("FlyBtnState", FALSE);
 	}
+
+
+	// Update Movement Controls according to Fly mode
+	LLFloaterMove::setFlyingMode(fly);
+
 	mbFlagsDirty = TRUE;
 }
 
@@ -807,11 +815,16 @@ bool LLAgent::enableFlying()
 	BOOL sitting = FALSE;
 	if (gAgent.getAvatarObject())
 	{
-		sitting = gAgent.getAvatarObject()->mIsSitting;
+		sitting = gAgent.getAvatarObject()->isSitting();
 	}
 	return !sitting;
 }
 
+void LLAgent::standUp()
+{
+	setControlFlags(AGENT_CONTROL_STAND_UP);
+}
+
 
 //-----------------------------------------------------------------------------
 // setRegion()
@@ -1242,7 +1255,7 @@ F32 LLAgent::clampPitchToLimits(F32 angle)
 
 	F32 angle_from_skyward = acos( mFrameAgent.getAtAxis() * skyward );
 
-	if (mAvatarObject.notNull() && mAvatarObject->mIsSitting)
+	if (mAvatarObject.notNull() && mAvatarObject->isSitting())
 	{
 		look_down_limit = 130.f * DEG_TO_RAD;
 	}
@@ -2488,13 +2501,11 @@ void LLAgent::autoPilot(F32 *delta_yaw)
 void LLAgent::propagate(const F32 dt)
 {
 	// Update UI based on agent motion
-	LLFloaterMove *floater_move = LLFloaterReg::getTypedInstance<LLFloaterMove>("moveview");
+	LLFloaterMove *floater_move = LLFloaterReg::findTypedInstance<LLFloaterMove>("moveview");
 	if (floater_move)
 	{
 		floater_move->mForwardButton   ->setToggleState( mAtKey > 0 || mWalkKey > 0 );
 		floater_move->mBackwardButton  ->setToggleState( mAtKey < 0 || mWalkKey < 0 );
-		floater_move->mSlideLeftButton ->setToggleState( mLeftKey > 0 );
-		floater_move->mSlideRightButton->setToggleState( mLeftKey < 0 );
 		floater_move->mTurnLeftButton  ->setToggleState( mYawKey > 0.f );
 		floater_move->mTurnRightButton ->setToggleState( mYawKey < 0.f );
 		floater_move->mMoveUpButton    ->setToggleState( mUpKey > 0 );
@@ -2579,7 +2590,7 @@ void LLAgent::updateLookAt(const S32 mouse_x, const S32 mouse_y)
 		else
 		{
 			// *FIX: rotate mframeagent by sit object's rotation?
-			LLQuaternion look_rotation = mAvatarObject->mIsSitting ? mAvatarObject->getRenderRotation() : mFrameAgent.getQuaternion(); // use camera's current rotation
+			LLQuaternion look_rotation = mAvatarObject->isSitting() ? mAvatarObject->getRenderRotation() : mFrameAgent.getQuaternion(); // use camera's current rotation
 			LLVector3 look_offset = LLVector3(2.f, 0.f, 0.f) * look_rotation * av_inv_rot;
 			setLookAt(LOOKAT_TARGET_IDLE, mAvatarObject, look_offset);
 		}
@@ -2815,6 +2826,8 @@ void LLAgent::endAnimationUpdateUI()
 
 		LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
 
+		LLFloaterCamera::toPrevModeIfInAvatarViewMode();
+
 		// Only pop if we have pushed...
 		if (TRUE == mViewsPushed)
 		{
@@ -2909,6 +2922,10 @@ void LLAgent::endAnimationUpdateUI()
 		// JC - Added for always chat in third person option
 		gFocusMgr.setKeyboardFocus(NULL);
 
+		//Making sure Camera Controls floater is in the right state 
+		//when entering Mouse Look using wheel scrolling
+		LLFloaterCamera::updateIfNotInAvatarViewMode();
+
 		LLToolMgr::getInstance()->setCurrentToolset(gMouselookToolset);
 
 		mViewsPushed = TRUE;
@@ -3019,7 +3036,7 @@ void LLAgent::updateCamera()
 	validateFocusObject();
 
 	if (mAvatarObject.notNull() && 
-		mAvatarObject->mIsSitting &&
+		mAvatarObject->isSitting() &&
 		camera_mode == CAMERA_MODE_MOUSELOOK)
 	{
 		//Ventrella
@@ -3050,24 +3067,24 @@ void LLAgent::updateCamera()
 	}
 
 	// Update UI with our camera inputs
-	LLFloaterCamera* camera_instance = LLFloaterReg::getTypedInstance<LLFloaterCamera>("camera");
-	if(camera_instance)
+	LLFloaterCamera* camera_floater = LLFloaterReg::findTypedInstance<LLFloaterCamera>("camera");
+	if (camera_floater)
 	{
-		camera_instance->mRotate->setToggleState(
-												 mOrbitRightKey > 0.f,	// left
-												 mOrbitUpKey > 0.f,		// top
-												 mOrbitLeftKey > 0.f,	// right
-												 mOrbitDownKey > 0.f);	// bottom
+		camera_floater->mRotate->setToggleState(
+		mOrbitRightKey > 0.f,	// left
+		mOrbitUpKey > 0.f,		// top
+		mOrbitLeftKey > 0.f,	// right
+		mOrbitDownKey > 0.f);	// bottom
 
-	    camera_instance->mZoom->setToggleState( 
-											   mOrbitInKey > 0.f,		// top
-											   mOrbitOutKey > 0.f);	// bottom
+		camera_floater->mZoom->setToggleState( 
+		mOrbitInKey > 0.f,		// top
+		mOrbitOutKey > 0.f);	// bottom
 
-		camera_instance->mTrack->setToggleState(
-												mPanLeftKey > 0.f,		// left
-												mPanUpKey > 0.f,		// top
-												mPanRightKey > 0.f,		// right
-												mPanDownKey > 0.f);		// bottom
+		camera_floater->mTrack->setToggleState(
+		mPanLeftKey > 0.f,		// left
+		mPanUpKey > 0.f,		// top
+		mPanRightKey > 0.f,		// right
+		mPanDownKey > 0.f);		// bottom
 	}
 
 	// Handle camera movement based on keyboard.
@@ -3144,7 +3161,7 @@ void LLAgent::updateCamera()
 			// (2) focus, and (3) upvector. They can then be queried elsewhere in llAgent.
 			//--------------------------------------------------------------------------------
 			// *TODO: use combined rotation of frameagent and sit object
-			LLQuaternion avatarRotationForFollowCam = mAvatarObject->mIsSitting ? mAvatarObject->getRenderRotation() : mFrameAgent.getQuaternion();
+			LLQuaternion avatarRotationForFollowCam = mAvatarObject->isSitting() ? mAvatarObject->getRenderRotation() : mFrameAgent.getQuaternion();
 
 			LLFollowCamParams* current_cam = LLFollowCamMgr::getActiveFollowCamParams();
 			if (current_cam)
@@ -3324,7 +3341,7 @@ void LLAgent::updateCamera()
 	}
 	mLastPositionGlobal = global_pos;
 	
-	if (LLVOAvatar::sVisibleInFirstPerson && mAvatarObject.notNull() && !mAvatarObject->mIsSitting && cameraMouselook())
+	if (LLVOAvatar::sVisibleInFirstPerson && mAvatarObject.notNull() && !mAvatarObject->isSitting() && cameraMouselook())
 	{
 		LLVector3 head_pos = mAvatarObject->mHeadp->getWorldPosition() + 
 			LLVector3(0.08f, 0.f, 0.05f) * mAvatarObject->mHeadp->getWorldRotation() + 
@@ -3504,7 +3521,7 @@ LLVector3d LLAgent::calcFocusPositionTargetGlobal()
 		}
 		return mFocusTargetGlobal;
 	}
-	else if (mSitCameraEnabled && mAvatarObject.notNull() && mAvatarObject->mIsSitting && mSitCameraReferenceObject.notNull())
+	else if (mSitCameraEnabled && mAvatarObject.notNull() && mAvatarObject->isSitting() && mSitCameraReferenceObject.notNull())
 	{
 		// sit camera
 		LLVector3 object_pos = mSitCameraReferenceObject->getRenderPosition();
@@ -3628,7 +3645,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 			return LLVector3d::zero;
 		}
 		head_offset.clearVec();
-		if (mAvatarObject->mIsSitting && mAvatarObject->getParent())
+		if (mAvatarObject->isSitting() && mAvatarObject->getParent())
 		{
 			mAvatarObject->updateHeadOffset();
 			head_offset.mdV[VX] = mAvatarObject->mHeadOffset.mV[VX];
@@ -3642,7 +3659,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 		else
 		{
 			head_offset.mdV[VZ] = mAvatarObject->mHeadOffset.mV[VZ];
-			if (mAvatarObject->mIsSitting)
+			if (mAvatarObject->isSitting())
 			{
 				head_offset.mdV[VZ] += 0.1;
 			}
@@ -3658,7 +3675,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 
 		if (mSitCameraEnabled 
 			&& mAvatarObject.notNull() 
-			&& mAvatarObject->mIsSitting 
+			&& mAvatarObject->isSitting() 
 			&& mSitCameraReferenceObject.notNull())
 		{
 			// sit camera
@@ -3690,7 +3707,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 				local_camera_offset = mFrameAgent.rotateToAbsolute( local_camera_offset );
 			}
 
-			if (!mCameraCollidePlane.isExactlyZero() && (mAvatarObject.isNull() || !mAvatarObject->mIsSitting))
+			if (!mCameraCollidePlane.isExactlyZero() && (mAvatarObject.isNull() || !mAvatarObject->isSitting()))
 			{
 				LLVector3 plane_normal;
 				plane_normal.setVec(mCameraCollidePlane.mV);
@@ -4116,7 +4133,7 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
 
 	if (mAvatarObject.notNull())
 	{
-		if (!mAvatarObject->mIsSitting)
+		if (!mAvatarObject->isSitting())
 		{
 			mAvatarObject->mPelvisp->setPosition(LLVector3::zero);
 		}
@@ -4198,7 +4215,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
 		return;
 	}
 
-	setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
+	standUp(); // force stand up
 	gViewerWindow->getWindow()->resetBusyCount();
 
 	if (gFaceEditToolset)
@@ -5478,13 +5495,8 @@ void update_group_floaters(const LLUUID& group_id)
 {
 	LLFloaterGroupInfo::refreshGroup(group_id);
 
-	//*TODO Implement group update for Profile View
-	// update avatar info
-// 	LLFloaterAvatarInfo* fa = LLFloaterReg::findTypedInstance<LLFloaterAvatarInfo>("preview_avatar", LLSD(gAgent.getID()));
-// 	if(fa)
-// 	{
-// 		fa->resetGroupList();
-// 	}
+	//*TODO Implement group update for Profile View 
+	// still actual as of July 31, 2009 (DZ)
 
 	if (gIMMgr)
 	{
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index e25bb0a578..0b1ff2e76b 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -373,6 +373,12 @@ private:
 	bool 			mbAlwaysRun; 			// Should the avatar run by default rather than walk?
 	bool 			mbRunning;				// Is the avatar trying to run right now?
 
+	//--------------------------------------------------------------------
+	// Sit and stand
+	//--------------------------------------------------------------------
+public:
+	void			standUp();
+
 	//--------------------------------------------------------------------
 	// Busy
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 245e358d80..7834e7b2ef 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3997,8 +3997,6 @@ void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
 
 void LLAppViewer::handleLoginComplete()
 {
-	gViewerWindow->handleLoginComplete();
-
 	initMainloopTimeout("Mainloop Init");
 
 	// Store some data to DebugInfo in case of a freeze.
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index a85f8710c7..40dd20dfa4 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -117,6 +117,24 @@ void LLAvatarList::draw()
 	}
 }
 
+//virtual
+BOOL LLAvatarList::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	LLScrollListItem* hit_item = hitItem(x, y);
+	if (NULL == hit_item)
+	{
+		std::vector<LLScrollListItem*> selectedItems = getAllSelected();
+		std::vector<LLScrollListItem*>::const_iterator it = selectedItems.begin();
+
+		for (; it != selectedItems.end(); ++it)
+		{
+			(*it)->setSelected(FALSE);
+		}
+		return TRUE;
+	}
+	return LLScrollListCtrl::handleMouseDown(x, y, mask);
+}
+
 std::vector<LLUUID> LLAvatarList::getSelectedIDs()
 {
 	LLUUID selected_id;
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
index 8b419dbb57..991e9fa145 100644
--- a/indra/newview/llavatarlist.h
+++ b/indra/newview/llavatarlist.h
@@ -59,6 +59,14 @@ public:
 	virtual	~LLAvatarList() {}
 
 	/*virtual*/ void	draw();
+	/**
+	 * Overrides base-class behavior of Mouse Down Event.
+	 * 
+	 * LLScrollListCtrl::handleMouseDown version calls setFocus which select the first item if nothing selected.
+	 * We need to deselect all items if perform click not over the any item. Otherwise calls base method.
+	 * See EXT-246
+	 */
+	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
 
 	BOOL update(const std::vector<LLUUID>& all_buddies,
 		const std::string& name_filter = LLStringUtil::null);
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 1781e6b3f1..8e1ae7d4f2 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -38,17 +38,14 @@
 #include "llfloaterreg.h"
 #include "llflyoutbutton.h"
 #include "llnearbychatbar.h"
-
-//FIXME: temporary, for stand up proto
-#include "llselectmgr.h" 
-#include "llvoavatarself.h"
+#include "llsplitbutton.h"
+#include "llfloatercamera.h"
 
 LLBottomTray::LLBottomTray(const LLSD&)
 	: mChicletPanel(NULL)
 	, mIMWell(NULL)
 	, mSysWell(NULL)
 	, mTalkBtn(NULL)
-	, mStandUpBtn(NULL)  ////FIXME: temporary, for stand up proto
 	, mNearbyChatBar(NULL)
 {
 	mFactoryMap["chat_bar"] = LLCallbackMap(LLBottomTray::createNearbyChatBar, NULL);
@@ -61,13 +58,9 @@ LLBottomTray::LLBottomTray(const LLSD&)
 
 	mChicletPanel->setChicletClickedCallback(boost::bind(&LLBottomTray::onChicletClick,this,_1));
 
-	////FIXME: temporary, for stand up proto
-	mStandUpBtn = getChild<LLButton> ("stand", TRUE, FALSE);
-	if (mStandUpBtn)
-	{
-		mStandUpBtn->setCommitCallback(boost::bind(&LLBottomTray::onCommitStandUp, this, _1));
-	}
-	
+	LLSplitButton* presets = getChild<LLSplitButton>("presets", TRUE, FALSE);
+	if (presets) presets->setSelectionCallback(LLFloaterCamera::onClickCameraPresets);
+
 	LLIMMgr::getInstance()->addSessionObserver(this);
 
 	//this is to fix a crash that occurs because LLBottomTray is a singleton
@@ -99,6 +92,7 @@ void LLBottomTray::onChicletClick(LLUICtrl* ctrl)
 		//// Show after comm window so it is frontmost (and hence will not
 		//// auto-hide)
 		//LLIMFloater::show(chiclet->getSessionId());
+		chiclet->setCounter(0);
 	}
 }
 
@@ -113,37 +107,6 @@ void* LLBottomTray::createNearbyChatBar(void* userdata)
 	return bt->mNearbyChatBar;
 }
 
-//virtual
-void LLBottomTray::draw()
-{
-	refreshStandUp();
-	LLPanel::draw();
-}
-
-void LLBottomTray::refreshStandUp()
-{
-	//FIXME: temporary, for stand up proto
-	BOOL sitting = FALSE;
-	if (gAgent.getAvatarObject())
-	{
-		sitting = gAgent.getAvatarObject()->mIsSitting;
-	}
-	
-	if (mStandUpBtn && mStandUpBtn->getVisible() != sitting)
-	{
-		mStandUpBtn->setVisible(sitting);
-		sendChildToFront(mStandUpBtn);
-		moveChildToBackOfTabGroup(mStandUpBtn);
-	}
-}
-
-//FIXME: temporary, for stand up proto
-void LLBottomTray::onCommitStandUp(LLUICtrl* ctrl)
-{
-	LLSelectMgr::getInstance()->deselectAllForStandingUp();
-	gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
-}
-
 //virtual
 void LLBottomTray::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id)
 {
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index e5848f72dc..a100124e02 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -56,11 +56,7 @@ public:
 	LLNotificationChiclet*	getSysWell()	{return mSysWell;}
 	LLNearbyChatBar*		getNearbyChatBar()	{return mNearbyChatBar;}
 
-	/*virtual*/void draw();
-	void refreshStandUp();
-
 	void onCommitGesture(LLUICtrl* ctrl);
-	void onCommitStandUp(LLUICtrl* ctrl);	
 	void refreshGestures();
 
 	// LLIMSessionObserver observe triggers
@@ -82,7 +78,6 @@ protected:
 	LLNotificationChiclet* 	mIMWell;
 	LLNotificationChiclet* 	mSysWell;
 	LLTalkButton* 		mTalkBtn;
-	LLButton*           mStandUpBtn;
 	LLNearbyChatBar*	mNearbyChatBar;
 };
 
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp
index 0eb0801a2c..118385ab58 100644
--- a/indra/newview/llchannelmanager.cpp
+++ b/indra/newview/llchannelmanager.cpp
@@ -45,6 +45,8 @@ using namespace LLNotificationsUI;
 LLChannelManager::LLChannelManager()
 {
 	LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLChannelManager::onLoginCompleted, this));
+	mChannelList.clear();
+	mStartUpChannel = NULL;
 }
 
 //--------------------------------------------------------------------------
@@ -74,7 +76,6 @@ void LLChannelManager::onLoginCompleted()
 	p.id = LLUUID(STARTUP_CHANNEL_ID);
 	p.channel_right_bound = getRootView()->getRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); 
 	p.channel_width = gSavedSettings.getS32("NotifyBoxWidth");
-	mStartUpChannel = NULL;
 	mStartUpChannel = createChannel(p);
 
 	if(!mStartUpChannel)
@@ -90,6 +91,7 @@ void LLChannelManager::enableShowToasts()
 {
 	LLScreenChannel::setStartUpToastShown();
 	delete mStartUpChannel;
+	mStartUpChannel = NULL;
 }
 
 //--------------------------------------------------------------------------
@@ -166,6 +168,10 @@ void LLChannelManager::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 //--------------------------------------------------------------------------
 
+LLScreenChannel* LLChannelManager::getStartUpChannel()
+{
+	return mStartUpChannel;
+}
 
 //--------------------------------------------------------------------------
 
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index 3914d20ebc..ac8e81d7ef 100644
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@@ -112,6 +112,8 @@ public:
 
 	void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
+	LLScreenChannel* getStartUpChannel();
+
 private:
 
 	LLScreenChannel*			mStartUpChannel;
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index ee3e465832..81f1beb40d 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -35,24 +35,143 @@
 #include "llfloatercamera.h"
 
 // Library includes
-#include "lluictrlfactory.h"
+#include "llfloaterreg.h"
 
 // Viewer includes
 #include "lljoystickbutton.h"
+#include "llfirsttimetipmanager.h"
 #include "llviewercontrol.h"
+#include "llbottomtray.h"
+#include "llagent.h"
+#include "lltoolmgr.h"
+#include "lltoolfocus.h"
 
 // Constants
 const F32 CAMERA_BUTTON_DELAY = 0.0f;
 
+#define ORBIT "cam_rotate_stick"
+#define PAN "cam_track_stick"
+#define CONTROLS "controls"
+
 //
 // Member functions
 //
+
+/*static*/ bool LLFloaterCamera::inFreeCameraMode()
+{
+	LLFloaterCamera* floater_camera = LLFloaterCamera::findInstance();
+	if (floater_camera && floater_camera->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA)
+	{
+		return true;
+	}
+	return false;
+}
+
+bool LLFloaterCamera::inAvatarViewMode()
+{
+	return mCurrMode == CAMERA_CTRL_MODE_AVATAR_VIEW;
+}
+
+void LLFloaterCamera::resetFreeCameraMode()
+{
+	if (mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA)
+	{
+		/* Camera Tool can be deselected when we are mouse wheel scrolling into Mouse Look 
+		In such case we are unable to determine that we will be into Mouse Look view */
+		if (mPrevMode == CAMERA_CTRL_MODE_AVATAR_VIEW)
+		{
+			setMode(CAMERA_CTRL_MODE_ORBIT);
+		}
+		else
+		{
+			setMode(mPrevMode);
+		}
+	}
+}
+
+void LLFloaterCamera::update()
+{
+	ECameraControlMode mode = determineMode();
+	if (mode != mCurrMode) setMode(mode);
+	LLFirstTimeTipsManager::showTipsFor(mMode2TipType[mode], this);
+}
+
+
+/*static*/ void LLFloaterCamera::updateIfNotInAvatarViewMode()
+{
+	LLFloaterCamera* floater_camera = LLFloaterCamera::findInstance();
+	if (floater_camera && !floater_camera->inAvatarViewMode()) 
+	{
+		floater_camera->update();
+	}
+}
+
+
+void LLFloaterCamera::toPrevMode()
+{
+	switchMode(mPrevMode);
+}
+
+/*static*/ void LLFloaterCamera::toPrevModeIfInAvatarViewMode()
+{
+	LLFloaterCamera* floater_camera = LLFloaterCamera::findInstance();
+	if (floater_camera && floater_camera->inAvatarViewMode())
+	{
+		floater_camera->toPrevMode();
+	}
+}
+
+LLFloaterCamera* LLFloaterCamera::findInstance()
+{
+	return LLFloaterReg::findTypedInstance<LLFloaterCamera>("camera");
+}
+
+/*static*/
+void LLFloaterCamera::onClickCameraPresets(LLUICtrl* ctrl, const LLSD& param)
+{
+	std::string name = param.asString();
+
+	if ("rear_view" == name)
+	{
+		LLFirstTimeTipsManager::showTipsFor(LLFirstTimeTipsManager::FTT_CAMERA_PRESET_REAR, ctrl);
+		gAgent.resetView(TRUE, TRUE);
+	}
+	else if ("3/4_view" == name)
+	{
+		LLFirstTimeTipsManager::showTipsFor(LLFirstTimeTipsManager::FTT_CAMERA_PRESET_GROUP);
+		//*TODO implement 3/4 view
+	}
+	else if ("front_view" == name)
+	{
+		LLFirstTimeTipsManager::showTipsFor(LLFirstTimeTipsManager::FTT_CAMERA_PRESET_FRONT);
+		//*TODO implement front view
+	}
+
+}
+
+void LLFloaterCamera::onOpen(const LLSD& key)
+{
+	updatePosition();
+}
+
+void LLFloaterCamera::updatePosition()
+{
+	LLBottomTray* tray = LLBottomTray::getInstance();
+	if (!tray) return;
+
+	LLButton* camera_button = tray->getChild<LLButton>("camera_btn", TRUE, FALSE);
+	if (!camera_button) return;
+
+	//align centers of a button and a floater
+	S32 x = camera_button->calcScreenRect().getCenterX() - getRect().getWidth()/2;
+	setOrigin(x, 0);
+}
+
 LLFloaterCamera::LLFloaterCamera(const LLSD& val)
-:	LLFloater(val)
+:	LLFloater(val),
+	mCurrMode(CAMERA_CTRL_MODE_ORBIT),
+	mPrevMode(CAMERA_CTRL_MODE_ORBIT)
 {
-	//// For now, only used for size and tooltip strings
-	//const BOOL DONT_OPEN = FALSE;
-	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_camera.xml", DONT_OPEN);
 }
 
 // virtual
@@ -60,10 +179,163 @@ BOOL LLFloaterCamera::postBuild()
 {
 	setIsChrome(TRUE);
 
-	mRotate = getChild<LLJoystickCameraRotate>("cam_rotate_stick");
+	mRotate = getChild<LLJoystickCameraRotate>(ORBIT);
 	mZoom = getChild<LLJoystickCameraZoom>("zoom");
-	mTrack = getChild<LLJoystickCameraTrack>("cam_track_stick");
+	mTrack = getChild<LLJoystickCameraTrack>(PAN);
+
+	initMode2TipTypeMap();
+
+	assignButton2Mode(CAMERA_CTRL_MODE_ORBIT,			"orbit_btn");
+	assignButton2Mode(CAMERA_CTRL_MODE_PAN,				"pan_btn");
+	assignButton2Mode(CAMERA_CTRL_MODE_FREE_CAMERA,		"freecamera_btn");
+	assignButton2Mode(CAMERA_CTRL_MODE_AVATAR_VIEW,		"avatarview_btn");
+
+	update();
 
 	return TRUE;
 }
 
+ECameraControlMode LLFloaterCamera::determineMode()
+{
+	LLTool* curr_tool = LLToolMgr::getInstance()->getCurrentTool();
+	if (curr_tool == LLToolCamera::getInstance())
+	{
+		return CAMERA_CTRL_MODE_FREE_CAMERA;
+	} 
+
+	if (gAgent.getCameraMode() == CAMERA_MODE_MOUSELOOK)
+	{
+		return CAMERA_CTRL_MODE_AVATAR_VIEW;
+	}
+
+	return CAMERA_CTRL_MODE_ORBIT;
+}
+
+
+void clear_camera_tool()
+{
+	LLToolMgr* tool_mgr = LLToolMgr::getInstance();
+	if (tool_mgr->usingTransientTool() && 
+		tool_mgr->getCurrentTool() == LLToolCamera::getInstance())
+	{
+		tool_mgr->clearTransientTool();
+	}
+}
+
+
+void LLFloaterCamera::setMode(ECameraControlMode mode)
+{
+	if (mode != mCurrMode)
+	{
+		mPrevMode = mCurrMode;
+		mCurrMode = mode;
+	}
+	
+	updateState();
+}
+
+void LLFloaterCamera::switchMode(ECameraControlMode mode)
+{
+	setMode(mode);
+
+	switch (mode)
+	{
+	case CAMERA_CTRL_MODE_ORBIT:
+		clear_camera_tool();
+		break;
+
+	case CAMERA_CTRL_MODE_PAN:
+		clear_camera_tool();
+		break;
+
+	case CAMERA_CTRL_MODE_FREE_CAMERA:
+		LLToolMgr::getInstance()->setTransientTool(LLToolCamera::getInstance());
+		break;
+
+	case CAMERA_CTRL_MODE_AVATAR_VIEW:
+		gAgent.changeCameraToMouselook();
+		break;
+
+	default:
+		//normally we won't occur here
+		llassert_always(FALSE);
+	}
+}
+
+
+void LLFloaterCamera::onClickBtn(ECameraControlMode mode)
+{
+	// check for a click on active button
+	if (mCurrMode == mode) mMode2Button[mode]->setToggleState(TRUE);
+	
+	switchMode(mode);
+
+	LLFirstTimeTipsManager::showTipsFor(mMode2TipType[mode], mMode2Button[mode]);
+}
+
+void LLFloaterCamera::assignButton2Mode(ECameraControlMode mode, const std::string& button_name)
+{
+	LLButton* button = getChild<LLButton>(button_name, TRUE, FALSE);
+	llassert_always(button);
+	
+	if (button)
+	{
+		button->setClickedCallback(boost::bind(&LLFloaterCamera::onClickBtn, this, mode));
+		mMode2Button[mode] = button;
+	}
+}
+
+void LLFloaterCamera::initMode2TipTypeMap()
+{
+	mMode2TipType[CAMERA_CTRL_MODE_ORBIT]			= LLFirstTimeTipsManager::FTT_CAMERA_ORBIT_MODE;
+	mMode2TipType[CAMERA_CTRL_MODE_PAN]				= LLFirstTimeTipsManager::FTT_CAMERA_PAN_MODE;
+	mMode2TipType[CAMERA_CTRL_MODE_FREE_CAMERA]		= LLFirstTimeTipsManager::FTT_CAMERA_FREE_MODE;
+	mMode2TipType[CAMERA_CTRL_MODE_AVATAR_VIEW]		= LLFirstTimeTipsManager::FTT_AVATAR_FREE_MODE;
+}
+
+
+void LLFloaterCamera::updateState()
+{
+	//updating buttons
+	std::map<ECameraControlMode, LLButton*>::const_iterator iter = mMode2Button.begin();
+	for (; iter != mMode2Button.end(); ++iter)
+	{
+		iter->second->setToggleState(iter->first == mCurrMode);
+	}
+
+	//updating controls
+	bool isOrbitMode = CAMERA_CTRL_MODE_ORBIT == mCurrMode;
+	bool isPanMode = CAMERA_CTRL_MODE_PAN == mCurrMode;
+
+	childSetVisible(ORBIT, isOrbitMode);
+	childSetVisible(PAN, isPanMode);
+
+	//hiding or showing the panel with controls by reshaping the floater
+	bool showControls = isOrbitMode || isPanMode;
+	if (showControls == childIsVisible(CONTROLS)) return;
+
+	childSetVisible(CONTROLS, showControls);
+
+	LLRect rect = getRect();
+	LLRect controls_rect;
+	if (childGetRect(CONTROLS, controls_rect))
+	{
+		static S32 height = controls_rect.getHeight();
+		S32 newHeight = rect.getHeight();
+		
+		if (showControls)
+		{
+			newHeight += height;
+		}
+		else
+		{
+			newHeight -= height;
+		}
+
+		rect.setOriginAndSize(rect.mLeft, rect.mBottom, rect.getWidth(), newHeight);
+		reshape(rect.getWidth(), rect.getHeight());
+		setRect(rect);
+
+	}
+}
+
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index fabe8f577e..04554c6493 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -35,26 +35,94 @@
 
 #include "llfloater.h"
 
+#include "llfirsttimetipmanager.h"
+
 class LLJoystickCameraRotate;
 class LLJoystickCameraZoom;
 class LLJoystickCameraTrack;
+class LLFloaterReg;
+
+enum ECameraControlMode
+{
+	CAMERA_CTRL_MODE_ORBIT,
+	CAMERA_CTRL_MODE_PAN,
+	CAMERA_CTRL_MODE_FREE_CAMERA,
+	CAMERA_CTRL_MODE_AVATAR_VIEW
+};
 
 class LLFloaterCamera
 	:	public LLFloater
 {
 	friend class LLFloaterReg;
 	
-private:
-
-	LLFloaterCamera(const LLSD& val);
-	~LLFloaterCamera() {};
-	
-	/*virtual*/ BOOL postBuild();
 public:
+
+	/* whether in free camera mode */
+	static bool inFreeCameraMode();
+
+	static void toPrevModeIfInAvatarViewMode();
+
+	/* resets free camera mode to the previous mode */
+	//*TODO remove, if it won't be used by LLToolCamera::handleDeselect()
+	void resetFreeCameraMode();
+
+	/* determines actual mode and updates ui */
+	void update();
 	
+	static void updateIfNotInAvatarViewMode();
+
+	static void onClickCameraPresets(LLUICtrl* ctrl, const LLSD& param);
+
+	virtual void onOpen(const LLSD& key);
+
+	// *HACK: due to hard enough to have this control aligned with "Camera" button while resizing
+	// let update its position in each frame
+	/*virtual*/ void draw(){updatePosition(); LLFloater::draw();}
+
 	LLJoystickCameraRotate* mRotate;
 	LLJoystickCameraZoom*	mZoom;
 	LLJoystickCameraTrack*	mTrack;
+
+private:
+
+	LLFloaterCamera(const LLSD& val);
+	~LLFloaterCamera() {};
+
+	/* return instance if it exists - created by LLFloaterReg */
+	static LLFloaterCamera* findInstance();
+
+	/*virtual*/ BOOL postBuild();
+
+	ECameraControlMode determineMode();
+
+	/* whether in avatar view (first person) mode */
+	bool inAvatarViewMode();
+
+	/* resets to the previous mode */
+	void toPrevMode();
+
+	/* sets a new mode and performs related actions */
+	void switchMode(ECameraControlMode mode);
+
+	/* sets a new mode preserving previous one and updates ui*/
+	void setMode(ECameraControlMode mode);
+
+	/* updates the state (UI) according to the current mode */
+	void updateState();
+
+	void onClickBtn(ECameraControlMode mode);
+	void assignButton2Mode(ECameraControlMode mode, const std::string& button_name);
+	void initMode2TipTypeMap();
+
+	/*Updates position of the floater to be center aligned with "Camera" button.*/
+	void updatePosition();
+
+
+	ECameraControlMode mPrevMode;
+	ECameraControlMode mCurrMode;
+	std::map<ECameraControlMode, LLButton*> mMode2Button;
+	std::map<ECameraControlMode, LLFirstTimeTipsManager::EFirstTimeTipType> mMode2TipType;
+
 };
 
 #endif
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp
index cf78d7d34f..1118dd8f69 100644
--- a/indra/newview/llfloaterinventory.cpp
+++ b/indra/newview/llfloaterinventory.cpp
@@ -50,7 +50,6 @@
 // newview includes
 #include "llappviewer.h"
 #include "llfirstuse.h"
-#include "llfloateravatarinfo.h"
 #include "llfloaterchat.h"
 #include "llfloatercustomize.h"
 #include "llfocusmgr.h"
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index cda30d8900..30f4447283 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -39,6 +39,127 @@
 #include "llfloatergroupinfo.h"
 #include "llfloaterreg.h"
 #include "llimview.h" // for gIMMgr
+#include "llgroupmgr.h"
+#include "llavataractions.h"
+#include "llviewercontrol.h"
+
+// LLGroupActions::teleport helper
+//
+// Method is offerTeleport should be called.
+// First it checks, whether LLGroupMgr contains LLGroupMgrGroupData for this group already.
+// If it's there, processMembersList can be called, which builds vector of ID's for online members and
+// calls LLAvatarActions::offerTeleport.
+// If LLGroupMgr doesn't contain LLGroupMgrGroupData, then ID of group should be saved in
+// mID or queue, if mID is not empty. After that processQueue uses ID from mID or queue,
+// registers LLGroupTeleporter as observer at LLGroupMgr and sends request for group members.
+// LLGroupMgr notifies about response on this request by calling method 'changed'.
+// It calls processMembersList, sets mID to null, to indicate that current group is processed,
+// and calls processQueue to process remaining groups.
+// The reason of calling of LLGroupMgr::addObserver and LLGroupMgr::removeObserver in
+// processQueue and 'changed' methods is that LLGroupMgr notifies observers of only particular group,
+// so, for each group mID should be updated and addObserver/removeObserver is called.
+
+class LLGroupTeleporter : public LLGroupMgrObserver
+{
+public:
+	LLGroupTeleporter() : LLGroupMgrObserver(LLUUID()) {}
+
+	void offerTeleport(const LLUUID& group_id);
+
+	// LLGroupMgrObserver trigger
+	virtual void changed(LLGroupChange gc);
+private:
+	void processQueue();
+	void processMembersList(LLGroupMgrGroupData* gdatap);
+
+	std::queue<LLUUID> mGroupsQueue;
+};
+
+void LLGroupTeleporter::offerTeleport(const LLUUID& group_id)
+{
+	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id);
+
+	if (!gdatap || !gdatap->isMemberDataComplete())
+	{
+		if (mID.isNull())
+			mID = group_id;
+		else
+			// Not null mID means that user requested next group teleport before
+			// previous group is processed, so this group goes to queue
+			mGroupsQueue.push(group_id);
+
+		processQueue();
+	}
+	else
+	{
+		processMembersList(gdatap);
+	}
+}
+
+// Sends request for group in mID or one group in queue
+void LLGroupTeleporter::processQueue()
+{
+	// Get group from queue, if mID is empty
+	if (mID.isNull() && !mGroupsQueue.empty())
+	{
+		mID = mGroupsQueue.front();
+		mGroupsQueue.pop();
+	}
+
+	if (mID.notNull())
+	{
+		LLGroupMgr::getInstance()->addObserver(this);
+		LLGroupMgr::getInstance()->sendGroupMembersRequest(mID);
+	}
+}
+
+// Collects all online members of group and offers teleport to them
+void LLGroupTeleporter::processMembersList(LLGroupMgrGroupData* gdatap)
+{
+	U32 limit = gSavedSettings.getU32("GroupTeleportMembersLimit");
+
+	LLDynamicArray<LLUUID> ids;
+	for (LLGroupMgrGroupData::member_list_t::iterator iter = gdatap->mMembers.begin(); iter != gdatap->mMembers.end(); iter++)
+	{
+		LLGroupMemberData* member = iter->second;
+		if (!member)
+			continue;
+
+		if (member->getID() == gAgent.getID())
+			// No need to teleport own avatar
+			continue;
+
+		if (member->getOnlineStatus() == "Online")
+			ids.push_back(member->getID());
+
+		if ((U32)ids.size() >= limit)
+			break;
+	}
+
+	LLAvatarActions::offerTeleport(ids);
+}
+
+// LLGroupMgrObserver trigger
+void LLGroupTeleporter::changed(LLGroupChange gc)
+{
+	if (gc == GC_MEMBER_DATA)
+	{
+		LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mID);
+
+		if (gdatap && gdatap->isMemberDataComplete())
+			processMembersList(gdatap);
+
+		LLGroupMgr::getInstance()->removeObserver(this);
+
+		// group in mID is processed
+		mID.setNull();
+
+		// process other groups in queue, if any
+		processQueue();
+	}
+}
+
+static LLGroupTeleporter sGroupTeleporter;
 
 // static
 void LLGroupActions::search()
@@ -119,6 +240,12 @@ void LLGroupActions::startChat(const LLUUID& group_id)
 	}
 }
 
+// static
+void LLGroupActions::offerTeleport(const LLUUID& group_id)
+{
+	sGroupTeleporter.offerTeleport(group_id);
+}
+
 //-- Private methods ----------------------------------------------------------
 
 // static
diff --git a/indra/newview/llgroupactions.h b/indra/newview/llgroupactions.h
index 1e6caea17c..b6ddb4511a 100644
--- a/indra/newview/llgroupactions.h
+++ b/indra/newview/llgroupactions.h
@@ -71,6 +71,11 @@ public:
 	 * Start group instant messaging session.
 	 */
 	static void startChat(const LLUUID& group_id);
+
+	/**
+	 * Offers teleport for online members of group
+	 */
+	static void offerTeleport(const LLUUID& group_id);
 	
 private:
 	static bool onLeaveGroup(const LLSD& notification, const LLSD& response);
diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp
index 471a0868bc..68143fd1e3 100644
--- a/indra/newview/lllocationhistory.cpp
+++ b/indra/newview/lllocationhistory.cpp
@@ -47,6 +47,12 @@ void LLLocationHistory::addItem(std::string item)
 {
 	static LLUICachedControl<S32> max_items("LocationHistoryMaxSize", 100);
 	
+	std::vector<std::string>::iterator item_iter = std::find(mItems.begin(), mItems.end(), item);
+
+	if (item_iter != mItems.end()) {
+		mItems.erase(item_iter);
+	}
+
 	mItems.push_back(item);
 
 	// If the vector size exceeds the maximum, purge the oldest items.
@@ -56,7 +62,7 @@ void LLLocationHistory::addItem(std::string item)
 
 void LLLocationHistory::removeItems()
 {
-	mItems.erase(mItems.begin(), mItems.end());
+	mItems.clear();
 }
 
 
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 94abd128c4..3880ea91eb 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -54,6 +54,7 @@
 #include "llsidetray.h"
 #include "llviewerinventory.h"
 #include "llviewerparcelmgr.h"
+#include "llviewercontrol.h"
 
 //============================================================================
 /*
@@ -330,6 +331,13 @@ void LLLocationInputCtrl::onFocusLost()
 	LLUICtrl::onFocusLost();
 	refreshLocation();
 }
+void	LLLocationInputCtrl::draw(){
+	
+	if(!hasFocus()){
+		refreshLocation();
+	}
+	LLComboBox::draw();
+}
 
 void LLLocationInputCtrl::onInfoButtonClicked()
 {
@@ -341,8 +349,7 @@ void LLLocationInputCtrl::onAddLandmarkButtonClicked()
 	LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
 	
 	// Floater "Add Landmark" functionality moved to Side Tray
-	// TODO* Disable floater "Add Landmark" call
-	LLFloaterReg::showInstance("add_landmark");
+	//LLFloaterReg::showInstance("add_landmark");
 }
 
 void LLLocationInputCtrl::onAgentParcelChange()
@@ -387,8 +394,10 @@ void LLLocationInputCtrl::refreshLocation()
 
 	// Update location field.
 	std::string location_name;
+	LLAgent::ELocationFormat format =  (gSavedSettings.getBOOL("ShowCoordinatesOption") ? 
+			LLAgent::LOCATION_FORMAT_FULL: LLAgent::LOCATION_FORMAT_NORMAL);
 
-	if (!gAgent.buildLocationString(location_name, LLAgent::LOCATION_FORMAT_NORMAL))
+	if (!gAgent.buildLocationString(location_name,format))
 		location_name = "Unknown";
 
 	setText(location_name);
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index 2cc63a33b7..bda67fd313 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -71,6 +71,7 @@ public:
 	/*virtual*/ BOOL		handleKeyHere(KEY key, MASK mask);
 	/*virtual*/ void		onFocusReceived();
 	/*virtual*/ void		onFocusLost();
+	/*virtual*/ void		draw();
 	//========================================================================
 
 	// LLUICtrl interface
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 963be61d93..124a2def7f 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -40,12 +40,17 @@
 // Viewer includes
 
 #include "llagent.h"
+#include "llvoavatarself.h" // to check gAgent.getAvatarObject()->isSitting()
+#include "llbottomtray.h"
 #include "llbutton.h"
+#include "llfirsttimetipmanager.h"
 #include "llfloaterreg.h"
+#include "llfloaterfirsttimetip.h"
 #include "lljoystickbutton.h"
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
+#include "llselectmgr.h" 
 
 //
 // Constants
@@ -55,17 +60,24 @@ const F32 MOVE_BUTTON_DELAY = 0.0f;
 const F32 YAW_NUDGE_RATE = 0.05f;	// fraction of normal speed
 const F32 NUDGE_TIME = 0.25f;		// in seconds
 
+const std::string BOTTOM_TRAY_BUTTON_NAME = "movement_btn";
+
 //
 // Member functions
 //
 
 // protected
 LLFloaterMove::LLFloaterMove(const LLSD& key)
-:	LLFloater(key)
+:	LLFloater(key),
+	mForwardButton(NULL),
+	mBackwardButton(NULL),
+	mTurnLeftButton(NULL), 
+	mTurnRightButton(NULL),
+	mMoveUpButton(NULL),
+	mMoveDownButton(NULL),
+	mStopFlyingButton(NULL),
+	mModeActionsPanel(NULL)
 {
-
-//	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_moveview.xml", DONT_OPEN); 
-
 }
 
 // virtual
@@ -80,36 +92,55 @@ BOOL LLFloaterMove::postBuild()
 	mBackwardButton = getChild<LLJoystickAgentTurn>("backward btn"); 
 	mBackwardButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
 
-	mSlideLeftButton = getChild<LLJoystickAgentSlide>("slide left btn"); 
-	mSlideLeftButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-
-	mSlideRightButton = getChild<LLJoystickAgentSlide>("slide right btn"); 
-	mSlideRightButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-
 	mTurnLeftButton = getChild<LLButton>("turn left btn"); 
 	mTurnLeftButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-	mTurnLeftButton->setHeldDownCallback( turnLeft, NULL );
-
+	mTurnLeftButton->setHeldDownCallback(boost::bind(&LLFloaterMove::turnLeft, this));
 	mTurnRightButton = getChild<LLButton>("turn right btn"); 
 	mTurnRightButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-	mTurnRightButton->setHeldDownCallback( turnRight, NULL );
+	mTurnRightButton->setHeldDownCallback(boost::bind(&LLFloaterMove::turnRight, this));
 
 	mMoveUpButton = getChild<LLButton>("move up btn"); 
-	childSetAction("move up btn",moveUp,NULL);
 	mMoveUpButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-	mMoveUpButton->setHeldDownCallback( moveUp, NULL );
+	mMoveUpButton->setHeldDownCallback(boost::bind(&LLFloaterMove::moveUp, this));
 
 	mMoveDownButton = getChild<LLButton>("move down btn"); 
-	childSetAction("move down btn",moveDown,NULL);	
 	mMoveDownButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-	mMoveDownButton->setHeldDownCallback( moveDown, NULL );
+	mMoveDownButton->setHeldDownCallback(boost::bind(&LLFloaterMove::moveDown, this));
+
+
+	mStopFlyingButton = getChild<LLButton>("stop_fly_btn");
+
+	mModeActionsPanel = getChild<LLPanel>("panel_modes");
+
+	LLButton* btn;
+	btn = getChild<LLButton>("mode_walk_btn");
+	btn->setCommitCallback(boost::bind(&LLFloaterMove::onWalkButtonClick, this));
+
+	btn = getChild<LLButton>("mode_run_btn");
+	btn->setCommitCallback(boost::bind(&LLFloaterMove::onRunButtonClick, this));
+
+	btn = getChild<LLButton>("mode_fly_btn");
+	btn->setCommitCallback(boost::bind(&LLFloaterMove::onFlyButtonClick, this));
+
+	btn = getChild<LLButton>("stop_fly_btn");
+	btn->setCommitCallback(boost::bind(&LLFloaterMove::onStopFlyingButtonClick, this));
+
+
+
+	showFlyControls(false);
+
+	initModeTooltips();
+
+	updatePosition();
+
+	initModeButtonMap();
+
+	initMovementMode();
+
 	return TRUE;
 }
-//
-// Static member functions
-//
 
-// protected static 
+// static 
 F32 LLFloaterMove::getYawRate( F32 time )
 {
 	if( time < NUDGE_TIME )
@@ -123,38 +154,431 @@ F32 LLFloaterMove::getYawRate( F32 time )
 	}
 }
 
-// protected static 
-void LLFloaterMove::turnLeft(void *)
+
+// static 
+void LLFloaterMove::setFlyingMode(BOOL fly)
 {
-	LLFloaterMove* instance = LLFloaterReg::getTypedInstance<LLFloaterMove>("moveview");
-	if(!instance) return;
-	
-	F32 time = instance->mTurnLeftButton->getHeldDownTime();
+	LLFloaterMove* instance = LLFloaterReg::findTypedInstance<LLFloaterMove>("moveview");
+	if (instance)
+	{
+		instance->setFlyingModeImpl(fly);
+		instance->showModeButtons(!fly);
+	}
+	if (fly)
+	{
+		LLPanelStandStopFlying::setStandStopFlyingMode(LLPanelStandStopFlying::SSFM_STOP_FLYING);
+	}
+	else
+	{
+		LLPanelStandStopFlying::clearStandStopFlyingMode(LLPanelStandStopFlying::SSFM_STOP_FLYING);
+	}
+}
+//static
+void LLFloaterMove::setAlwaysRunMode(bool run)
+{
+	LLFloaterMove* instance = LLFloaterReg::findTypedInstance<LLFloaterMove>("moveview");
+	if (instance)
+	{
+		instance->setAlwaysRunModeImpl(run);
+	}
+}
+
+void LLFloaterMove::setFlyingModeImpl(BOOL fly)
+{
+	updateButtonsWithMovementMode(fly ? MM_FLY : (gAgent.getAlwaysRun() ? MM_RUN : MM_WALK));
+}
+
+void LLFloaterMove::setAlwaysRunModeImpl(bool run)
+{
+	if (!gAgent.getFlying())
+	{
+		updateButtonsWithMovementMode(run ? MM_RUN : MM_WALK);
+	}
+}
+
+//static
+void LLFloaterMove::setSittingMode(BOOL bSitting)
+{
+	if (bSitting)
+	{
+		LLPanelStandStopFlying::setStandStopFlyingMode(LLPanelStandStopFlying::SSFM_STAND);
+	}
+	else
+	{
+		LLPanelStandStopFlying::clearStandStopFlyingMode(LLPanelStandStopFlying::SSFM_STAND);
+	}
+	enableInstance(!bSitting);
+}
+
+// protected 
+void LLFloaterMove::turnLeft()
+{
+	F32 time = mTurnLeftButton->getHeldDownTime();
 	gAgent.moveYaw( getYawRate( time ) );
 }
 
-// protected static 
-void LLFloaterMove::turnRight(void *)
+// protected
+void LLFloaterMove::turnRight()
 {
-	LLFloaterMove* instance = LLFloaterReg::getTypedInstance<LLFloaterMove>("moveview");
-	if(!instance) return;
-	
-	F32 time = instance->mTurnRightButton->getHeldDownTime();
+	F32 time = mTurnRightButton->getHeldDownTime();
 	gAgent.moveYaw( -getYawRate( time ) );
 }
 
-// protected static 
-void LLFloaterMove::moveUp(void *)
+// protected
+void LLFloaterMove::moveUp()
 {
 	// Jumps or flys up, depending on fly state
 	gAgent.moveUp(1);
 }
 
-// protected static 
-void LLFloaterMove::moveDown(void *)
+// protected
+void LLFloaterMove::moveDown()
 {
 	// Crouches or flys down, depending on fly state
 	gAgent.moveUp(-1);
 }
 
+//////////////////////////////////////////////////////////////////////////
+// Private Section:
+//////////////////////////////////////////////////////////////////////////
+
+void LLFloaterMove::onWalkButtonClick()
+{
+	setMovementMode(MM_WALK);
+}
+void LLFloaterMove::onRunButtonClick()
+{
+	setMovementMode(MM_RUN);
+}
+void LLFloaterMove::onFlyButtonClick()
+{
+	setMovementMode(MM_FLY);
+}
+void LLFloaterMove::onStopFlyingButtonClick()
+{
+	setMovementMode(gAgent.getAlwaysRun() ? MM_RUN : MM_WALK);
+}
+
+void LLFloaterMove::setMovementMode(const EMovementMode mode)
+{
+	gAgent.setFlying(MM_FLY == mode);
+
+	switch (mode)
+	{
+	case MM_RUN:
+		gAgent.setAlwaysRun();
+		gAgent.setRunning();
+		break;
+	case MM_WALK:
+		gAgent.clearAlwaysRun();
+		gAgent.clearRunning();
+		break;
+	default:
+		//do nothing for other modes (MM_FLY)
+		break;
+	}
+	// tell the simulator.
+	gAgent.sendWalkRun(gAgent.getAlwaysRun());
+	
+	updateButtonsWithMovementMode(mode);
+
+	bool bHideModeButtons = MM_FLY == mode
+		|| (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting());
+
+	showModeButtons(!bHideModeButtons);
+
+	showQuickTips(mode);
+}
+
+void LLFloaterMove::updateButtonsWithMovementMode(const EMovementMode newMode)
+{
+	showFlyControls(MM_FLY == newMode);
+	setModeTooltip(newMode);
+	setModeButtonToggleState(newMode);
+}
+
+void LLFloaterMove::showFlyControls(bool bShow)
+{
+	mMoveUpButton->setVisible(bShow);
+	mMoveDownButton->setVisible(bShow);
+
+	// *TODO: mantipov: mStopFlyingButton from the FloaterMove is not used now.
+	// It was not completly removed until functionality is reviewed by LL
+	mStopFlyingButton->setVisible(FALSE);
+}
+
+void LLFloaterMove::initModeTooltips()
+{
+	control_tooltip_map_t walkTipMap;
+	walkTipMap.insert(std::make_pair(mForwardButton, getString("walk_forward_tooltip")));
+	walkTipMap.insert(std::make_pair(mBackwardButton, getString("walk_back_tooltip")));
+	mModeControlTooltipsMap[MM_WALK] = walkTipMap;
+
+	control_tooltip_map_t runTipMap;
+	runTipMap.insert(std::make_pair(mForwardButton, getString("run_forward_tooltip")));
+	runTipMap.insert(std::make_pair(mBackwardButton, getString("run_back_tooltip")));
+	mModeControlTooltipsMap[MM_RUN] = runTipMap;
+
+	control_tooltip_map_t flyTipMap;
+	flyTipMap.insert(std::make_pair(mForwardButton, getString("fly_forward_tooltip")));
+	flyTipMap.insert(std::make_pair(mBackwardButton, getString("fly_back_tooltip")));
+	mModeControlTooltipsMap[MM_FLY] = flyTipMap;
+
+	setModeTooltip(MM_WALK);
+}
+
+void LLFloaterMove::initModeButtonMap()
+{
+	mModeControlButtonMap[MM_WALK] = getChild<LLButton>("mode_walk_btn");
+	mModeControlButtonMap[MM_RUN] = getChild<LLButton>("mode_run_btn");
+	mModeControlButtonMap[MM_FLY] = getChild<LLButton>("mode_fly_btn");
+}
+
+void LLFloaterMove::initMovementMode()
+{
+	EMovementMode initMovementMode = gAgent.getAlwaysRun() ? MM_RUN : MM_WALK;
+	if (gAgent.getFlying())
+	{
+		initMovementMode = MM_FLY;
+	}
+	setMovementMode(initMovementMode);
+
+	if (gAgent.getAvatarObject())
+	{
+		setEnabled(!gAgent.getAvatarObject()->isSitting());
+	}
+}
+
+void LLFloaterMove::setModeTooltip(const EMovementMode mode)
+{
+	llassert_always(mModeControlTooltipsMap.end() != mModeControlTooltipsMap.find(mode));
+	control_tooltip_map_t controlsTipMap = mModeControlTooltipsMap[mode];
+	control_tooltip_map_t::const_iterator it = controlsTipMap.begin();
+	for (; it != controlsTipMap.end(); ++it)
+	{
+		LLView* ctrl = it->first;
+		std::string tooltip = it->second;
+		ctrl->setToolTip(tooltip);
+	}
+}
+
+/**
+ * Updates position of the floater to be center aligned with Move button.
+ * 
+ * Because Tip floater created as dependent floater this method 
+ * must be called before "showQuickTips()" to get Tip floater be positioned at the right side of the floater
+ */
+void LLFloaterMove::updatePosition()
+{
+	LLBottomTray* tray = LLBottomTray::getInstance();
+	if (!tray) return;
+
+	LLButton* movement_btn = tray->getChild<LLButton>(BOTTOM_TRAY_BUTTON_NAME, TRUE, FALSE);
+	if (!movement_btn) return;
+
+	//align centers of a button and a floater
+	S32 x = movement_btn->calcScreenRect().getCenterX() - getRect().getWidth()/2;
+
+	S32 y = 0;
+	if (!mModeActionsPanel->getVisible())
+	{
+		y = mModeActionsPanel->getRect().getHeight();
+	}
+	setOrigin(x, y);
+}
+void LLFloaterMove::showModeButtons(BOOL bShow)
+{
+	if (mModeActionsPanel->getVisible() == bShow)
+		return;
+	mModeActionsPanel->setVisible(bShow);
+
+	LLRect rect = getRect();
+
+	static S32 height = mModeActionsPanel->getRect().getHeight();
+	S32 newHeight = getRect().getHeight();
+	if (!bShow)
+	{
+		newHeight -= height;
+	}
+	else
+	{
+		newHeight += height;
+	}
+	rect.setLeftTopAndSize(rect.mLeft, rect.mTop, rect.getWidth(), newHeight);
+	reshape(rect.getWidth(), rect.getHeight());
+	setRect(rect);
+}
+//static
+void LLFloaterMove::enableInstance(BOOL bEnable)
+{
+	LLFloaterMove* instance = LLFloaterReg::findTypedInstance<LLFloaterMove>("moveview");
+	if (instance)
+	{
+		instance->setEnabled(bEnable);
+		instance->showModeButtons(bEnable);
+	}
+}
+
+void LLFloaterMove::onOpen(const LLSD& key)
+{
+	updatePosition();
+}
+
+void LLFloaterMove::showQuickTips(const EMovementMode mode)
+{
+	LLFirstTimeTipsManager::EFirstTimeTipType tipType = LLFirstTimeTipsManager::FTT_MOVE_WALK;
+	switch (mode)
+	{
+	case MM_FLY:	tipType = LLFirstTimeTipsManager::FTT_MOVE_FLY;			break;
+	case MM_RUN:	tipType = LLFirstTimeTipsManager::FTT_MOVE_RUN;			break;
+	case MM_WALK:	tipType = LLFirstTimeTipsManager::FTT_MOVE_WALK;		break;
+	default: llwarns << "Quick Tip type was not detected, FTT_MOVE_WALK will be used" << llendl;
+	}
+
+	LLFirstTimeTipsManager::showTipsFor(tipType, this);
+}
+
+void LLFloaterMove::setModeButtonToggleState(const EMovementMode mode)
+{
+	llassert_always(mModeControlButtonMap.end() != mModeControlButtonMap.find(mode));
+
+	mode_control_button_map_t::const_iterator it = mModeControlButtonMap.begin();
+	for (; it != mModeControlButtonMap.end(); ++it)
+	{
+		it->second->setToggleState(FALSE);
+	}
+
+	mModeControlButtonMap[mode]->setToggleState(TRUE);
+}
+
+
+
+/************************************************************************/
+/*                        LLPanelStandStopFlying                        */
+/************************************************************************/
+LLPanelStandStopFlying::LLPanelStandStopFlying() :
+	mStandButton(NULL),
+	mStopFlyingButton(NULL)
+{
+	// make sure we have the only instance of this class
+	static bool b = true;
+	llassert_always(b);
+	b=false;
+}
+
+// static
+inline LLPanelStandStopFlying* LLPanelStandStopFlying::getInstance()
+{
+	static LLPanelStandStopFlying* panel = getStandStopFlyingPanel();
+	return panel;
+}
+
+//static
+void LLPanelStandStopFlying::setStandStopFlyingMode(EStandStopFlyingMode mode)
+{
+	LLPanelStandStopFlying* panel = getInstance();
+	panel->setVisible(TRUE);
+
+	BOOL standVisible = SSFM_STAND == mode;
+	panel->mStandButton->setVisible(standVisible);
+	panel->mStopFlyingButton->setVisible(!standVisible);
+}
+
+//static
+void LLPanelStandStopFlying::clearStandStopFlyingMode(EStandStopFlyingMode mode)
+{
+	LLPanelStandStopFlying* panel = getInstance();
+	switch(mode) {
+	case SSFM_STAND:
+		panel->mStandButton->setVisible(FALSE);
+		break;
+	case SSFM_STOP_FLYING:
+		panel->mStopFlyingButton->setVisible(FALSE);
+		break;
+	default:
+		llerrs << "Unexpected EStandStopFlyingMode is passed: " << mode << llendl;
+	}
+
+}
+
+BOOL LLPanelStandStopFlying::postBuild()
+{
+	mStandButton = getChild<LLButton>("stand_btn");
+	mStandButton->setCommitCallback(boost::bind(&LLPanelStandStopFlying::onStandButtonClick, this));
+	mStandButton->setCommitCallback(boost::bind(&LLFloaterMove::enableInstance, TRUE));
+	
+	mStopFlyingButton = getChild<LLButton>("stop_fly_btn");
+	mStopFlyingButton->setCommitCallback(boost::bind(&LLFloaterMove::setFlyingMode, FALSE));
+	mStopFlyingButton->setCommitCallback(boost::bind(&LLPanelStandStopFlying::onStopFlyingButtonClick, this));
+
+	
+	return TRUE;
+}
+
+//virtual
+void LLPanelStandStopFlying::setVisible(BOOL visible)
+{
+	if (visible)
+	{
+		updatePosition();
+	}
+
+	LLPanel::setVisible(visible);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Private Section
+//////////////////////////////////////////////////////////////////////////
+
+//static
+LLPanelStandStopFlying* LLPanelStandStopFlying::getStandStopFlyingPanel()
+{
+	LLPanelStandStopFlying* panel = new LLPanelStandStopFlying();
+	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_stand_stop_flying.xml");
+
+	panel->setVisible(FALSE);
+	LLUI::getRootView()->addChild(panel);
+
+	llinfos << "Build LLPanelStandStopFlying panel" << llendl;
+
+	panel->updatePosition();
+	return panel;
+}
+
+void LLPanelStandStopFlying::onStandButtonClick()
+{
+	LLSelectMgr::getInstance()->deselectAllForStandingUp();
+	gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+
+	setVisible(FALSE);
+}
+
+void LLPanelStandStopFlying::onStopFlyingButtonClick()
+{
+	gAgent.setFlying(FALSE);
+
+	setVisible(FALSE);
+}
+
+/**
+ * Updates position of the Stand & Stop Flying panel to be center aligned with Move button.
+ */
+void LLPanelStandStopFlying::updatePosition()
+{
+
+	LLBottomTray* tray = LLBottomTray::getInstance();
+	if (!tray) return;
+
+	LLButton* movement_btn = tray->getChild<LLButton>(BOTTOM_TRAY_BUTTON_NAME, TRUE, FALSE);
+	if (!movement_btn) return;
+
+	//align centers of a button and a floater
+	S32 x = movement_btn->calcScreenRect().getCenterX() - getRect().getWidth()/2;
+
+	S32 y = tray->getRect().getHeight();
+
+	setOrigin(x, y);
+}
+
+
 // EOF
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index 250315b9f2..fd9cf9f4c1 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -55,26 +55,106 @@ public:
 
 	/*virtual*/	BOOL	postBuild();
 	static F32	getYawRate(F32 time);
+	static void setFlyingMode(BOOL fly);
+	void setFlyingModeImpl(BOOL fly);
+	static void setAlwaysRunMode(bool run);
+	void setAlwaysRunModeImpl(bool run);
+	static void setSittingMode(BOOL bSitting);
+	static void enableInstance(BOOL bEnable);
+	/*virtual*/ void onOpen(const LLSD& key);
+
+	// *HACK: due to hard enough to have this control aligned with "Move" button while resizing
+	// let update its position in each frame
+	/*virtual*/ void draw(){updatePosition(); LLFloater::draw();}
+
 
 protected:
-	static void turnLeftNudge(void* userdata);
-	static void turnLeft(void* userdata);
-	
-	static void turnRightNudge(void* userdata);
-	static void turnRight(void* userdata);
+	void turnLeft();
+	void turnRight();
 
-	static void moveUp(void* userdata);
-	static void moveDown(void* userdata);
+	void moveUp();
+	void moveDown();
+
+private:
+	typedef enum movement_mode_t
+	{
+		MM_WALK,
+		MM_RUN,
+		MM_FLY
+	} EMovementMode;
+	void onWalkButtonClick();
+	void onRunButtonClick();
+	void onFlyButtonClick();
+	void onStopFlyingButtonClick();
+	void initMovementMode();
+	void setMovementMode(const EMovementMode mode);
+	void showFlyControls(bool bShow);
+	void initModeTooltips();
+	void setModeTooltip(const EMovementMode mode);
+	void showQuickTips(const EMovementMode mode);
+	void initModeButtonMap();
+	void setModeButtonToggleState(const EMovementMode mode);
+	void updateButtonsWithMovementMode(const EMovementMode newMode);
+	void updatePosition();
+	void showModeButtons(BOOL bShow);
 
 public:
+
 	LLJoystickAgentTurn*	mForwardButton;
 	LLJoystickAgentTurn*	mBackwardButton;
-	LLJoystickAgentSlide*	mSlideLeftButton;
-	LLJoystickAgentSlide*	mSlideRightButton;
 	LLButton*				mTurnLeftButton;
 	LLButton*				mTurnRightButton;
 	LLButton*				mMoveUpButton;
 	LLButton*				mMoveDownButton;
+private:
+	LLButton*				mStopFlyingButton;
+	LLPanel*				mModeActionsPanel;
+	
+	typedef std::map<LLView*, std::string> control_tooltip_map_t;
+	typedef std::map<EMovementMode, control_tooltip_map_t> mode_control_tooltip_map_t;
+	mode_control_tooltip_map_t mModeControlTooltipsMap;
+
+	typedef std::map<EMovementMode, LLButton*> mode_control_button_map_t;
+	mode_control_button_map_t mModeControlButtonMap;
+
+};
+
+
+/**
+ * This class contains Stand Up and Stop Flying buttons displayed above Move button in bottom tray
+ */
+class LLPanelStandStopFlying : public LLPanel
+{
+public:
+	typedef enum stand_stop_flying_mode_t
+	{
+		SSFM_STAND,
+		SSFM_STOP_FLYING
+	} EStandStopFlyingMode;
+
+	static LLPanelStandStopFlying* getInstance();
+	static void setStandStopFlyingMode(EStandStopFlyingMode mode);
+	static void clearStandStopFlyingMode(EStandStopFlyingMode mode);
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void setVisible(BOOL visible);
+
+	// *HACK: due to hard enough to have this control aligned with "Move" button while resizing
+	// let update its position in each frame
+	/*virtual*/ void draw(){updatePosition(); LLPanel::draw();}
+
+
+protected:
+	LLPanelStandStopFlying();
+
+
+private:
+	static LLPanelStandStopFlying* getStandStopFlyingPanel();
+	void onStandButtonClick();
+	void onStopFlyingButtonClick();
+	void updatePosition();
+
+	LLButton* mStandButton;
+	LLButton* mStopFlyingButton;
 };
 
 
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 58ec2d24a8..06cab9afb0 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -47,12 +47,15 @@
 #include "lllocationinputctrl.h"
 #include "llteleporthistory.h"
 #include "llsearcheditor.h"
+#include "llsidetray.h"
 #include "llslurl.h"
 #include "llurlsimstring.h"
 #include "llviewerinventory.h"
 #include "llviewermenu.h"
 #include "llviewerparcelmgr.h"
 #include "llworldmap.h"
+#include "llappviewer.h"
+#include "llviewercontrol.h"
 
 //-- LLTeleportHistoryMenuItem -----------------------------------------------
 
@@ -190,6 +193,9 @@ LLNavigationBar::LLNavigationBar()
 
 	// navigation bar can never get a tab
 	setFocusRoot(FALSE);
+
+	// set a listener function for LoginComplete event
+	LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLNavigationBar::handleLoginComplete, this));
 }
 
 LLNavigationBar::~LLNavigationBar()
@@ -253,7 +259,7 @@ void LLNavigationBar::draw()
 	LLPanel::draw();
 }
 
-BOOL LLNavigationBar::handleRightMouseDown(S32 x, S32 y, MASK mask)
+BOOL LLNavigationBar::handleRightMouseUp(S32 x, S32 y, MASK mask)
 {
 	// *HACK. We should use mCmbLocation's right click callback instead.
 
@@ -271,7 +277,7 @@ BOOL LLNavigationBar::handleRightMouseDown(S32 x, S32 y, MASK mask)
 		}
 		return TRUE;
 	}
-	return LLPanel:: handleRightMouseDown(x, y, mask);
+	return LLPanel:: handleRightMouseUp(x, y, mask);
 }
 
 void LLNavigationBar::onBackButtonClicked()
@@ -410,21 +416,26 @@ void LLNavigationBar::onRegionNameResponse(
 	}
 
 	// Location is valid. Add it to the typed locations history.
+	// If user has typed text this variable will contain -1.
 	S32 selected_item = mCmbLocation->getCurrentIndex();
-	if (selected_item == -1) // user has typed text
-	{
-		LLLocationHistory* lh = LLLocationHistory::getInstance();
-		mCmbLocation->add(typed_location);
-		lh->addItem(typed_location);
-		lh->save();
-	}
+
+	/*
+	LLLocationHistory* lh = LLLocationHistory::getInstance();
+	lh->addItem(selected_item == -1 ? typed_location : mCmbLocation->getSelectedItemLabel());
+	lh->save();
+	*/
 
 	// Teleport to the location.
 	LLVector3d region_pos = from_region_handle(region_handle);
 	LLVector3d global_pos = region_pos + (LLVector3d) local_coords;
+
 	
 	llinfos << "Teleporting to: " << global_pos  << llendl;
 	gAgent.teleportViaLocation(global_pos);
+
+	LLLocationHistory* lh = LLLocationHistory::getInstance();
+	lh->addItem(selected_item == -1 ? typed_location : mCmbLocation->getSelectedItemLabel());
+	lh->save();
 }
 
 void	LLNavigationBar::showTeleportHistoryMenu()
@@ -456,18 +467,16 @@ void LLNavigationBar::onLocationContextMenuItemClicked(const LLSD& userdata)
 	std::string item = userdata.asString();
 	LLLineEditor* location_entry = mCmbLocation->getTextEntry();
 
-	if (item == std::string("copy_url"))
+	if (item == std::string("show_coordinates"))
 	{
-		std::string sl_url = gAgent.getSLURL();
-		LLView::getWindow()->copyTextToClipboard(utf8str_to_wstring(sl_url));
-		
-		LLSD args;
-		args["SLURL"] = sl_url;
-		LLNotifications::instance().add("CopySLURL", args);
+		gSavedSettings.setBOOL("ShowCoordinatesOption",!gSavedSettings.getBOOL("ShowCoordinatesOption"));
 	}
 	else if (item == std::string("landmark"))
 	{
-		LLFloaterReg::showInstance("add_landmark");
+		LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
+
+		// Floater "Add Landmark" functionality moved to Side Tray
+		//LLFloaterReg::showInstance("add_landmark");
 	}
 	else if (item == std::string("cut"))
 	{
@@ -519,6 +528,9 @@ bool LLNavigationBar::onLocationContextMenuItemEnabled(const LLSD& userdata)
 	else if(item == std::string("can_landmark"))
 	{
 		return !LLLandmarkActions::landmarkAlreadyExists();
+	}else if(item == std::string("show_coordinates")){
+	
+		return gSavedSettings.getBOOL("ShowCoordinatesOption");
 	}
 
 	return false;
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index a46c59306d..17a1438912 100644
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -56,7 +56,7 @@ public:
 	
 	/*virtual*/ void	draw();
 	/*virtual*/ BOOL	postBuild();
-	/*virtual*/ BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);
 
 	void handleLoginComplete();
 	void clearHistoryCache();
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 847262ddfd..1fa1e2a09d 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -252,7 +252,8 @@ void	LLNearbyChat::addMessage(const LLChat& chat)
 
 void LLNearbyChat::onNearbySpeakers()
 {
-	LLSD param = "nearby_panel";
+	LLSD param;
+	param["people_panel_tab_name"] = "nearby_panel";
 	LLSideTray::getInstance()->showPanel("panel_people",param);
 }
 
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 7b67ae645c..a3100f65ca 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -50,6 +50,16 @@ void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32
 
 static LLDefaultChildRegistry::Register<LLGestureComboBox> r("gesture_combo_box");
 
+struct LLChatTypeTrigger {
+	std::string name;
+	EChatType type;
+};
+
+static LLChatTypeTrigger sChatTypeTriggers[] = {
+	{ "/whisper"	, CHAT_TYPE_WHISPER},
+	{ "/shout"	, CHAT_TYPE_SHOUT}
+};
+
 LLGestureComboBox::LLGestureComboBox(const LLComboBox::Params& p)
 	: LLComboBox(p)
 	, mGestureLabelTimer()
@@ -219,12 +229,38 @@ BOOL LLNearbyChatBar::handleKeyHere( KEY key, MASK mask )
 	return handled;
 }
 
+BOOL LLNearbyChatBar::matchChatTypeTrigger(const std::string& in_str, std::string* out_str)
+{
+	U32 in_len = in_str.length();
+	S32 cnt = sizeof(sChatTypeTriggers) / sizeof(*sChatTypeTriggers);
+	
+	for (S32 n = 0; n < cnt; n++)
+	{
+		if (in_len > sChatTypeTriggers[n].name.length())
+			continue;
+
+		std::string trigger_trunc = sChatTypeTriggers[n].name;
+		LLStringUtil::truncate(trigger_trunc, in_len);
+
+		if (!LLStringUtil::compareInsensitive(in_str, trigger_trunc))
+		{
+			*out_str = sChatTypeTriggers[n].name;
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 void LLNearbyChatBar::onChatBoxKeystroke(LLLineEditor* caller, void* userdata)
 {
+
 	LLNearbyChatBar* self = (LLNearbyChatBar *)userdata;
 
-	LLWString raw_text;
-	if (self->mChatBox) raw_text = self->mChatBox->getWText();
+	if (!self->mChatBox)
+		return;
+
+	LLWString raw_text = self->mChatBox->getWText();
 
 	// Can't trim the end, because that will cause autocompletion
 	// to eat trailing spaces that might be part of a gesture.
@@ -270,16 +306,19 @@ void LLNearbyChatBar::onChatBoxKeystroke(LLLineEditor* caller, void* userdata)
 
 		if (gGestureManager.matchPrefix(utf8_trigger, &utf8_out_str))
 		{
-			if (self->mChatBox)
-			{
-				std::string rest_of_match = utf8_out_str.substr(utf8_trigger.size());
-				self->mChatBox->setText(utf8_trigger + rest_of_match); // keep original capitalization for user-entered part
-				S32 outlength = self->mChatBox->getLength(); // in characters
-			
-				// Select to end of line, starting from the character
-				// after the last one the user typed.
-				self->mChatBox->setSelection(length, outlength);
-			}
+			std::string rest_of_match = utf8_out_str.substr(utf8_trigger.size());
+			self->mChatBox->setText(utf8_trigger + rest_of_match); // keep original capitalization for user-entered part
+			S32 outlength = self->mChatBox->getLength(); // in characters
+
+			// Select to end of line, starting from the character
+			// after the last one the user typed.
+			self->mChatBox->setSelection(length, outlength);
+		}
+		else if (matchChatTypeTrigger(utf8_trigger, &utf8_out_str))
+		{
+			std::string rest_of_match = utf8_out_str.substr(utf8_trigger.size());
+			self->mChatBox->setText(utf8_trigger + rest_of_match + " "); // keep original capitalization for user-entered part
+			self->mChatBox->setCursorToEnd();
 		}
 
 		//llinfos << "GESTUREDEBUG " << trigger 
@@ -296,6 +335,38 @@ void LLNearbyChatBar::onChatBoxFocusLost(LLFocusableElement* caller, void* userd
 	gAgent.stopTyping();
 }
 
+EChatType LLNearbyChatBar::processChatTypeTriggers(EChatType type, std::string &str)
+{
+	U32 length = str.length();
+	S32 cnt = sizeof(sChatTypeTriggers) / sizeof(*sChatTypeTriggers);
+	
+	for (S32 n = 0; n < cnt; n++)
+	{
+		if (length >= sChatTypeTriggers[n].name.length())
+		{
+			std::string trigger = str.substr(0, sChatTypeTriggers[n].name.length());
+
+			if (!LLStringUtil::compareInsensitive(trigger, sChatTypeTriggers[n].name))
+			{
+				U32 trigger_length = sChatTypeTriggers[n].name.length();
+
+				// It's to remove space after trigger name
+				if (length > trigger_length && str[trigger_length] == ' ')
+					trigger_length++;
+
+				str = str.substr(trigger_length, length);
+
+				if (CHAT_TYPE_NORMAL == type)
+					return sChatTypeTriggers[n].type;
+				else
+					break;
+			}
+		}
+	}
+
+	return type;
+}
+
 void LLNearbyChatBar::sendChat( EChatType type )
 {
 	if (mChatBox)
@@ -324,6 +395,8 @@ void LLNearbyChatBar::sendChat( EChatType type )
 
 			utf8_revised_text = utf8str_trim(utf8_revised_text);
 
+			type = processChatTypeTriggers(type, utf8_revised_text);
+
 			if (!utf8_revised_text.empty())
 			{
 				// Chat with animation
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h
index d1f5fbff6b..9c2a72aaf3 100644
--- a/indra/newview/llnearbychatbar.h
+++ b/indra/newview/llnearbychatbar.h
@@ -86,6 +86,7 @@ public:
 	static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
 
 protected:
+	static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str);
 	static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata);
 	static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata);
 
@@ -93,6 +94,7 @@ protected:
 	void onChatBoxCommit();
 
 	static LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
+	EChatType processChatTypeTriggers(EChatType type, std::string &str);
 
 	// Which non-zero channel did we last chat on?
 	static S32 sLastSpecialChatChannel;
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp
index a24d1ed54a..0eb96f992a 100644
--- a/indra/newview/lloverlaybar.cpp
+++ b/indra/newview/lloverlaybar.cpp
@@ -231,7 +231,7 @@ void LLOverlayBar::refresh()
 	BOOL sitting = FALSE;
 	if (gAgent.getAvatarObject())
 	{
-		sitting = gAgent.getAvatarObject()->mIsSitting;
+		sitting = gAgent.getAvatarObject()->isSitting();
 	}
 	button = getChild<LLButton>("Stand Up");
 
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index f57489934a..91156ae542 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -269,7 +269,7 @@ void LLPanelAvatarProfile::processProperties(void* data, EAvatarProcessorType ty
 			childSetValue("sl_description_edit", avatar_data->about_text);
 			childSetValue("fl_description_edit",avatar_data->fl_about_text);
 			childSetValue("2nd_life_pic", avatar_data->image_id);
-			childSetValue("1st_life_pic", avatar_data->fl_image_id);
+			childSetValue("real_world_pic", avatar_data->fl_image_id);
 			childSetValue("homepage_edit", avatar_data->profile_url);
 
 			if (!isEditMode())
@@ -365,7 +365,7 @@ void LLPanelAvatarProfile::clear()
 void LLPanelAvatarProfile::clearControls()
 {
 	childSetValue("2nd_life_pic",LLUUID::null);
-	childSetValue("1st_life_pic",LLUUID::null);
+	childSetValue("real_world_pic",LLUUID::null);
 	childSetValue("online_status",LLStringUtil::null);
 	childSetValue("status_message",LLStringUtil::null);
 	childSetValue("sl_description_edit",LLStringUtil::null);
@@ -489,7 +489,7 @@ void LLPanelAvatarProfile::onShareButtonClick()
 	{
 		pic->setFallbackImageName("default_land_picture.j2c");
 	}
-	pic = getChild<LLTextureCtrl>("1st_life_pic",TRUE,FALSE);
+	pic = getChild<LLTextureCtrl>("real_world_pic",TRUE,FALSE);
 	if(pic)
 	{
 		pic->setFallbackImageName("default_land_picture.j2c");
@@ -510,13 +510,13 @@ void LLPanelAvatarProfile::onOpen(const LLSD& key)
 
 void LLPanelAvatarProfile::updateChildrenList()
 {
-	if (mUpdated || isEditMode())
-	{
-		return;
-	}
 	switch (mProfileType)
 	{
 	case PT_OWN:
+		if (mUpdated || isEditMode())
+		{
+			return;
+		}
 		childSetVisible("user_name", true);
 		childSetVisible("status_panel", false);
 		childSetVisible("profile_buttons_panel", false);
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 92a8653252..2f63033437 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -539,7 +539,7 @@ void LLPanelPeople::updateButtons()
 	}
 
 	bool item_selected = selected_id.notNull();
-	buttonSetEnabled("teleport_btn",		friends_tab_active && item_selected);
+	buttonSetEnabled("teleport_btn",		(friends_tab_active || group_tab_active) && item_selected);
 	buttonSetEnabled("view_profile_btn",	item_selected);
 	buttonSetEnabled("im_btn",				item_selected);
 	buttonSetEnabled("call_btn",			item_selected && false); // not implemented yet
@@ -771,7 +771,16 @@ void LLPanelPeople::onCallButtonClicked()
 
 void LLPanelPeople::onTeleportButtonClicked()
 {
-	LLAvatarActions::offerTeleport(getCurrentItemID());
+	std::string cur_tab = mTabContainer->getCurrentPanel()->getName();
+
+	if (cur_tab == FRIENDS_TAB_NAME)
+	{
+		LLAvatarActions::offerTeleport(getCurrentItemID());
+	}
+	else if (cur_tab == GROUP_TAB_NAME)
+	{
+		LLGroupActions::offerTeleport(getCurrentItemID());
+	}
 }
 
 void LLPanelPeople::onShareButtonClicked()
@@ -786,22 +795,10 @@ void LLPanelPeople::onMoreButtonClicked()
 
 void	LLPanelPeople::onOpen(const LLSD& key)
 {
-	// Profile View is activated through LLSideTray::showPanel(), 
-	// hide Profile View to be able to see Panel People content
-	hideProfileView();
-
-	std::string tab_name = key.asString();
+	std::string tab_name = key["people_panel_tab_name"];
 	if (!tab_name.empty())
 		mTabContainer->selectTabByName(tab_name);
 	else
 		reSelectedCurrentTab();
 }
 
-void LLPanelPeople::hideProfileView()
-{
-	LLView* view = getChildView("panel_profile_view",true,false);
-	if(view && view->getVisible())
-	{
-		view->setVisible(false);
-	}
-}
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 2ac1bf424c..6c3b5e0664 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -104,8 +104,6 @@ private:
 								const std::vector<LLUUID>& ids,
 								void*);
 
-	void					hideProfileView();
-
 	LLFilterEditor*			mFilterEditor;
 	LLTabContainer*			mTabContainer;
 	LLAvatarList*			mFriendList;
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index ea05b666db..40275be82f 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -51,6 +51,7 @@
 #include "llagent.h"
 #include "llfloaterworldmap.h"
 #include "llinventorymodel.h"
+#include "lllandmarkactions.h"
 #include "lltexturectrl.h"
 #include "llviewerinventory.h"
 #include "llviewerparcelmgr.h"
@@ -487,6 +488,26 @@ void LLPanelPlaceInfo::onCommitTitleOrNote(LANDMARK_INFO_TYPE type)
 	}
 }
 
+void LLPanelPlaceInfo::createLandmark(const LLUUID& folder_id)
+{
+	std::string name = mTitleEditor->getText();
+	std::string desc = mNotesEditor->getText();
+
+	LLStringUtil::trim(name);
+	LLStringUtil::trim(desc);
+
+	// If typed name is empty use the parcel name instead.
+	if (name.empty())
+	{
+		name = mParcelName->getText() + "; " + mRegionName->getText();
+	}
+
+	LLStringUtil::replaceChar(desc, '\n', ' ');
+	// If no folder chosen use the "Landmarks" folder.
+	LLLandmarkActions::createLandmarkHere(name, desc, 
+		folder_id.notNull() ? folder_id : gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK));
+}
+
 void LLPanelPlaceInfo::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
 	if (mMinHeight > 0)
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index f06a2d1fb7..e7b81dc3e6 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -79,6 +79,10 @@ public:
 	// sets a corresponding title and contents.
 	void setInfoType(INFO_TYPE type);
 
+	// Create a landmark for the current location
+	// in a folder specified by folder_id
+	void createLandmark(const LLUUID& folder_id);
+
 	BOOL isMediaPanelVisible();
 	void toggleMediaPanel(BOOL visible);
 	void displayItemInfo(const LLInventoryItem* pItem);
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index b443cc4d5e..1fb3eb8b71 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -39,6 +39,7 @@
 #include "llnotifications.h"
 #include "llfiltereditor.h"
 #include "lltabcontainer.h"
+#include "lltrans.h"
 #include "lluictrlfactory.h"
 
 #include "llagent.h"
@@ -48,11 +49,15 @@
 #include "llpanellandmarks.h"
 #include "llpanelteleporthistory.h"
 #include "llsidetray.h"
+#include "lltoggleablemenu.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 
-// Helper function to get local position from global
-const LLVector3 get_pos_local_from_global(const LLVector3d &pos_global);
+// Helper functions
+static bool cmp_folders(const folder_pair_t& left, const folder_pair_t& right);
+static std::string getFullFolderName(const LLViewerInventoryCategory* cat);
+static void collectLandmarkFolders(LLInventoryModel::cat_array_t& cats);
+static const LLVector3 get_pos_local_from_global(const LLVector3d &pos_global);
 
 static LLRegisterPanelClassWrapper<LLPanelPlaces> t_places("panel_places");
 
@@ -63,6 +68,7 @@ LLPanelPlaces::LLPanelPlaces()
 		mFilterEditor(NULL),
 		mPlaceInfo(NULL),
 		mItem(NULL),
+		mLandmarkFoldersMenuHandle(),
 		mPosGlobal()
 {
 	gInventory.addObserver(this);
@@ -77,17 +83,25 @@ LLPanelPlaces::~LLPanelPlaces()
 {
 	if (gInventory.containsObserver(this))
 		gInventory.removeObserver(this);
+	
+	LLView::deleteViewByHandle(mLandmarkFoldersMenuHandle);
 }
 
 BOOL LLPanelPlaces::postBuild()
 {
+	mCreateLandmarkBtn = getChild<LLButton>("create_landmark_btn");
+	mCreateLandmarkBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onCreateLandmarkButtonClicked, this, LLUUID()));
+	
+	mFolderMenuBtn = getChild<LLButton>("folder_menu_btn");
+	mFolderMenuBtn->setClickedCallback(boost::bind(&LLPanelPlaces::showLandmarkFoldersMenu, this));
+
 	mTeleportBtn = getChild<LLButton>("teleport_btn");
 	mTeleportBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onTeleportButtonClicked, this));
 	
 	mShowOnMapBtn = getChild<LLButton>("map_btn");
 	mShowOnMapBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onShowOnMapButtonClicked, this));
 	
-	//mShareBtn = getChild<LLButton>("share_btn");
+	mShareBtn = getChild<LLButton>("share_btn");
 	//mShareBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onShareButtonClicked, this));
 
 	mOverflowBtn = getChild<LLButton>("overflow_btn");
@@ -155,6 +169,11 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 	}
 	else if (mPlaceInfoType == "remote_place")
 	{
+		if (mPlaceInfo->isMediaPanelVisible())
+		{
+			toggleMediaPanel();
+		}
+
 		mPosGlobal = LLVector3d(key["x"].asReal(),
 								key["y"].asReal(),
 								key["z"].asReal());
@@ -323,20 +342,31 @@ void LLPanelPlaces::onShowOnMapButtonClicked()
 	}
 }
 
+void LLPanelPlaces::onCreateLandmarkButtonClicked(const LLUUID& folder_id)
+{
+	if (!mPlaceInfo)
+		return;
+
+	mPlaceInfo->createLandmark(folder_id);
+
+	onBackButtonClicked();
+	LLSideTray::getInstance()->collapseSideBar();
+}
+
 void LLPanelPlaces::onBackButtonClicked()
 {
 	togglePlaceInfoPanel(FALSE);
 
 	// Resetting mPlaceInfoType when Place Info panel is closed.
 	mPlaceInfoType = LLStringUtil::null;
-	
+
 	updateVerbs();
 }
 
 void LLPanelPlaces::toggleMediaPanel()
 {
 	if (!mPlaceInfo)
-			return;
+		return;
 
 	mPlaceInfo->toggleMediaPanel(!mPlaceInfo->isMediaPanelVisible());
 }
@@ -403,7 +433,7 @@ void LLPanelPlaces::onAgentParcelChange()
 {
 	if (mPlaceInfo->getVisible() && (mPlaceInfoType == "agent" || mPlaceInfoType == "create_landmark"))
 	{
-		LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", mPlaceInfoType));
+		onOpen(LLSD().insert("type", mPlaceInfoType));
 	}
 	else
 	{
@@ -415,9 +445,20 @@ void LLPanelPlaces::updateVerbs()
 {
 	bool is_place_info_visible = mPlaceInfo->getVisible();
 	bool is_agent_place_info_visible = mPlaceInfoType == "agent";
+	bool is_create_landmark_visible = mPlaceInfoType == "create_landmark";
+	
+	mTeleportBtn->setVisible(!is_create_landmark_visible);
+	mShareBtn->setVisible(!is_create_landmark_visible);
+	mCreateLandmarkBtn->setVisible(is_create_landmark_visible);
+	mFolderMenuBtn->setVisible(is_create_landmark_visible);
+
+	// Enable overflow button only when showing the information
+	// about agent's current location.
+	mOverflowBtn->setEnabled(is_agent_place_info_visible);
+
 	if (is_place_info_visible)
 	{
-		if (is_agent_place_info_visible || mPlaceInfoType == "create_landmark")
+		if (is_agent_place_info_visible)
 		{
 			// We don't need to teleport to the current location so disable the button
 			mTeleportBtn->setEnabled(FALSE);
@@ -433,9 +474,205 @@ void LLPanelPlaces::updateVerbs()
 	{
 		mActivePanel->updateVerbs();
 	}
+}
+
+void LLPanelPlaces::showLandmarkFoldersMenu()
+{
+	if (mLandmarkFoldersMenuHandle.isDead())
+	{
+		LLMenuGL::Params menu_p;
+		menu_p.name("landmarks_folders_menu");
+		menu_p.can_tear_off(false);
+		menu_p.visible(false);
+		menu_p.scrollable(true);
+
+		LLToggleableMenu* menu = LLUICtrlFactory::create<LLToggleableMenu>(menu_p);
+
+		mLandmarkFoldersMenuHandle = menu->getHandle();
+	}
+
+	LLToggleableMenu* menu = (LLToggleableMenu*)mLandmarkFoldersMenuHandle.get();
+	if(!menu)
+		return;
+
+	if (menu->getClosedByButtonClick())
+	{
+		menu->resetClosedByButtonClick();
+		return;
+	}
+
+	if (menu->getVisible())
+	{
+		menu->setVisible(FALSE);
+		menu->resetClosedByButtonClick();
+		return;
+	}
+
+	// Collect all folders that can contain landmarks.
+	LLInventoryModel::cat_array_t cats;
+	collectLandmarkFolders(cats);
+
+	// Sort the folders by their full name.
+	folder_vec_t folders;
+	S32 count = cats.count();
+	for (S32 i = 0; i < count; i++)
+	{
+		const LLViewerInventoryCategory* cat = cats.get(i);
+		std::string cat_full_name = getFullFolderName(cat);
+		folders.push_back(folder_pair_t(cat->getUUID(), cat_full_name));
+	}
+	sort(folders.begin(), folders.end(), cmp_folders);
+
+	LLRect btn_rect = mFolderMenuBtn->getRect();
+
+	LLRect root_rect = getRootView()->getRect();
+	
+	// Check it there are changed items or viewer dimensions 
+	// have changed since last call
+	if (mLandmarkFoldersCache.size() == count &&
+		mRootViewWidth == root_rect.getWidth() &&
+		mRootViewHeight == root_rect.getHeight())
+	{
+		S32 i;
+		for (i = 0; i < count; i++)
+		{
+			if (mLandmarkFoldersCache[i].second != folders[i].second)
+			{
+				break;
+			}
+		}
+
+		// Check passed, just show the menu
+		if (i == count)
+		{
+			menu->buildDrawLabels();
+			menu->updateParent(LLMenuGL::sMenuContainer);
 
-	// Enable overflow button only when showing the information about agent's current location.
-	mOverflowBtn->setEnabled(is_place_info_visible && is_agent_place_info_visible);
+			menu->setButtonRect(btn_rect, this);
+			LLMenuGL::showPopup(this, menu, btn_rect.mRight, btn_rect.mTop);
+			return;
+		}
+	}
+
+	// If there are changes, store the new viewer dimensions
+	// and a list of folders
+	mRootViewWidth = root_rect.getWidth();
+	mRootViewHeight = root_rect.getHeight();
+	mLandmarkFoldersCache = folders;
+
+	menu->empty();
+	U32 max_width = 0;
+
+	// Menu width must not exceed the root view limits,
+	// so we assume the space between the left edge of
+	// the root view and 
+	LLRect screen_btn_rect;
+	localRectToScreen(btn_rect, &screen_btn_rect);
+	S32 free_space = screen_btn_rect.mRight;
+
+	for(folder_vec_t::const_iterator it = mLandmarkFoldersCache.begin(); it != mLandmarkFoldersCache.end(); it++)
+	{
+		const std::string& item_name = it->second;
+
+		LLMenuItemCallGL::Params item_params;
+		item_params.name(item_name);
+		item_params.label(item_name);
+
+		item_params.on_click.function(boost::bind(&LLPanelPlaces::onCreateLandmarkButtonClicked, this, it->first));
+
+		LLMenuItemCallGL *menu_item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
+
+		// Check whether item name wider than menu
+		if ((S32) menu_item->getNominalWidth() > free_space)
+		{
+			S32 chars_total = item_name.length();
+			S32 chars_fitted = 1;
+			menu_item->setLabel(LLStringExplicit(""));
+			S32 label_space = free_space - menu_item->getFont()->getWidth("...") -
+				menu_item->getNominalWidth(); // This returns width of menu item with empty label (pad pixels)
+
+			while (chars_fitted < chars_total && menu_item->getFont()->getWidth(item_name, 0, chars_fitted) < label_space)
+			{
+				chars_fitted++;
+			}
+			chars_fitted--; // Rolling back one char, that doesn't fit
+
+			menu_item->setLabel(item_name.substr(0, chars_fitted) + "...");
+		}
+
+		max_width = llmax(max_width, menu_item->getNominalWidth());
+
+		menu->addChild(menu_item);
+	}
+
+	menu->buildDrawLabels();
+	menu->updateParent(LLMenuGL::sMenuContainer);
+	menu->setButtonRect(btn_rect, this);
+	LLMenuGL::showPopup(this, menu, btn_rect.mRight, btn_rect.mTop);
+}
+
+static bool cmp_folders(const folder_pair_t& left, const folder_pair_t& right)
+{
+	return left.second < right.second;
+}
+
+static std::string getFullFolderName(const LLViewerInventoryCategory* cat)
+{
+	std::string name = cat->getName();
+	LLUUID parent_id;
+
+	// translate category name, if it's right below the root
+	// FIXME: it can throw notification about non existent string in strings.xml
+	if (cat->getParentUUID().notNull() && cat->getParentUUID() == gInventory.getRootFolderID())
+	{
+		name = LLTrans::getString("InvFolder " + name);
+	}
+
+	// we don't want "My Inventory" to appear in the name
+	while ((parent_id = cat->getParentUUID()).notNull() && parent_id != gInventory.getRootFolderID())
+	{
+		cat = gInventory.getCategory(parent_id);
+		name = cat->getName() + "/" + name;
+	}
+
+	return name;
+}
+
+static void collectLandmarkFolders(LLInventoryModel::cat_array_t& cats)
+{
+	// Add the "Landmarks" category itself.
+	LLUUID landmarks_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
+	LLViewerInventoryCategory* landmarks_cat = gInventory.getCategory(landmarks_id);
+	if (!landmarks_cat)
+	{
+		llwarns << "Cannot find the landmarks folder" << llendl;
+	}
+	else
+	{
+		cats.put(landmarks_cat);
+	}
+
+	// Add descendent folders of the "Landmarks" category.
+	LLInventoryModel::item_array_t items; // unused
+	LLIsType is_category(LLAssetType::AT_CATEGORY);
+	gInventory.collectDescendentsIf(
+		landmarks_id,
+		cats,
+		items,
+		LLInventoryModel::EXCLUDE_TRASH,
+		is_category);
+
+	// Add the "My Favorites" category.
+	LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_FAVORITE);
+	LLViewerInventoryCategory* favorites_cat = gInventory.getCategory(favorites_id);
+	if (!favorites_cat)
+	{
+		llwarns << "Cannot find the favorites folder" << llendl;
+	}
+	else
+	{
+		cats.put(favorites_cat);
+	}
 }
 
 const LLVector3 get_pos_local_from_global(const LLVector3d &pos_global)
@@ -445,4 +682,4 @@ const LLVector3 get_pos_local_from_global(const LLVector3d &pos_global)
 
 	LLVector3 pos_local(region_x, region_y, (F32)pos_global.mdV[VZ]);
 	return pos_local;
-}	
+}
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index c100ace8cc..695c78cfba 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -47,6 +47,8 @@ class LLPanelPlacesTab;
 class LLFilterEditor;
 class LLTabContainer;
 
+typedef std::pair<LLUUID, std::string>	folder_pair_t;
+
 class LLPanelPlaces : public LLPanel, LLInventoryObserver
 {
 public:
@@ -69,6 +71,7 @@ private:
 	//void onShareButtonClicked();
 	void onTeleportButtonClicked();
 	void onShowOnMapButtonClicked();
+	void onCreateLandmarkButtonClicked(const LLUUID& folder_id);
 	void onBackButtonClicked();
 
 	void toggleMediaPanel();
@@ -76,15 +79,19 @@ private:
 
 	void onAgentParcelChange();
 	void updateVerbs();
+	
+	void showLandmarkFoldersMenu();
 
 	LLFilterEditor*				mFilterEditor;
 	LLPanelPlacesTab*			mActivePanel;
 	LLTabContainer*				mTabContainer;
 	LLPanelPlaceInfo*			mPlaceInfo;
 
-	//LLButton*					mShareBtn;
+	LLButton*					mCreateLandmarkBtn;
+	LLButton*					mFolderMenuBtn;
 	LLButton*					mTeleportBtn;
 	LLButton*					mShowOnMapBtn;
+	LLButton*					mShareBtn;
 	LLButton*					mOverflowBtn;
 
 	// Pointer to a landmark item or to a linked landmark
@@ -100,6 +107,20 @@ private:
 
 	// Information type currently shown in Place Information panel
 	std::string					mPlaceInfoType;
+
+	// Menu handle for pop-up menu to chose a landmark saving
+	// folder when creating a new landmark
+	LLHandle<LLView> 			mLandmarkFoldersMenuHandle;
+
+	typedef std::vector<folder_pair_t>	folder_vec_t;
+
+	// List of folders to choose from when creating a landmark
+	folder_vec_t				mLandmarkFoldersCache;
+	
+	// If root view width or height is changed
+	// the pop-up menu must be updated
+	S32							mRootViewWidth;
+	S32							mRootViewHeight;
 };
 
 #endif //LL_LLPANELPLACES_H
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index deca08050b..f97105caa8 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -35,6 +35,8 @@
 #include "lltabcontainer.h"
 #include "llpanelpicks.h"
 #include "llagent.h"
+#include "llcommandhandler.h"
+#include "llavataractions.h"
 
 static const std::string PANEL_PICKS = "panel_picks";
 static const std::string PANEL_NOTES = "panel_notes";
@@ -44,6 +46,33 @@ static LLRegisterPanelClassWrapper<LLPanelAvatarProfile> t_panel_profile(PANEL_P
 static LLRegisterPanelClassWrapper<LLPanelPicks> t_panel_picks(PANEL_PICKS);
 
 
+class LLAgentHandler : public LLCommandHandler
+{
+public:
+	// requires trusted browser to trigger
+	LLAgentHandler() : LLCommandHandler("agent", true) { }
+
+	bool handle(const LLSD& params, const LLSD& query_map,
+		LLWebBrowserCtrl* web)
+	{
+		if (params.size() < 2) return false;
+		LLUUID agent_id;
+		if (!agent_id.set(params[0], FALSE))
+		{
+			return false;
+		}
+
+		if (params[1].asString() == "about")
+		{
+			LLAvatarActions::showProfile(agent_id);
+			return true;
+		}
+		return false;
+	}
+};
+LLAgentHandler gAgentHandler;
+
+
 LLPanelProfile::LLPanelProfile()
 :	LLPanel(),
 	mTabContainer(NULL)
@@ -68,25 +97,6 @@ BOOL LLPanelProfile::postBuild()
 	return TRUE;
 }
 
-void LLPanelProfile::onOpen(const LLSD& key)
-{
-	//*NOTE LLUUID::null in this context means Agent related stuff
-	LLUUID id(key.has("id") ? key["id"].asUUID() : gAgentID);
-	if (key.has("open_tab_name"))
-		mTabContainer->selectTabByName(key["open_tab_name"]);
-
-	if(id.notNull() && mAvatarId.notNull() && mAvatarId != id)
-	{
-		mTabs[PANEL_PROFILE]->clear();
-		mTabs[PANEL_PICKS]->clear();
-		mTabs[PANEL_NOTES]->clear();
-	}
-
-	mAvatarId = id;
-
-	mTabContainer->getCurrentPanel()->onOpen(mAvatarId);
-}
-
 //*TODO redo panel toggling
 void LLPanelProfile::togglePanel(LLPanel* panel)
 {
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index e8aea849df..2f6d53a859 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -46,7 +46,7 @@ class LLPanelProfile : public LLPanel
 public:
 	virtual BOOL postBuild();
 
-	virtual void onOpen(const LLSD& key);
+	virtual void onOpen(const LLSD& key) {};
 
 	virtual void togglePanel(LLPanel*);
 
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 7d02c8ff0b..00254ee8ee 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -35,6 +35,7 @@
 
 #include "llpanelavatar.h"
 #include "llpanelpicks.h"
+#include "llsidetraypanelcontainer.h"
 #include "llpanelprofile.h"
 
 static LLRegisterPanelClassWrapper<LLPanelProfileView> t_panel_target_profile("panel_profile_view");
@@ -56,15 +57,23 @@ LLPanelProfileView::~LLPanelProfileView(void)
 /*virtual*/ 
 void LLPanelProfileView::onOpen(const LLSD& key)
 {
-	LLPanelProfile::onOpen(key);
-	
-	//*NOTE profile view panel doesn't have own side tray tab and 
-	//is usually opened over People side tray tab. By Back button
-	// Profile View panel just becomes invisible, see onBackBtnClick()
-	setVisible(TRUE);
+	LLUUID id = key["id"];
+	if (key.has("open_tab_name"))
+		mTabContainer->selectTabByName(key["open_tab_name"]);
+
+	if(id.notNull() && mAvatarId != id)
+	{
+		mAvatarId = id;
+
+		mTabs[PANEL_PROFILE]->clear();
+		mTabs[PANEL_PICKS]->clear();
+		mTabs[PANEL_NOTES]->clear();
+	}
+
+	mTabContainer->getCurrentPanel()->onOpen(mAvatarId);
 
 	std::string full_name;
-	gCacheName->getFullName(key["id"],full_name);
+	gCacheName->getFullName(mAvatarId,full_name);
 	childSetValue("user_name",full_name);
 }
 
@@ -85,5 +94,9 @@ BOOL LLPanelProfileView::postBuild()
 
 void LLPanelProfileView::onBackBtnClick()
 {
-	setVisible(FALSE);
+	LLSideTrayPanelContainer* parent = dynamic_cast<LLSideTrayPanelContainer*>(getParent());
+	if(parent)
+	{
+		parent->openPreviousPanel();
+	}
 }
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 5dca12e06b..5ae79f6c63 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -59,6 +59,7 @@ LLScreenChannel::LLScreenChannel(): mUnreadToastsPanel(NULL),
 	//TODO: load as a resource string
 	mOverflowFormatString = "You have %d more notification";
 
+	mToastList.clear();
 	setMouseOpaque( false );
 }
 
@@ -266,7 +267,7 @@ void LLScreenChannel::showToastsBottom()
 		{
 			mHiddenToastsNum++;
 		}
-		createOverflowToast(bottom);
+		createOverflowToast(bottom, gSavedSettings.getS32("NotificationToastTime"));
 	}	
 }
 
@@ -319,7 +320,7 @@ void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
 	mUnreadToastsPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
 	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastMargin"), getRect().getWidth(), toast_rect.getHeight());	
 	mUnreadToastsPanel->setRect(toast_rect);
-	mUnreadToastsPanel->setAndStartTimer(timer ? timer : gSavedSettings.getS32("NotificationToastTime"));
+	mUnreadToastsPanel->setAndStartTimer(timer);
 	getRootView()->addChild(mUnreadToastsPanel);
 
 	text_box->setValue(text);
@@ -337,14 +338,19 @@ void LLScreenChannel::onOverflowToastHide()
 }
 
 //--------------------------------------------------------------------------
-void LLScreenChannel::hideToastsFromScreen()
+void LLScreenChannel::closeUnreadToastsPanel()
 {
-	if(mUnreadToastsPanel)
+	if(mUnreadToastsPanel != NULL)
 	{
 		mUnreadToastsPanel->close();
-		delete mUnreadToastsPanel;
 		mUnreadToastsPanel = NULL;
 	}
+}
+
+//--------------------------------------------------------------------------
+void LLScreenChannel::hideToastsFromScreen()
+{
+	closeUnreadToastsPanel();
 	for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end(); it++)
 		(*it).toast->setVisible(FALSE);
 }
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index f05c205e2a..a205b913ab 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -73,6 +73,7 @@ public:
 	void		setHovering(bool hovering) { mIsHovering = hovering; }
 
 	void		removeToastsFromChannel();
+	void 		closeUnreadToastsPanel();
 	void		hideToastsFromScreen();
 
 	void		setStoreToasts(bool store) { mStoreToasts = store; }
@@ -125,7 +126,7 @@ private:
 	void	showToastsCentre();
 	void	showToastsTop();
 	
-	void	createOverflowToast(S32 bottom, F32 timer = 0);
+	void	createOverflowToast(S32 bottom, F32 timer);
 	void	onOverflowToastHide();
 
 	static bool	mWasStartUpToastShown;
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 2688399139..5f0fbe6ee5 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -44,6 +44,7 @@
 
 #include "llfloater.h" //for gFloaterView
 #include "lliconctrl.h"//for Home tab icon
+#include "llsidetraypanelcontainer.h"
 #include "llwindow.h"//for SetCursor
 
 //#include "llscrollcontainer.h"
@@ -609,9 +610,22 @@ LLPanel*	LLSideTray::showPanel		(const std::string& panel_name, const LLSD& para
 		if(view)
 		{
 			onTabButtonClick((*child_it)->getName());
+
+			LLSideTrayPanelContainer* container = dynamic_cast<LLSideTrayPanelContainer*>(view->getParent());
+			if(container)
+			{
+				LLSD new_params = params;
+				new_params[LLSideTrayPanelContainer::PARAM_SUB_PANEL_NAME] = panel_name;
+				container->onOpen(new_params);
+
+				return container->getCurrentPanel();
+			}
+
 			LLPanel* panel = dynamic_cast<LLPanel*>(view);
 			if(panel)
+			{
 				panel->onOpen(params);
+			}
 			return panel;
 		}
 	}
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h
index 99e84f8141..1f8b6b402f 100644
--- a/indra/newview/llsidetray.h
+++ b/indra/newview/llsidetray.h
@@ -163,6 +163,7 @@ public:
 	/**
 	 * Activate tab with "panel_name" panel
 	 * if no such tab - return NULL, otherwise a pointer to the panel
+	 * Pass params as array, or they may be overwritten(example - params["name"]="nearby")
 	 */
     LLPanel*	showPanel		(const std::string& panel_name, const LLSD& params);
 
diff --git a/indra/newview/llsidetraypanelcontainer.cpp b/indra/newview/llsidetraypanelcontainer.cpp
new file mode 100644
index 0000000000..21061a802a
--- /dev/null
+++ b/indra/newview/llsidetraypanelcontainer.cpp
@@ -0,0 +1,89 @@
+/** 
+* @file llsidetraypanelcontainer.cpp
+* @brief LLSideTrayPanelContainer implementation
+*
+* $LicenseInfo:firstyear=2001&license=viewergpl$
+* 
+* Copyright (c) 2001-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+#include "llsidetraypanelcontainer.h"
+
+static LLDefaultChildRegistry::Register<LLSideTrayPanelContainer> r2("panel_container");
+
+std::string LLSideTrayPanelContainer::PARAM_SUB_PANEL_NAME = "sub_panel_name";
+
+LLSideTrayPanelContainer::Params::Params()
+{
+	// Always hide tabs.
+	hide_tabs(true);
+}
+
+LLSideTrayPanelContainer::LLSideTrayPanelContainer(const Params& p)
+ : LLTabContainer(p)
+{
+}
+
+void LLSideTrayPanelContainer::onOpen(const LLSD& key)
+{
+	// Select specified panel and save navigation history.
+	if(key.has(PARAM_SUB_PANEL_NAME))
+	{
+		// Save panel navigation history
+		std::string panel_name = key[PARAM_SUB_PANEL_NAME];
+		S32 old_index = getCurrentPanelIndex();
+
+		selectTabByName(panel_name);
+
+		S32 new_index = getCurrentPanelIndex();
+
+		// Don't update navigation history if we are opening same panel again.
+		if(old_index != new_index)
+		{
+			mPanelHistory[panel_name] = old_index;
+		}
+	}
+	// Will reopen current panel if no panel name was passed.
+	getCurrentPanel()->onOpen(key);
+}
+
+void LLSideTrayPanelContainer::openPreviousPanel()
+{
+	std::string current_panel_name = getCurrentPanel()->getName();
+	panel_navigation_history_t::const_iterator it = mPanelHistory.find(current_panel_name);
+	if(mPanelHistory.end() != it)
+	{
+		selectTab(it->second);
+	}
+}
+
+BOOL LLSideTrayPanelContainer::handleKeyHere(KEY key, MASK mask)
+{
+	// No key press handling code for Panel Container - this disables
+	// Tab Container's Alt + Left/Right Button tab switching.
+	return TRUE;
+}
diff --git a/indra/newview/llsidetraypanelcontainer.h b/indra/newview/llsidetraypanelcontainer.h
new file mode 100644
index 0000000000..3f3cb552f8
--- /dev/null
+++ b/indra/newview/llsidetraypanelcontainer.h
@@ -0,0 +1,95 @@
+/** 
+* @file llsidetraypanelcontainer.h
+* @brief LLSideTrayPanelContainer class declaration
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+* 
+* Copyright (c) 2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLSIDETRAY_PANEL_CONTAINER_H
+#define LL_LLSIDETRAY_PANEL_CONTAINER_H
+
+#include "lltabcontainer.h"
+
+/**
+* LLSideTrayPanelContainer class acts like LLTabContainer with invisible tabs.
+* It is designed to make panel switching easier, avoid setVisible(TRUE) setVisible(FALSE)
+* calls and related workarounds.
+* use onOpen to open sub panel, pass the name of panel to open
+* in key[PARAM_SUB_PANEL_NAME].
+* LLSideTrayPanelContainer also implements panel navigation history - it allows to 
+* open previous or next panel if navigation history is available(after user 
+* has opened two or more panels). *NOTE - only back navigation is implemented so far.
+*/
+class LLSideTrayPanelContainer : public LLTabContainer
+{
+public:
+
+	struct Params :	public LLInitParam::Block<Params, LLTabContainer::Params>
+	{
+		Params();
+	};
+
+	/**
+	* Opens sub panel
+	* @param key - params to be passed to panel, use key[PARAM_SUB_PANEL_NAME]
+	* to specify panel name to be opened.
+	*/
+	/*virtual*/ void onOpen(const LLSD& key);
+
+	/**
+	* Opens previous panel from panel navigation history.
+	*/
+	void openPreviousPanel();
+
+	/**
+	* Overrides LLTabContainer::handleKeyHere to disable panel switch on 
+	* Alt + Left/Right button press.
+	*/
+	BOOL handleKeyHere(KEY key, MASK mask);
+
+	/**
+	* Name of parameter that stores panel name to open.
+	*/
+	static std::string PARAM_SUB_PANEL_NAME;
+
+protected:
+	LLSideTrayPanelContainer(const Params& p);
+	friend class LLUICtrlFactory;
+
+	/**
+	* std::string - name of panel
+	* S32 - index of previous panel
+	* *NOTE - no forward navigation implemented yet
+	*/
+	typedef std::map<std::string, S32> panel_navigation_history_t;
+
+	// Navigation history
+	panel_navigation_history_t mPanelHistory;
+};
+
+#endif //LL_LLSIDETRAY_PANEL_CONTAINER_H
diff --git a/indra/newview/llsplitbutton.cpp b/indra/newview/llsplitbutton.cpp
new file mode 100644
index 0000000000..ffd9bc7624
--- /dev/null
+++ b/indra/newview/llsplitbutton.cpp
@@ -0,0 +1,275 @@
+/** 
+ * @file llsplitbutton.cpp
+ * @brief LLSplitButton base class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// A control that consolidates several buttons as options
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llsplitbutton.h"
+
+#include "llinitparam.h"
+#include "llpanel.h"
+#include "llfocusmgr.h"
+#include "llviewerwindow.h"
+#include "llrootview.h"
+
+
+S32 BUTTON_PAD = 2; //pad between buttons on an items panel
+
+
+static LLDefaultChildRegistry::Register<LLSplitButton> split_button("split_button");
+
+void LLSplitButton::ArrowPositionValues::declareValues()
+{
+	declare("left", LEFT);
+	declare("right", RIGHT);
+}
+
+LLSplitButton::ItemParams::ItemParams()
+{
+}
+
+LLSplitButton::Params::Params()
+:	arrow_position("arrow_position", LEFT),
+	items("item"),
+	arrow_button("arrow_button"),
+	items_panel("items_panel")
+{
+}
+
+
+void LLSplitButton::onFocusLost()
+{
+	hideButtons();
+	LLUICtrl::onFocusLost();
+}
+
+void LLSplitButton::setFocus(BOOL b)
+{
+	LLUICtrl::setFocus(b);
+
+	if (b)
+	{
+		if (mItemsPanel && mItemsPanel->getVisible())
+		{
+			mItemsPanel->setFocus(TRUE);
+		}
+	}
+}
+
+void LLSplitButton::setEnabled(BOOL enabled)
+{
+	LLView::setEnabled(enabled);
+	mArrowBtn->setEnabled(enabled);
+}
+
+
+void LLSplitButton::onArrowBtnDown()
+{
+	if (!mItemsPanel->getVisible())
+	{
+		showButtons();
+
+		setFocus(TRUE);
+
+		if (mArrowBtn->hasMouseCapture() || mShownItem->hasMouseCapture())
+		{
+			gFocusMgr.setMouseCapture(this);
+		}
+	}
+	else
+	{
+		hideButtons();
+	}
+}
+
+void LLSplitButton::onHeldDownShownButton()
+{
+	if (!mItemsPanel->getVisible()) onArrowBtnDown();
+}
+
+void LLSplitButton::onItemSelected(LLUICtrl* ctrl)
+{
+	if (!ctrl) return;
+
+	hideButtons();
+
+	// call the callback if it exists
+	if(!mSelectionCallback.empty())
+	{
+		mSelectionCallback(this, ctrl->getName());
+	}
+
+	gFocusMgr.setKeyboardFocus(NULL);
+}
+
+BOOL LLSplitButton::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+	gFocusMgr.setMouseCapture(NULL);
+
+	if (mShownItem->parentPointInView(x, y))
+	{
+		onItemSelected(mShownItem);
+		return TRUE;
+	}
+
+	for (std::list<LLButton*>::const_iterator it = mHidenItems.begin(); it != mHidenItems.end(); ++it)
+	{
+		LLButton* item = *it;
+
+		S32 panel_x = 0;
+		S32 panel_y = 0;
+		localPointToOtherView(x, y, &panel_x, &panel_y, mItemsPanel);
+
+		if (item->parentPointInView(panel_x, panel_y))
+		{
+			onItemSelected(item);
+			return TRUE;
+		}
+	}
+	return TRUE;
+}
+
+void LLSplitButton::showButtons()
+{
+	mItemsPanel->setOrigin(0, getRect().getHeight());
+
+	// register ourselves as a "top" control
+	// effectively putting us into a special draw layer
+	gFocusMgr.setTopCtrl(this);
+
+	mItemsPanel->setFocus(TRUE);
+
+	//push arrow button down and show the item buttons
+	mArrowBtn->setToggleState(TRUE);
+	mItemsPanel->setVisible(TRUE);
+
+	setUseBoundingRect(TRUE);
+}
+
+void LLSplitButton::hideButtons()
+{
+	mItemsPanel->setVisible(FALSE);
+	mArrowBtn->setToggleState(FALSE);
+
+	setUseBoundingRect(FALSE);
+	if(gFocusMgr.getTopCtrl() == this)
+	{
+		gFocusMgr.setTopCtrl(NULL);
+	}
+}
+
+
+// protected/private
+
+LLSplitButton::LLSplitButton(const LLSplitButton::Params& p)
+:	LLUICtrl(p),
+	mArrowBtn(NULL),
+	mShownItem(NULL),
+	mItemsPanel(NULL),
+	mArrowPosition(p.arrow_position)
+{
+	LLRect rc(p.rect);
+
+	LLButton::Params arrow_params = p.arrow_button;
+	S32 arrow_width = p.arrow_button.rect.width;
+
+	//Default arrow rect values for LEFT arrow position
+	S32 arrow_left = 0;
+	S32 arrow_right = arrow_width;
+	S32 btn_left = arrow_width;
+	S32 btn_right = rc.getWidth();
+
+	if (mArrowPosition == RIGHT)
+	{
+		arrow_left = rc.getWidth()- arrow_width;
+		arrow_right = rc.getWidth();
+		btn_left = 0;
+		btn_right = arrow_left;
+	}
+
+	arrow_params.rect(LLRect(arrow_left, rc.getHeight(), arrow_right, 0));
+	arrow_params.label("");
+	arrow_params.mouse_down_callback.function(boost::bind(&LLSplitButton::onArrowBtnDown, this));
+	mArrowBtn = LLUICtrlFactory::create<LLButton>(arrow_params);
+	addChild(mArrowBtn);
+
+	//a panel for hidden item buttons
+	LLPanel::Params panel_params = p.items_panel;
+	mItemsPanel= prepareItemsPanel(panel_params, p.items.numValidElements());
+	addChild(mItemsPanel);
+
+
+	LLInitParam::ParamIterator<ItemParams>::const_iterator it = p.items().begin();
+
+	//processing shown item button
+	mShownItem = prepareItemButton(*it);
+	mShownItem->setHeldDownCallback(boost::bind(&LLSplitButton::onHeldDownShownButton, this));
+	mShownItem->setMouseUpCallback(boost::bind(&LLSplitButton::onItemSelected, this, _1));
+	mShownItem->setRect(LLRect(btn_left, rc.getHeight(), btn_right, 0));
+	addChild(mShownItem);
+
+	//processing hidden item buttons
+	S32 item_top = mItemsPanel->getRect().getHeight();
+	for (++it; it != p.items().end(); ++it)
+	{
+		LLButton* hidden_button = prepareItemButton(*it);
+		hidden_button->setRect(LLRect(btn_left, item_top, btn_right, item_top - rc.getHeight()));
+		hidden_button->setMouseDownCallback(boost::bind(&LLSplitButton::onItemSelected, this, _1));
+		mHidenItems.push_back(hidden_button);
+		mItemsPanel->addChild(hidden_button);
+
+		//calculate next button's top
+		item_top -= (rc.getHeight() + BUTTON_PAD);
+	}
+
+	setTopLostCallback(boost::bind(&LLSplitButton::hideButtons, this));
+}
+
+
+LLButton* LLSplitButton::prepareItemButton(LLButton::Params params)
+{
+	params.label("");
+	params.is_toggle(false);
+	return LLUICtrlFactory::create<LLButton>(params); 
+}
+
+LLPanel* LLSplitButton::prepareItemsPanel(LLPanel::Params params, S32 items_count)
+{
+	S32 num_hiden_btns = items_count - 1;
+	S32 panel_height = num_hiden_btns * (getRect().getHeight() + BUTTON_PAD);
+	params.visible(false);
+	params.rect.width(getRect().getWidth());
+	params.rect.height(panel_height);
+	return LLUICtrlFactory::create<LLPanel>(params);
+}
+
diff --git a/indra/newview/llsplitbutton.h b/indra/newview/llsplitbutton.h
new file mode 100644
index 0000000000..0fb5f6594e
--- /dev/null
+++ b/indra/newview/llsplitbutton.h
@@ -0,0 +1,112 @@
+/** 
+ * @file llsplitbutton.h
+ * @brief LLSplitButton base class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// A control that displays the name of the chosen item, which when clicked
+// shows a scrolling box of choices.
+
+
+#include "llbutton.h"
+#include "llpanel.h"
+#include "lluictrl.h"
+
+
+#ifndef LL_LLSPLITBUTTON_H
+#define LL_LLSPLITBUTTON_H
+
+class LLSplitButton
+	:	public LLUICtrl
+{
+public:
+	typedef enum e_arrow_position
+	{
+		LEFT,
+		RIGHT
+	} EArrowPosition;
+
+	struct ArrowPositionValues : public LLInitParam::TypeValuesHelper<EArrowPosition, ArrowPositionValues>
+	{
+		static void declareValues();
+	};
+
+	struct ItemParams : public LLInitParam::Block<ItemParams, LLButton::Params>
+	{
+		ItemParams();
+	};
+
+	struct Params :	public LLInitParam::Block<Params, LLUICtrl::Params>
+	{
+		Optional<EArrowPosition, ArrowPositionValues> arrow_position;
+		Optional<LLButton::Params> arrow_button;
+		Optional<LLPanel::Params> items_panel;
+		Multiple<ItemParams> items;
+
+		Params();
+	};
+
+
+	virtual ~LLSplitButton() {};
+
+	//Overridden
+	virtual void	onFocusLost();
+	virtual void	setFocus(BOOL b);
+	virtual void	setEnabled(BOOL enabled);
+
+	//Callbacks
+	void	onArrowBtnDown();
+	void	onHeldDownShownButton();
+	void	onItemSelected(LLUICtrl* ctrl);
+	void	setSelectionCallback(commit_callback_t cb) { mSelectionCallback = cb; }
+
+	virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+
+	virtual void	showButtons();
+	virtual void	hideButtons();
+
+
+protected:
+	friend class LLUICtrlFactory;
+	LLSplitButton(const LLSplitButton::Params& p);
+
+	LLButton* prepareItemButton(LLButton::Params params);
+	LLPanel* prepareItemsPanel(LLPanel::Params params, S32 items_count);
+
+	LLPanel* mItemsPanel;
+	std::list<LLButton*> mHidenItems;
+	LLButton* mArrowBtn;
+	LLButton* mShownItem;
+	EArrowPosition mArrowPosition;
+
+	commit_callback_t mSelectionCallback;
+};
+
+
+#endif
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 6f5b25214e..0d4c75b507 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -36,6 +36,7 @@
 
 #include "llbutton.h"
 #include "llfocusmgr.h"
+#include "llviewercontrol.h"
 
 using namespace LLNotificationsUI;
 
@@ -48,7 +49,8 @@ LLToast::LLToast(LLPanel* panel) :
 					mCanFade(true),
 					mHideBtn(NULL),
 					mIsModal(false),
-					mCanBeStored(true)
+					mCanBeStored(true),
+					mHideBtnPressed(false)
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_toast.xml");
 
@@ -104,8 +106,7 @@ bool LLToast::timerHasExpired()
 	if (mTimer.getStarted())
 	{
 		F32 elapsed_time = mTimer.getElapsedTimeF32();
-		// after 4 seconds a toast should start fade
-		if (elapsed_time > 4) 
+		if (elapsed_time > gSavedSettings.getS32("ToastOpaqueTime")) 
 		{
 			setBackgroundOpaque(FALSE);
 		}
@@ -218,6 +219,7 @@ void LLToast::onMouseEnter(S32 x, S32 y, MASK mask)
 //--------------------------------------------------------------------------
 void LLToast::onMouseLeave(S32 x, S32 y, MASK mask)
 {	
+	llinfos << "MOUSE LEAVE: x = " << x << "y = " << y << llendl;
 	mOnToastHover(this, MOUSE_LEAVE);
 
 	if(mCanFade && !mIsViewed)
@@ -226,14 +228,26 @@ void LLToast::onMouseLeave(S32 x, S32 y, MASK mask)
 	}
 	if(mHideBtn && mHideBtn->getEnabled())
 	{
-		if( mHideBtn->getRect().pointInRect(x, y) )
+		if( mHideBtnPressed )
+		{
+			mHideBtnPressed = false;
 			return;
-		mHideBtn->setVisible(FALSE);
+		}
+		mHideBtn->setVisible(FALSE);		
 	}
 }
 
 //--------------------------------------------------------------------------
 
+BOOL LLToast::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	if(mHideBtn && mHideBtn->getEnabled())
+	{
+		mHideBtnPressed = mHideBtn->getRect().pointInRect(x, y);
+	}
+
+	return LLFloater::handleMouseDown(x, y, mask);
+}
 
 
 
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index 018664f3d1..f998754585 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -55,6 +55,7 @@ public:
 	LLToast(LLPanel* panel);
 	virtual ~LLToast();
 
+	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
 	//
 	bool isViewed() { return mIsViewed; }
 	
@@ -109,6 +110,7 @@ private:
 	bool		mCanFade;
 	bool		mIsModal;
 	bool		mCanBeStored;
+	bool		mHideBtnPressed;
 };
 
 }
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index 477e452907..5478e0005a 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -253,7 +253,7 @@ void LLToolBar::refresh()
 	BOOL sitting = FALSE;
 	if (gAgent.getAvatarObject())
 	{
-		sitting = gAgent.getAvatarObject()->mIsSitting;
+		sitting = gAgent.getAvatarObject()->isSitting();
 	}
 
 	if (!gAgent.canFly())
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index ee6e36518f..297cf2c667 100644
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -56,6 +56,8 @@
 #include "llviewerwindow.h"
 #include "llvoavatarself.h"
 #include "llmorphview.h"
+#include "llfloaterreg.h"
+#include "llfloatercamera.h"
 
 // Globals
 BOOL gCameraBtnZoom = TRUE;
@@ -254,7 +256,11 @@ void LLToolCamera::releaseMouse()
 
 	gViewerWindow->showCursor();
 
-	LLToolMgr::getInstance()->clearTransientTool();
+	//for the situation when left click was performed on the Agent
+	if (!LLFloaterCamera::inFreeCameraMode())
+	{
+		LLToolMgr::getInstance()->clearTransientTool();
+	}
 
 	mMouseSteering = FALSE;
 	mValidClickPoint = FALSE;
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 350657538b..fab336f17d 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -42,7 +42,6 @@
 #include "llagent.h"
 #include "llviewercontrol.h"
 #include "llfirstuse.h"
-#include "llfloateravatarinfo.h"
 #include "llfloaterland.h"
 #include "llfloaterreg.h"
 #include "llfloaterscriptdebug.h"
@@ -190,7 +189,7 @@ BOOL LLToolPie::pickLeftMouseDownCallback()
 			// touch behavior down below...
 			break;
 		case CLICK_ACTION_SIT:
-			if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // agent not already sitting
+			if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->isSitting())) // agent not already sitting
 			{
 				handle_sit_or_stand();
 				return TRUE;
@@ -362,7 +361,7 @@ ECursorType cursor_from_object(LLViewerObject* object)
 	switch(click_action)
 	{
 	case CLICK_ACTION_SIT:
-		if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // not already sitting?
+		if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->isSitting())) // not already sitting?
 		{
 			cursor = UI_CURSOR_TOOLSIT;
 		}
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 5c38be86d5..034bb9b88d 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -42,7 +42,6 @@
 #include "llfloateractivespeakers.h"
 #include "llfloaterauction.h"
 #include "llfloateraddlandmark.h"
-#include "llfloateravatarinfo.h"
 #include "llfloaterbeacons.h"
 #include "llfloaterbulkpermission.h"
 #include "llfloaterbuildoptions.h"
@@ -51,6 +50,7 @@
 #include "llfloaterchat.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterdirectory.h"
+#include "llfloaterfirsttimetip.h"
 #include "llfloaterfonttest.h"
 #include "llfloatergodtools.h"
 #include "llfloaterhtmlcurrency.h"
@@ -114,6 +114,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
 	LLFloaterReg::add("contacts", "floater_my_friends.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMyFriends>);	
 
+	LLFloaterReg::add("first_time_tip", "floater_first_time_tip.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFirstTimeTip>);
 	LLFloaterReg::add("font_test", "floater_font_test.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFontTest>);
 
 	LLFloaterReg::add("god_tools", "floater_god_tools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGodTools>);
@@ -127,7 +128,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("lagmeter", "floater_lagmeter.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLagMeter>);
 	
 	LLFloaterReg::add("mem_leaking", "floater_mem_leaking.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMemLeak>);
-	LLFloaterReg::add("me_profile", "floater_me.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAvatarInfo>);
 	LLFloaterReg::add("media_browser", "floater_media_browser.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMediaBrowser>);	
 	LLFloaterReg::add("moveview", "floater_moveview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMove>);
 	LLFloaterReg::add("mute", "floater_mute.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMute>);
@@ -144,7 +144,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("preview_url", "floater_preview_url.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterURLDisplay>);
 	LLFloaterReg::add("pref_joystick", "floater_joystick.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterJoystick>);
 	LLFloaterReg::add("pref_voicedevicesettings", "floater_device_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterVoiceDeviceSettings>);
-	LLFloaterReg::add("preview_avatar", "floater_profile.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAvatarInfo>);
 	LLFloaterReg::add("preview_anim", "floater_preview_animation.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewAnim>, "preview");
 	LLFloaterReg::add("preview_gesture", "floater_preview_gesture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewGesture>, "preview");
 	LLFloaterReg::add("preview_landmark", "floater_preview_existing_landmark.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewLandmark>, "preview");
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 66da7d89fb..75d9321313 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -201,10 +201,19 @@ void LLViewerInventoryItem::fetchFromServer(void) const
 	{
 		std::string url; 
 
-		if( ALEXANDRIA_LINDEN_ID.getString() == mPermissions.getOwner().getString())
-			url = gAgent.getRegion()->getCapability("FetchLib");
-		else	
-			url = gAgent.getRegion()->getCapability("FetchInventory");
+		LLViewerRegion* region = gAgent.getRegion();
+		// we have to check region. It can be null after region was destroyed. See EXT-245
+		if (region)
+		{
+			if( ALEXANDRIA_LINDEN_ID.getString() == mPermissions.getOwner().getString())
+				url = region->getCapability("FetchLib");
+			else	
+				url = region->getCapability("FetchInventory");
+		}
+		else
+		{
+			llwarns << "Agent Region is absent" << llendl;
+		}
 
 		if (!url.empty())
 		{
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index 4e0c4023fd..6bb302727d 100644
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -44,6 +44,7 @@
 #include "lltoolfocus.h"
 #include "llviewerwindow.h"
 #include "llvoavatarself.h"
+#include "llfloatercamera.h"
 
 //
 // Constants
@@ -135,14 +136,29 @@ static void agent_push_forwardbackward( EKeystate s, S32 direction, LLAgent::EDo
 	}
 }
 
+void camera_move_forward( EKeystate s );
+
 void agent_push_forward( EKeystate s )
 {
+	//in free camera control mode we need to intercept keyboard events for avatar movements
+	if (LLFloaterCamera::inFreeCameraMode())
+	{
+		camera_move_forward(s);
+		return;
+	}
 	agent_push_forwardbackward(s, 1, LLAgent::DOUBLETAP_FORWARD);
 }
 
+void camera_move_backward( EKeystate s );
 
 void agent_push_backward( EKeystate s )
 {
+	//in free camera control mode we need to intercept keyboard events for avatar movements
+	if (LLFloaterCamera::inFreeCameraMode())
+	{
+		camera_move_backward(s);
+		return;
+	}
 	agent_push_forwardbackward(s, -1, LLAgent::DOUBLETAP_BACKWARD);
 }
 
@@ -175,8 +191,17 @@ void agent_slide_right( EKeystate s )
 	agent_slide_leftright(s, -1, LLAgent::DOUBLETAP_SLIDERIGHT);
 }
 
+void camera_spin_around_cw( EKeystate s );
+
 void agent_turn_left( EKeystate s )
 {
+	//in free camera control mode we need to intercept keyboard events for avatar movements
+	if (LLFloaterCamera::inFreeCameraMode())
+	{
+		camera_spin_around_cw(s);
+		return;
+	}
+
 	if (LLToolCamera::getInstance()->mouseSteerMode())
 	{
 		agent_slide_left(s);
@@ -189,9 +214,17 @@ void agent_turn_left( EKeystate s )
 	}
 }
 
+void camera_spin_around_ccw( EKeystate s );
 
 void agent_turn_right( EKeystate s )
 {
+	//in free camera control mode we need to intercept keyboard events for avatar movements
+	if (LLFloaterCamera::inFreeCameraMode())
+	{
+		camera_spin_around_ccw(s);
+		return;
+	}
+
 	if (LLToolCamera::getInstance()->mouseSteerMode())
 	{
 		agent_slide_right(s);
@@ -842,7 +875,7 @@ EKeyboardMode LLViewerKeyboard::getMode()
 	{
 		return MODE_EDIT_AVATAR;
 	}
-	else if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->mIsSitting)
+	else if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting())
 	{
 		return MODE_SITTING;
 	}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 7071b65228..d4cbe580a9 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -81,6 +81,7 @@
 #include "lldrawpooltree.h"
 #include "llface.h"
 #include "llfirstuse.h"
+#include "llfirsttimetipmanager.h"
 #include "llfloater.h"
 #include "llfloaterabout.h"
 #include "llfloaterbuycurrency.h"
@@ -3439,7 +3440,7 @@ class LLSelfStandUp : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+		gAgent.standUp();
 		return true;
 	}
 };
@@ -3448,7 +3449,7 @@ class LLSelfEnableStandUp : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		bool new_value = gAgent.getAvatarObject() && gAgent.getAvatarObject()->mIsSitting;
+		bool new_value = gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting();
 		return new_value;
 	}
 };
@@ -3676,7 +3677,7 @@ bool handle_sit_or_stand()
 
 	if (sitting_on_selection())
 	{
-		gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+		gAgent.standUp();
 		return true;
 	}
 
@@ -3722,7 +3723,7 @@ class LLLandSit : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+		gAgent.standUp();
 		LLViewerParcelMgr::getInstance()->deselectLand();
 
 		LLVector3d posGlobal = LLToolPie::getInstance()->getPick().mPosGlobal;
@@ -4630,7 +4631,7 @@ BOOL sitting_on_selection()
 		return FALSE;
 	}
 
-	return (avatar->mIsSitting && avatar->getRoot() == root_object);
+	return (avatar->isSitting() && avatar->getRoot() == root_object);
 }
 
 class LLToolsSaveToInventory : public view_listener_t
@@ -5225,6 +5226,9 @@ class LLWorldAlwaysRun : public view_listener_t
 		// tell the simulator.
 		gAgent.sendWalkRun(gAgent.getAlwaysRun());
 
+		// Update Movement Controls according to AlwaysRun mode
+		LLFloaterMove::setAlwaysRunMode(gAgent.getAlwaysRun());
+
 		return true;
 	}
 };
@@ -5275,7 +5279,10 @@ class LLWorldCreateLandmark : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		LLFloaterReg::showInstance("add_landmark");
+		LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
+			
+		// Floater "Add Landmark" functionality moved to Side Tray
+		//LLFloaterReg::showInstance("add_landmark");
 		return true;
 	}
 };
@@ -7623,7 +7630,23 @@ class LLWorldDayCycle : public view_listener_t
 	}
 };
 
+/// Show First Time Tips calbacks
+class LLHelpCheckShowFirstTimeTip : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		return LLFirstTimeTipsManager::tipsEnabled();
+	}
+};
 
+class LLHelpShowFirstTimeTip : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLFirstTimeTipsManager::enabledTip(!userdata.asBoolean());
+		return true;
+	}
+};
 
 void initialize_menus()
 {
@@ -7728,6 +7751,9 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
 	view_listener_t::addMenu(new LLWorldDayCycle(), "World.DayCycle");
 
+	view_listener_t::addMenu(new LLHelpCheckShowFirstTimeTip(), "Help.CheckShowFirstTimeTip");
+	view_listener_t::addMenu(new LLHelpShowFirstTimeTip(), "Help.ShowQuickTips");
+
 	// Tools menu
 	view_listener_t::addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
 	view_listener_t::addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 25c00bb816..129cd5aab9 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -96,6 +96,7 @@
 #include "llinventorymodel.h"
 #include "llfloaterinventory.h"
 #include "llmenugl.h"
+#include "llmoveview.h"
 #include "llmutelist.h"
 #include "llnotifications.h"
 #include "llnotify.h"
@@ -1184,9 +1185,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 			{
 				opener = open_agent_offer;
 			}
-
-			// add buddy to recent people list
-			LLRecentPeople::instance().add(mFromID);
 		}
 			break;
 		case IM_TASK_INVENTORY_OFFERED:
@@ -1259,6 +1257,12 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		break;
 	}
 
+	if(IM_INVENTORY_OFFERED == mIM)
+	{
+		// add buddy to recent people list
+		LLRecentPeople::instance().add(mFromID);
+	}
+
 	if(opener)
 	{
 		gInventory.addObserver(opener);
@@ -3850,7 +3854,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
 	if (object)
 	{
 		LLVector3 sit_spot = object->getPositionAgent() + (sitPosition * object->getRotation());
-		if (!use_autopilot || (avatar && avatar->mIsSitting && avatar->getRoot() == object->getRoot()))
+		if (!use_autopilot || (avatar && avatar->isSitting() && avatar->getRoot() == object->getRoot()))
 		{
 			//we're already sitting on this object, so don't autopilot
 		}
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 0fadba1364..afee30293a 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -44,7 +44,6 @@
 #include "llviewertexteditor.h"
 
 #include "llfloaterchat.h"
-#include "llfloateravatarinfo.h"
 #include "llfloaterworldmap.h"
 #include "llnotify.h"
 #include "llpanelplaces.h"
@@ -64,6 +63,7 @@
 #include "llnotecard.h"
 #include "llmemorystream.h"
 #include "llmenugl.h"
+#include "llavataractions.h"
 
 #include "llappviewer.h" // for gPacificDaylightTime
 
@@ -1394,9 +1394,7 @@ void LLViewerTextEditor::openEmbeddedCallingcard( LLInventoryItem* item, llwchar
 {
 	if(item && !item->getCreatorUUID().isNull())
 	{
-		BOOL online;
-		online = LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID());
-		LLFloaterAvatarInfo::showFromFriend(item->getCreatorUUID(), online);
+		LLAvatarActions::showProfile(item->getCreatorUUID());
 	}
 }
 
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index f312cc0f63..e44112fb8f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4254,30 +4254,19 @@ void LLViewerWindow::destroyWindow()
 
 void LLViewerWindow::drawMouselookInstructions()
 {
-	// Draw instructions for mouselook ("Press ESC to leave Mouselook" in a box at the top of the screen.)
+	// Draw instructions for mouselook ("Press ESC to return to World View" partially transparent at the bottom of the screen.)
 	const std::string instructions = LLTrans::getString("LeaveMouselook");
-	const LLFontGL* font = LLFontGL::getFontSansSerif();
-
-	const S32 INSTRUCTIONS_PAD = 5;
-	LLRect instructions_rect;
-	instructions_rect.setLeftTopAndSize( 
-		mWorldViewRect.mLeft + INSTRUCTIONS_PAD,
-		mWorldViewRect.mTop - INSTRUCTIONS_PAD,
-		font->getWidth( instructions ) + 2 * INSTRUCTIONS_PAD,
-		llround(font->getLineHeight() + 2 * INSTRUCTIONS_PAD));
-
-	{
-		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-		gGL.color4f( 0.9f, 0.9f, 0.9f, 1.0f );
-		gl_rect_2d( instructions_rect );
-	}
+	const LLFontGL* font = LLFontGL::getFont(LLFontDescriptor("SansSerif", "Huge", LLFontGL::BOLD));
 	
+	//to be on top of Bottom bar when it is opened
+	const S32 INSTRUCTIONS_PAD = 50;
+
 	font->renderUTF8( 
 		instructions, 0,
-		instructions_rect.mLeft + INSTRUCTIONS_PAD,
-		instructions_rect.mTop - INSTRUCTIONS_PAD,
-		LLColor4( 0.0f, 0.0f, 0.0f, 1.f ),
-		LLFontGL::LEFT, LLFontGL::TOP);
+		mWorldViewRect.getCenterX(),
+		mWorldViewRect.mBottom + INSTRUCTIONS_PAD,
+		LLColor4( 0.0f, 0.0f, 0.0f, 0.6f ),
+		LLFontGL::HCENTER, LLFontGL::TOP);
 }
 
 
@@ -4396,11 +4385,6 @@ BOOL LLViewerWindow::getShowProgress() const
 	return (mProgressView && mProgressView->getVisible());
 }
 
-void LLViewerWindow::handleLoginComplete()
-{
-	LLNavigationBar::getInstance()->handleLoginComplete();
-}
-
 void LLViewerWindow::moveProgressViewToFront()
 {
 	if( mProgressView && mRootView )
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index 35173c8922..62769fe343 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -267,7 +267,6 @@ public:
 	void			setProgressMessage(const std::string& msg);
 	void			setProgressCancelButtonVisible( BOOL b, const std::string& label = LLStringUtil::null );
 	LLProgressView *getProgressView() const;
-	void			handleLoginComplete();
 
 	void			updateObjectUnderCursor();
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 714145ce14..6658227aaf 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -57,6 +57,7 @@
 #include "llkeyframestandmotion.h"
 #include "llkeyframewalkmotion.h"
 #include "llmutelist.h"
+#include "llmoveview.h"
 #include "llnotify.h"
 #include "llquantize.h"
 #include "llregionhandle.h"
@@ -4244,7 +4245,7 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
 		}
 		else if (anim_id == ANIM_AGENT_SIT_GROUND_CONSTRAINED)
 		{
-			mIsSitting = TRUE;
+			sitDown(TRUE);
 		}
 
 
@@ -4261,7 +4262,7 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
 	{
 		if (anim_id == ANIM_AGENT_SIT_GROUND_CONSTRAINED)
 		{
-			mIsSitting = FALSE;
+			sitDown(FALSE);
 		}
 		stopMotion(anim_id);
 		result = TRUE;
@@ -5483,6 +5484,19 @@ BOOL LLVOAvatar::detachObject(LLViewerObject *viewer_object)
 	return FALSE;
 }
 
+//-----------------------------------------------------------------------------
+// sitDown()
+//-----------------------------------------------------------------------------
+void LLVOAvatar::sitDown(BOOL bSitting)
+{
+	mIsSitting = bSitting;
+	if (isSelf())
+	{
+		// Update Movement Controls according to own Sitting mode
+		LLFloaterMove::setSittingMode(bSitting);
+	}
+}
+
 //-----------------------------------------------------------------------------
 // sitOnObject()
 //-----------------------------------------------------------------------------
@@ -5502,7 +5516,7 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
 	mDrawable->mXform.setRotation(mDrawable->getWorldRotation() * inv_obj_rot);
 
 	gPipeline.markMoved(mDrawable, TRUE);
-	mIsSitting = TRUE;
+	sitDown(TRUE);
 	mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject
 	mRoot.setPosition(getPosition());
 	mRoot.updateWorldMatrixChildren();
@@ -5566,7 +5580,8 @@ void LLVOAvatar::getOffObject()
 	
 	gPipeline.markMoved(mDrawable, TRUE);
 
-	mIsSitting = FALSE;
+	sitDown(FALSE);
+
 	mRoot.getXform()->setParent(NULL); // LLVOAvatar::getOffObject
 	mRoot.setPosition(cur_position_world);
 	mRoot.setRotation(cur_rotation_world);
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index f36d64aa8e..59be38a1b0 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -784,8 +784,13 @@ public:
 	// Sitting
 	//--------------------------------------------------------------------
 public:
+	void			sitDown(BOOL bSitting);
+	BOOL			isSitting(){return mIsSitting;}
 	void 			sitOnObject(LLViewerObject *sit_object);
 	void 			getOffObject();
+	
+private:
+	// set this property only with LLVOAvatar::sitDown method
 	BOOL 			mIsSitting;
 
 /**                    Hierarchy
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 4a6bb6facb..9df25bdb11 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1006,6 +1006,15 @@ void LLVOAvatarSelf::localTextureLoaded(BOOL success, LLViewerFetchedTexture *sr
 	ETextureIndex index = data->mIndex;
 	if (!isIndexLocalTexture(index)) return;
 	LLLocalTextureObject *local_tex_obj = getLocalTextureObject(index, 0);
+
+	// fix for EXT-268. Preventing using of NULL pointer
+	if(NULL == local_tex_obj)
+	{
+		LL_WARNS("TAG") << "There is no Local Texture Object with index: " << index 
+			<< ", final: " << final
+			<< LL_ENDL;
+		return;
+	}
 	if (success)
 	{
 		if (!local_tex_obj->getBakedReady() &&
diff --git a/indra/newview/macview_Prefix.h b/indra/newview/macview_Prefix.h
index a273320b3d..0fcdf2da4f 100644
--- a/indra/newview/macview_Prefix.h
+++ b/indra/newview/macview_Prefix.h
@@ -63,7 +63,6 @@
 #include "lldrawable.h"
 #include "llfirstuse.h"
 #include "llfloater.h"
-#include "llfloateravatarinfo.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloaterchat.h"
 #include "llfloatercustomize.h"
diff --git a/indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png b/indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png
new file mode 100644
index 0000000000..be7c87efb6
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_free_mode.png b/indra/newview/skins/default/textures/quick_tips/camera_free_mode.png
new file mode 100644
index 0000000000..9a3f3703b2
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/camera_free_mode.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png b/indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png
new file mode 100644
index 0000000000..dd72cc0162
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png b/indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png
new file mode 100644
index 0000000000..b537dcbe46
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png b/indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png
new file mode 100644
index 0000000000..7674a75ac3
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png b/indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png
new file mode 100644
index 0000000000..9c9b923a5a
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png b/indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png
new file mode 100644
index 0000000000..15c3053491
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_fly_first.png b/indra/newview/skins/default/textures/quick_tips/move_fly_first.png
new file mode 100644
index 0000000000..b6e2ce60e4
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/move_fly_first.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_fly_second.png b/indra/newview/skins/default/textures/quick_tips/move_fly_second.png
new file mode 100644
index 0000000000..84b63cc338
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/move_fly_second.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_run_first.png b/indra/newview/skins/default/textures/quick_tips/move_run_first.png
new file mode 100644
index 0000000000..16093dc683
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/move_run_first.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_run_second.png b/indra/newview/skins/default/textures/quick_tips/move_run_second.png
new file mode 100644
index 0000000000..19fa43ec32
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/move_run_second.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_walk_first.png b/indra/newview/skins/default/textures/quick_tips/move_walk_first.png
new file mode 100644
index 0000000000..92d120d53e
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/move_walk_first.png differ
diff --git a/indra/newview/skins/default/textures/quick_tips/move_walk_second.png b/indra/newview/skins/default/textures/quick_tips/move_walk_second.png
new file mode 100644
index 0000000000..f8e28722be
Binary files /dev/null and b/indra/newview/skins/default/textures/quick_tips/move_walk_second.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 343ff893e8..1501f39b67 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_minimize="false"
+ can_close="false" 
  center_horiz="true"
  follows="top"
- height="64"
+ height="95"
  layout="topleft"
  name="camera_floater"
  save_rect="true"
  save_visibility="true"
- width="176">
+ width="105">
     <floater.string
      name="rotate_tooltip">
         Rotate Camera Around Focus
@@ -21,50 +22,121 @@
      name="move_tooltip">
         Move Camera Up and Down, Left and Right
     </floater.string>
-    <joystick_rotate
-     follows="top|left"
+    <panel
+     border="true"
      height="64"
-     image_selected="cam_rotate_in.tga"
-     image_unselected="cam_rotate_out.tga"
      layout="topleft"
-     left="16"
-     name="cam_rotate_stick"
-     picture_style="true"
-     quadrant="left"
-     scale_image="false"
-     sound_flags="3"
-     tool_tip="rotate_tooltip"
+     left="0"
      top="0"
-     width="64" />
-    <joystick_zoom
-     follows="top|left"
-     height="64"
-     image_unselected="cam_zoom_out.tga"
-     layout="topleft"
-     left_delta="64"
-     minus_image="cam_zoom_minus_in.tga"
-     name="zoom"
-     picture_style="true"
-     plus_image="cam_zoom_plus_in.tga"
-     quadrant="left"
-     scale_image="false"
-     sound_flags="3"
-     tool_tip="zoom_tooltip"
-     top_delta="0"
-     width="16" />
-    <joystick_track
-     follows="top|left"
-     height="64"
-     image_selected="cam_tracking_in.tga"
-     image_unselected="cam_tracking_out.tga"
+     name="controls"
+     width="105">
+        <joystick_rotate
+         follows="top|left"
+         height="64"
+         image_selected="cam_rotate_in.tga"
+         image_unselected="cam_rotate_out.tga"
+         layout="topleft"
+         left="2"
+         name="cam_rotate_stick"
+         picture_style="true"
+         quadrant="left"
+         scale_image="false"
+         sound_flags="3"
+         tool_tip="Orbit Camera Around Focus"
+         top="0"
+         width="64" />
+        <joystick_track
+         follows="top|left"
+         height="64"
+         image_selected="cam_tracking_in.tga"
+         image_unselected="cam_tracking_out.tga"
+         layout="topleft"
+         left="2"
+         name="cam_track_stick"
+         picture_style="true"
+         quadrant="left"
+         scale_image="false"
+         sound_flags="3"
+         tool_tip="Move Camera Up and Down, Left and Right"
+         top="0"
+         visible="false"
+         width="64" />
+        <joystick_zoom
+         follows="top|left"
+         height="64"
+         image_unselected="cam_zoom_out.tga"
+         layout="topleft"
+         left_delta="74"
+         minus_image="cam_zoom_minus_in.tga"
+         name="zoom"
+         picture_style="true"
+         plus_image="cam_zoom_plus_in.tga"
+         quadrant="left"
+         scale_image="false"
+         sound_flags="3"
+         tool_tip="Zoom Camera Towards Focus"
+         top_delta="0"
+         width="16" />
+    </panel>
+    <panel
+     border="true"
+     height="30"
      layout="topleft"
-     left_delta="16"
-     name="cam_track_stick"
-     picture_style="true"
-     quadrant="left"
-     scale_image="false"
-     sound_flags="3"
-     tool_tip="move_tooltip"
-     top_delta="0"
-     width="64" />
+     left="0"
+     top_pad="1"
+     name="buttons"
+     width="105">
+        <button
+         height="25"
+         label=""
+         layout="topleft"
+         left="0"
+         is_toggle="true"
+         image_selected="btn_orbit_selected.png"
+         image_unselected="btn_orbit_unselected.png"
+         name="orbit_btn"
+         tab_stop="false"
+         tool_tip="Orbit Camera"
+         value="true"
+         width="25">
+        </button>
+        <button
+         height="25"
+         label=""
+         layout="topleft"
+         left_pad="1"
+         is_toggle="true"
+         image_selected="btn_pan_selected.png"
+         image_unselected="btn_pan_unselected.png"
+         name="pan_btn"
+         tab_stop="false"
+         tool_tip="Pan Camera"
+         width="25">
+        </button>
+        <button
+         height="25"
+         label=""
+         layout="topleft"
+         left_pad="1"
+         is_toggle="true"
+         image_selected="btn_freecamera_selected.png"
+         image_unselected="btn_freecamera_unselected.png"
+         name="freecamera_btn"
+         tab_stop="false"
+         tool_tip="View Object"
+         width="25">
+        </button>
+        <button
+         height="25"
+         label=""
+         layout="topleft"
+         left_pad="2"
+         image_selected="btn_firstperson_selected.png"
+         image_unselected="btn_firstperson_unselected.png"
+         name="avatarview_btn"
+         tab_stop="false"
+         tool_tip="See as Avatar"
+         width="25">
+        </button>
+    </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_first_time_tip.xml b/indra/newview/skins/default/xui/en/floater_first_time_tip.xml
new file mode 100644
index 0000000000..c16373ba3c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_first_time_tip.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_minimize="false"
+ height="250"
+ layout="topleft"
+ name="set_name_in_the_cladd"
+ save_rect="true"
+ width="300">
+    <check_box
+     height="20"
+     follows="left|bottom|right"
+     label="Turn off Quick Tips"
+     layout="topleft"
+     left="5"
+     name="DontShowFirstTimeTip_checkbox"
+     text_enabled_color="white"
+     top="225"
+     width="200" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 7666a2494d..17d12c89b7 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,128 +1,184 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ can_close="false"
  can_minimize="false"
  center_horiz="true"
  follows="bottom"
- height="58"
+ height="95"
  layout="topleft"
  name="move_floater"
  save_rect="true"
  save_visibility="true"
- width="135">
-    <button
-     follows="left|bottom"
-     height="25"
-     image_disabled="move_turn_left_out.tga"
-     image_disabled_selected="move_turn_left_in.tga"
-     image_selected="move_turn_left_in.tga"
-     image_unselected="move_turn_left_out.tga"
-     layout="topleft"
-     left="20"
-     name="turn left btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Turn Left"
-     top="29"
-     width="25" />
-    <button
-     follows="left|bottom"
-     height="25"
-     image_disabled="move_turn_right_out.tga"
-     image_disabled_selected="move_turn_right_in.tga"
-     image_selected="move_turn_right_in.tga"
-     image_unselected="move_turn_right_out.tga"
-     layout="topleft"
-     left_pad="21"
-     name="turn right btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Turn Right"
-     top_delta="0"
-     width="25" />
-    <button
-     follows="left|bottom"
-     height="25"
-     image_disabled="move_up_out.tga"
-     image_disabled_selected="move_up_in.tga"
-     image_selected="move_up_in.tga"
-     image_unselected="move_up_out.tga"
-     layout="topleft"
-     left="91"
-     name="move up btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Jump or Fly Up"
-     top="4"
-     width="25" />
-    <button
-     follows="left|bottom"
-     height="25"
-     image_disabled="move_down_out.tga"
-     image_disabled_selected="move_down_in.tga"
-     image_selected="move_down_in.tga"
-     image_unselected="move_down_out.tga"
-     layout="topleft"
-     left_delta="0"
-     name="move down btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Crouch or Fly Down"
-     top_delta="25"
-     width="25" />
-    <joystick_slide
-     follows="left|bottom"
-     height="25"
-     image_selected="move_left_in.tga"
-     image_unselected="move_left_out.tga"
-     layout="topleft"
-     left="20"
-     name="slide left btn"
-     picture_style="true"
-     quadrant="left"
-     scale_image="false"
-     tool_tip="Move Left"
-     top="4"
-     width="25" />
-    <joystick_slide
-     follows="left|bottom"
-     height="25"
-     image_selected="move_right_in.tga"
-     image_unselected="move_right_out.tga"
-     layout="topleft"
-     left_pad="21"
-     name="slide right btn"
-     picture_style="true"
-     quadrant="right"
-     scale_image="false"
-     tool_tip="Move Right"
-     top_delta="0"
-     width="25" />
-    <joystick_turn
-     follows="left|bottom"
-     height="25"
-     image_selected="move_forward_in.tga"
-     image_unselected="move_forward_out.tga"
+ width="115">
+    <string
+     name="walk_forward_tooltip">
+        Walk Forward (press Up Arrow or W)
+    </string>
+    <string
+     name="walk_back_tooltip">
+        Walk Backwards (press Down Arrow or S)
+    </string>
+    <string
+     name="run_forward_tooltip">
+        Run Forward (press Up Arrow or W)
+    </string>
+    <string
+     name="run_back_tooltip">
+        Run Backwards (press Down Arrow or S)
+    </string>
+    <string
+     name="fly_forward_tooltip">
+        Fly Forward (press Up Arrow or W)
+    </string>
+    <string
+     name="fly_back_tooltip">
+        Fly Backwards (press Down Arrow or S)
+    </string>
+    <panel
+     border="true" 
+     height="70"
+     follows="left|top" 
      layout="topleft"
-     left_delta="-21"
-     name="forward btn"
-     picture_style="true"
-     quadrant="up"
-     scale_image="false"
-     tool_tip="Move Forward"
-     top_delta="0"
-     width="21" />
-    <joystick_turn
-     follows="left|bottom"
+     left="0"
+     name="panel_actions"
+     top="0"
+     width="115">
+        <button
+         follows="left|bottom"
+         height="25"
+         image_selected="move_turn_left_in.tga"
+         image_unselected="move_turn_left_out.tga"
+         layout="topleft"
+         left="10"
+         name="turn left btn"
+         picture_style="true"
+         scale_image="false"
+         tool_tip="Turn Left (press Left Arrow or A)"
+         top="35"
+         width="25" />
+        <button
+         follows="left|bottom"
+         height="25"
+         image_selected="move_turn_right_in.tga"
+         image_unselected="move_turn_right_out.tga"
+         layout="topleft"
+         left_pad="45"
+         name="turn right btn"
+         picture_style="true"
+         scale_image="false"
+         tool_tip="Turn Right (press Right Arrow or D)"
+         top_delta="0"
+         width="25" />
+        <button
+         follows="left|bottom"
+         height="25"
+         image_selected="move_up_in.tga"
+         image_unselected="move_up_out.tga"
+         layout="topleft"
+         left="10"
+         name="move up btn"
+         picture_style="true"
+         scale_image="false"
+         tool_tip="Fly Up, Press &quot;E&quot;"
+         top="4"
+         width="25" />
+        <button
+         follows="left|bottom"
+         height="25"
+         image_selected="move_down_in.tga"
+         image_unselected="move_down_out.tga"
+         layout="topleft"
+         left_pad="45"
+         name="move down btn"
+         picture_style="true"
+         scale_image="false"
+         tool_tip="Fly Down, Press &quot;C&quot;"
+         top_delta="0"
+         width="25" />
+        <joystick_turn
+         follows="left|bottom"
+         height="25"
+         image_selected="move_forward_in.tga"
+         image_unselected="move_forward_out.tga"
+         layout="topleft"
+         left="47"
+         name="forward btn"
+         picture_style="true"
+         quadrant="up"
+         scale_image="false"
+         tool_tip="Walk Forward (press Up Arrow or W)"
+         top_delta="10"
+         width="21" />
+        <joystick_turn
+         follows="left|bottom"
+         height="25"
+         image_selected="move_backward_in.tga"
+         image_unselected="move_backward_out.tga"
+         layout="topleft"
+         left_delta="0"
+         name="backward btn"
+         picture_style="true"
+         quadrant="down"
+         scale_image="false"
+         tool_tip="Walk Backward (press Down Arrow or S)"
+         top_delta="30"
+         width="21" />
+    </panel>
+<!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml -->
+    <panel
+     border="true" 
      height="25"
-     image_selected="move_backward_in.tga"
-     image_unselected="move_backward_out.tga"
      layout="topleft"
-     left_delta="0"
-     name="backward btn"
-     picture_style="true"
-     quadrant="down"
-     scale_image="false"
-     tool_tip="Move Backward"
-     top_delta="25"
-     width="21" />
+     left="0"
+     name="panel_modes"
+     top_pad="1"
+     width="115">
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Walk"
+         layout="topleft"
+         name="mode_walk_btn"
+         pad_left="0"
+         pad_right="0"
+         tool_tip="Walking Mode"
+         top="2"
+         width="43" />
+        <button
+         follows="left|bottom"
+         font="SansSerifSmall" 
+         height="20"
+         label="Run"
+         layout="topleft"
+         left_pad="0"
+         name="mode_run_btn"
+         pad_left="0"
+         pad_right="0"
+         tool_tip="Running Mode"
+         top="2"
+         width="37" />
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Fly"
+         layout="topleft"
+         left_pad="0"
+         name="mode_fly_btn"
+         pad_left="0"
+         pad_right="0"
+         tool_tip="Flying Mode"
+         top="2"
+         width="35" />
+        <button
+         visible="false" 
+         follows="left|bottom"
+         height="20"
+         label="Stop Flying"
+         layout="topleft"
+         left="0"
+         name="stop_fly_btn"
+         tool_tip="Stop Flying"
+         top="2"
+         width="115" />
+    </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
index 013136a593..435d928f00 100644
--- a/indra/newview/skins/default/xui/en/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_navbar.xml
@@ -8,14 +8,17 @@
  top="624"
  visible="false"
  width="128">
-    <menu_item_call
-     label="Copy SLurl to Clipboard"
-     layout="topleft"
-     name="Copy SLURL">
-        <menu_item_call.on_click
-         function="Navbar.Action"
-         parameter="copy_url" />
-    </menu_item_call>
+    <menu_item_check
+         label="Show Coordinates"
+         layout="topleft"
+         name="Show Coordinates">
+           <menu_item_check.on_click
+             function="Navbar.Action"
+             parameter="show_coordinates" />
+             <menu_item_check.on_check
+             function="Navbar.EnableMenuItem"
+             parameter="show_coordinates" />
+    </menu_item_check>
     <menu_item_call
      label="Add Landmark..."
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index fe1baf22d0..4d1572e4a5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -405,6 +405,15 @@
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>
+        <menu_item_check
+         label="Show Quick Tips"
+         layout="topleft"
+         name="Show Quick Tips">
+            <menu_item_check.on_check
+             function="Help.CheckShowFirstTimeTip" />
+            <menu_item_check.on_click
+             function="Help.ShowQuickTips" />
+        </menu_item_check>
         <menu_item_separator
              layout="topleft" />
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index d42943d225..4c880f6dc0 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -55,8 +55,8 @@
          left="0"
          name="DUMMY"
          top="0"
-         width="5" 
-         min_width="5"/>
+         width="3" 
+         min_width="3"/>
         <layout_panel
          auto_resize="false"
          follows="right"
@@ -64,19 +64,116 @@
          layout="topleft"
 		 left="5"
          min_height="28"
-         width="90"
+         width="70"
          top_delta="-10"
-         min_width="90"
+         min_width="70"
          user_resize="false">
             <button
-             bottom="22"
              follows="right"
              height="20"
-             label="Stand Up"
+             is_toggle="true"
+             label="Move"
+             layout="topleft"
+             name="movement_btn"
+             tab_stop="false"
+             tool_tip="Shows/Hide Movement controls" 
+             top="6"
+             width="70">
+                <button.init_callback
+                 function="Button.SetFloaterToggle"
+                 parameter="moveview" />
+            </button>
+        </layout_panel>
+         <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         name="DUMMY"
+         top="0"
+         width="8" 
+         min_width="8"/>
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="150"
+         top_delta="-10"
+         width="150">
+            <split_button
+             follows="right"
+             height="18"
+             name="presets"
+             top="6"
+             width="35">
+                <split_button.arrow_button 
+                 image_selected="camera_presets/camera_presets_arrow.png"
+                 image_unselected="camera_presets/camera_presets_arrow.png"
+                 image_disabled_selected="camera_presets/camera_presets_arrow.png" 
+                 image_disabled="camera_presets/camera_presets_arrow.png"
+                 tool_tip="Camera Presets" 
+                 />
+                <split_button.item
+                 image_selected="camera_presets/camera_presets_rear_view.png"
+                 image_unselected="camera_presets/camera_presets_rear_view.png"
+                 name="rear_view"
+                 tool_tip="Rear View"
+                 />
+                <split_button.item
+                 image_selected="camera_presets/camera_presets_34_view.png"
+                 image_unselected="camera_presets/camera_presets_34_view.png"
+                 name="3/4_view"
+                 tool_tip="3/4 View" 
+                />
+                <split_button.item
+                 image_selected="camera_presets/camera_presets_fron_view.png"
+                 image_unselected="camera_presets/camera_presets_fron_view.png"
+                 name="front_view"
+                 tool_tip="Front View" 
+                />
+            </split_button>
+            <button
+             follows="right"
+             height="20"
+             is_toggle="true"
+             label="Camera"
              layout="topleft"
-             name="stand"
-             top="3"
-             width="90" />
+             left_pad="0"
+             tab_stop="false"
+             tool_tip="Shows/Hide Camera controls" 
+             top="6"
+             name="camera_btn"
+             width="70">
+                <button.init_callback
+                 function="Button.SetFloaterToggle"
+                 parameter="camera" />
+            </button>
+            <split_button
+             arrow_position="right"
+             follows="right"
+             height="18"
+             left_pad="0"
+             name="snapshots"
+             top="6"
+             width="35">
+                <split_button.arrow_button 
+                 image_selected="camera_presets/camera_presets_arrow_right.png"
+                 image_unselected="camera_presets/camera_presets_arrow_right.png"
+                 image_disabled_selected="camera_presets/camera_presets_arrow_right.png" 
+                 image_disabled="camera_presets/camera_presets_arrow_right.png"
+                 tool_tip="Snapshot Settings" />
+                 />
+                <split_button.item
+                 image_selected="camera_presets/camera_presets_snapshot.png"
+                 image_unselected="camera_presets/camera_presets_snapshot.png"
+                 name="snapshot"
+                 tool_tip="Take Snapshot" />
+            </split_button>
         </layout_panel>
         <icon
          auto_resize="false"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index f7b2481f1c..55ac14ed46 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -492,16 +492,4 @@
   <string name="no_groups">
     No groups
   </string>
-  <panel 
-	layout="topleft"
-	name="panel_profile_view" 
-	class="panel_profile_view" 
-	filename="panel_profile_view.xml"
-	top="0"
-	left="0"
-	width="355"
-	height="465"
-	follows="left|right|top|bottom"
-	visible="false"
-	/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index c91cb2394c..1a88cc55ec 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -1,52 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- follows="left|top|right|bottom"
+ follows="all"
  height="400"
  label="Places"
  layout="topleft"
- left="0"
  min_height="350"
  min_width="240"
  name="places panel"
- top="400"
  width="305">
-    <panel.string
-     name="landmarks_tab_title">
-        Landmarks
-    </panel.string>
-    <panel.string
-     name="teleport_history_tab_title">
-        Teleport History
-    </panel.string>
+    <string
+     name="landmarks_tab_title"
+     value="Landmarks" />
+    <string
+     name="teleport_history_tab_title"
+     value="Teleport History" />
     <filter_editor
+     background_image="TextField_Search_Off"
      follows="left|top|right"
+     font="SansSerif"
      height="20"
      label="Filter"
      layout="topleft"
      left="15"
      name="Filter"
-     top="3"
-     width="270"
-     font="SansSerif"
-     background_image="TextField_Search_Off"
+     text_color="black"
      text_pad_left="23"
-     text_color="black"/>
+     top="3"
+     width="270" />
     <button
-      name="landmark_search"
-      layout="topleft"
-      top="5"
-      left="23"
-      width="13"
-      height="13"
-      scale_image="false"
-      follows="left|top|right"
-      font="SansSerifBigBold"
-      image_selected="Search"
-      image_unselected="Search"
-      picture_style="true"/>
+     follows="left|top|right"
+     font="SansSerifBigBold"
+     height="13"
+     image_selected="Search"
+     image_unselected="Search"
+     layout="topleft"
+     left="23"
+     name="landmark_search"
+     picture_style="true"
+     scale_image="false"
+     top="5"
+     width="13" />
     <tab_container
-     follows="left|top|right|bottom"
+     follows="all"
      height="326"
      layout="topleft"
      left="10"
@@ -54,26 +50,42 @@
      tab_position="top"
      top_pad="19"
      width="280" />
-    <panel
-     class="panel_place_info"
-     filename="panel_place_info.xml"
-     follows="left|top|right|bottom"
-     height="675"
+    <button
+     follows="bottom|left"
+     font="SansSerifSmallBold"
+     height="25"
+     image_disabled="widgets/SegmentedBtn_Left_Disabled.png"
+     image_selected="widgets/SegmentedBtn_Left_Selected.png"
+     image_unselected="widgets/SegmentedBtn_Left_Off.png"
+     label="Create"
      layout="topleft"
-     left="0"
-     name="panel_place_info"
-     top="-310"
+     left="10"
+     name="create_landmark_btn"
+     top_pad="5"
      visible="false"
-     width="280" />
+     width="60" />
+    <button
+     follows="bottom|left"
+     font="SansSerifSmallBold"
+     height="25"
+     image_disabled="widgets/ComboButton_Disabled.png"
+     image_selected="widgets/ComboButton_Selected.png"
+     image_unselected="widgets/ComboButton_Off.png"
+     label="â–¼"
+     layout="topleft"
+     left_pad="0"
+     name="folder_menu_btn"
+     visible="false"
+     width="20" />
     <button
      follows="bottom|left"
      font="SansSerifSmallBold"
      height="25"
      label="Teleport"
      layout="topleft"
-     left_delta="10"
+     left="10"
      name="teleport_btn"
-     top_pad="5"
+     top_delta="0"
      width="80" />
     <button
      follows="bottom|left"
@@ -97,7 +109,6 @@
      top_delta="0"
      width="60" />
     <button
-     enabled="true"
      follows="bottom|right"
      font="SansSerifSmallBold"
      height="25"
@@ -107,4 +118,13 @@
      name="overflow_btn"
      top_delta="0"
      width="30" />
+    <panel
+     class="panel_place_info"
+     filename="panel_place_info.xml"
+     follows="all"
+     layout="topleft"
+     left="0"
+     name="panel_place_info"
+     top="-200"
+     visible="false" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 4f559394a6..2b21c05283 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -438,7 +438,7 @@
              left="0"
              name="status_me_panel"
              top_pad="20"
-             width="125">
+             width="250">
                 <text
                  type="string"
                  follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index cd46ccb0bc..2466480d16 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -3,12 +3,12 @@
  background_visible="true"
  follows="left|top|right|bottom"
  height="660"
- label="Me"
+ label="Profile"
  layout="topleft"
  left="0"
  name="panel_target_profile"
  top="0"
- width="305">
+ width="250">
     <button 
      layout="topleft" 
      name="back" 
@@ -17,6 +17,7 @@
      width="20" 
      height="20" 
      label=""
+     tab_stop="false"
      follows="top|left"
      image_selected="navbar_bg_button.tga"
      image_unselected="navbar_bg_button.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 096b60adb1..73b06a3e41 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -20,8 +20,6 @@
       <panel 
         name="panel_home" 
         filename="panel_sidetray_home_tab.xml" 
-        width="355" 
-        height="465" 
         label="home" 
         border="true" 
       />
@@ -37,15 +35,22 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
+    <panel_container
+      name="panel_container"
+    >
       <panel 
         class="panel_people" 
         name="panel_people" 
         filename="panel_people.xml" 
-        width="280" 
-        height="465" 
-        label="People" 
         border="true" 
       />
+      <panel 
+        class="panel_profile_view" 
+        name="panel_profile_view" 
+        filename="panel_profile_view.xml"
+        border="true"
+      />
+    </panel_container>
   </sidetray_tab>
   <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
new file mode 100644
index 0000000000..445c9cc288
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
+<panel
+ height="25"
+ layout="topleft"
+ name="panel_stand_stop_flying"
+ mouse_opaque="false" 
+ visible="false" 
+ width="115">
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Stand"
+     layout="topleft"
+     name="stand_btn"
+     tool_tip="Click here to stand up."
+     top="2"
+     width="115" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Stop Flying"
+     layout="topleft"
+     name="stop_fly_btn"
+     tool_tip="Stop Flying"
+     top="2"
+     width="115" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e5665b0194..c64316e305 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -335,7 +335,7 @@
 	<string name="GraphicsQualityHigh">High</string>
 	
 	<!-- mouselook -->
-	<string name="LeaveMouselook">Press ESC to leave Mouselook.</string>
+	<string name="LeaveMouselook">Press ESC to return to World View</string>
 	
 	<!-- inventory -->
 	<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
new file mode 100644
index 0000000000..b0367b599b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<split_button 
+ font="SansSerifSmall"
+ arrow_position="left"
+ follows="right|top">
+    <split_button.arrow_button 
+     name="Arrow Button"
+     label=""
+     font="SansSerifSmall"
+     scale_image="true"
+     image_selected="camera_presets/camera_presets_arrow.png"
+     image_unselected="camera_presets/camera_presets_arrow.png"
+     image_disabled_selected="camera_presets/camera_presets_arrow.png" 
+     image_disabled="camera_presets/camera_presets_arrow.png"
+     width="10"/>
+    <split_button.items_panel
+     background_visible="true"
+     border="true"
+     bg_alpha_color="1 1 1 1"
+     bg_opaq_color="1 1 1 1"
+     layout="topleft"
+     name="item_buttons"
+    />
+</split_button>
-- 
cgit v1.3


From 9828faf565d0146739495cb14270c400c9249c8d Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 7 Aug 2009 23:41:29 +0000
Subject: Command: Merging from
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra,
 revision 1245 to
 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra, revision 1246
 into P:\svn\viewer-2-0\latest\indra, ignoring ancestry * EXT-277 -
 Modifications to the Location Bar Context Menu * EXT-252 - /whisper, /shout *
 EXT-254 - IM chiclet counter * EXT-267 - 'Status' drop-down menu doesn't drop
 in the Side tray / Me panel * EXT-298 - Update Places Panel Spec to reflect
 latest Create Landmark format * EXT-278 -  Input Field History should display
 human readable names * EXT-317 - Avatar profile isn't opened in the sidetray
 as Profile Info panel when selecting an avatar in the search * Changes to
 notification tips * Changes to movement and camera controls * Side Tray
 functionality additions and code cleanup

---
 indra/newview/CMakeLists.txt          |  6 +--
 indra/newview/llfloatercamera.cpp     | 10 +++-
 indra/newview/lllocationhistory.cpp   | 59 +++++++++++++++++-----
 indra/newview/lllocationhistory.h     | 13 +++--
 indra/newview/lllocationinputctrl.cpp | 10 ++--
 indra/newview/llmoveview.cpp          |  2 +-
 indra/newview/llnavigationbar.cpp     | 93 +++++++++++++++++++++++++++--------
 indra/newview/llnavigationbar.h       | 22 ++++++---
 indra/newview/llpanelplaceinfo.cpp    | 36 ++++++++------
 indra/newview/llpanelplaces.cpp       | 45 +++++++++++------
 indra/newview/llpanelplaces.h         |  1 -
 indra/newview/llscreenchannel.h       | 72 ++++++++++++++++++---------
 indra/newview/llviewerfloaterreg.cpp  |  2 -
 indra/newview/llviewermenu.cpp        |  4 +-
 14 files changed, 260 insertions(+), 115 deletions(-)

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0be84e2ab9..4286b91654 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -135,7 +135,6 @@ set(viewer_SOURCE_FILES
     llflexibleobject.cpp
     llfloaterabout.cpp
     llfloateractivespeakers.cpp
-    llfloateraddlandmark.cpp
     llfloateranimpreview.cpp
     llfloaterauction.cpp
     llfloateravatarpicker.cpp
@@ -283,7 +282,6 @@ set(viewer_SOURCE_FILES
     llpanelavatarrow.cpp
     llpanelavatartag.cpp
     llpanelclassified.cpp
-    llsidetraypanelcontainer.cpp
     llpanelcontents.cpp
     llpaneldirbrowser.cpp
     llpaneldirclassified.cpp
@@ -344,6 +342,7 @@ set(viewer_SOURCE_FILES
     llscreenchannel.cpp
     llselectmgr.cpp
     llsidetray.cpp
+    llsidetraypanelcontainer.cpp
     llsky.cpp
     llslurl.cpp
     llspatialpartition.cpp
@@ -577,7 +576,6 @@ set(viewer_HEADER_FILES
     llflexibleobject.h
     llfloaterabout.h
     llfloateractivespeakers.h
-    llfloateraddlandmark.h
     llfloateranimpreview.h
     llfloaterauction.h
     llfloateravatarpicker.h
@@ -724,7 +722,6 @@ set(viewer_HEADER_FILES
     llpanelavatarrow.h
     llpanelavatartag.h
     llpanelclassified.h
-    llsidetraypanelcontainer.h
     llpanelcontents.h
     llpaneldirbrowser.h
     llpaneldirclassified.h
@@ -787,6 +784,7 @@ set(viewer_HEADER_FILES
     llsavedsettingsglue.h
     llselectmgr.h
     llsidetray.h
+    llsidetraypanelcontainer.h
     llsky.h
     llslurl.h
     llspatialpartition.h
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 81f1beb40d..8cba42dea5 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -53,6 +53,11 @@ const F32 CAMERA_BUTTON_DELAY = 0.0f;
 #define PAN "cam_track_stick"
 #define CONTROLS "controls"
 
+
+void show_tip(LLFirstTimeTipsManager::EFirstTimeTipType tipType, LLView* anchorView)
+{
+	LLFirstTimeTipsManager::showTipsFor(tipType, anchorView, LLFirstTimeTipsManager::TPA_POS_RIGHT_ALIGN_TOP);
+}
 //
 // Member functions
 //
@@ -93,7 +98,8 @@ void LLFloaterCamera::update()
 {
 	ECameraControlMode mode = determineMode();
 	if (mode != mCurrMode) setMode(mode);
-	LLFirstTimeTipsManager::showTipsFor(mMode2TipType[mode], this);
+	updatePosition();
+	show_tip(mMode2TipType[mode], this);
 }
 
 
@@ -270,7 +276,7 @@ void LLFloaterCamera::onClickBtn(ECameraControlMode mode)
 	
 	switchMode(mode);
 
-	LLFirstTimeTipsManager::showTipsFor(mMode2TipType[mode], mMode2Button[mode]);
+	show_tip(mMode2TipType[mode], this);
 }
 
 void LLFloaterCamera::assignButton2Mode(ECameraControlMode mode, const std::string& button_name)
diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp
index 68143fd1e3..03d6953521 100644
--- a/indra/newview/lllocationhistory.cpp
+++ b/indra/newview/lllocationhistory.cpp
@@ -38,33 +38,58 @@
 
 #include "llui.h"
 
+const char LLLocationHistory::delimiter = '\t';
+
 LLLocationHistory::LLLocationHistory() :
 	mFilename("typed_locations.txt")
 {
 }
 
-void LLLocationHistory::addItem(std::string item)
-{
+void LLLocationHistory::addItem(const std::string & item, const std::string & tooltip) {
 	static LLUICachedControl<S32> max_items("LocationHistoryMaxSize", 100);
-	
-	std::vector<std::string>::iterator item_iter = std::find(mItems.begin(), mItems.end(), item);
 
-	if (item_iter != mItems.end()) {
-		mItems.erase(item_iter);
+	// check if this item doesn't duplicate any existing one
+	if (touchItem(item)) {
+		return;
 	}
 
 	mItems.push_back(item);
+	mToolTips[item] = tooltip;
 
 	// If the vector size exceeds the maximum, purge the oldest items.
-	if ((S32)mItems.size() > max_items)
-		mItems.erase(mItems.begin(), mItems.end()-max_items);
+	if ((S32)mItems.size() > max_items) {
+		for(std::vector<std::string>::iterator i = mItems.begin(); i != mItems.end()-max_items; ++i) {
+			mToolTips.erase(*i);
+			mItems.erase(i);
+		}
+	}
+}
+
+bool LLLocationHistory::touchItem(const std::string & item) {
+	bool result = false;
+	std::vector<std::string>::iterator item_iter = std::find(mItems.begin(), mItems.end(), item);
+
+	// the last used item should be the first in the history
+	if (item_iter != mItems.end()) {
+		mItems.erase(item_iter);
+		mItems.push_back(item);
+		result = true;
+	}
+
+	return result;
 }
 
 void LLLocationHistory::removeItems()
 {
 	mItems.clear();
+	mToolTips.clear();
 }
 
+std::string LLLocationHistory::getToolTip(const std::string & item) const {
+	std::map<std::string, std::string>::const_iterator i = mToolTips.find(item);
+
+	return i != mToolTips.end() ? i->second : "";
+}
 
 bool LLLocationHistory::getMatchingItems(std::string substring, location_list_t& result) const
 {
@@ -110,7 +135,7 @@ void LLLocationHistory::save() const
 	}
 
 	for (location_list_t::const_iterator it = mItems.begin(); it != mItems.end(); ++it)
-		file << (*it) << std::endl;
+		file << (*it) << delimiter << mToolTips.find(*it)->second << std::endl;
 
 	file.close();
 }
@@ -129,13 +154,21 @@ void LLLocationHistory::load()
 		return;
 	}
 	
-	// remove current entries before we load over them
-	mItems.clear();
+	removeItems();
 	
 	// add each line in the file to the list
 	std::string line;
-	while (std::getline(file, line))
-		addItem(line);
+
+	while (std::getline(file, line)) {
+		size_t dp = line.find(delimiter);
+
+		if (dp != std::string::npos) {
+			const std::string reg_name = line.substr(0, dp);
+			const std::string tooltip = line.substr(dp + 1, std::string::npos);
+
+			addItem(reg_name, tooltip);
+		}
+	}
 
 	file.close();
 	
diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h
index 19032686c1..67eabcdaca 100644
--- a/indra/newview/lllocationhistory.h
+++ b/indra/newview/lllocationhistory.h
@@ -37,6 +37,7 @@
 
 #include <vector>
 #include <string>
+#include <map>
 #include <boost/function.hpp>
 
 class LLLocationHistory: public LLSingleton<LLLocationHistory>
@@ -50,8 +51,10 @@ public:
 	
 	LLLocationHistory();
 	
-	void					addItem(std::string item);
+	void					addItem(const std::string & item, const std::string & tooltip);
+	bool					touchItem(const std::string & item);
 	void                    removeItems();
+	std::string				getToolTip(const std::string & item) const;
 	size_t					getItemCount() const	{ return mItems.size(); }
 	const location_list_t&	getItems() const		{ return mItems; }
 	bool					getMatchingItems(std::string substring, location_list_t& result) const;
@@ -62,9 +65,11 @@ public:
 	void					dump() const;
 
 private:
-	std::vector<std::string>	mItems;
-	std::string					mFilename; /// File to store the history to.
-	loaded_signal_t				mLoadedSignal;
+	const static char delimiter;
+	std::vector<std::string>			mItems;
+	std::map<std::string, std::string>	mToolTips;
+	std::string							mFilename; /// File to store the history to.
+	loaded_signal_t						mLoadedSignal;
 };
 
 #endif
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 3880ea91eb..a20296a122 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -234,6 +234,13 @@ BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect*
 	// Let the buttons show their tooltips.
 	if (LLUICtrl::handleToolTip(x, y, msg, sticky_rect_screen) && !msg.empty())
 	{
+		LLLocationHistory* lh = LLLocationHistory::getInstance();
+		const std::string tooltip = lh->getToolTip(msg);
+
+		if (!tooltip.empty()) {
+			msg = tooltip;
+		}
+
 		return TRUE;
 	}
 
@@ -347,9 +354,6 @@ void LLLocationInputCtrl::onInfoButtonClicked()
 void LLLocationInputCtrl::onAddLandmarkButtonClicked()
 {
 	LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
-	
-	// Floater "Add Landmark" functionality moved to Side Tray
-	//LLFloaterReg::showInstance("add_landmark");
 }
 
 void LLLocationInputCtrl::onAgentParcelChange()
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 124a2def7f..96c8f3e2e9 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -435,7 +435,7 @@ void LLFloaterMove::showQuickTips(const EMovementMode mode)
 	default: llwarns << "Quick Tip type was not detected, FTT_MOVE_WALK will be used" << llendl;
 	}
 
-	LLFirstTimeTipsManager::showTipsFor(tipType, this);
+	LLFirstTimeTipsManager::showTipsFor(tipType, this, LLFirstTimeTipsManager::TPA_POS_LEFT_ALIGN_TOP);
 }
 
 void LLFloaterMove::setModeButtonToggleState(const EMovementMode mode)
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 06cab9afb0..b980490434 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -181,10 +181,14 @@ LLNavigationBar::LLNavigationBar()
 	mBtnHome(NULL),
 	mCmbLocation(NULL),
 	mLeSearch(NULL),
-	mPurgeTPHistoryItems(false)
+	mPurgeTPHistoryItems(false),
+	mUpdateTypedLocationHistory(false)
 {
 	setIsChrome(TRUE);
 	
+	mParcelMgrConnection = LLViewerParcelMgr::getInstance()->setAgentParcelChangedCallback(
+			boost::bind(&LLNavigationBar::onTeleportFinished, this));
+
 	// Register callbacks and load the location field context menu (NB: the order matters).
 	mCommitCallbackRegistrar.add("Navbar.Action", boost::bind(&LLNavigationBar::onLocationContextMenuItemClicked, this, _2));
 	mEnableCallbackRegistrar.add("Navbar.EnableMenuItem", boost::bind(&LLNavigationBar::onLocationContextMenuItemEnabled, this, _2));
@@ -200,6 +204,7 @@ LLNavigationBar::LLNavigationBar()
 
 LLNavigationBar::~LLNavigationBar()
 {
+	mParcelMgrConnection.disconnect();
 	sInstance = 0;
 }
 
@@ -324,12 +329,12 @@ void LLNavigationBar::onLocationSelection()
 
 	std::string region_name;
 	LLVector3 local_coords(128, 128, 0);
+	S32 x = 0, y = 0, z = 0;
 
 	// Is the typed location a SLURL?
 	if (LLSLURL::isSLURL(typed_location))
 	{
 		// Yes. Extract region name and local coordinates from it.
-		S32 x = 0, y = 0, z = 0;
 		if (LLURLSimString::parse(LLSLURL::stripProtocol(typed_location), &region_name, &x, &y, &z))
 			local_coords.set(x, y, z);
 		else
@@ -337,8 +342,13 @@ void LLNavigationBar::onLocationSelection()
 	}
 	else
 	{
+		region_name = extractLocalCoordsFromRegName(typed_location, &x, &y, &z);
+
+		if (region_name != typed_location) {
+			local_coords.set(x, y, z);
+		}
 		// Treat it as region name.
-		region_name = typed_location;
+		// region_name = typed_location;
 	}
 
 	// Resolve the region name to its global coordinates.
@@ -349,6 +359,32 @@ void LLNavigationBar::onLocationSelection()
 	LLWorldMap::getInstance()->sendNamedRegionRequest(region_name, cb, std::string("unused"), false);
 }
 
+void LLNavigationBar::onTeleportFinished() {
+
+	if (mUpdateTypedLocationHistory) {
+		LLLocationHistory* lh = LLLocationHistory::getInstance();
+
+		// Location is valid. Add it to the typed locations history.
+		// If user has typed text this variable will contain -1.
+		if (mCmbLocation->getCurrentIndex() != -1) {
+			lh->touchItem(mCmbLocation->getSelectedItemLabel());
+		} else {
+			std::string region_name;
+			std::string url = gAgent.getSLURL();
+			S32 x = 0, y = 0, z = 0;
+
+			if (LLSLURL::isSLURL(url)) {
+				LLURLSimString::parse(LLSLURL::stripProtocol(url), &region_name, &x, &y, &z);
+				appendLocalCoordsToRegName(&region_name, x, y, z);
+				lh->addItem(region_name, url);
+			}
+		}
+
+		lh->save();
+		mUpdateTypedLocationHistory = false;
+	}
+}
+
 void LLNavigationBar::onTeleportHistoryChanged()
 {
 	// Update navigation controls.
@@ -415,27 +451,13 @@ void LLNavigationBar::onRegionNameResponse(
 		return;
 	}
 
-	// Location is valid. Add it to the typed locations history.
-	// If user has typed text this variable will contain -1.
-	S32 selected_item = mCmbLocation->getCurrentIndex();
-
-	/*
-	LLLocationHistory* lh = LLLocationHistory::getInstance();
-	lh->addItem(selected_item == -1 ? typed_location : mCmbLocation->getSelectedItemLabel());
-	lh->save();
-	*/
-
 	// Teleport to the location.
 	LLVector3d region_pos = from_region_handle(region_handle);
 	LLVector3d global_pos = region_pos + (LLVector3d) local_coords;
-
 	
+	mUpdateTypedLocationHistory = true;
 	llinfos << "Teleporting to: " << global_pos  << llendl;
 	gAgent.teleportViaLocation(global_pos);
-
-	LLLocationHistory* lh = LLLocationHistory::getInstance();
-	lh->addItem(selected_item == -1 ? typed_location : mCmbLocation->getSelectedItemLabel());
-	lh->save();
 }
 
 void	LLNavigationBar::showTeleportHistoryMenu()
@@ -474,9 +496,6 @@ void LLNavigationBar::onLocationContextMenuItemClicked(const LLSD& userdata)
 	else if (item == std::string("landmark"))
 	{
 		LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
-
-		// Floater "Add Landmark" functionality moved to Side Tray
-		//LLFloaterReg::showInstance("add_landmark");
 	}
 	else if (item == std::string("cut"))
 	{
@@ -546,6 +565,38 @@ void LLNavigationBar::invokeSearch(std::string search_text)
 	LLFloaterReg::showInstance("search", LLSD().insert("panel", "all").insert("id", LLSD(search_text)));
 }
 
+void LLNavigationBar::appendLocalCoordsToRegName(std::string* reg_name, S32 x, S32 y, S32 z) {
+	std::string fmt = *reg_name + " (%d, %d, %d)";
+	*reg_name = llformat(fmt.c_str(), x, y, z);
+}
+
+std::string LLNavigationBar::extractLocalCoordsFromRegName(const std::string & reg_name, S32* x, S32* y, S32* z) {
+	/*
+	 * This regular expression extracts numbers from the following string
+	 * construct: "(num1, num2, num3)", where num1, num2 and num3 are decimal
+	 * numbers. Leading and trailing spaces are also caught by the expression.
+	 */
+	const boost::regex re("\\s*\\((\\d+),\\s*(\\d+),\\s*(\\d+)\\)\\s*");
+
+	boost::smatch m;
+	if (boost::regex_search(reg_name, m, re)) {
+		// string representations of parsed by regex++ numbers
+		std::string xstr(m[1].first, m[1].second);
+		std::string ystr(m[2].first, m[2].second);
+		std::string zstr(m[3].first, m[3].second);
+
+		*x = atoi(xstr.c_str());
+		*y = atoi(ystr.c_str());
+		*z = atoi(zstr.c_str());
+
+		return boost::regex_replace(reg_name, re, "");
+	}
+
+	*x = *y = *z = 0;
+
+	return reg_name;
+}
+
 void LLNavigationBar::clearHistoryCache()
 {
 	mCmbLocation->removeall();
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index 17a1438912..1c93a05348 100644
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -68,6 +68,9 @@ private:
 	void showTeleportHistoryMenu();
 	void invokeSearch(std::string search_text);
 
+	static void appendLocalCoordsToRegName(std::string* reg_name, S32 x, S32 y, S32 z);
+	static std::string extractLocalCoordsFromRegName(const std::string & reg_name, S32* x, S32* y, S32* z);
+
 	// callbacks
 	bool onLocationContextMenuItemEnabled(const LLSD& userdata);
 	void onLocationContextMenuItemClicked(const LLSD& userdata);
@@ -81,6 +84,7 @@ private:
 	void onLocationSelection();
 	void onLocationPrearrange(const LLSD& data);
 	void onSearchCommit();
+	void onTeleportFinished();
 	void onRegionNameResponse(
 			std::string typed_location,
 			std::string region_name,
@@ -90,14 +94,16 @@ private:
 
 	static LLNavigationBar *sInstance;
 	
-	LLMenuGL*				mLocationContextMenu;
-	LLMenuGL*				mTeleportHistoryMenu;
-	LLButton*				mBtnBack;
-	LLButton*				mBtnForward;
-	LLButton*				mBtnHome;
-	LLSearchEditor*			mLeSearch;
-	LLLocationInputCtrl*	mCmbLocation;
-	bool					mPurgeTPHistoryItems;
+	LLMenuGL*					mLocationContextMenu;
+	LLMenuGL*					mTeleportHistoryMenu;
+	LLButton*					mBtnBack;
+	LLButton*					mBtnForward;
+	LLButton*					mBtnHome;
+	LLSearchEditor*				mLeSearch;
+	LLLocationInputCtrl*		mCmbLocation;
+	boost::signals2::connection	mParcelMgrConnection;
+	bool						mPurgeTPHistoryItems;
+	bool						mUpdateTypedLocationHistory;
 };
 
 #endif
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index 40275be82f..a2d491c2cf 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -67,7 +67,10 @@ LLPanelPlaceInfo::LLPanelPlaceInfo()
 	mRequestedID(),
 	mPosRegion(),
 	mLandmarkID(),
-	mMinHeight(0)
+	mMinHeight(0),
+	mScrollingPanel(NULL),
+	mInfoPanel(NULL),
+	mMediaPanel(NULL)
 {}
 
 LLPanelPlaceInfo::~LLPanelPlaceInfo()
@@ -110,9 +113,10 @@ BOOL LLPanelPlaceInfo::postBuild()
 	mMinHeight = scroll_container->getScrolledViewRect().getHeight();
 
 	mScrollingPanel = getChild<LLPanel>("scrolling_panel");
-
-	mInfoPanel = getChild<LLPanel>("info_panel", TRUE, FALSE);
-	mMediaPanel = getChild<LLMediaPanel>("media_panel", TRUE, FALSE);
+	mInfoPanel = getChild<LLPanel>("info_panel");
+	mMediaPanel = getChild<LLMediaPanel>("media_panel");
+	if (!(mMediaPanel && mInfoPanel && mScrollingPanel))
+		return FALSE;
 
 	return TRUE;
 }
@@ -240,12 +244,20 @@ void LLPanelPlaceInfo::setInfoType(INFO_TYPE type)
 	if (!mInfoPanel)
 	    return;
 
+	if (type != PLACE)
+		toggleMediaPanel(FALSE);
+	
+	bool is_landmark_info_type = type == LANDMARK;
+	LLPanel* landmark_info_panel = getChild<LLPanel>("landmark_info_panel");
+	if (landmark_info_panel)
+	{
+		landmark_info_panel->setVisible(is_landmark_info_type);
+	}
+
 	switch(type)
 	{
 		case CREATE_LANDMARK:
 			mCurrentTitle = getString("title_create_landmark");
-
-			toggleMediaPanel(FALSE);
 		break;
 
 		case PLACE:
@@ -261,14 +273,10 @@ void LLPanelPlaceInfo::setInfoType(INFO_TYPE type)
 		// a landmark or a teleport history item
 		case LANDMARK:
 			mCurrentTitle = getString("title_landmark");
-
-			toggleMediaPanel(FALSE);
 		break;
-		
+
 		case TELEPORT_HISTORY:
 			mCurrentTitle = getString("title_place");
- 
-			toggleMediaPanel(FALSE);
 		break;
 	}
 }
@@ -383,7 +391,7 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data)
 	
 	if (mCurrentTitle != getString("title_landmark"))
 	{
-		mTitleEditor->setText(parcel_data.name + "; " + name);
+		mTitleEditor->setText(parcel_data.name);
 		mNotesEditor->setText(LLStringUtil::null);
 	}
 }
@@ -499,7 +507,7 @@ void LLPanelPlaceInfo::createLandmark(const LLUUID& folder_id)
 	// If typed name is empty use the parcel name instead.
 	if (name.empty())
 	{
-		name = mParcelName->getText() + "; " + mRegionName->getText();
+		name = mParcelName->getText();
 	}
 
 	LLStringUtil::replaceChar(desc, '\n', ' ');
@@ -510,7 +518,7 @@ void LLPanelPlaceInfo::createLandmark(const LLUUID& folder_id)
 
 void LLPanelPlaceInfo::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-	if (mMinHeight > 0)
+	if (mMinHeight > 0 && mScrollingPanel != NULL)
 	{
 		mScrollingPanel->reshape(mScrollingPanel->getRect().getWidth(), mMinHeight);
 	}
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 31b2d01dcf..5976897970 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -106,6 +106,9 @@ BOOL LLPanelPlaces::postBuild()
 
 	mOverflowBtn = getChild<LLButton>("overflow_btn");
 
+	// *TODO: Assign the action to an appropriate event.
+	mOverflowBtn->setClickedCallback(boost::bind(&LLPanelPlaces::toggleMediaPanel, this));
+
 	mTabContainer = getChild<LLTabContainer>("Places Tabs");
 	if (mTabContainer)
 	{
@@ -118,17 +121,14 @@ BOOL LLPanelPlaces::postBuild()
 		mFilterEditor->setCommitCallback(boost::bind(&LLPanelPlaces::onFilterEdit, this, _2));
 	}
 
-	mPlaceInfo = getChild<LLPanelPlaceInfo>("panel_place_info", TRUE, FALSE);
-	if (mPlaceInfo)
+	mPlaceInfo = getChild<LLPanelPlaceInfo>("panel_place_info");
+	if (!mPlaceInfo)
+		return FALSE;
+	
+	LLButton* back_btn = mPlaceInfo->getChild<LLButton>("back_btn");
+	if (back_btn)
 	{
-		LLButton* back_btn = mPlaceInfo->getChild<LLButton>("back_btn");
-		if (back_btn)
-		{
-			back_btn->setClickedCallback(boost::bind(&LLPanelPlaces::onBackButtonClicked, this));
-		}
-
-		// *TODO: Assign the action to an appropriate event.
-		mOverflowBtn->setClickedCallback(boost::bind(&LLPanelPlaces::toggleMediaPanel, this));
+		back_btn->setClickedCallback(boost::bind(&LLPanelPlaces::onBackButtonClicked, this));
 	}
 
 	return TRUE;
@@ -136,7 +136,7 @@ BOOL LLPanelPlaces::postBuild()
 
 void LLPanelPlaces::onOpen(const LLSD& key)
 {
-	if(key.size() == 0)
+	if(mPlaceInfo == NULL || key.size() == 0)
 		return;
 
 	mPlaceInfoType = key["type"].asString();
@@ -201,6 +201,9 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 
 void LLPanelPlaces::setItem(LLInventoryItem* item)
 {
+	if (!mPlaceInfo)
+		return;
+
 	mItem = item;
 	
 	// If the item is a link get a linked item
@@ -224,6 +227,9 @@ void LLPanelPlaces::setItem(LLInventoryItem* item)
 
 void LLPanelPlaces::onLandmarkLoaded(LLLandmark* landmark)
 {
+	if (!mPlaceInfo)
+		return;
+
 	LLUUID region_id;
 	landmark->getRegionID(region_id);
 	LLVector3d pos_global;
@@ -263,11 +269,6 @@ void LLPanelPlaces::onShareButtonClicked()
 	// TODO: Launch the "Things" Share wizard
 }
 
-void LLPanelPlaces::onAddLandmarkButtonClicked()
-{
-	LLFloaterReg::showInstance("add_landmark");
-}
-
 void LLPanelPlaces::onCopySLURLButtonClicked()
 {
 	mActivePanel->onCopySLURL();
@@ -276,6 +277,9 @@ void LLPanelPlaces::onCopySLURLButtonClicked()
 
 void LLPanelPlaces::onTeleportButtonClicked()
 {
+	if (!mPlaceInfo)
+		return;
+
 	if (mPlaceInfo->getVisible())
 	{
 		if (mPlaceInfoType == "landmark")
@@ -302,6 +306,9 @@ void LLPanelPlaces::onTeleportButtonClicked()
 
 void LLPanelPlaces::onShowOnMapButtonClicked()
 {
+	if (!mPlaceInfo)
+		return;
+
 	if (mPlaceInfo->getVisible())
 	{
 		LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
@@ -430,6 +437,9 @@ void LLPanelPlaces::changed(U32 mask)
 
 void LLPanelPlaces::onAgentParcelChange()
 {
+	if (!mPlaceInfo)
+		return;
+
 	if (mPlaceInfo->getVisible() && (mPlaceInfoType == "agent" || mPlaceInfoType == "create_landmark"))
 	{
 		onOpen(LLSD().insert("type", mPlaceInfoType));
@@ -442,6 +452,9 @@ void LLPanelPlaces::onAgentParcelChange()
 
 void LLPanelPlaces::updateVerbs()
 {
+	if (!mPlaceInfo)
+		return;
+
 	bool is_place_info_visible = mPlaceInfo->getVisible();
 	bool is_agent_place_info_visible = mPlaceInfoType == "agent";
 	bool is_create_landmark_visible = mPlaceInfoType == "create_landmark";
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index 695c78cfba..431c8168d9 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -66,7 +66,6 @@ private:
 	void onFilterEdit(const std::string& search_string);
 	void onTabSelected();
 
-	//void onAddLandmarkButtonClicked();
 	//void onCopySLURLButtonClicked();
 	//void onShareButtonClicked();
 	void onTeleportButtonClicked();
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index a205b913ab..579f41eac8 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -59,36 +59,55 @@ public:
 	LLScreenChannel();
 	virtual ~LLScreenChannel();
 
+	// Channel's outfit-functions
+	// classic reshape
 	void		reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
-
-	LLToast*	addToast(LLUUID id, LLPanel* panel, bool is_not_tip = true);
+	// initialization of channel's shape and position
 	void		init(S32 channel_left, S32 channel_right);
+	// set allignment of toasts inside a channel
+	void		setToastAlignment(e_notification_toast_alignment align) {mToastAlignment = align;}
+	// set a template for a string in the OverflowToast
+	void		setOverflowFormatString ( std::string str)  { mOverflowFormatString = str; }
 	
+	// Operating with toasts
+	// add a toast to a channel
+	LLToast*	addToast(LLUUID id, LLPanel* panel, bool is_not_tip = true);
+	// kill or modify a toast by its ID
 	void		killToastByNotificationID(LLUUID id);
 	void		modifyToastByNotificationID(LLUUID id, LLPanel* panel);
-	
-	void		setToastAlignment(e_notification_toast_alignment align) {mToastAlignment = align;}
-
-	void		setControlHovering(bool control) { mControlHovering = control; }
-	void		setHovering(bool hovering) { mIsHovering = hovering; }
-
+	// hide all toasts from screen, but not remove them from a channel
+	void		hideToastsFromScreen();
+	// removes all toasts from a channel
 	void		removeToastsFromChannel();
+	// show all toasts in a channel
+	void		showToasts();
+	//
+	void		loadStoredToastsToChannel();
+	// 
 	void 		closeUnreadToastsPanel();
-	void		hideToastsFromScreen();
 
+	// Channel's behavior-functions
+	// set whether a channel will control hovering inside itself or not
+	void		setControlHovering(bool control) { mControlHovering = control; }
+	// set Hovering flag for a channel
+	void		setHovering(bool hovering) { mIsHovering = hovering; }
+	// set whether a channel will store faded toasts or not
 	void		setStoreToasts(bool store) { mStoreToasts = store; }
-	void		loadStoredToastsToChannel();
-	
-	void		showToasts();
+	// tell all channels that the StartUp toast was shown and allow them showing of toasts
+	static void	setStartUpToastShown() { mWasStartUpToastShown = true; }
 
+	// Channel's other interface functions functions
 	S32			getNumberOfHiddenToasts() { return mHiddenToastsNum;}
+	// TODO: split StartUp and Overflow toasts
 	void		setNumberOfHiddenToasts(S32 num) { mHiddenToastsNum = num;}
-
-	static void	setStartUpToastShown() { mWasStartUpToastShown = true; }
-
 	e_notification_toast_alignment getToastAlignment() {return mToastAlignment;}
 
-	void		setOverflowFormatString ( std::string str)  { mOverflowFormatString = str; }
+	// Channel's callbacks
+	// callback for storing of faded toasts
+	typedef boost::function<void (LLPanel* info_panel, const LLUUID id)> store_tost_callback_t;
+	typedef boost::signals2::signal<void (LLPanel* info_panel, const LLUUID id)> store_tost_signal_t;
+	store_tost_signal_t mOnStoreToast;	
+	boost::signals2::connection setOnStoreToastCallback(store_tost_callback_t cb) { return mOnStoreToast.connect(cb); }
 
 private:
 	struct ToastElem
@@ -117,31 +136,38 @@ private:
 		}
 	};
 
+	// Channel's handlers
 	void	onToastHover(LLToast* toast, bool mouse_enter);
-
 	void	onToastFade(LLToast* toast);
+	void	onOverflowToastHide();
+
+	//
 	void	storeToast(ToastElem& toast_elem);
 	
+	// show-functions depending on allignment of toasts
 	void	showToastsBottom();
 	void	showToastsCentre();
 	void	showToastsTop();
 	
+	// create the OverflowToast
 	void	createOverflowToast(S32 bottom, F32 timer);
-	void	onOverflowToastHide();
 
+	// Channel's flags
 	static bool	mWasStartUpToastShown;
 	bool		mControlHovering;
 	bool		mIsHovering;
 	bool		mStoreToasts;
 	bool		mOverflowToastHidden;
-	S32			mHiddenToastsNum;
-	LLToast*	mUnreadToastsPanel;
-	std::vector<ToastElem>	mToastList;
-	std::vector<ToastElem>	mStoredToastList;
+	// 
 	e_notification_toast_alignment	mToastAlignment;
-	std::map<LLToast*, bool>	mToastEventStack;
 
+	S32			mHiddenToastsNum;
+	LLToast*	mUnreadToastsPanel;
 	std::string mOverflowFormatString;
+
+	std::vector<ToastElem>		mToastList;
+	std::vector<ToastElem>		mStoredToastList;
+	std::map<LLToast*, bool>	mToastEventStack;
 };
 
 }
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 9c29131def..f573a0858b 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -40,7 +40,6 @@
 #include "llcompilequeue.h"
 #include "llfloaterabout.h"
 #include "llfloateractivespeakers.h"
-#include "llfloateraddlandmark.h"
 #include "llfloateranimpreview.h"
 #include "llfloaterauction.h"
 #include "llfloateravatarpicker.h"
@@ -129,7 +128,6 @@ void LLViewerFloaterReg::registerFloaters()
 	
 	LLFloaterReg::add("about_land", "floater_about_land.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLand>);
 	LLFloaterReg::add("active_speakers", "floater_active_speakers.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterActiveSpeakers>);
-	LLFloaterReg::add("add_landmark", "floater_add_landmark.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAddLandmark>);
 	LLFloaterReg::add("auction", "floater_auction.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAuction>);
 	LLFloaterReg::add("avatar_picker", "floater_avatar_picker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAvatarPicker>);
 	LLFloaterReg::add("avatar_textures", "floater_avatar_textures.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAvatarTextures>);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index cbaee2ac70..3af85a82c9 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -5280,9 +5280,7 @@ class LLWorldCreateLandmark : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
-			
-		// Floater "Add Landmark" functionality moved to Side Tray
-		//LLFloaterReg::showInstance("add_landmark");
+
 		return true;
 	}
 };
-- 
cgit v1.3


From caa367e5d435a70647c56460741a52b14f41ec9e Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 11 Aug 2009 06:37:35 +0000
Subject: svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3 EXT-172 -
 adding non-unicode support for group name line_editor EXT-310 text was
 squished, moved things around so there was was more space between text
 blocks. EXT-313 "me" panel EXT-314 changed out arrow character for arrow art,
 added arrow art to textures.xml EXT-315 replaced word "mute" with "block"
 EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml
 EXT-323 killed some two items EXT-324 and EXT-322 removed small avatar names
 checkbox and added show chat bubbled checkbox EXT-330 Sidetray filter - text
 overlaps search icon inside textbox EXT-261  I18N: Labels in
 /character/avatar_lad.xml are not localizable EXT-392 Rearranged
 floater_inventory_items_properties.xml to match spec DEV-35897  Filters in
 sidebar remain active even after user has changed/closed tab DEV-36886 I18N:
 hardcoded currency format in panel_status_bar.xml/status/buycurrency
 DEV-36987 - Pressed states needed for widgets DEV-36795 Remove slurl tooltip
 from navigation bar location box DEV-37184 Move "Block List" out of topmenu
 and make a button in Prefs > Privacy

---
 indra/llui/llbutton.cpp                            | 234 +++++++-------------
 indra/llui/llbutton.h                              | 115 ++++------
 indra/llui/llcheckboxctrl.cpp                      |   1 -
 indra/llui/llcombobox.cpp                          |  21 +-
 indra/llui/llcombobox.h                            |   3 -
 indra/llui/llflyoutbutton.cpp                      |   7 -
 indra/llui/llflyoutbutton.h                        |   1 -
 indra/llui/llfocusmgr.cpp                          |   8 +-
 indra/llui/llfocusmgr.h                            |   4 +-
 indra/llui/lllineeditor.cpp                        |   6 +-
 indra/llui/llmultislider.h                         |   2 +-
 indra/llui/llscrollbar.cpp                         |   9 +-
 indra/llui/llslider.cpp                            |  42 +++-
 indra/llui/llslider.h                              |  10 +-
 indra/llui/lluictrlfactory.h                       |   8 +
 indra/newview/llfloaterlagmeter.cpp                |  24 +-
 indra/newview/llimpanel.cpp                        |  29 ---
 indra/newview/llimview.cpp                         |  24 +-
 indra/newview/lllocationinputctrl.cpp              |   2 +-
 indra/newview/llpanelpeople.cpp                    |   3 +
 indra/newview/llpanelplaces.cpp                    |   5 +
 indra/newview/llsidetray.cpp                       |   2 +
 indra/newview/llstatusbar.cpp                      |   8 +-
 indra/newview/llviewerwindow.cpp                   |   4 +-
 .../default/textures/icons/ForwardArrow_Off.png    | Bin 0 -> 220 bytes
 .../default/textures/icons/ForwardArrow_Press.png  | Bin 0 -> 220 bytes
 indra/newview/skins/default/textures/textures.xml  |  17 +-
 .../skins/default/textures/widgets/Arrow_Down.png  | Bin 0 -> 3066 bytes
 .../skins/default/textures/widgets/Arrow_Up.png    | Bin 0 -> 363 bytes
 .../skins/default/xui/en/floater_buy_land.xml      |  24 +-
 .../xui/en/floater_inventory_item_properties.xml   | 244 +++++++++++++--------
 .../skins/default/xui/en/menu_nearby_chat.xml      |   2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |   4 +-
 .../skins/default/xui/en/panel_group_general.xml   |   1 +
 indra/newview/skins/default/xui/en/panel_notes.xml | 182 +++++----------
 .../newview/skins/default/xui/en/panel_people.xml  |  49 +++--
 .../skins/default/xui/en/panel_pick_info.xml       |  32 ++-
 .../skins/default/xui/en/panel_pick_list_item.xml  |  60 +++--
 indra/newview/skins/default/xui/en/panel_picks.xml | 104 +++------
 .../default/xui/en/panel_preferences_advanced.xml  |  26 ++-
 .../default/xui/en/panel_preferences_chat.xml      |   9 -
 .../default/xui/en/panel_preferences_general.xml   |  12 +-
 .../newview/skins/default/xui/en/panel_profile.xml | 214 ++++++++----------
 .../skins/default/xui/en/panel_profile_view.xml    |  79 ++++---
 .../skins/default/xui/en/panel_status_bar.xml      |   4 +
 indra/newview/skins/default/xui/en/strings.xml     | 194 +++++++++++++++-
 .../skins/default/xui/en/widgets/check_box.xml     |   4 +-
 .../skins/default/xui/en/widgets/radio_item.xml    |   4 +-
 .../skins/default/xui/en/widgets/slider_bar.xml    |   2 +
 49 files changed, 933 insertions(+), 906 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/ForwardArrow_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/ForwardArrow_Press.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Arrow_Down.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Arrow_Up.png

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index fc3af34951..ac368fd785 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -70,6 +70,8 @@ LLButton::Params::Params()
 	image_hover_unselected("image_hover_unselected"),
 	image_disabled_selected("image_disabled_selected"),
 	image_disabled("image_disabled"),
+	image_pressed("image_pressed"),
+	image_pressed_selected("image_pressed_selected"),
 	image_overlay("image_overlay"),
 	image_overlay_alignment("image_overlay_alignment", std::string("center")),
 	label_color("label_color"),
@@ -108,7 +110,6 @@ LLButton::LLButton(const LLButton::Params& p)
 	mFlashing( FALSE ),
 	mCurGlowStrength(0.f),
 	mNeedsHighlight(FALSE),
-	mImagep( NULL ),
 	mUnselectedLabel(p.label()),
 	mSelectedLabel(p.label_selected()),
 	mGLFont(p.font),
@@ -118,6 +119,8 @@ LLButton::LLButton(const LLButton::Params& p)
 	mImageSelected(p.image_selected),
 	mImageDisabled(p.image_disabled),
 	mImageDisabledSelected(p.image_disabled_selected),
+	mImagePressed(p.image_pressed),
+	mImagePressedSelected(p.image_pressed_selected),
 	mImageHoverSelected(p.image_hover_selected),
 	mImageHoverUnselected(p.image_hover_unselected),
 	mUnselectedLabelColor(p.label_color()),
@@ -182,6 +185,11 @@ LLButton::LLButton(const LLButton::Params& p)
 			mImageDisabled = p.image_unselected;
 			mFadeWhenDisabled = TRUE;
 		}
+
+		if (p.image_pressed_selected == default_params.image_pressed_selected)
+		{
+			mImagePressedSelected = mImageUnselected;
+		}
 	}
 
 	// if custom selected button image provided...
@@ -193,6 +201,21 @@ LLButton::LLButton(const LLButton::Params& p)
 			mImageDisabledSelected = p.image_selected;
 			mFadeWhenDisabled = TRUE;
 		}
+
+		if (p.image_pressed == default_params.image_pressed)
+		{
+			mImagePressed = mImageSelected;
+		}
+	}
+
+	if (!p.image_pressed.isProvided())
+	{
+		mImagePressed = mImageSelected;
+	}
+
+	if (!p.image_pressed_selected.isProvided())
+	{
+		mImagePressedSelected = mImageUnselected;
 	}
 	
 	if (mImageUnselected.isNull())
@@ -427,7 +450,7 @@ BOOL	LLButton::handleRightMouseUp(S32 x, S32 y, MASK mask)
 
 void LLButton::onMouseEnter(S32 x, S32 y, MASK mask)
 {
-	if (getEnabled())
+	if (isInEnabledChain())
 		mNeedsHighlight = TRUE;
 }
 
@@ -462,7 +485,7 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
 // virtual
 void LLButton::draw()
 {
-	BOOL flash = FALSE;
+	bool flash = FALSE;
 	static LLUICachedControl<F32> button_flash_rate("ButtonFlashRate", 0);
 	static LLUICachedControl<S32> button_flash_count("ButtonFlashCount", 0);
 
@@ -474,7 +497,7 @@ void LLButton::draw()
 		flash = (flash_count % 2 == 0) || flash_count > S32((F32)button_flash_count * 2.f);
 	}
 
-	BOOL pressed_by_keyboard = FALSE;
+	bool pressed_by_keyboard = FALSE;
 	if (hasFocus())
 	{
 		pressed_by_keyboard = gKeyboard->getKeyDown(' ') || (mCommitOnReturn && gKeyboard->getKeyDown(KEY_RETURN));
@@ -485,24 +508,31 @@ void LLButton::draw()
 	S32 local_mouse_y;
 	LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
 
-	BOOL pressed = pressed_by_keyboard 
-					|| (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y)) 
-                    || getToggleState();
+	bool enabled = isInEnabledChain();
+
+	bool pressed = pressed_by_keyboard 
+					|| (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y));
+	bool selected = getToggleState();
 	
-	BOOL use_glow_effect = FALSE;
+	bool use_glow_effect = FALSE;
 	LLColor4 glow_color = LLColor4::white;
 	LLRender::eBlendType glow_type = LLRender::BT_ADD_WITH_ALPHA;
-	if ( mNeedsHighlight )
+	LLUIImage* imagep = NULL;
+	if (pressed)
 	{
-		if (pressed)
+		imagep = selected ? mImagePressedSelected : mImagePressed;
+	}
+	else if ( mNeedsHighlight )
+	{
+		if (selected)
 		{
 			if (mImageHoverSelected)
 			{
-				mImagep = mImageHoverSelected;
+				imagep = mImageHoverSelected;
 			}
 			else
 			{
-				mImagep = mImageSelected;
+				imagep = mImageSelected;
 				use_glow_effect = TRUE;
 			}
 		}
@@ -510,22 +540,37 @@ void LLButton::draw()
 		{
 			if (mImageHoverUnselected)
 			{
-				mImagep = mImageHoverUnselected;
+				imagep = mImageHoverUnselected;
 			}
 			else
 			{
-				mImagep = mImageUnselected;
+				imagep = mImageUnselected;
 				use_glow_effect = TRUE;
 			}
 		}
 	}
-	else if ( pressed )
+	else 
 	{
-		mImagep = mImageSelected;
+		imagep = selected ? mImageSelected : mImageUnselected;
 	}
-	else
+
+	// Override if more data is available
+	// HACK: Use gray checked state to mean either:
+	//   enabled and tentative
+	// or
+	//   disabled but checked
+	if (!mImageDisabledSelected.isNull() 
+		&& 
+			( (enabled && getTentative()) 
+			|| (!enabled && selected ) ) )
+	{
+		imagep = mImageDisabledSelected;
+	}
+	else if (!mImageDisabled.isNull() 
+		&& !enabled 
+		&& !selected)
 	{
-		mImagep = mImageUnselected;
+		imagep = mImageDisabled;
 	}
 
 	if (mFlashing)
@@ -540,26 +585,7 @@ void LLButton::draw()
 			glow_color = flash_color;
 	}
 
-	// Override if more data is available
-	// HACK: Use gray checked state to mean either:
-	//   enabled and tentative
-	// or
-	//   disabled but checked
-	if (!mImageDisabledSelected.isNull() 
-		&& 
-			( (getEnabled() && getTentative()) 
-			|| (!getEnabled() && pressed ) ) )
-	{
-		mImagep = mImageDisabledSelected;
-	}
-	else if (!mImageDisabled.isNull() 
-		&& !getEnabled() 
-		&& !pressed)
-	{
-		mImagep = mImageDisabled;
-	}
-
-	if (mNeedsHighlight && !mImagep)
+	if (mNeedsHighlight && !imagep)
 	{
 		use_glow_effect = TRUE;
 	}
@@ -568,7 +594,7 @@ void LLButton::draw()
 	LLColor4 label_color;
 
 	// label changes when button state changes, not when pressed
-	if ( getEnabled() )
+	if ( enabled )
 	{
 		if ( getToggleState() )
 		{
@@ -596,32 +622,18 @@ void LLButton::draw()
 
 	if( getToggleState() )
 	{
-		if( getEnabled() || mDisabledSelectedLabel.empty() )
-		{
-			label = mSelectedLabel;
-		}
-		else
-		{
-			label = mDisabledSelectedLabel;
-		}
+		label = mSelectedLabel;
 	}
 	else
 	{
-		if( getEnabled() || mDisabledLabel.empty() )
-		{
-			label = mUnselectedLabel;
-		}
-		else
-		{
-			label = mDisabledLabel;
-		}
+		label = mUnselectedLabel;
 	}
 
 	// overlay with keyboard focus border
 	if (hasFocus())
 	{
 		F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
-		drawBorder(gFocusMgr.getFocusColor(), llround(lerp(1.f, 3.f, lerp_amt)));
+		drawBorder(imagep, gFocusMgr.getFocusColor(), llround(lerp(1.f, 3.f, lerp_amt)));
 	}
 	
 	if (use_glow_effect)
@@ -638,27 +650,27 @@ void LLButton::draw()
 
 	// Draw button image, if available.
 	// Otherwise draw basic rectangular button.
-	if (mImagep.notNull())
+	if (imagep != NULL)
 	{
 		// apply automatic 50% alpha fade to disabled image
 		LLColor4 disabled_color = mFadeWhenDisabled ? mDisabledImageColor.get() % 0.5f : mDisabledImageColor.get();
 		if ( mScaleImage)
 		{
-			mImagep->draw(getLocalRect(), getEnabled() ? mImageColor.get() : disabled_color  );
+			imagep->draw(getLocalRect(), enabled ? mImageColor.get() : disabled_color  );
 			if (mCurGlowStrength > 0.01f)
 			{
 				gGL.setSceneBlendType(glow_type);
-				mImagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), glow_color % mCurGlowStrength);
+				imagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), glow_color % mCurGlowStrength);
 				gGL.setSceneBlendType(LLRender::BT_ALPHA);
 			}
 		}
 		else
 		{
-			mImagep->draw(0, 0, getEnabled() ? mImageColor.get() : disabled_color );
+			imagep->draw(0, 0, enabled ? mImageColor.get() : disabled_color );
 			if (mCurGlowStrength > 0.01f)
 			{
 				gGL.setSceneBlendType(glow_type);
-				mImagep->drawSolid(0, 0, glow_color % mCurGlowStrength);
+				imagep->drawSolid(0, 0, glow_color % mCurGlowStrength);
 				gGL.setSceneBlendType(LLRender::BT_ALPHA);
 			}
 		}
@@ -699,7 +711,7 @@ void LLButton::draw()
 
 		// fade out overlay images on disabled buttons
 		LLColor4 overlay_color = mImageOverlayColor.get();
-		if (!getEnabled())
+		if (!enabled)
 		{
 			overlay_color.mV[VALPHA] = 0.5f;
 		}
@@ -777,19 +789,19 @@ void LLButton::draw()
 			NULL, FALSE, FALSE);
 	}
 
-	LLView::draw();
+	LLUICtrl::draw();
 }
 
-void LLButton::drawBorder(const LLColor4& color, S32 size)
+void LLButton::drawBorder(LLUIImage* imagep, const LLColor4& color, S32 size)
 {
-	if (mImagep.isNull()) return;
+	if (imagep == NULL) return;
 	if (mScaleImage)
 	{
-		mImagep->drawBorder(getLocalRect(), color, size);
+		imagep->drawBorder(getLocalRect(), color, size);
 	}
 	else
 	{
-		mImagep->drawBorder(0, 0, color, size);
+		imagep->drawBorder(0, 0, color, size);
 	}
 }
 
@@ -851,16 +863,6 @@ void LLButton::setLabelSelected( const LLStringExplicit& label )
 	mSelectedLabel = label;
 }
 
-void LLButton::setDisabledLabel( const LLStringExplicit& label )
-{
-	mDisabledLabel = label;
-}
-
-void LLButton::setDisabledSelectedLabel( const LLStringExplicit& label )
-{
-	mDisabledSelectedLabel = label;
-}
-
 void LLButton::setImageUnselected(LLPointer<LLUIImage> image)
 {
 	mImageUnselected = image;
@@ -875,25 +877,11 @@ void LLButton::autoResize()
 	LLUIString label;
 	if(getToggleState())
 	{
-		if( getEnabled() || mDisabledSelectedLabel.empty() )
-		{
-			label = mSelectedLabel;
-		}
-		else
-		{
-			label = mDisabledSelectedLabel;
-		}
+		label = mSelectedLabel;
 	}
 	else
 	{
-		if( getEnabled() || mDisabledLabel.empty() )
-		{
-			label = mUnselectedLabel;
-		}
-		else
-		{
-			label = mDisabledLabel;
-		}
+		label = mUnselectedLabel;
 	}
 	resize(label);
 }
@@ -915,9 +903,8 @@ void LLButton::resize(LLUIString label)
 }
 void LLButton::setImages( const std::string &image_name, const std::string &selected_name )
 {
-	setImageUnselected(image_name);
-	setImageSelected(selected_name);
-
+	setImageUnselected(LLUI::getUIImage(image_name));
+	setImageSelected(LLUI::getUIImage(selected_name));
 }
 
 void LLButton::setImageSelected(LLPointer<LLUIImage> image)
@@ -950,19 +937,6 @@ void LLButton::setImageDisabledSelected(LLPointer<LLUIImage> image)
 	mFadeWhenDisabled = TRUE;
 }
 
-void LLButton::setDisabledImages( const std::string &image_name, const std::string &selected_name)
-{
-	setDisabledImages( image_name, selected_name, mImageColor.get());
-	mFadeWhenDisabled = TRUE;
-}
-
-void LLButton::setDisabledImages( const std::string &image_name, const std::string &selected_name, const LLColor4& c )
-{
-	setImageDisabled(image_name);
-	setImageDisabledSelected(selected_name);
-	mDisabledImageColor = c;
-}
-
 void LLButton::setImageHoverSelected(LLPointer<LLUIImage> image)
 {
 	mImageHoverSelected = image;
@@ -973,12 +947,6 @@ void LLButton::setImageHoverUnselected(LLPointer<LLUIImage> image)
 	mImageHoverUnselected = image;
 }
 
-void LLButton::setHoverImages( const std::string& image_name, const std::string& selected_name )
-{
-	setImageHoverUnselected(image_name);
-	setImageHoverSelected(selected_name);
-}
-
 void LLButton::setImageOverlay(const std::string& image_name, LLFontGL::HAlign alignment, const LLColor4& color)
 {
 	if (image_name.empty())
@@ -1016,42 +984,6 @@ S32 round_up(S32 grid, S32 value)
 	}
 }
 
-void			LLButton::setImageUnselected(const std::string &image_name)
-{	
-	setImageUnselected(LLUI::getUIImage(image_name));
-	mImageUnselectedName = image_name;
-}
-
-void			LLButton::setImageSelected(const std::string &image_name)
-{	
-	setImageSelected(LLUI::getUIImage(image_name));
-	mImageSelectedName = image_name;
-}
-
-void			LLButton::setImageHoverSelected(const std::string &image_name)
-{
-	setImageHoverSelected(LLUI::getUIImage(image_name));
-	mImageHoverSelectedName = image_name;
-}
-
-void			LLButton::setImageHoverUnselected(const std::string &image_name)
-{
-	setImageHoverUnselected(LLUI::getUIImage(image_name));
-	mImageHoverUnselectedName = image_name;
-}
-
-void			LLButton::setImageDisabled(const std::string &image_name)
-{
-	setImageDisabled(LLUI::getUIImage(image_name));
-	mImageDisabledName = image_name;
-}
-
-void			LLButton::setImageDisabledSelected(const std::string &image_name)
-{
-	setImageDisabledSelected(LLUI::getUIImage(image_name));
-	mImageDisabledSelectedName = image_name;
-}
-
 void LLButton::addImageAttributeToXML(LLXMLNodePtr node, 
 									  const std::string& image_name,
 									  const LLUUID&	image_id,
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index e387c91a17..93e0414a02 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -84,6 +84,8 @@ public:
 								image_hover_unselected,
 								image_disabled_selected,
 								image_disabled,
+								image_pressed,
+								image_pressed_selected,
 								image_overlay;
 
 		Optional<std::string>	image_overlay_alignment;
@@ -190,11 +192,7 @@ public:
 	virtual void	setColor(const LLColor4& c);
 
 	void			setImages(const std::string &image_name, const std::string &selected_name);
-	void			setDisabledImages(const std::string &image_name, const std::string &selected_name);
-	void			setDisabledImages(const std::string &image_name, const std::string &selected_name, const LLColor4& c);
 	
-	void			setHoverImages(const std::string &image_name, const std::string &selected_name);
-
 	void			setDisabledImageColor(const LLColor4& c)		{ mDisabledImageColor = c; }
 
 	void			setDisabledSelectedLabelColor( const LLColor4& c )	{ mDisabledSelectedLabelColor = c; }
@@ -208,8 +206,6 @@ public:
 	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 	void			setLabelUnselected(const LLStringExplicit& label);
 	void			setLabelSelected(const LLStringExplicit& label);
-	void			setDisabledLabel(const LLStringExplicit& disabled_label);
-	void			setDisabledSelectedLabel(const LLStringExplicit& disabled_label);
 	void			setDisabledLabelColor( const LLColor4& c )		{ mDisabledLabelColor = c; }
 	
 	void			setFont(const LLFontGL *font)		
@@ -223,15 +219,6 @@ public:
 
 	void			setHoverGlowStrength(F32 strength) { mHoverGlowStrength = strength; }
 
-	void			setImageUnselected(const std::string &image_name);
-	const std::string& getImageUnselectedName() const { return mImageUnselectedName; }
-	void			setImageSelected(const std::string &image_name);
-	const std::string& getImageSelectedName() const { return mImageSelectedName; }
-	void			setImageHoverSelected(const std::string &image_name);
-	void			setImageHoverUnselected(const std::string &image_name);
-	void			setImageDisabled(const std::string &image_name);
-	void			setImageDisabledSelected(const std::string &image_name);
-
 	void			setImageUnselected(LLPointer<LLUIImage> image);
 	void			setImageSelected(LLPointer<LLUIImage> image);
 	void			setImageHoverSelected(LLPointer<LLUIImage> image);
@@ -250,106 +237,84 @@ public:
 	static void		setFloaterToggle(LLUICtrl* ctrl, const LLSD& sdname);
 	
 protected:
-
-	virtual void	drawBorder(const LLColor4& color, S32 size);
-
-	void			setImageUnselectedID(const LLUUID &image_id);
-	const LLUUID&	getImageUnselectedID() const { return mImageUnselectedID; }
-	void			setImageSelectedID(const LLUUID &image_id);
-	const LLUUID&	getImageSelectedID() const { return mImageSelectedID; }
-	void			setImageHoverSelectedID(const LLUUID &image_id);
-	void			setImageHoverUnselectedID(const LLUUID &image_id);
-	void			setImageDisabledID(const LLUUID &image_id);
-	void			setImageDisabledSelectedID(const LLUUID &image_id);
 	const LLPointer<LLUIImage>&	getImageUnselected() const	{ return mImageUnselected; }
 	const LLPointer<LLUIImage>& getImageSelected() const	{ return mImageSelected; }
-	void			resetMouseDownTimer();
 
 	LLFrameTimer	mMouseDownTimer;
 
 	// If the label is empty, set the picture_style attribute
 	static void setupParamsForExport(Params& p, LLView* parent);
+private:
+	void			drawBorder(LLUIImage* imagep, const LLColor4& color, S32 size);
+	void			resetMouseDownTimer();
 
 private:
-	commit_signal_t mMouseDownSignal;
-	commit_signal_t mMouseUpSignal;
-	commit_signal_t mHeldDownSignal;
+	commit_signal_t 			mMouseDownSignal;
+	commit_signal_t 			mMouseUpSignal;
+	commit_signal_t 			mHeldDownSignal;
 	
-	const LLFontGL	*mGLFont;
+	const LLFontGL*				mGLFont;
 	
-	S32				mMouseDownFrame;
-	S32 			mMouseHeldDownCount; 	// Counter for parameter passed to held-down callback
-	F32				mHeldDownDelay;			// seconds, after which held-down callbacks get called
-	S32				mHeldDownFrameDelay;	// frames, after which held-down callbacks get called
+	S32							mMouseDownFrame;
+	S32 						mMouseHeldDownCount; 	// Counter for parameter passed to held-down callback
+	F32							mHeldDownDelay;			// seconds, after which held-down callbacks get called
+	S32							mHeldDownFrameDelay;	// frames, after which held-down callbacks get called
 
 	LLPointer<LLUIImage>		mImageOverlay;
 	LLFontGL::HAlign			mImageOverlayAlignment;
-	LLUIColor	mImageOverlayColor;
+	LLUIColor					mImageOverlayColor;
 
 	LLPointer<LLUIImage>		mImageUnselected;
 	LLUIString					mUnselectedLabel;
-	LLUIColor	mUnselectedLabelColor;
+	LLUIColor					mUnselectedLabelColor;
 
 	LLPointer<LLUIImage>		mImageSelected;
 	LLUIString					mSelectedLabel;
-	LLUIColor	mSelectedLabelColor;
+	LLUIColor					mSelectedLabelColor;
 
 	LLPointer<LLUIImage>		mImageHoverSelected;
 
 	LLPointer<LLUIImage>		mImageHoverUnselected;
 
 	LLPointer<LLUIImage>		mImageDisabled;
-	LLUIString					mDisabledLabel;
-	LLUIColor	mDisabledLabelColor;
+	LLUIColor					mDisabledLabelColor;
 
 	LLPointer<LLUIImage>		mImageDisabledSelected;
 	LLUIString					mDisabledSelectedLabel;
-	LLUIColor	mDisabledSelectedLabelColor;
-
-	LLUUID			mImageUnselectedID;
-	LLUUID			mImageSelectedID;
-	LLUUID			mImageHoverSelectedID;
-	LLUUID			mImageHoverUnselectedID;
-	LLUUID			mImageDisabledID;
-	LLUUID			mImageDisabledSelectedID;
-	std::string		mImageUnselectedName;
-	std::string		mImageSelectedName;
-	std::string		mImageHoverSelectedName;
-	std::string		mImageHoverUnselectedName;
-	std::string		mImageDisabledName;
-	std::string		mImageDisabledSelectedName;
+	LLUIColor					mDisabledSelectedLabelColor;
 
-	LLUIColor	mHighlightColor;
-	LLUIColor		mFlashBgColor;
+	LLPointer<LLUIImage>		mImagePressed;
+	LLPointer<LLUIImage>		mImagePressedSelected;
 
-	LLUIColor	mImageColor;
-	LLUIColor	mDisabledImageColor;
+	LLUIColor					mHighlightColor;
+	LLUIColor					mFlashBgColor;
 
-	BOOL			mIsToggle;
-	BOOL			mScaleImage;
+	LLUIColor					mImageColor;
+	LLUIColor					mDisabledImageColor;
 
-	BOOL			mDropShadowedText;
-	BOOL			mAutoResize;
-	BOOL			mBorderEnabled;
+	BOOL						mIsToggle;
+	BOOL						mScaleImage;
 
-	BOOL			mFlashing;
+	BOOL						mDropShadowedText;
+	BOOL						mAutoResize;
+	BOOL						mBorderEnabled;
 
-	LLFontGL::HAlign mHAlign;
-	S32				mLeftHPad;
-	S32				mRightHPad;
+	BOOL						mFlashing;
 
-	F32				mHoverGlowStrength;
-	F32				mCurGlowStrength;
+	LLFontGL::HAlign			mHAlign;
+	S32							mLeftHPad;
+	S32							mRightHPad;
 
-	BOOL			mNeedsHighlight;
-	BOOL			mCommitOnReturn;
-	BOOL			mFadeWhenDisabled;
+	F32							mHoverGlowStrength;
+	F32							mCurGlowStrength;
 
-	std::string		mHelpURL;
+	BOOL						mNeedsHighlight;
+	BOOL						mCommitOnReturn;
+	BOOL						mFadeWhenDisabled;
 
-	LLPointer<LLUIImage> mImagep;
+	std::string					mHelpURL;
 
-	LLFrameTimer	mFlashingTimer;
+	LLFrameTimer				mFlashingTimer;
 };
 
 
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp
index b43f91e766..455b17ffc7 100644
--- a/indra/llui/llcheckboxctrl.cpp
+++ b/indra/llui/llcheckboxctrl.cpp
@@ -161,7 +161,6 @@ void LLCheckBoxCtrl::onCommit()
 void LLCheckBoxCtrl::setEnabled(BOOL b)
 {
 	LLView::setEnabled(b);
-	mButton->setEnabled(b);
 
 	if (b)
 	{
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index f8c6204afb..93d2b83c9f 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -182,12 +182,6 @@ LLComboBox::~LLComboBox()
 }
 
 
-void LLComboBox::setEnabled(BOOL enabled)
-{
-	LLView::setEnabled(enabled);
-	mButton->setEnabled(enabled);
-}
-
 void LLComboBox::clear()
 { 
 	if (mTextEntry)
@@ -196,8 +190,6 @@ void LLComboBox::clear()
 	}
 	mButton->setLabelSelected(LLStringUtil::null);
 	mButton->setLabelUnselected(LLStringUtil::null);
-	mButton->setDisabledLabel(LLStringUtil::null);
-	mButton->setDisabledSelectedLabel(LLStringUtil::null);
 	mList->deselectAllItems();
 }
 
@@ -376,10 +368,7 @@ void LLComboBox::setLabel(const LLStringExplicit& name)
 	
 	if (!mAllowTextEntry)
 	{
-		mButton->setLabelUnselected(name);
-		mButton->setLabelSelected(name);
-		mButton->setDisabledLabel(name);
-		mButton->setDisabledSelectedLabel(name);
+		mButton->setLabel(name);
 	}
 }
 
@@ -441,14 +430,6 @@ void LLComboBox::setButtonVisible(BOOL visible)
 	}
 }
 
-void LLComboBox::draw()
-{
-	mButton->setEnabled(getEnabled() /*&& !mList->isEmpty()*/);
-
-	// Draw children normally
-	LLUICtrl::draw();
-}
-
 BOOL LLComboBox::setCurrentByIndex( S32 index )
 {
 	BOOL found = mList->selectNthItem( index );
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index db97b0df75..4becda195f 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -110,11 +110,8 @@ protected:
 
 public:
 	// LLView interface
-	virtual void	draw();
 	virtual void	onFocusLost();
 
-	virtual void	setEnabled(BOOL enabled);
-
 	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
 	virtual BOOL	handleKeyHere(KEY key, MASK mask);
 	virtual BOOL	handleUnicodeCharHere(llwchar uni_char);
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp
index 536919c072..3483bac782 100644
--- a/indra/llui/llflyoutbutton.cpp
+++ b/indra/llui/llflyoutbutton.cpp
@@ -74,13 +74,6 @@ void LLFlyoutButton::draw()
 	LLComboBox::draw();	
 }
 
-void LLFlyoutButton::setEnabled(BOOL enabled)
-{
-	mActionButton->setEnabled(enabled);
-	LLComboBox::setEnabled(enabled);
-}
-
-
 void LLFlyoutButton::setToggleState(BOOL state)
 {
 	mToggleState = state;
diff --git a/indra/llui/llflyoutbutton.h b/indra/llui/llflyoutbutton.h
index 1f1716593a..d8c0f1a50d 100644
--- a/indra/llui/llflyoutbutton.h
+++ b/indra/llui/llflyoutbutton.h
@@ -61,7 +61,6 @@ protected:
 	friend class LLUICtrlFactory;
 public:
 	virtual void	draw();
-	virtual void	setEnabled(BOOL enabled);
 
 	void setToggleState(BOOL state);
 
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 7e452a25a3..3fef215661 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -49,7 +49,6 @@ LLFocusMgr::LLFocusMgr()
 	mDefaultKeyboardFocus( NULL ),
 	mKeystrokesOnly(FALSE),
 	mTopCtrl( NULL ),
-	mFocusWeight(0.f),
 	mAppHasFocus(TRUE)   // Macs don't seem to notify us that we've gotten focus, so default to true
 	#ifdef _DEBUG
 		, mMouseCaptorName("none")
@@ -146,8 +145,6 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystroke
 		// cache the new focus list for next time
 		swap(mCachedKeyboardFocusList, new_focus_list);
 
-		mFocusTimer.reset();
-
 		#ifdef _DEBUG
 			mKeyboardFocusName = new_focus ? new_focus->getName() : std::string("none");
 		#endif
@@ -346,7 +343,7 @@ void LLFocusMgr::unlockFocus()
 
 F32 LLFocusMgr::getFocusFlashAmt() const
 {
-	return clamp_rescale(getFocusTime(), 0.f, FOCUS_FADE_TIME, mFocusWeight, 0.f);
+	return clamp_rescale(mFocusFlashTimer.getElapsedTimeF32(), 0.f, FOCUS_FADE_TIME, 1.f, 0.f);
 }
 
 LLColor4 LLFocusMgr::getFocusColor() const
@@ -363,8 +360,7 @@ LLColor4 LLFocusMgr::getFocusColor() const
 
 void LLFocusMgr::triggerFocusFlash()
 {
-	mFocusTimer.reset();
-	mFocusWeight = 1.f;
+	mFocusFlashTimer.reset();
 }
 
 void LLFocusMgr::setAppHasFocus(BOOL focus) 
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h
index 165a114f3d..fbe0d22084 100644
--- a/indra/llui/llfocusmgr.h
+++ b/indra/llui/llfocusmgr.h
@@ -63,7 +63,6 @@ public:
 	BOOL			getKeystrokesOnly() { return mKeystrokesOnly; }
 	void			setKeystrokesOnly(BOOL keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
 
-	F32				getFocusTime() const { return mFocusTimer.getElapsedTimeF32(); }
 	F32				getFocusFlashAmt() const;
 	S32				getFocusFlashWidth() const { return llround(lerp(1.f, 3.f, getFocusFlashAmt())); }
 	LLColor4		getFocusColor() const;
@@ -110,8 +109,7 @@ private:
 	// Top View
 	LLUICtrl*			mTopCtrl;
 
-	LLFrameTimer		mFocusTimer;
-	F32					mFocusWeight;
+	LLFrameTimer		mFocusFlashTimer;
 
 	BOOL				mAppHasFocus;
 
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index f94eb7fcc3..02ee567803 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -318,10 +318,8 @@ void LLLineEditor::setMaxTextLength(S32 max_text_length)
 void LLLineEditor::updateTextPadding()
 {
 	static LLUICachedControl<S32> line_editor_hpad ("UILineEditorHPad", 0);
-	mTextPadLeft = llclamp(mTextPadLeft, 0, getRect().getWidth());
-	mTextPadRight = llclamp(mTextPadRight, 0, getRect().getWidth());
-	mMinHPixels = line_editor_hpad + mTextPadLeft;
-	mMaxHPixels = getRect().getWidth() - mMinHPixels - mTextPadRight;
+	mMinHPixels = line_editor_hpad + llclamp(mTextPadLeft, 0, getRect().getWidth());;
+	mMaxHPixels = getRect().getWidth() - mMinHPixels - llclamp(mTextPadRight, 0, getRect().getWidth());
 }
 
 
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h
index 89d44eaa87..da633cc1cd 100644
--- a/indra/llui/llmultislider.h
+++ b/indra/llui/llmultislider.h
@@ -120,4 +120,4 @@ protected:
 	commit_signal_t	mMouseUpSignal;
 };
 
-#endif  // LL_LLSLIDER_H
+#endif  // LL_MULTI_SLIDER_H
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index bc489592d4..566825ff3b 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -497,8 +497,8 @@ void LLScrollbar::draw()
 	}
 
 	// Draw background and thumb.
-	if (   ( mOrientation == VERTICAL&&(mThumbImageV.isNull() || mThumbImageV.isNull()) ) 
-		|| (mOrientation == HORIZONTAL&&(mTrackImageH.isNull() || mThumbImageH.isNull()) ))
+	if (   ( mOrientation == VERTICAL&&(mThumbImageV.isNull() || mThumbImageH.isNull()) ) 
+		|| (mOrientation == HORIZONTAL&&(mTrackImageH.isNull() || mTrackImageV.isNull()) ))
 	{
 		gl_rect_2d(mOrientation == HORIZONTAL ? mThickness : 0, 
 		mOrientation == VERTICAL ? getRect().getHeight() - 2 * mThickness : getRect().getHeight(),
@@ -513,7 +513,6 @@ void LLScrollbar::draw()
 		// Thumb
 		LLRect outline_rect = mThumbRect;
 		outline_rect.stretch(2);
-		S32 rect_fix = 0;
 		// Background
 		
 		if(mOrientation == HORIZONTAL)
@@ -521,7 +520,7 @@ void LLScrollbar::draw()
 			mTrackImageH->drawSolid(mThickness								//S32 x
 								   , 0										//S32 y
 								   , getRect().getWidth() - 2 * mThickness  //S32 width
-								   , getRect().getHeight()- rect_fix		//S32 height
+								   , getRect().getHeight()					//S32 height
 								   , mTrackColor.get());                    //const LLColor4& color
 			
 			if (gFocusMgr.getKeyboardFocus() == this)
@@ -540,7 +539,7 @@ void LLScrollbar::draw()
 		}
 		else if(mOrientation == VERTICAL)
 		{
-			mTrackImageV->drawSolid(  0+rect_fix								//S32 x
+			mTrackImageV->drawSolid(  0										//S32 x
 								   , mThickness								//S32 y
 								   , getRect().getWidth()					//S32 width
 								   , getRect().getHeight() - 2 * mThickness	//S32 height
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp
index f167836bee..1c394a71dd 100644
--- a/indra/llui/llslider.cpp
+++ b/indra/llui/llslider.cpp
@@ -49,6 +49,8 @@ LLSlider::Params::Params()
 	thumb_outline_color("thumb_outline_color"),
 	thumb_center_color("thumb_center_color"),
 	thumb_image("thumb_image"),
+	thumb_image_pressed("thumb_image_pressed"),
+	thumb_image_disabled("thumb_image_disabled"),
 	track_image("track_image"),
 	track_highlight_image("track_highlight_image"),
 	mouse_down_callback("mouse_down_callback"),
@@ -64,6 +66,8 @@ LLSlider::LLSlider(const LLSlider::Params& p)
 	mThumbOutlineColor(p.thumb_outline_color()),
 	mThumbCenterColor(p.thumb_center_color()),
 	mThumbImage(p.thumb_image),
+	mThumbImagePressed(p.thumb_image_pressed),
+	mThumbImageDisabled(p.thumb_image_disabled),
 	mTrackImage(p.track_image),
 	mTrackHighlightImage(p.track_highlight_image)
 {
@@ -243,10 +247,6 @@ void LLSlider::draw()
 	// drawing solids requires texturing be disabled
 	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
-	F32 opacity = getEnabled() ? 1.f : 0.3f;
-	LLColor4 center_color = (mThumbCenterColor.get() % opacity);
-	LLColor4 track_color = (mTrackColor.get() % opacity);
-
 	// Track
 	LLRect track_rect(mThumbImage->getWidth() / 2, 
 						getLocalRect().getCenterY() + (mTrackImage->getHeight() / 2), 
@@ -257,18 +257,38 @@ void LLSlider::draw()
 	mTrackHighlightImage->draw(highlight_rect);
 
 	// Thumb
-	if( hasMouseCapture() )
-	{
-		// Show ghost where thumb was before dragging began.
-		mThumbImage->draw(mDragStartThumbRect, mThumbCenterColor.get() % 0.3f);
-	}
 	if (hasFocus())
 	{
 		// Draw focus highlighting.
 		mThumbImage->drawBorder(mThumbRect, gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
 	}
-	// Fill in the thumb.
-	mThumbImage->draw(mThumbRect, hasMouseCapture() ? mThumbOutlineColor.get() : center_color);
 
+	if( hasMouseCapture() ) // currently clicking on slider
+	{
+		// Show ghost where thumb was before dragging began.
+		if (mThumbImage.notNull())
+		{
+			mThumbImage->draw(mDragStartThumbRect, mThumbCenterColor.get() % 0.3f);
+		}
+		if (mThumbImagePressed.notNull())
+		{
+			mThumbImagePressed->draw(mThumbRect, mThumbOutlineColor);
+		}
+	}
+	else if (!isInEnabledChain())
+	{
+		if (mThumbImageDisabled.notNull())
+		{
+			mThumbImageDisabled->draw(mThumbRect, mThumbCenterColor);
+		}
+	}
+	else
+	{
+		if (mThumbImage.notNull())
+		{
+			mThumbImage->draw(mThumbRect, mThumbCenterColor);
+		}
+	}
+	
 	LLUICtrl::draw();
 }
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h
index 088fd20d94..e2a94e4d8c 100644
--- a/indra/llui/llslider.h
+++ b/indra/llui/llslider.h
@@ -46,6 +46,8 @@ public:
 							thumb_center_color;
 
 		Optional<LLUIImage*>	thumb_image,
+								thumb_image_pressed,
+								thumb_image_disabled,
 								track_image,
 								track_highlight_image;
 
@@ -85,9 +87,11 @@ private:
 	S32				mMouseOffset;
 	LLRect			mDragStartThumbRect;
 
-	LLUIImage*		mThumbImage;
-	LLUIImage*		mTrackImage;
-	LLUIImage*		mTrackHighlightImage;
+	LLPointer<LLUIImage>	mThumbImage;
+	LLPointer<LLUIImage>	mThumbImagePressed;
+	LLPointer<LLUIImage>	mThumbImageDisabled;
+	LLPointer<LLUIImage>	mTrackImage;
+	LLPointer<LLUIImage>	mTrackHighlightImage;
 
 	LLRect			mThumbRect;
 	LLUIColor	mTrackColor;
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 9dbe458bae..b82feb3f58 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -459,6 +459,14 @@ LLChildRegistry<DERIVED>::Register<T>::Register(const char* tag, LLWidgetCreator
 {
 	const std::type_info* widget_type_infop = &typeid(T);
 	// associate parameter block type with template .xml file
+	std::string* existing_tag = LLWidgetNameRegistry ::instance().getValue(&typeid(typename T::Params));
+	if (existing_tag != NULL && *existing_tag != tag)
+	{
+		// duplicate entry for T::Params
+		// try creating empty param block in derived classes that inherit T::Params
+		int* crash = 0;
+		*crash = 0;
+	}
 	LLWidgetNameRegistry ::instance().defaultRegistrar().add(&typeid(typename T::Params), tag);
 	// associate widget type with factory function
 	LLDefaultWidgetRegistry::instance().defaultRegistrar().add(widget_type_infop, &LLUICtrlFactory::createDefaultWidget<T>);
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp
index da6dceb149..3753dcaaa8 100644
--- a/indra/newview/llfloaterlagmeter.cpp
+++ b/indra/newview/llfloaterlagmeter.cpp
@@ -152,25 +152,25 @@ void LLFloaterLagMeter::determineClient()
 
 	if (!gFocusMgr.getAppHasFocus())
 	{
-		mClientButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
+		mClientButton->setImageUnselected(LLUI::getUIImage(LAG_GOOD_IMAGE_NAME));
 		mClientText->setText( getString("client_frame_time_window_bg_msg", mStringArgs) );
 		mClientCause->setText( LLStringUtil::null );
 	}
 	else if(client_frame_time >= mClientFrameTimeCritical)
 	{
-		mClientButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
+		mClientButton->setImageUnselected(LLUI::getUIImage(LAG_CRITICAL_IMAGE_NAME));
 		mClientText->setText( getString("client_frame_time_critical_msg", mStringArgs) );
 		find_cause = true;
 	}
 	else if(client_frame_time >= mClientFrameTimeWarning)
 	{
-		mClientButton->setImageUnselected(LAG_WARNING_IMAGE_NAME);
+		mClientButton->setImageUnselected(LLUI::getUIImage(LAG_WARNING_IMAGE_NAME));
 		mClientText->setText( getString("client_frame_time_warning_msg", mStringArgs) );
 		find_cause = true;
 	}
 	else
 	{
-		mClientButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
+		mClientButton->setImageUnselected(LLUI::getUIImage(LAG_GOOD_IMAGE_NAME));
 		mClientText->setText( getString("client_frame_time_normal_msg", mStringArgs) );
 		mClientCause->setText( LLStringUtil::null );
 	}	
@@ -211,13 +211,13 @@ void LLFloaterLagMeter::determineNetwork()
 	
 	if(packet_loss >= mNetworkPacketLossCritical)
 	{
-		mNetworkButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
+		mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_CRITICAL_IMAGE_NAME));
 		mNetworkText->setText( getString("network_packet_loss_critical_msg", mStringArgs) );
 		find_cause_loss = true;
 	}
 	else if(ping_time >= mNetworkPingCritical)
 	{
-		mNetworkButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
+		mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_CRITICAL_IMAGE_NAME));
 		if (client_frame_time_ms < mNetworkPingCritical)
 		{
 			mNetworkText->setText( getString("network_ping_critical_msg", mStringArgs) );
@@ -226,13 +226,13 @@ void LLFloaterLagMeter::determineNetwork()
 	}
 	else if(packet_loss >= mNetworkPacketLossWarning)
 	{
-		mNetworkButton->setImageUnselected(LAG_WARNING_IMAGE_NAME);
+		mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_WARNING_IMAGE_NAME));
 		mNetworkText->setText( getString("network_packet_loss_warning_msg", mStringArgs) );
 		find_cause_loss = true;
 	}
 	else if(ping_time >= mNetworkPingWarning)
 	{
-		mNetworkButton->setImageUnselected(LAG_WARNING_IMAGE_NAME);
+		mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_WARNING_IMAGE_NAME));
 		if (client_frame_time_ms < mNetworkPingWarning)
 		{
 			mNetworkText->setText( getString("network_ping_warning_msg", mStringArgs) );
@@ -241,7 +241,7 @@ void LLFloaterLagMeter::determineNetwork()
 	}
 	else
 	{
-		mNetworkButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
+		mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_GOOD_IMAGE_NAME));
 		mNetworkText->setText( getString("network_performance_normal_msg", mStringArgs) );
 	}
 
@@ -266,19 +266,19 @@ void LLFloaterLagMeter::determineServer()
 
 	if(sim_frame_time >= mServerFrameTimeCritical)
 	{
-		mServerButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
+		mServerButton->setImageUnselected(LLUI::getUIImage(LAG_CRITICAL_IMAGE_NAME));
 		mServerText->setText( getString("server_frame_time_critical_msg", mStringArgs) );
 		find_cause = true;
 	}
 	else if(sim_frame_time >= mServerFrameTimeWarning)
 	{
-		mServerButton->setImageUnselected(LAG_WARNING_IMAGE_NAME);
+		mServerButton->setImageUnselected(LLUI::getUIImage(LAG_WARNING_IMAGE_NAME));
 		mServerText->setText( getString("server_frame_time_warning_msg", mStringArgs) );
 		find_cause = true;
 	}
 	else
 	{
-		mServerButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
+		mServerButton->setImageUnselected(LLUI::getUIImage(LAG_GOOD_IMAGE_NAME));
 		mServerText->setText( getString("server_frame_time_normal_msg", mStringArgs) );
 		mServerCause->setText( LLStringUtil::null );
 	}	
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 4ae188977e..879f106b1f 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1713,35 +1713,6 @@ void LLFloaterIMPanel::sendMsg()
 								mOtherParticipantUUID,
 								mDialog);
 
-				// local echo
-				if((mDialog == IM_NOTHING_SPECIAL) && 
-				   (mOtherParticipantUUID.notNull()))
-				{
-					std::string history_echo;
-					gAgent.buildFullname(history_echo);
-
-					// Look for IRC-style emotes here.
-					std::string prefix = utf8_text.substr(0, 4);
-					if (prefix == "/me " || prefix == "/me'")
-					{
-						utf8_text.replace(0,3,"");
-					}
-					else
-					{
-						history_echo += ": ";
-					}
-					history_echo += utf8_text;
-
-					BOOL other_was_typing = mOtherTyping;
-
-					addHistoryLine(history_echo, LLUIColorTable::instance().getColor("IMChatColor"), true, gAgent.getID());
-
-					if (other_was_typing) 
-					{
-						addTypingIndicator(mOtherTypingName);
-					}
-
-				}
 			}
 			else
 			{
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 6d0868b526..fa0ab0ea3f 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -380,6 +380,28 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
 		std::string from;
 		gAgent.buildFullname(from);
 		LLIMModel::instance().addToHistory(im_session_id, from, utf8_text);
+
+		//local echo for the legacy communicate panel
+		std::string history_echo;
+		std::string utf8_copy = utf8_text;
+		gAgent.buildFullname(history_echo);
+
+		// Look for IRC-style emotes here.
+
+		std::string prefix = utf8_copy.substr(0, 4);
+		if (prefix == "/me " || prefix == "/me'")
+		{
+			utf8_copy.replace(0,3,"");
+		}
+		else
+		{
+			history_echo += ": ";
+		}
+		history_echo += utf8_copy;
+		
+		LLFloaterIMPanel* floater = gIMMgr->findFloaterBySession(im_session_id);
+		if (floater) floater->addHistoryLine(history_echo, LLUIColorTable::instance().getColor("IMChatColor"), true, gAgent.getID());
+
 	}
 
 	// Add the recipient to the recent people list.
@@ -1362,7 +1384,7 @@ LLUUID LLIMMgr::addSession(
 	{
 		// *TODO: Remove this?  Otherwise old communicate window opens on
 		// second initiation of IM session from People panel?
-		floater->openFloater();
+		// floater->openFloater();
 	}
 	//mTabContainer->selectTabPanel(panel);
 	floater->setInputFocus(TRUE);
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index a20296a122..7986d7c861 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -245,7 +245,7 @@ BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect*
 	}
 
 	// Cursor is above the text entry.
-	msg = LLUI::sShowXUINames ? getShowNamesToolTip() : gAgent.getSLURL();
+	msg = LLUI::sShowXUINames ? getShowNamesToolTip() : "";
 	if (mTextEntry && sticky_rect_screen)
 	{
 		*sticky_rect_screen = mTextEntry->calcScreenRect();
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 9be2fb12d2..0d50d7c781 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -798,6 +798,9 @@ void LLPanelPeople::onMoreButtonClicked()
 void	LLPanelPeople::onOpen(const LLSD& key)
 {
 	std::string tab_name = key["people_panel_tab_name"];
+	mFilterEditor -> clear();
+	onFilterEdit("");
+	
 	if (!tab_name.empty())
 		mTabContainer->selectTabByName(tab_name);
 	else
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 5976897970..191c43791d 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -136,6 +136,9 @@ BOOL LLPanelPlaces::postBuild()
 
 void LLPanelPlaces::onOpen(const LLSD& key)
 {
+	mFilterEditor->clear();
+	onFilterEdit("");
+	
 	if(mPlaceInfo == NULL || key.size() == 0)
 		return;
 
@@ -197,6 +200,8 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 									  hist_items[index].mRegionID,
 									  pos_global);
 	}
+	
+
 }
 
 void LLPanelPlaces::setItem(LLInventoryItem* item)
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 5f0fbe6ee5..fec4798f7b 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -508,6 +508,8 @@ void LLSideTray::expandSideBar	()
 {
 	mCollapsed = false;
 	mCollapseButton->setLabel(EXPANDED_NAME);
+	LLSD key;//empty
+	mActiveTab->onOpen(key);
 	mActiveTab->setVisible(TRUE);
 
 	reflectCollapseChange();
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index bc90fe7adc..12fb811328 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -479,9 +479,11 @@ void LLStatusBar::creditBalance(S32 credit)
 void LLStatusBar::setBalance(S32 balance)
 {
 	std::string money_str = LLResMgr::getInstance()->getMonetaryString( balance );
-	std::string balance_str = "L$";
-	balance_str += money_str;
-	mBtnBuyCurrency->setLabel( balance_str );
+
+	LLStringUtil::format_map_t string_args;
+	string_args["[AMT]"] = llformat("%s", money_str.c_str());
+	std::string labe_str = getString("buycurrencylabel", string_args);
+	mBtnBuyCurrency->setLabel(labe_str);
 
 	// Resize the balance button so that the label fits it, and the button expands to the left.
 	// *TODO: LLButton should have an option where to expand.
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index d6be326a76..b502dbe6fc 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2905,7 +2905,9 @@ void LLViewerWindow::updateKeyboardFocus()
 	{
 		if (!cur_focus->isInVisibleChain() || !cur_focus->isInEnabledChain())
 		{
-			gFocusMgr.releaseFocusIfNeeded(cur_focus);
+            // don't release focus, just reassign so that if being given
+            // to a sibling won't call onFocusLost on all the ancestors
+			// gFocusMgr.releaseFocusIfNeeded(cur_focus);
 
 			LLUICtrl* parent = cur_focus->getParentUICtrl();
 			const LLUICtrl* focus_root = cur_focus->findRootMostFocusRoot();
diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png
new file mode 100644
index 0000000000..e9b72b0401
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png
new file mode 100644
index 0000000000..c7b2c769ae
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 96d93e7081..69742c6ecd 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -15,6 +15,9 @@
   <texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true"/>
   <texture name="Arrow_Right_Press" file_name="navbar/Arrow_Right_Press.png" preload="true"/>
 
+  <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
+  <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png" preload="true" />
+
   <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
   <texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />
 
@@ -56,9 +59,12 @@
   <texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="false" />
   <texture name="FileMenu_BG" file_name="navbar/FileMenu_BG.png" preload="false" />
 
+  <texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
+  <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" />
+
   <texture name="Help_Off" file_name="navbar/Help_Off.png" preload="false"/>
   <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="false"/>
-  
+
   <texture name="History_Arrow" file_name="navbar/History_Arrow.png" preload="true"/>
 
   <texture name="Home_Off" file_name="navbar/Home_Off.png" preload="false"/>
@@ -110,7 +116,8 @@
   <texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-
+  
+  <texture name="RadioButton_Press" file_name="widgets/RadioButton_Press.png" preload="true" />
   <texture name="RadioButton_On_Press" file_name="widgets/RadioButton_On_Press.png" preload="true" />
   <texture name="RadioButton_Off" file_name="widgets/RadioButton_Off.png" preload="true" />
   <texture name="RadioButton_On" file_name="widgets/RadioButton_On.png" preload="true" />
@@ -240,7 +247,7 @@
 
   <texture name="Window_Background" file_name="windows/Window_Background.png" preload="true" />
   <texture name="Window_Foreground" file_name="windows/Window_Foreground.png" preload="true" />
- 
+
 
 
 
@@ -249,7 +256,7 @@
 
   <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
   <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
-  
+
   <texture name="cam_rotate_out.tga" preload="false"/>
   <texture name="cam_rotate_in.tga" preload="false"/>
   <texture name="cam_zoom_out.tga" preload="false"/>
@@ -333,7 +340,7 @@
   <texture name="minimize_pressed.tga"	preload="true"/>
 
   <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4"/>
- 
+
   <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
 
   <texture name="rounded_square_soft.tga"	file_name="rounded_square_soft.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/>
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Down.png b/indra/newview/skins/default/textures/widgets/Arrow_Down.png
new file mode 100644
index 0000000000..e10f6472eb
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Arrow_Down.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Up.png
new file mode 100644
index 0000000000..48df69d82e
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Arrow_Up.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index ec52c565ae..777236504d 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -374,9 +374,11 @@ supports [AMOUNT2] objects
      length="1"
      bottom_delta="-119"
      follows="top|left"
+     height="16"
      layout="topleft"
      left="204"
      name="info_parcel_label"
+     top="30"
      width="48">
         Parcel:
     </text>
@@ -389,7 +391,7 @@ supports [AMOUNT2] objects
      layout="topleft"
      left_delta="16"
      name="info_parcel"
-     top_delta="-1"
+     top_pad="1"
      width="180">
         Scotopteryx 138,204
     </text>
@@ -397,9 +399,11 @@ supports [AMOUNT2] objects
      type="string"
      length="1"
      follows="top|left"
+     height="16"
      layout="topleft"
      left="204"
      name="info_size_label"
+     top_pad="1"
      width="48">
         Size:
     </text>
@@ -412,7 +416,7 @@ supports [AMOUNT2] objects
      layout="topleft"
      left_delta="16"
      name="info_size"
-     top_delta="-1"
+     top_pad="1"
      width="180">
         1024 m²
     </text>
@@ -420,9 +424,11 @@ supports [AMOUNT2] objects
      type="string"
      length="1"
      follows="top|left"
+     height="16"
      layout="topleft"
      left="204"
      name="info_price_label"
+     top_pad="1"
      width="48">
         Price:
     </text>
@@ -435,7 +441,7 @@ supports [AMOUNT2] objects
      layout="topleft"
      left_delta="16"
      name="info_price"
-     top_delta="-1"
+     top_pad="1"
      width="180">
         L$ 1500
 (L$ 1.1/m²)
@@ -450,7 +456,7 @@ sold with objects
      layout="topleft"
      left="16"
      name="info_action"
-     top="156"
+     top="166"
      width="350">
         Buying this land will:
     </text>
@@ -485,7 +491,7 @@ sold with objects
      layout="topleft"
      left_delta="0"
      name="error_web"
-     top_delta="144"
+     top_delta="154"
      width="120" />
     <locate
      height="-200"
@@ -508,7 +514,7 @@ sold with objects
      left="72"
      name="account_action"
      right="438"
-     top="190"
+     top="200"
      width="218">
         Upgrade you to premium membership.
     </text>
@@ -562,7 +568,7 @@ sold with objects
      left="72"
      name="land_use_action"
      right="438"
-     top="274"
+     top="284"
      width="218">
         Increase your monthly land use fees to US$ 40/month.
     </text>
@@ -638,7 +644,7 @@ sold with objects
      layout="topleft"
      left="170"
      name="currency_amt"
-     top="398"
+     top="408"
      width="80">
         1000
     </line_editor>
@@ -654,7 +660,7 @@ sold with objects
      layout="topleft"
      left="260"
      name="currency_est"
-     top="399"
+     top="409"
      width="178">
         for approx. US$ [AMOUNT2]
     </text>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 6cb044cda1..467168ebd8 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  auto_tile="true"
- height="320"
+ height="340"
  layout="topleft"
  name="item properties"
  save_rect="true"
@@ -185,33 +185,160 @@
      name="OwnerLabel"
      top="125"
      width="78">
-        You can:
+        You:
     </text>
     <check_box
      height="16"
-     label="Modify"
+     label="Edit"
      layout="topleft"
-     left_delta="0"
+     left_pad="5"
      name="CheckOwnerModify"
-     top_pad="4"
+     top_delta="0"
      width="78" />
     <check_box
      height="16"
      label="Copy"
      layout="topleft"
-     left_delta="78"
+     left_delta="0"
      name="CheckOwnerCopy"
-     top_delta="0"
+     top_pad="5"
      width="88" />
     <check_box
      height="16"
-     label="Resell/Give away"
+     label="Resell"
      layout="topleft"
-     left_delta="88"
+     left_delta="0"
      name="CheckOwnerTransfer"
+     top_pad="5"
+     width="106" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="AnyoneLabel"
+     top_pad="5"
+     width="78">
+        Anyone:
+    </text>
+    <check_box
+     height="16"
+     label="Copy"
+     layout="topleft"
+     left_pad="5"
+     name="CheckEveryoneCopy"
      top_delta="0"
+     width="130" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="GroupLabel"
+     top_pad="5"
+     width="78">
+        Group:
+    </text>
+    <check_box
+     height="16"
+     label="Share"
+     layout="topleft"
+     left_pad="5"
+     name="CheckShareWithGroup"
+     top_delta="5"
      width="106" />
     <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="NextOwnerLabel"
+     top_pad="5"
+     width="78">
+        Next owner:
+    </text>
+    <check_box
+     height="16"
+     label="Edit"
+     layout="topleft"
+     left_pad="5"
+     name="CheckNextOwnerModify"
+     top_delta="0"
+     width="78" />
+    <check_box
+     height="16"
+     label="Copy"
+     layout="topleft"
+     left_delta="0"
+     name="CheckNextOwnerCopy"
+     top_pad="5"
+     width="88" />
+    <check_box
+     height="16"
+     label="Resell"
+     layout="topleft"
+     left_delta="0"
+     name="CheckNextOwnerTransfer"
+     top_pad="5"
+     width="106" />
+    <check_box
+     height="16"
+     label="For Sale"
+     layout="topleft"
+     left="10"
+     name="CheckPurchase"
+     top_pad="5"
+     width="78" />
+     <combo_box
+     height="19"
+     left_pad="5"
+     layout="topleft"
+     follows="left|top"
+     name="combobox sale copy"
+     width="90">
+        <combo_box.item
+         label="Copy"
+         name="Copy"
+         value="Copy" />
+        <combo_box.item
+         label="Original"
+         name="Original"
+         value="Original" />
+    </combo_box>
+    <spinner
+        follows="left|top"
+        decimal_digits="0"
+        increment="1"
+        control_name="Edit Cost"
+        name="Edit Cost"
+        label="Price: L$"
+        label_width="60"
+        left="10"
+        width="180"
+        min_val="1"
+        height="19"
+        max_val="999999999"
+        top_pad="5"/>
+
+    <!--line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top|right"
+     height="16"
+     layout="topleft"
+     left_pad="5"
+     max_length="25"
+     name="EditPrice"
+     top_delta="0"
+     width="242" /-->
+
+    <!--text
      type="string"
      length="1"
      follows="left|top"
@@ -270,60 +397,8 @@
      top_delta="0"
      width="90">
         N:
-    </text>
-    <check_box
-     height="16"
-     label="Share with group"
-     layout="topleft"
-     left="10"
-     name="CheckShareWithGroup"
-     top="171"
-     width="106" />
-    <check_box
-     height="16"
-     label="Allow anyone to copy"
-     layout="topleft"
-     left_delta="0"
-     name="CheckEveryoneCopy"
-     top_pad="16"
-     width="130" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     name="NextOwnerLabel"
-     top_pad="16"
-     width="88">
-        Next owner can:
-    </text>
-    <check_box
-     height="16"
-     label="Modify"
-     layout="topleft"
-     left_delta="0"
-     name="CheckNextOwnerModify"
-     top_pad="4"
-     width="78" />
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_delta="78"
-     name="CheckNextOwnerCopy"
-     top_delta="0"
-     width="88" />
-    <check_box
-     height="16"
-     label="Resell/Give away"
-     layout="topleft"
-     left_delta="88"
-     name="CheckNextOwnerTransfer"
-     top_delta="0"
-     width="106" />
-    <text
+    </text-->
+        <!--text
      type="string"
      length="1"
      follows="left|top"
@@ -331,19 +406,13 @@
      layout="topleft"
      left="10"
      name="SaleLabel"
-     top="265"
+     top_pad="5"
      width="330">
         Mark Item:
-    </text>
-    <check_box
-     height="16"
-     label="For Sale"
-     layout="topleft"
-     left_delta="0"
-     name="CheckPurchase"
-     top_pad="4"
-     width="78" />
-    <radio_group
+    </text-->
+    
+
+    <!--radio_group
      draw_border="false"
      follows="left|top|right"
      height="16"
@@ -368,28 +437,19 @@
          name="radio2"
          top_delta="0"
          width="70" />
-    </radio_group>
-    <text
+    </radio_group-->
+    
+    <!--text
      type="string"
      length="1"
      follows="left|top"
      height="16"
      layout="topleft"
-     left="42"
+     left="10"
      name="TextPrice"
-     top="299"
-     width="56">
-        Price:  L$
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_delta="56"
-     max_length="25"
-     name="EditPrice"
-     top_delta="0"
-     width="242" />
+     top_pad="5"
+     width="78">
+        Price: L$
+    </text-->
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
index 02a2f83d14..ff89e20ea5 100644
--- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
@@ -7,7 +7,7 @@
 	</menu_item_call>
 	
 	<menu_item_separator />
-	<menu_item_check bottom_delta="-18" height="18" label="Show Muted Text" left="0" mouse_opaque="true"
+	<menu_item_check bottom_delta="-18" height="18" label="Show Blocked Text" left="0" mouse_opaque="true"
 	     name="muted_text" width="128">
     	<menu_item_check.on_click function="NearbyChat.Action" userdata="muted_text" />
 		<menu_item_check.on_check function="NearbyChat.Check" userdata="muted_text"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2bb3c887f5..40847b28fe 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -205,7 +205,7 @@
              function="Floater.Toggle"
              parameter="active_speakers" />
         </menu_item_check>
-        <menu_item_check
+        <!--menu_item_check
          label="Block List"
          layout="topleft"
          name="Mute List">
@@ -215,7 +215,7 @@
             <menu_item_check.on_click
              function="Floater.Toggle"
              parameter="mute" />
-        </menu_item_check>
+        </menu_item_check-->
         <menu_item_separator
          layout="topleft" />
         <menu_item_check
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 71b5f78d59..fcae65dd69 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -42,6 +42,7 @@ Hover your mouse over the options for more help.
     <line_editor
      follows="left|top"
      font="SansSerifSmall"
+     prevalidate_callback="asci"
      halign="left"
      height="16"
      label="Type your new group name here"
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index a0ac9df8a5..e616389c36 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -1,205 +1,121 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- follows="top|left|right|bottom"
  bevel_style="in"
- height="625"
- label="Notes and Privacy"
+ follows="left|top|right|bottom"
+ height="570"
+ width="295"
+ border="false"
  layout="topleft"
- left="10"
- name="panel_notes"
- top="10"
- width="305">
+ left="0"
+ top="0"
+ label="Notes &amp; Privacy"
+ name="panel_notes">
     <scroll_container
-     left="8" 
-     width="260" 
-     height="570" 
+     color="DkGray2"
      follows="left|top|right|bottom"
+     height="570"
+     width="265"
      layout="topleft"
-     name="profile_scroll"
+     left="5"
+     top_pad="0"
+ bevel_style="in"
      opaque="true"
-     color="DkGray2"
+     name="profile_scroll"
      reserve_scroll_corner="false">
-        <panel
-         layout="topleft"
-         width="260"
-         height="530"
-         left="0"
-         follows="left|right"
-         top="0">
-           <!-- <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerifHugeBold"
-             height="20"
-             layout="topleft"
-             left="10"
-             name="pick_title"
-             text_color="white"
-             top="10"
-             width="250"
-             word_wrap="true">
-                Private Notes
-            </text>-->
             <text
              type="string"
              length="1"
              follows="left|top"
              font="SansSerifBold"
-             height="15"
-             layout="topleft"
-             left="10"
+             height="16"
+             width="225"
+             left="0"
              name="status_message"
-             text_color="White"
-             top="20"
-             width="260">
-                Your private notes:
+             text_color="white"
+             top="">
+               My private notes:
             </text>
             <text_editor
-             bg_focus_color="LtGray"
-             bg_writeable_color="LtGray"
-             follows="left|right"
-             font="SansSerif"
              height="200"
+             follows="left|top"
+             width="243"
              hide_scrollbar="true"
-             layout="topleft"
              left="10"
              max_length="1000"
              name="notes_edit"
              text_color="black"
              top_pad="10"
-             width="240"
              word_wrap="true" />
-           <!-- <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerifHugeBold"
-             height="20"
-             layout="topleft"
-             left="10"
-             name="pick_title2"
-             text_color="white"
-             top_pad="10"
-             width="250"
-             word_wrap="true">
-                Private Settings
-            </text> -->
            <text
              type="string"
              length="1"
              follows="left|top"
              font="SansSerifBold"
-             height="15"
-             layout="topleft"
+             height="16"
+             width="225"
              left="10"
              name="status_message2"
              text_color="white"
-             top_pad="30"
-             width="260">
-                Allow this user to:
+             top_pad="30">
+                Let this person:
             </text>
             <check_box
              enabled="false"
              follows="left|top"
-             font="SansSerif"
+             width="230"
              height="20"
              label="See my online status"
-             layout="topleft"
-             left="10"
-             name="status_check"
-             text_disabled_color="0.1 0.1 0.1 1"
-             text_enabled_color="white"
+             left="20"
              top_pad="10"
-             width="260" />
+             name="status_check" />
             <check_box
              enabled="false"
              follows="left|top"
-             font="SansSerif"
+             width="230"
              height="20"
              label="See me on the map"
-             layout="topleft"
-             left="10"
-             name="map_check"
-             text_disabled_color="0.1 0.1 0.1 1"
-             text_enabled_color="white"
+             left="20"
              top_pad="10"
-             width="260" />
+             name="map_check"/>
             <check_box
              enabled="false"
              follows="left|top"
-             font="SansSerif"
+             width="230"
              height="20"
              label="Edit, delete or take my objects"
-             layout="topleft"
-             left="10"
-             name="objects_check"
-             text_disabled_color="0.1 0.1 0.1 1"
-             text_enabled_color="white"
+             left="20"
              top_pad="10"
-             width="260" />
-        </panel>
+             name="objects_check" />
     </scroll_container>
     <panel
-	 layout="topleft"
-     follows="bottom"
+     follows="bottom|left"
      height="30"
-     left="8"
-     name="notes_buttons_panel"
-     bottom="625"
-     width="280">
-        <button
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Add Friend"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="add_friend"
-         top="0"
-         width="90" />
-        <button
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="IM"
-         layout="topleft"
-         left_pad="0"
-         name="im"
-         top="0"
-         width="40" />
-        <button
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Call"
-         layout="topleft"
-         left_pad="0"
-         name="call"
-         top="0"
-         width="50"
-         enabled="false"/>
+     width="280"
+     layout="topleft"
+     left="10"
+     top_pad="5"
+     name="notes_buttons_panel">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Teleport"
          layout="topleft"
-         left_pad="0"
-         name="teleport"
+         left="0"
+         name="teleport_btn"
+         enabled="false"
          top="0"
          width="75" />
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
-         label="Share"
+         label="Show on Map"
          layout="topleft"
          left_pad="0"
-         name="share"
+         name="show_on_map_btn"
+         enabled="false"
          top="0"
-         width="60"
-         enabled="false"/>
+         width="105" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 6b3f5eaee1..dc12bb7239 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
   layout="topleft"
+  font="SansSerifBigBold"
   top="0"
   left="0"
   width="305"
   height="465"
-  follows="left|top|right|bottom"  
-  background_visible="true"
+  follows="left|top|right|bottom"
+     background_visible="true"
+     bg_alpha_color="DkGray2"
+ bevel_style="in"
   label="People"
   name="people_panel">
   <filter_editor
     layout="topleft"
     top="3"
-    left="15"
-    width="270"
-    height="20"
+    left="10"
+    width="256"
+    height="23"
     follows="left|top|right"
     max_length="270"
     label="Filter People"
@@ -22,7 +25,7 @@
     font="SansSerif"
     background_image="TextField_Search_Off"
     text_pad_left="23"
-    text_color="black"/>
+    text_color="black" />
   <button
           name="people_search"
           layout="topleft"
@@ -39,8 +42,8 @@
   <tab_container
     layout="topleft"
     top="30"
-    left="10"
-    width="280"
+     left="10"
+    width="295"
     height="400"
     follows="left|top|right|bottom"
     name="tabs"
@@ -50,8 +53,8 @@
       height="390"
       width="280"
       follows="left|top|right|bottom"
-      background_visible="true"
-      bevel_style="bright" 
+      background_visible="false"
+      bevel_style="none"
       label="Nearby"
       name="nearby_panel">
       <avatar_list
@@ -62,7 +65,7 @@
         height="357"
         follows="left|top|right|bottom"
         name="avatar_list"
-		volume_column_width="20"/>
+	volume_column_width="20"/>
       <panel
         layout="topleft"
         bottom="390"
@@ -71,7 +74,7 @@
         height="30"
         follows="left|right|bottom"
         background_visible="true"
-        bevel_style="bright"
+        bevel_style="none"
         label="bottom_panel"
         name="bottom_panel">
         <button
@@ -96,7 +99,7 @@
       width="280"
       follows="left|top|right|bottom"
       background_visible="true"
-      bevel_style="bright" 
+      bevel_style="none"
       label="Friends"
       name="friends_panel">
       <avatar_list
@@ -115,7 +118,7 @@
         height="30"
         follows="left|right|bottom"
         background_visible="true"
-        bevel_style="in"
+        bevel_style="none"
         label="bottom_panel"
         name="bottom_panel">
          <button
@@ -163,10 +166,10 @@
     <panel
       layout="topleft"
       height="390"
-      width="280"  
+      width="280"
       follows="left|top|right|bottom"
       background_visible="true"
-      bevel_style="bright" 
+      bevel_style="none"
       label="Groups"
       name="groups_panel">
       <group_list
@@ -185,7 +188,7 @@
         height="30"
         follows="left|right|bottom"
         background_visible="true"
-        bevel_style="in"
+        bevel_style="none"
         label="bottom_panel"
         name="bottom_panel">
         <button
@@ -240,7 +243,7 @@
           hover_glow_amount="0.15"
           image_selected="TrashItem_Press"
           image_unselected="TrashItem_Off"
-          picture_style="true"/> 
+          picture_style="true"/>
         </panel>
     </panel>
     <panel
@@ -249,8 +252,8 @@
       width="280"
       follows="left|top|right|bottom"
       background_visible="true"
-      bevel_style="bright"
-      label="Recent"
+      bevel_style="none"
+      label="History"
       name="recent_panel">
       <avatar_list
         layout="topleft"
@@ -268,7 +271,7 @@
         height="30"
         follows="left|right|bottom"
         background_visible="true"
-        bevel_style="in"
+        bevel_style="none"
         label="bottom_panel"
         name="bottom_panel">
         <button
@@ -293,7 +296,7 @@
     follows="left|right|bottom"
     bottom="6"
     left="6"
-    width="280"
+    width="295"
     height="27"
     orientation="horizontal"
     animate="false"
@@ -478,7 +481,7 @@
         follows="top|right"
         font="SansSerifSmallBold"/>
     </layout_panel>
-  </layout_stack> 
+  </layout_stack>
   <string name="no_people">
     No people
   </string>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 393521f1d2..1425246540 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -1,24 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+ follows="left|top|right|bottom"
  bevel_style="in"
- height="660"
+ height="625"
+ width="280"
  layout="topleft"
  left="0"
  name="panel_pick_info"
- top="0"
- width="305">
-    <button
-     follows="top|left"
-     height="20"
-     image_overlay="navbar_back.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
-     layout="topleft"
-     left="10"
-     name="back_btn"
-     picture_style="true"
-     top="5"
-     width="20" />
+ top="0">
     <text
      type="string"
      length="1"
@@ -33,15 +22,24 @@
      width="150">
         Pick Info
     </text>
+   <button
+     follows="top|right"
+     right="-25"
+     top="10"
+     width="20"
+     height="20"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back_btn"
+     picture_style="true" />
     <panel
      follows="left|right|top|bottom"
-     height="580"
+     min_height="300"
      width="280"
      layout="topleft"
      background_visible="true"
      bg_alpha_color="DkGray2"
      left="10"
-     right="-10"
      top="30">
         <texture_picker
          enabled="false"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 1a06e2bb06..78bec6035f 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -1,63 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- bg_alpha_color="0.4 0.4 0.4 1"
- bg_opaque_color="0.4 0.4 0.4 1"
- border="true"
- follows="top|left|right"
- height="80"
- layout="topleft"
+ border="false"
+ follows="top|left|right|bottom"
+ top="0"
  left="0"
- name="picture_item"
- top="80"
- width="245">
+ height="100"
+     width="265"
+ name="picture_item">
     <texture_picker
      allow_no_texture="true"
      default_image_name="None"
      enabled="false"
      follows="left|top"
-     height="80"
+     height="100"
+     width="100"
      layout="topleft"
-     left="5"
+     left="10"
+     bottom_pad="10"
      mouse_opaque="false"
      name="picture"
      tab_stop="false"
-     top="7"
-     width="70" />
+     top="10" />
     <text
      follows="top|left|right"
-     font="SansSerif"
-     height="20"
+     font="SansSerifTiny"
+     height="16"
      layout="topleft"
-     left="80"
+     left="120"
      name="picture_name"
-     text_color="black"
-     top="5"
+     top="10"
+     text_color="white"
      use_ellipses="true"
-     width="150"/>
+     width="120" />
     <text
      follows="top|left|right"
-     font="SansSerifSmall"
-     height="40"
+     font="SansSerifTiny"
+     height="60"
+     width="140"
+     top_pad="0"
      layout="topleft"
      name="picture_descr"
-     text_color="white"
-     top="25"
      use_ellipses="true"
-     width="150"
      word_wrap="true" />
     <button
      follows="top|right"
-     height="20"
-     image_disabled="navbar_bg_button.tga"
-     image_disabled_selected="navbar_bg_button.tga"
-     image_overlay="navbar_forward.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
+     height="16"
+     image_selected="Info"
+     image_unselected="Info"
      layout="topleft"
      name="info_chevron"
      picture_style="true"
-     right="-5"
      tab_stop="false"
-     top="28"
-     width="20" />
+     top="6"
+     left="233"
+     width="16" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 5b66026f48..2be9f900da 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -2,78 +2,64 @@
 <panel
  bevel_style="in"
  follows="left|top|right|bottom"
- height="625"
- label="Picks"
+ height="570"
+ width="295"
+ border="false"
  layout="topleft"
  left="0"
- name="panel_picks"
  top="0"
- width="305">
-    <!--<text
-     type="string"
-     length="1"
-     follows="top|left|right"
-     font="SansSerifHugeBold"
-     height="50"
+ label="Picks"
+ name="panel_picks">
+    <scroll_container
+     color="DkGray2"
+     follows="left|top|right|bottom"
+     height="570"
+     width="265"
      layout="topleft"
-     left="10"
-     name="pick_title"
-     text_color="white"
-     top="10"
-     width="270"
-     word_wrap="true">
-        [NAME]&apos;s favorite places in Second Life...
-    </text>-->
-    <!-- below is a special title shown for the Agent on the "Picks" tab-->
+     left="5"
+     top_pad="0"
+ bevel_style="in"
+     opaque="true"
+     name="profile_scroll"
+     reserve_scroll_corner="false">
+<!-- below is a special title shown for the Agent on the "Picks" tab
     <text
      type="string"
      length="1"
      follows="top"
      font="SansSerifBold"
      height="35"
+     width="250"
      layout="topleft"
      left="10"
      name="pick_title_agent"
      text_color="white"
-     top="10"
-     visible="false" 
-     width="270"
+     top_pad="25"
+     visible="false"
      word_wrap="true">
         Tell everyone about your favorite Second Life places...
-    </text>
-    <scroll_container
-     follows="left|top|right|bottom"
-     height="495"
-     layout="topleft"
-     left="8"
-     name="profile_scroll"
-     opaque="true"
-     color="DkGray2"
-     reserve_scroll_corner="false"
-     top_pad="0"
-     width="260">
+    </text>-->
         <panel
-         bevel_style="in"
-         height="40"
+         height="115"
+     width="265"
          layout="topleft"
          left="0"
          name="back_panel"
-         top="0"
-         width="260" />
+         top="0" />
     </scroll_container>
-    <panel
+   <panel
      background_visible="true"
-     bevel_style="in"
+     bevel_style="none"
      enabled="false"
      follows="left|right|bottom"
-     height="25"
+     height="30"
      label="bottom_panel"
      layout="topleft"
-     left="8"
+     left="0"
      name="edit_panel"
      visible="false"
      top_pad="0"
-     width="260">
+     width="280">
         <button
          enabled="false"
          follows="bottom|left"
@@ -123,29 +109,18 @@
     <panel
      follows="bottom|left"
      height="30"
+     width="280"
      layout="topleft"
-     left="8"
-     name="buttons_cucks"
-     bottom="625"
-     width="280">
-        <button
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Info"
-         layout="topleft"
-         left="0"
-         name="info_btn"
-         enabled="false"
-         top="0"
-         width="60" />
+     left="10"
+     top_pad="5"
+     name="buttons_cucks">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Teleport"
          layout="topleft"
-         left_pad="0"
+         left="0"
          name="teleport_btn"
          enabled="false"
          top="0"
@@ -161,16 +136,5 @@
          enabled="false"
          top="0"
          width="105" />
-        <button
-         enabled="false"
-         follows="bottom|right"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Verb"
-         layout="topleft"
-         left_pad="0"
-         name="verb_btn"
-         top="0"
-         width="60" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 13efa7bcff..c154c5d21e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -13,24 +13,15 @@
         
         <!-- ADVANCED -->
 
-    <check_box
-     control_name="SmallAvatarNames"
-     height="16"
-     initial_value="true"
-     label="Small Avatar Names"
-     layout="topleft"
-     left_delta="30"
-     name="small_avatar_names_checkbox"
-     top="20"
-     width="200" />
+
     <check_box
      control_name="ArrowKeysMoveAvatar"
      height="16"
      label="Arrow keys always move avatar when chatting"
      layout="topleft"
-     left_delta="0"
+     left_delta="30"
      name="arrow_keys_move_avatar_check"
-     top_pad="10"
+     top="20"
      width="237" />
     <text
      type="string"
@@ -253,6 +244,17 @@
      name="first_person_avatar_visible"
      top_delta="0"
      width="256" />
+    
+        <check_box
+     control_name="UseChatBubbles"
+     height="16"
+     label="Show chat bubbles"
+     layout="topleft"
+     left="30"
+     name="bubble_text_chat"
+     top_pad="5"
+     width="400" />
+
 
 
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 89d96b015f..f4696152f9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -277,15 +277,6 @@
      name="play_typing_animation"
      top_pad="40"
      width="400" />
-    <check_box
-     control_name="UseChatBubbles"
-     height="16"
-     label="Show chat bubbles"
-     layout="topleft"
-     left_delta="0"
-     name="bubble_text_chat"
-     top_pad="5"
-     width="400" />
     <check_box
      enabled="false"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 2d42757150..95d8d2ce2a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -263,13 +263,23 @@
      name="show_my_name_checkbox"
      top_pad="5"
      width="300" />
+    <check_box
+     control_name="SmallAvatarNames"
+     height="16"
+     initial_value="true"
+     label="Small name tags"
+     layout="topleft"
+     left_delta="175"
+     name="small_avatar_names_checkbox"
+     top_delta="0"
+     width="200" />
    <check_box
 	 enabled_control="AvatarNameTagMode"
      control_name="RenderShowGroupTitleAll"
      height="16"
      label="Show group titles"
      layout="topleft"
-     left_delta="0"
+     left_delta="-175"
      name="show_all_title_checkbox"
      top_pad="5"
      width="300" />
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 2b21c05283..7d2f76da5e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -2,21 +2,22 @@
 <panel
  bevel_style="in"
  follows="left|top|right|bottom"
- height="625"
- label="Profile"
+ height="570"
+ width="295"
+ border="false"
  layout="topleft"
- left="10"
+ left="0"
+ top="0"
+ label="Profile"
  mouse_opaque="false"
- name="panel_profile"
- top="10"
- width="305">
+ name="panel_profile">
     <panel.string
      name="CaptionTextAcctInfo">
         [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
     </panel.string>
     <panel.string
      name="AcctTypeResident">
-        Resident.
+        Resident
     </panel.string>
     <panel.string
      name="AcctTypeTrial">
@@ -70,51 +71,41 @@
      color="DkGray2"
      follows="left|top|right|bottom"
      height="570"
+     width="265"
      layout="topleft"
-     left="8"
-     name="profile_scroll"
+     left="5"
+     top_pad="0"
+     border="false"
      opaque="true"
-     reserve_scroll_corner="false"
-     width="260">
+     name="profile_scroll"
+     reserve_scroll_corner="false">
          <panel
-         height="680"
+         height="300"
          layout="topleft"
          left="0"
          top="0"
-         width="280">
-            <text 
-             type="string"
-             follows="top|left|right"
-             font="SansSerifHugeBold" 
-             height="20" 
-             layout="topleft" 
-             left="9" 
-             name="user_name" 
-             text_color="white" 
-             top="0" 
-             mouse_opaque="true" 
-             width="250">
-              (Loading...)
-            </text> 
+ bevel_style="in"
+     width="265">
                <panel
                  follows="left|top"
                  height="100"
                  layout="topleft"
                  left="10"
+ bevel_style="in"
                  name="second_life_image_panel"
                  top="20"
-                 width="250">
+                 width="230">
                     <texture_picker
                      allow_no_texture="true"
                      default_image_name="None"
                      enabled="false"
                      follows="top|left"
-                     height="100"
+                     height="125"
                      layout="topleft"
                      left="0"
                      name="2nd_life_pic"
                      top="0"
-                     width="100" />
+                     width="125" />
                     <text
              type="string"
              follows="left|top"
@@ -130,12 +121,12 @@
             </text>
             <text
              type="string"
-             top_pad="4"
+             left_pad="10"
+             top_pad="5"
              follows="left|top|right"
              font="SansSerifSmall"
-             height="75"
+             height="125"
              layout="topleft"
-             left_delta="0"
              name="sl_description_edit"
              text_color="LtGray"
              width="125"
@@ -147,7 +138,7 @@
                  follows="left|top"
                  height="100"
                  layout="topleft"
-                 left="10" 
+                 left="10"
                  name="first_life_image_panel"
                  top_pad="20"
                  width="125">
@@ -156,12 +147,12 @@
                      default_image_name="None"
                      enabled="false"
                      follows="top|left"
-                     height="100"
+                     height="125"
                      layout="topleft"
                      left="0"
                      name="real_world_pic"
                      top_pad="0"
-                     width="100" />
+                     width="125" />
                     <text
              type="string"
              follows="left|top"
@@ -179,9 +170,9 @@
              type="string"
              follows="left|top|right"
              font="SansSerifSmall"
-             height="45"
+             height="125"
              layout="topleft"
-             left_delta="0"
+             left_pad="10"
              top_pad="10"
              name="fl_description_edit"
              text_color="LtGray"
@@ -190,61 +181,17 @@
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </text>
                   </panel>
-            <text
-             type="string"
-             follows="left|top"
-             font="SansSerifBold"
-             height="15"
-             layout="topleft"
-             halign="right"
-             left="10"
-             name="title_groups_text"
-             text_color="white"
-             top_pad="20"
-             width="100">
-                Groups:
-            </text>
             <text
              type="string"
              follows="left|top|right"
              font="SansSerifSmall"
-             height="45"
-             layout="topleft"
-             left_pad="10"
-             top_delta="0"
-             name="sl_groups"
-             text_color="LtGray"
-             width="125"
-             word_wrap="true">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-            </text>
-            <text
-             type="string"
-             follows="left|top"
-             font="SansSerifBold"
              height="15"
-             halign="right"
-             layout="topleft"
-             left="10"
-             name="title_homepage_text"
-             text_color="white"
              top_pad="20"
-             width="100">
-                Homepage:
-            </text>
-            <text
-             type="string"
-             follows="left|top|right"
-             font="SansSerifSmall"
-             font.style="UNDERLINE"
-             font_shadow="hard" 
-             height="15"
-             top_delta="0"
              layout="topleft"
-             left_pad="10"
+             left="10"
              name="homepage_edit"
-             text_color="0.2 0.2 1 1"
-             width="125">
+             text_color="HTMLLinkColor"
+             width="280">
                 TODO
             </text>
             <text
@@ -287,7 +234,7 @@
              name="title_acc_status_text"
              text_color="white"
              width="100">
-                Account status:
+                Status:
             </text>
             <text
              type="string"
@@ -343,38 +290,61 @@
                  type="string"
                  follows="top|right"
                  font="SansSerifSmall"
-                 font.style="UNDERLINE"
-                 font_shadow="hard" 
                  height="15"
                  layout="topleft"
                  left_delta="0"
                  name="partner_edit_link"
-                 text_color="0.2 0.2 1 1"
+                 text_color="HTMLLinkColor"
                  top_delta="15"
                  width="40">
                     Edit
                 </text>
             </panel>
-           
-           <panel
+            <text
+             type="string"
+             follows="left|top"
+             font="SansSerifBold"
+             height="15"
+             layout="topleft"
+             halign="right"
+             left="10"
+             name="title_groups_text"
+             text_color="white"
+             top_pad="20"
+             width="100">
+                Groups:
+            </text>
+            <text
+             type="string"
+             follows="left|top|right|bottom"
+             font="SansSerifSmall"
+             height="120"
+             layout="topleft"
+             left_pad="10"
+             top_delta="0"
+             name="sl_groups"
+             text_color="LtGray"
+             width="125"
+             word_wrap="true">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+            </text>
+           <!--panel
              follows="left|top|right"
              height="15"
              layout="topleft"
              left="50"
-             top_pad="40"
+             top_pad="30"
              name="account_actions_panel"
              width="200">
                 <text
                  type="string"
                  follows="left|top"
                  font="SansSerif"
-                 font.style="UNDERLINE"
-                 font_shadow="hard" 
                  height="15"
                  layout="topleft"
                  left="0"
                  name="payment_update_link"
-                 text_color="0.2 0.2 1 1"
+                 text_color="HTMLLinkColor"
                  top="0"
                  width="100">
                     Update
@@ -383,21 +353,19 @@
                  type="string"
                  follows="left|top"
                  font="SansSerif"
-                 font.style="UNDERLINE"
-                 font_shadow="hard" 
                  height="15"
                  layout="topleft"
                  left="70"
                  name="my_account_link"
-                 text_color="0.2 0.2 1 1"
+                 text_color="HTMLLinkColor"
                  top="0"
                  width="80">
                     My Account
                 </text>
-            </panel>
-           
-           
-           
+            </panel-->
+
+
+
            <!--
            <panel
              follows="left|top|right"
@@ -431,14 +399,14 @@
                     TBD
                  </text>
         </panel>  -->
-            <panel
+            <!--panel
              follows="left|top|right"
              height="80"
              layout="topleft"
              left="0"
              name="status_me_panel"
              top_pad="20"
-             width="250">
+             width="125">
                 <text
                  type="string"
                  follows="left|top"
@@ -499,25 +467,25 @@
                  name="status_me_message_edit"
                  select_on_focus="true"
                  text_color="0.5 0.5 0.5 1"
-                 width="250">
+                 width="230">
                     Type a message about what you&apos;re doing in SL!
                 </line_editor>
+            </panel-->
+
+
+
+
             </panel>
-            
-         
-            
-            
-            </panel>
-            
+
     </scroll_container>
     <panel
-     bottom="625"
      follows="bottom|left"
      height="30"
+     width="280"
      layout="topleft"
-     left="8"
-     name="profile_buttons_panel"
-     width="280">
+     left="10"
+     top_pad="5"
+     name="profile_buttons_panel">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
@@ -560,7 +528,7 @@
          name="teleport"
          top="0"
          width="75" />
-        <button
+ <!--       <button
          enabled="false"
          follows="bottom|left"
          font="SansSerifSmallBold"
@@ -570,17 +538,17 @@
          left_pad="0"
          name="share"
          top="0"
-         width="60" />
-    </panel> 
+         width="60" />-->
+    </panel>
    <panel
-     bottom="625"
      follows="bottom|left"
      height="30"
+     width="280"
      layout="topleft"
-     left="8"
-     name="profile_me_buttons_panel"
+     left="10"
+     top_pad="5"
      visible="false"
-     width="345">
+     name="profile_me_buttons_panel">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
@@ -601,5 +569,5 @@
          name="edit_appearance_btn"
          top="0"
          width="130" />
-    </panel> 
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 2466480d16..a14d8bbc6b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -2,63 +2,76 @@
 <panel
  background_visible="true"
  follows="left|top|right|bottom"
- height="660"
+  width="305"
+  height="650"
  label="Profile"
+ bevel_style="in"
  layout="topleft"
  left="0"
  name="panel_target_profile"
- top="0"
- width="250">
-    <button 
-     layout="topleft" 
-     name="back" 
-     left="5" 
-     top="5" 
-     width="20" 
-     height="20" 
-     label=""
-     tab_stop="false"
-     follows="top|left"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
-     image_overlay="navbar_back.tga"/>
-    <text 
-     layout="topleft" 
-     top="0" 
-     left_pad="15" 
-     width="125" 
-     height="20" 
-     font="SansSerifHugeBold" 
-     text_color="white" 
+ top="0">
+    <text
+     layout="topleft"
+     top="0"
+     left="10"
+     width="250"
+     height="20"
+     font="SansSerifHugeBold"
+     text_color="white"
      follows="top|left|right"
-     mouse_opaque="true" 
+     mouse_opaque="true"
      name="user_name">(Loading...)</text>
+    <text
+     layout="topleft"
+     width="100"
+     height="16"
+     left="10"
+     top_pad="5"
+     font="SansSerifTiny"
+     text_color="LtGray_50"
+     follows="top|left"
+     mouse_opaque="true"
+     name="status">Online</text>
+    <button
+     layout="topleft"
+     name="back"
+     right="-10"
+     top="0"
+     width="25"
+     height="25"
+     label=""
+     tab_stop="false"
+     follows="top|right"
+     image_selected=""
+     image_unselected=""
+     image_overlay="BackArrow_Off" />
     <tab_container
      follows="left|top|right|bottom"
-     height="625"
+     height="550"
+     width="306"
+     tab_min_width="75"
      layout="topleft"
-     left="0"
+     left="10"
      name="tabs"
      tab_position="top"
-     top="35"
-     width="280">
+     top_pad="20">
         <panel
          class="panel_profile"
          filename="panel_profile.xml"
          label="Profile"
          layout="topleft"
-         name="panel_profile"/>
+         name="panel_profile" />
         <panel
          class="panel_picks"
          filename="panel_picks.xml"
          label="Picks"
          layout="topleft"
-         name="panel_picks"/>
+         name="panel_picks" />
         <panel
          class="panel_notes"
          filename="panel_notes.xml"
-         label="Notes"
+         label="Notes &amp; Privacy"
          layout="topleft"
-         name="panel_notes"/>
+         name="panel_notes" />
     </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 9bf401d817..82b7e02aeb 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -34,6 +34,10 @@
     <panel.string
      name="timeTooltip">
         [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
+    </panel.string>
+	<panel.string
+     name="buycurrencylabel">
+        L$ [AMT]
     </panel.string>
     <button
      auto_resize="true"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bc364687e9..fb3d3b4dea 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -733,7 +733,195 @@ If you continue to receive this message, contact customer support.
 If you continue to receive this message, contact customer support.
 	</string>
 
-	<!-- Group Information -->
-	
-	
+	<!-- Avatar Shape Information -->
+    <string name="Attached Earlobes">Attached Earlobes</string>
+	<string name="Arm Length">Arm Length</string>	
+    <string name="Back Bangs Down">Back Bangs Down</string>
+    <string name="Back Bangs Up">Back Bangs Up</string>
+    <string name="Back Hair Down">Back Hair Down</string>
+    <string name="Back Hair Up">Back Hair Up</string>
+    <string name="Belly Size">Belly Size</string>	
+	<string name="Blonde Hair">Blonde Hair</string>
+    <string name="Big Eyeball">Big Eyeball</string>
+    <string name="Big Hair Back">Big Hair Back</string>
+    <string name="Big Hair Front">Big Hair Front</string>
+    <string name="Big Hair Top">Big Hair Top</string>
+	<string name="Body Fat">Body Fat</string>
+    <string name="Body Thickness">Body Thickness</string>
+    <string name="Breast Buoyancy">Breast Buoyancy</string>
+    <string name="Breast Cleavage">Breast Cleavage</string>
+	<string name="Breast Size">Breast Size</string>
+    <string name="Bridge Width">Bridge Width</string>
+    <string name="Brow Size">Brow Size</string>
+    <string name="Butt Size">Butt Size</string>
+    <string name="Cheek Bones">Cheek Bones</string>
+    <string name="Chest Size">Chest Size</string>
+    <string name="Chin Angle">Chin Angle</string>
+    <string name="Chin Cleft">Chin Cleft</string>
+    <string name="Chin Depth">Chin Depth</string>
+    <string name="Chin-Neck">Chin-Neck</string>
+	<string name="Collar Back">Collar Back</string>
+	<string name="Collar Front">Collar Front</string>
+    <string name="Crooked Nose">Crooked Nose</string>
+    <string name="Cuff Flare">Cuff Flare</string>
+    <string name="Ear Angle">Ear Angle</string>
+    <string name="Ear Size">Ear Size</string>
+    <string name="Ear Tips">Ear Tips</string>
+    <string name="Egg Head">Egg Head</string>
+    <string name="Eye Bags">Eye Bags</string>
+	<string name="Eye Color">Eye Color</string>
+    <string name="Eye Depth">Eye Depth</string>
+	<string name="Eye Lightness">Eye Lightness</string>
+    <string name="Eye Opening">Eye Opening</string>
+    <string name="Eye Pop">Eye Pop</string>
+    <string name="Eye Size">Eye Size</string>
+    <string name="Eye Spacing">Eye Spacing</string>
+    <string name="Eyeball Size">Eyeball Size</string>
+    <string name="Eyebrow Arc">Eyebrow Arc</string>
+    <string name="Eyebrow Height">Eyebrow Height</string>
+    <string name="Eyebrow Points">Eyebrow Points</string>
+    <string name="Eyelash Length">Eyelash Length</string>
+	<string name="Eyeliner">Eyeliner</string>
+	<string name="Eyeliner Color">Eyeliner Color</string>
+	<string name="Face Shear">Face Shear</string>
+	<string name="Facial Definitionr">Facial Definition</string>
+    <string name="Fat Head">Fat Head</string>
+    <string name="Fat Lower Lip">Fat Lower Lip</string>
+    <string name="Fat Torso">Fat Torso</string>
+    <string name="Fat Upper Lip">Fat Upper Lip</string>
+    <string name="Foot Size">Foot Size</string>
+	<string name="Freckles">Freckles</string>
+    <string name="Front Bangs Down">Front Bangs Down</string>
+    <string name="Front Bangs Up">Front Bangs Up</string>
+    <string name="Front Hair Down">Front Hair Down</string>
+    <string name="Front Hair Up">Front Hair Up</string>
+	<string name="Forehead Angle">Forehead Angle</string>
+    <string name="Full Hair Sides">Full Hair Sides</string>
+	<string name="Glove Fingers">Glove Fingers</string> 
+	<string name="Glove Length">Glove Length</string>
+    <string name="Hair Thickess">Hair Thickess</string>
+    <string name="Hair Tilted Left">Hair Tilted Left</string>
+    <string name="Hair Tilted Right">Hair Tilted Right</string>
+    <string name="Hair Volume">Hair Volume</string>
+	<string name="Hand Size">Hand Size</string>
+	<string name="Head Length">Head Length</string>
+    <string name="Head Shape">Head Shape</string>
+    <string name="Head Size">Head Size</string>
+    <string name="Head Stretch">Head Stretch</string>
+    <string name="Heel Height">Heel Height</string>
+    <string name="Heel Shape">Heel Shape</string>
+    <string name="Height">Height</string>
+    <string name="Hip Width">Hip Width</string>
+	<string name="Hip Length">Hip Length</string>
+    <string name="Inner Eye Corner">Inner Eye Corner</string>
+    <string name="Jacket Length">Jacket Length</string>
+    <string name="Jacket Wrinkles">Jacket Wrinkles</string>
+    <string name="Jowls">Jowls</string>	
+    <string name="Jaw Angle">Jaw Angle</string>
+    <string name="Jaw Jut">Jaw Jut</string>
+    <string name="Jaw Shape">Jaw Shape</string>
+    <string name="Knee Angle">Knee Angle</string>
+    <string name="Left Part">Left Part</string>
+    <string name="Leg Muscles">Leg Muscles</string>
+	<string name="Leg Length">Leg Length</string>
+    <string name="Lip Cleft">Lip Cleft</string>
+    <string name="Lip Cleft Depth">Lip Cleft Depth</string>
+    <string name="Lip Fullness">Lip Fullness</string>
+	<string name="Lip Pinkness">Lip Pinkness</string>
+    <string name="Lip Ratio">Lip Ratio</string>
+    <string name="Lip Thickness">Lip Thickness</string>	
+    <string name="Lip Width">Lip Width</string>
+    <string name="Longcuffs">Longcuffs</string>
+    <string name="Love Handles">Love Handles</string>
+    <string name="Lower Bridge">Lower Bridge</string>
+    <string name="Lower Cheeks">Lower Cheeks</string>
+    <string name="Middle Part">Middle Part</string>
+    <string name="Mouth Corner">Mouth Corner</string>
+    <string name="Mouth Position">Mouth Position</string>
+	<string name="Nail Polish">Nail Polish</string>
+	<string name="Nail Polish Color">Nail Polish Color</string>
+	<string name="Neck Length">Neck Length</string>
+	<string name="Neck Thickness">Neck Thickness</string>
+    <string name="Nose Size">Nose Size</string>
+    <string name="Nose Thickness">Nose Thickness</string>
+    <string name="Nose Tip Angle">Nose Tip Angle</string>
+    <string name="Nose Tip Shape">Nose Tip Shape</string>
+    <string name="Nose Width">Nose Width</string>
+    <string name="Nostril Division">Nostril Division</string>
+    <string name="Nostril Width">Nostril Width</string>
+    <string name="Open Front">Open Front</string>
+    <string name="Outer Eye Corner">Outer Eye Corner</string>
+	<string name="Outer Shadow">Outer Shadow</string>
+	<string name="Out Shdw Opacity">Out Shdw Opacity</string>
+	<string name="Out Shdw Color">Out Shdw Color</string>	
+    <string name="Package">Package</string>
+    <string name="Pants Crotch">Pants Crotch</string> 
+	<string name="Pants Fit">Pants Fit</string>
+	<string name="Pants Length">Pants Length</string>
+	<string name="Pants Waist">Pants Waist</string>
+	<string name="Pants Wrinkles">Pants Wrinkles</string>
+    <string name="Part Bangs">Part Bangs</string>
+    <string name="Pectorals">Pectorals</string>
+    <string name="Platform Height">Platform Height</string>
+    <string name="Platform Width">Platform Width</string>
+	<string name="Pigment">Pigment</string>
+    <string name="Puffy Eyelids">Puffy Eyelids</string>
+	<string name="Rainbow Color">Rainbow Color</string>
+	<string name="Red Hair">Red Hair</string>
+    <string name="Right Part">Right Part</string>
+    <string name="Round Forehead">Round Forehead</string>
+	<string name="Rosy Complexion">Rosy Complexion</string>
+    <string name="Ruddiness">Ruddiness</string>
+    <string name="Rumpled Hair">Rumpled Hair</string>
+    <string name="Saddle Bags">Saddle Bags</string>
+    <string name="Scrawny Leg">Scrawny Leg</string>
+    <string name="Shear Back">Shear Back</string>
+    <string name="Shear Face">Shear Face</string>
+    <string name="Shear Front">Shear Front</string>
+    <string name="Shift Mouth">Shift Mouth</string>
+	<string name="Shirt Bottom">Shirt Bottom</string>
+    <string name="Shirt Fit">Shirt Fit</string>
+	<string name="Shirt Wrinkles">Shirt Wrinkles</string>
+	<string name="Shoe Height">Shoe Height</string>
+    <string name="Shoulders">Shoulders</string>
+    <string name="Side Bangs Down">Side Bangs Down</string>
+    <string name="Side Bangs Up">Side Bangs Up</string>
+    <string name="Sides Hair Down">Sides Hair Down</string>
+    <string name="Sides Hair Up">Sides Hair Up</string>
+    <string name="Skirt Fit">Skirt Fit</string>
+	<string name="Skirt Length">Skirt Length</string>
+    <string name="Slanted Forehead">Slanted Forehead</string> 
+	<string name="Sleeve Length">Sleeve Length</string>
+    <string name="Sleeve Looseness">Sleeve Looseness</string> 
+	<string name="Slit Back">Slit Back</string> 
+	<string name="Slit Front">Slit Front</string> 
+	<string name="Slit Left">Slit Left</string> 
+	<string name="Slit Right">Slit Right</string> 
+	<string name="Socks Length">Socks Length</string>
+    <string name="Spiked Hair">Spiked Hair</string>
+    <string name="Squash/Stretch Head">Squash/Stretch Head</string>
+    <string name="Swept Back Hair">Swept Back Hair</string>
+    <string name="Swept Forward Hair">Swept Forward Hair</string>
+    <string name="Taper Back">Taper Back</string>
+    <string name="Taper Front">Taper Front</string>
+    <string name="Toe Shape">Toe Shape</string>
+    <string name="Toe Thickness">Toe Thickness</string>
+	<string name="Toe Length">Toe Length</string>
+	<string name="Torso Length">Torso Length</string>
+    <string name="Torso Muscles">Torso Muscles</string>
+    <string name="Torso Scrawny">Torso Scrawny</string>
+    <string name="Upper Bridge">Upper Bridge</string>
+    <string name="Upper Cheeks">Upper Cheeks</string>
+    <string name="Upper Chin Cleft">Upper Chin Cleft</string>
+    <string name="Upper Eyelid Fold">Upper Eyelid Fold</string>
+	<string name="Waist Height">Waist Height</string>
+	<string name="White Hair">White Hair</string>
+    <string name="big belly skirt">big belly skirt</string>
+    <string name="bigbutt skirt">bigbutt skirt</string>
+    <string name="bustle skirt">bustle skirt</string>
+    <string name="legs skirt">legs skirt</string>
+    <string name="loose skirt">loose skirt</string>
+    <string name="poofy skirt">poofy skirt</string>
+    <string name="tight skirt">tight skirt</string>	
+	<string name="wrinkles">wrinkles</string>	
 </strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index 97060fb161..bbb5e9b56a 100644
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
@@ -13,5 +13,7 @@
                           image_unselected="Checkbox_Off"
                           image_selected="Checkbox_On"
                           image_disabled="Checkbox_Off_Disabled"
-                          image_disabled_selected="Checkbox_On_Disabled" />
+                          image_disabled_selected="Checkbox_On_Disabled"
+                          image_pressed="Checkbox_Press"
+                          image_pressed_selected="Checkbox_On_Press"/>
 </check_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
index 281a55d5e2..dd848f3acd 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
@@ -5,6 +5,8 @@
                           image_unselected="RadioButton_Off"
                           image_selected="RadioButton_On"
                           image_disabled="RadioButton_Disabled"
-                          image_disabled_selected="RadioButton_On_Disabled"/>
+                          image_disabled_selected="RadioButton_On_Disabled"
+                          image_pressed="RadioButton_Press"
+                          image_pressed_selected="RadioButton_On_Press"/>
 </radio_item>
 
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index b33acf81cc..bc1ca339a2 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -3,5 +3,7 @@
             thumb_outline_color="SliderThumbOutlineColor"
             thumb_center_color="SliderThumbCenterColor"
             thumb_image="SliderThumb_Off"
+            thumb_image_pressed="SliderThumb_Press"
+            thumb_image_disabled="SliderThumb_Disabled" 
             track_image="SliderTrack_Horiz"
             track_highlight_image="SliderTrack_Horiz" />
-- 
cgit v1.3


From 0bf4b5f2222ffb8171be094613363427f3b8470a Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 12 Aug 2009 01:12:27 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll@1277
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
 Fixes: EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280
 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343
 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360
 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396
 EXT-412 Other changes: Movement & Caemra controls work Profile and Me panel
 refactoring Notification refactoring

---
 indra/llui/CMakeLists.txt                          |   2 +
 indra/llui/llbutton.cpp                            |  18 +-
 indra/llui/llbutton.h                              |   6 +-
 indra/llui/llclipboard.cpp                         |   6 +
 indra/llui/llclipboard.h                           |   1 +
 indra/llui/llfiltereditor.cpp                      |   6 +
 indra/llui/llfiltereditor.h                        |   1 +
 indra/llui/llfocusmgr.cpp                          |   4 +-
 indra/llui/lllineeditor.cpp                        |   6 +-
 indra/llui/llmenugl.cpp                            |  11 +-
 indra/llui/llmenugl.h                              |  11 +-
 indra/llui/llscrolllistctrl.cpp                    |   3 +-
 indra/llui/lltextbox.cpp                           |   6 +
 indra/llui/lluictrl.cpp                            |  23 +-
 indra/llui/lluictrl.h                              |  18 +-
 indra/llui/llview.cpp                              |   2 +
 indra/newview/CMakeLists.txt                       |  10 +-
 indra/newview/app_settings/settings.xml            | 107 ++-
 indra/newview/llagent.cpp                          |  82 ++-
 indra/newview/llagent.h                            |  37 +-
 indra/newview/llavataractions.cpp                  |  14 +
 indra/newview/llavataractions.h                    |   5 +
 indra/newview/llavatarlist.cpp                     |  18 -
 indra/newview/llavatarlist.h                       |   8 -
 indra/newview/llbottomtray.cpp                     |  90 +--
 indra/newview/llbottomtray.h                       |   3 +
 indra/newview/llchannelmanager.cpp                 |  21 +-
 indra/newview/llchannelmanager.h                   |   2 +-
 indra/newview/llchatbar.cpp                        |   2 +
 indra/newview/llchatitemscontainerctrl.cpp         | 101 +--
 indra/newview/llchiclet.cpp                        |   8 +-
 indra/newview/llchiclet.h                          |   5 +
 indra/newview/llfavoritesbar.cpp                   | 117 ++--
 indra/newview/llfavoritesbar.h                     |   4 +-
 indra/newview/llfloatercamera.cpp                  |  21 +-
 indra/newview/llfloatergroups.cpp                  |   4 +-
 indra/newview/llfloaterinventory.cpp               |   1 -
 indra/newview/llfloaterland.cpp                    |   7 +-
 indra/newview/llfloaterlandholdings.cpp            |   5 +-
 indra/newview/llfloaternotificationsconsole.cpp    |   9 +-
 indra/newview/llfloaterproperties.cpp              |   4 +-
 indra/newview/llfloaterworldmap.cpp                |   3 +-
 indra/newview/llgroupactions.cpp                   | 126 +++-
 indra/newview/llgroupactions.h                     |  24 +-
 indra/newview/llgroupmgr.cpp                       |  15 +-
 indra/newview/llimpanel.cpp                        |   7 +-
 indra/newview/llinventorybridge.cpp                |   5 -
 indra/newview/lllocationinputctrl.cpp              |  64 +-
 indra/newview/lllocationinputctrl.h                |   1 +
 indra/newview/llmoveview.cpp                       |   6 +-
 indra/newview/llnavigationbar.cpp                  | 140 ++++
 indra/newview/llnavigationbar.h                    |   5 +
 indra/newview/llnearbychat.cpp                     | 192 ++---
 indra/newview/llnearbychat.h                       |   3 +
 indra/newview/llnearbychatbar.cpp                  |  65 +-
 indra/newview/llnearbychatbar.h                    |   9 +
 indra/newview/llnearbychathandler.cpp              |  12 +-
 indra/newview/llnotificationalerthandler.cpp       |  19 +-
 indra/newview/llnotificationgrouphandler.cpp       |  27 +-
 indra/newview/llnotificationhandler.h              |   4 +-
 indra/newview/llpanelavatar.cpp                    | 769 ++++++++++-----------
 indra/newview/llpanelavatar.h                      | 204 ++++--
 indra/newview/llpanelgroup.cpp                     | 556 ++++++---------
 indra/newview/llpanelgroup.h                       |  99 ++-
 indra/newview/llpanelgroupgeneral.cpp              | 165 ++++-
 indra/newview/llpanelgroupgeneral.h                |   9 +-
 indra/newview/llpanelgrouplandmoney.cpp            | 326 ++++++---
 indra/newview/llpanelgrouplandmoney.h              |   6 +-
 indra/newview/llpanelgroupnotices.cpp              |  30 +-
 indra/newview/llpanelgroupnotices.h                |   5 +-
 indra/newview/llpanelgrouproles.cpp                |  95 +--
 indra/newview/llpanelgrouproles.h                  |  23 +-
 indra/newview/llpanelpeople.cpp                    |  15 +-
 indra/newview/llpanelpermissions.cpp               |   4 +-
 indra/newview/llpanelpicks.cpp                     |  38 +-
 indra/newview/llpanelplaceinfo.cpp                 |   9 +-
 indra/newview/llpanelplaces.cpp                    |  23 +-
 indra/newview/llpanelprofile.cpp                   |  63 +-
 indra/newview/llpanelprofile.h                     |  28 +-
 indra/newview/llpanelprofileview.cpp               |  47 +-
 indra/newview/llpanelprofileview.h                 |  28 +-
 indra/newview/llscreenchannel.cpp                  | 263 +++++--
 indra/newview/llscreenchannel.h                    |  44 +-
 indra/newview/llsidetray.cpp                       |   4 +-
 indra/newview/llsidetray.h                         |  16 +-
 indra/newview/llslurl.cpp                          |   7 +
 indra/newview/llslurl.h                            |   7 +-
 indra/newview/llstatusbar.cpp                      |  67 ++
 indra/newview/llstatusbar.h                        |   9 +
 indra/newview/llsyswellitem.cpp                    | 105 +++
 indra/newview/llsyswellitem.h                      |  90 +++
 indra/newview/llsyswellwindow.cpp                  | 210 ++++++
 indra/newview/llsyswellwindow.h                    |  89 +++
 indra/newview/lltoast.cpp                          |  99 ++-
 indra/newview/lltoast.h                            | 101 ++-
 indra/newview/lltoastgroupnotifypanel.cpp          |  12 +-
 indra/newview/lltoastpanel.cpp                     |  23 +-
 indra/newview/lltoastpanel.h                       |   5 +
 indra/newview/llurllineeditorctrl.cpp              |  97 +++
 indra/newview/llurllineeditorctrl.h                | 100 +++
 indra/newview/llviewerfloaterreg.cpp               |   6 +-
 indra/newview/llviewermenu.cpp                     |   1 -
 indra/newview/llviewermessage.cpp                  |   7 +-
 indra/newview/llviewerparcelmgr.cpp                |   1 -
 indra/newview/llviewertexteditor.cpp               |   7 -
 indra/newview/llviewerwindow.cpp                   |  13 +-
 indra/newview/llvoiceclient.cpp                    |  11 +-
 indra/newview/llvoiceclient.h                      |   5 +
 .../skins/default/xui/en/favorites_bar_button.xml  |  22 +
 .../skins/default/xui/en/floater_avatar_picker.xml |   2 +-
 .../skins/default/xui/en/floater_sys_well.xml      |  99 +++
 .../skins/default/xui/en/panel_bottomtray.xml      |   4 +-
 .../skins/default/xui/en/panel_group_general.xml   |   1 +
 .../default/xui/en/panel_group_info_sidetray.xml   |  88 +++
 .../default/xui/en/panel_group_land_money.xml      |   4 +-
 .../skins/default/xui/en/panel_group_roles.xml     |  10 +-
 .../skins/default/xui/en/panel_navigation_bar.xml  | 230 +++---
 .../newview/skins/default/xui/en/panel_people.xml  |   7 +-
 .../newview/skins/default/xui/en/panel_profile.xml |  21 +-
 .../skins/default/xui/en/panel_side_tray.xml       |  91 +--
 .../skins/default/xui/en/panel_sys_well_item.xml   |  64 ++
 indra/newview/skins/default/xui/en/panel_toast.xml |  12 +-
 indra/newview/skins/default/xui/en/strings.xml     |   9 +-
 .../default/xui/en/widgets/location_input.xml      |   2 +-
 124 files changed, 4099 insertions(+), 2044 deletions(-)
 create mode 100644 indra/newview/llsyswellitem.cpp
 create mode 100644 indra/newview/llsyswellitem.h
 create mode 100644 indra/newview/llsyswellwindow.cpp
 create mode 100644 indra/newview/llsyswellwindow.h
 create mode 100644 indra/newview/llurllineeditorctrl.cpp
 create mode 100644 indra/newview/llurllineeditorctrl.h
 create mode 100644 indra/newview/skins/default/xui/en/favorites_bar_button.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_sys_well.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_sys_well_item.xml

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index edd3fe2beb..e8d95b44a5 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -48,6 +48,7 @@ set(llui_SOURCE_FILES
     llkeywords.cpp
     lllayoutstack.cpp
     lllineeditor.cpp
+    lllink.cpp
     llmenugl.cpp
     llmodaldialog.cpp
     llmultifloater.cpp 
@@ -125,6 +126,7 @@ set(llui_HEADER_FILES
     lllayoutstack.h
     lllazyvalue.h
     lllineeditor.h
+    lllink.h
     llmenugl.h
     llmodaldialog.h
     llmultifloater.h 
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index ac368fd785..c566282bef 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -64,6 +64,7 @@ LLButton::Params::Params()
 :	label_selected("label_selected"),				// requires is_toggle true
 	label_shadow("label_shadow", true),
 	auto_resize("auto_resize", false),
+	use_ellipses("use_ellipses", false),
 	image_unselected("image_unselected"),
 	image_selected("image_selected"),
 	image_hover_selected("image_hover_selected"),
@@ -138,6 +139,7 @@ LLButton::LLButton(const LLButton::Params& p)
 	mScaleImage(p.scale_image),
 	mDropShadowedText(p.label_shadow),
 	mAutoResize(p.auto_resize),
+	mUseEllipses( p.use_ellipses ),
 	mHAlign(p.font_halign),
 	mLeftHPad(p.pad_left),
 	mRightHPad(p.pad_right),
@@ -280,11 +282,6 @@ boost::signals2::connection LLButton::setHeldDownCallback( const commit_signal_t
 {
 	return mHeldDownSignal.connect(cb);
 }
-														  
-boost::signals2::connection LLButton::setRightClickedCallback( const commit_signal_t::slot_type& cb )
-{
-	return mRightClickSignal.connect(cb);
-}
 
 
 // *TODO: Deprecate (for backwards compatability only)
@@ -437,7 +434,7 @@ BOOL	LLButton::handleRightMouseUp(S32 x, S32 y, MASK mask)
 
 		if (pointInView(x, y))
 		{
-			mRightClickSignal(this, getValue());
+			mRightClickSignal(this, x,y,mask);
 		}
 	}
 	else 
@@ -780,13 +777,18 @@ void LLButton::draw()
 			x++;
 		}
 
+		// *NOTE: mantipov: before mUseEllipses is implemented in EXT-279 U32_MAX has been passed as
+		// max_chars.
+		// LLFontGL::render expects S32 max_chars variable but process in a separate way -1 value.
+		// Due to U32_MAX is equal to S32 -1 value I have rest this value for non-ellipses mode.
+		// Not sure if it is really needed. Probably S32_MAX should be always passed as max_chars.
 		mGLFont->render(label, 0, (F32)x, (F32)(LLBUTTON_V_PAD + y_offset), 
 			label_color,
 			mHAlign, LLFontGL::BOTTOM,
 			LLFontGL::NORMAL,
 			mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NO_SHADOW,
-			U32_MAX, text_width,
-			NULL, FALSE, FALSE);
+			S32_MAX, text_width,
+			NULL, FALSE, mUseEllipses);
 	}
 
 	LLUICtrl::draw();
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 93e0414a02..249882013a 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -76,6 +76,7 @@ public:
 		Optional<std::string>	label_selected;
 		Optional<bool>			label_shadow;
 		Optional<bool>			auto_resize;
+		Optional<bool>			use_ellipses;
 
 		// images
 		Optional<LLUIImage*>	image_unselected,
@@ -152,14 +153,14 @@ public:
 
 	void			setUnselectedLabelColor( const LLColor4& c )		{ mUnselectedLabelColor = c; }
 	void			setSelectedLabelColor( const LLColor4& c )			{ mSelectedLabelColor = c; }
+	void			setUseEllipses( BOOL use_ellipses )					{ mUseEllipses = use_ellipses; }
+
 
 	boost::signals2::connection setClickedCallback( const commit_signal_t::slot_type& cb ); // mouse down and up within button
 	boost::signals2::connection setMouseDownCallback( const commit_signal_t::slot_type& cb );
 	boost::signals2::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ); // mouse up, EVEN IF NOT IN BUTTON
 	// Passes a 'count' parameter in the commit param payload, i.e. param["count"])
 	boost::signals2::connection setHeldDownCallback( const commit_signal_t::slot_type& cb ); // Mouse button held down and in button
-	boost::signals2::connection setRightClickedCallback( const commit_signal_t::slot_type& cb ); // right mouse down and up within button
-
 
 	
 	// *TODO: Deprecate (for backwards compatability only)
@@ -297,6 +298,7 @@ private:
 
 	BOOL						mDropShadowedText;
 	BOOL						mAutoResize;
+	BOOL						mUseEllipses;
 	BOOL						mBorderEnabled;
 
 	BOOL						mFlashing;
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp
index 2cb8197a67..cbd4cb380f 100644
--- a/indra/llui/llclipboard.cpp
+++ b/indra/llui/llclipboard.cpp
@@ -61,6 +61,12 @@ void LLClipboard::copyFromSubstring(const LLWString &src, S32 pos, S32 len, cons
 	LLView::getWindow()->copyTextToClipboard( mString );
 }
 
+void LLClipboard::copyFromString(const LLWString &src, const LLUUID& source_id )
+{
+	mSourceID = source_id;
+	mString = src;
+	LLView::getWindow()->copyTextToClipboard( mString );
+}
 
 const LLWString& LLClipboard::getPasteWString( LLUUID* source_id )
 {
diff --git a/indra/llui/llclipboard.h b/indra/llui/llclipboard.h
index 034a7a6aeb..d7ffeb33e0 100644
--- a/indra/llui/llclipboard.h
+++ b/indra/llui/llclipboard.h
@@ -50,6 +50,7 @@ public:
 	   (i.e. X11/Linux). */
 
 	void		copyFromSubstring(const LLWString &copy_from, S32 pos, S32 len, const LLUUID& source_id = LLUUID::null );
+	void		copyFromString(const LLWString &copy_from, const LLUUID& source_id = LLUUID::null );
 	BOOL		canPasteString() const;
 	const LLWString&	getPasteWString(LLUUID* source_id = NULL);
 
diff --git a/indra/llui/llfiltereditor.cpp b/indra/llui/llfiltereditor.cpp
index 0f36483fc2..7d6a4007a2 100644
--- a/indra/llui/llfiltereditor.cpp
+++ b/indra/llui/llfiltereditor.cpp
@@ -86,6 +86,12 @@ BOOL LLFilterEditor::setLabelArg( const std::string& key, const LLStringExplicit
 	return mFilterEditor->setLabelArg(key, text);
 }
 
+//virtual
+void LLFilterEditor::setLabel( const LLStringExplicit &new_label )
+{
+	mFilterEditor->setLabel(new_label);
+}
+
 //virtual
 void LLFilterEditor::clear()
 {
diff --git a/indra/llui/llfiltereditor.h b/indra/llui/llfiltereditor.h
index 4240fd770c..fceb82af8d 100644
--- a/indra/llui/llfiltereditor.h
+++ b/indra/llui/llfiltereditor.h
@@ -74,6 +74,7 @@ public:
 	virtual LLSD	getValue() const;
 	virtual BOOL	setTextArg( const std::string& key, const LLStringExplicit& text );
 	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
+	virtual void	setLabel( const LLStringExplicit &new_label );
 	virtual void	clear();
 
 private:
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 3fef215661..3899897c5f 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -131,7 +131,9 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystroke
 		// call onFocusLost on all remaining in the old focus list
 		while (old_focus_iter != mCachedKeyboardFocusList.end())
 		{
-			old_focus_iter->get()->onFocusLost();
+			if (old_focus_iter->get() != NULL) {
+				old_focus_iter->get()->onFocusLost();
+			}
 			old_focus_iter++;
 		}
 
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 02ee567803..20957499bc 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -623,6 +623,8 @@ BOOL LLLineEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 
 	// delay cursor flashing
 	mKeystrokeTimer.reset();
+	
+	LLUICtrl::handleMouseDown(x,y,mask);
 
 	return TRUE;
 }
@@ -736,7 +738,9 @@ BOOL LLLineEditor::handleMouseUp(S32 x, S32 y, MASK mask)
 		// take selection to 'primary' clipboard
 		updatePrimary();
 	}
-
+	
+	// We won't call LLUICtrl::handleMouseUp to avoid double calls of  childrenHandleMouseUp().Just invoke the signal manually.
+	mMouseUpSignal(this,x,y, mask);
 	return handled;
 }
 
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index e355cfda8b..e5c32846a0 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -176,6 +176,12 @@ LLMenuItemGL::LLMenuItemGL(const LLMenuItemGL::Params& p)
 	std::string key_str = shortcut.substr(pipe_pos+1);
 
 	LLKeyboard::keyFromString(key_str, &mAcceleratorKey);
+
+	LL_DEBUGS("HotKeys") << "Process short cut key: shortcut: " << shortcut
+		<< ", key str: " << key_str
+		<< ", accelerator mask: " << mAcceleratorMask
+		<< ", accelerator key: " << mAcceleratorKey
+		<< LL_ENDL;
 }
 
 BOOL LLMenuItemGL::handleAcceleratorKey(KEY key, MASK mask)
@@ -285,6 +291,7 @@ void LLMenuItemGL::appendAcceleratorString( std::string& st ) const
 		st.append( " " );
 	}
 	st.append( keystr );
+	LL_DEBUGS("HotKeys") << "appendAcceleratorString: " << st << LL_ENDL;
 }
 
 void LLMenuItemGL::setJumpKey(KEY key)
@@ -797,7 +804,7 @@ BOOL LLMenuItemCallGL::handleRightMouseUp(S32 x, S32 y, MASK mask)
 {
 	if (pointInView(x, y))
 	{
-		mRightClickSignal(this, getValue());
+		mRightClickSignal(this,x,y, mask);
 	}
 
 	return TRUE;
@@ -2996,6 +3003,7 @@ BOOL LLMenuBarGL::handleMouseDown(S32 x, S32 y, MASK mask)
 	return LLMenuGL::handleMouseDown(x, y, mask);
 }
 
+/*
 BOOL LLMenuBarGL::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
 	// clicks on menu bar closes existing menus from other contexts but leave
@@ -3007,6 +3015,7 @@ BOOL LLMenuBarGL::handleRightMouseDown(S32 x, S32 y, MASK mask)
 
 	return LLMenuGL::handleMouseDown(x, y, mask);
 }
+*/
 
 
 void LLMenuBarGL::draw()
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 828956a217..930276f7bc 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -297,10 +297,6 @@ public:
 		return mEnableSignal.connect(cb);
 	}
 
-	boost::signals2::connection setRightClickedCallback( const commit_signal_t::slot_type& cb )
-	{
-		return mRightClickSignal.connect(cb);
-	}
 	
 private:
 	enable_signal_t mEnableSignal;
@@ -492,9 +488,6 @@ public:
 	void buildDrawLabels();
 	void createJumpKeys();
 
-	// Show popup in global screen space based on last mouse location.
-	static void showPopup(LLMenuGL* menu);
-
 	// Show popup at a specific location.
 	static void showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y);
 
@@ -716,7 +709,9 @@ public:
 	/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
 	/*virtual*/ BOOL handleJumpKey(KEY key);
 	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+//	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+
+
 
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL jumpKeysActive();
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 79f0f9d71b..3041773fb2 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1684,7 +1684,8 @@ BOOL LLScrollListCtrl::handleDoubleClick(S32 x, S32 y, MASK mask)
 		// so the scroll bars will work.
 		if (NULL == LLView::childrenHandleDoubleClick(x, y, mask))
 		{
-			if( mCanSelect && mOnDoubleClickCallback )
+			// Run the callback only if an item is being double-clicked.
+			if( mCanSelect && hitItem(x, y) && mOnDoubleClickCallback )
 			{
 				mOnDoubleClickCallback();
 			}
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 3dd8d21f6b..f9bcb685b8 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -32,12 +32,18 @@
 
 #include "linden_common.h"
 #include "lltextbox.h"
+#include "lllink.h"
 #include "lluictrlfactory.h"
 #include "llfocusmgr.h"
 #include "llwindow.h"
 
 static LLDefaultChildRegistry::Register<LLTextBox> r("text");
 
+//*NOTE
+// LLLink is not used in code for now, therefor Visual Studio doesn't build it.
+// "link" is registered here to force Visual Studio to build LLLink class.
+static LLDefaultChildRegistry::Register<LLLink>	register_link("link");
+
 LLTextBox::Params::Params()
 :	text_color("text_color"),
 	length("length"),
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 19d1d4040c..8aa7540446 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -47,7 +47,6 @@ LLUICtrl::Params::Params()
 	init_callback("init_callback"),
 	commit_callback("commit_callback"),
 	validate_callback("validate_callback"),
-	rightclick_callback("rightclick_callback"),
 	mouseenter_callback("mouseenter_callback"),
 	mouseleave_callback("mouseleave_callback"),
 	control_name("control_name")
@@ -199,9 +198,6 @@ void LLUICtrl::initFromParams(const Params& p)
 		}
 	}
 
-	if(p.rightclick_callback.isProvided())
-		initCommitCallback(p.rightclick_callback, mRightClickSignal);
-
 	if(p.mouseenter_callback.isProvided())
 		initCommitCallback(p.mouseenter_callback, mMouseEnterSignal);
 
@@ -282,7 +278,24 @@ void LLUICtrl::onMouseLeave(S32 x, S32 y, MASK mask)
 {
 	mMouseLeaveSignal(this, getValue());
 }
-
+//virtual 
+BOOL LLUICtrl::handleMouseDown(S32 x, S32 y, MASK mask){
+	BOOL handled  = LLView::handleMouseDown(x,y,mask);
+	mMouseDownSignal(this,x,y,mask);
+	return handled;
+}
+//virtual
+BOOL LLUICtrl::handleMouseUp(S32 x, S32 y, MASK mask){
+	BOOL handled  = LLView::handleMouseUp(x,y,mask);
+	mMouseUpSignal(this,x,y,mask);
+	return handled;
+}
+//virtual
+BOOL LLUICtrl::handleRightMouseUp(S32 x, S32 y, MASK mask){
+	BOOL handled  = LLView::handleRightMouseUp(x,y,mask);
+	mRightClickSignal(this,x,y,mask);
+	return handled;
+}
 void LLUICtrl::onCommit()
 {
 	mCommitSignal(this, getValue());
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index cf6634f370..6ba3b01fcb 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -81,6 +81,8 @@ public:
 
 	typedef boost::function<void (LLUICtrl* ctrl, const LLSD& param)> commit_callback_t;
 	typedef boost::signals2::signal<void (LLUICtrl* ctrl, const LLSD& param)> commit_signal_t;
+	// *TODO: add xml support for this type of signal in the future
+	typedef boost::signals2::signal<void (LLUICtrl* ctrl, S32 x, S32 y, MASK mask)> mouse_signal_t;
 	
 	typedef boost::function<bool (LLUICtrl* ctrl, const LLSD& param)> enable_callback_t;
 	typedef boost::signals2::signal<bool (LLUICtrl* ctrl, const LLSD& param), boost_boolean_combiner> enable_signal_t;
@@ -144,8 +146,6 @@ public:
 										commit_callback;
 		Optional<EnableCallbackParam>	validate_callback;
 		
-		Optional<CommitCallbackParam>	rightclick_callback;
-
 		Optional<CommitCallbackParam>	mouseenter_callback;
 		Optional<CommitCallbackParam>	mouseleave_callback;
 		
@@ -186,6 +186,9 @@ public:
 	/*virtual*/ BOOL	getTentative() const;
 	/*virtual*/ void	onMouseEnter(S32 x, S32 y, MASK mask);
 	/*virtual*/ void	onMouseLeave(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL 	handleMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL 	handleMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);
 
 	// From LLFocusableElement
 	/*virtual*/ void	setFocus( BOOL b );
@@ -253,6 +256,10 @@ public:
 	boost::signals2::connection setMouseEnterCallback( const commit_signal_t::slot_type& cb ) { return mMouseEnterSignal.connect(cb); }
 	boost::signals2::connection setMouseLeaveCallback( const commit_signal_t::slot_type& cb ) { return mMouseLeaveSignal.connect(cb); }
 	
+	boost::signals2::connection setMouseDownCallback( const mouse_signal_t::slot_type& cb ) { return mMouseDownSignal.connect(cb); }
+	boost::signals2::connection setMouseUpCallback( const mouse_signal_t::slot_type& cb ) { return mMouseUpSignal.connect(cb); }
+	boost::signals2::connection setRightClickedCallback( const mouse_signal_t::slot_type& cb ) { return mRightClickSignal.connect(cb); }
+	
 	// *TODO: Deprecate; for backwards compatability only:
 	boost::signals2::connection setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data);	
 	boost::signals2::connection setValidateBeforeCommit( boost::function<bool (const LLSD& data)> cb );
@@ -279,11 +286,14 @@ protected:
 
 	commit_signal_t		mCommitSignal;
 	enable_signal_t		mValidateSignal;
-	commit_signal_t		mRightClickSignal;
 
 	commit_signal_t		mMouseEnterSignal;
 	commit_signal_t		mMouseLeaveSignal;
-
+	
+	mouse_signal_t		mMouseDownSignal;
+	mouse_signal_t		mMouseUpSignal;
+	mouse_signal_t		mRightClickSignal;
+	
     LLViewModelPtr  mViewModel;
 
 	LLControlVariable* mControlVariable;
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index d94472a8e5..e3b61dfaa2 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -75,6 +75,8 @@ S32		LLView::sLastBottomXML = S32_MIN;
 BOOL LLView::sIsDrawing = FALSE;
 #endif
 
+static LLDefaultChildRegistry::Register<LLView> r("view");
+
 LLView::Params::Params()
 :	name("name", std::string("unnamed")),
 	enabled("enabled", true),
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4286b91654..a25ea01d11 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -161,7 +161,6 @@ set(viewer_SOURCE_FILES
     llfloaterfonttest.cpp
     llfloatergesture.cpp
     llfloatergodtools.cpp
-    llfloatergroupinfo.cpp
     llfloatergroupinvite.cpp
     llfloatergroups.cpp
     llfloaterhandler.cpp
@@ -248,6 +247,7 @@ set(viewer_SOURCE_FILES
     lllocaltextureobject.cpp
     lllocationhistory.cpp
     lllocationinputctrl.cpp
+    llurllineeditorctrl.cpp
     lllogchat.cpp
     llloginhandler.cpp
     llmanip.cpp
@@ -328,7 +328,6 @@ set(viewer_SOURCE_FILES
     llpreviewanim.cpp
     llpreview.cpp
     llpreviewgesture.cpp
-    llpreviewlandmark.cpp
     llpreviewnotecard.cpp
     llpreviewscript.cpp
     llpreviewsound.cpp
@@ -354,6 +353,8 @@ set(viewer_SOURCE_FILES
     llstylemap.cpp
     llsurface.cpp
     llsurfacepatch.cpp
+    llsyswellitem.cpp
+    llsyswellwindow.cpp
     llteleporthistory.cpp
     lltexglobalcolor.cpp
     lltexlayer.cpp
@@ -602,7 +603,6 @@ set(viewer_HEADER_FILES
     llfloaterfriends.h
     llfloatergesture.h
     llfloatergodtools.h
-    llfloatergroupinfo.h
     llfloatergroupinvite.h
     llfloatergroups.h
     llfloaterhandler.h
@@ -690,6 +690,7 @@ set(viewer_HEADER_FILES
     lllocaltextureobject.h
     lllocationhistory.h
     lllocationinputctrl.h
+    llurllineeditorctrl.h
     lllogchat.h
     llloginhandler.h
     llmanip.h
@@ -768,7 +769,6 @@ set(viewer_HEADER_FILES
     llpreview.h
     llpreviewanim.h
     llpreviewgesture.h
-    llpreviewlandmark.h
     llpreviewnotecard.h
     llpreviewscript.h
     llpreviewsound.h
@@ -796,6 +796,8 @@ set(viewer_HEADER_FILES
     llstylemap.h
     llsurface.h
     llsurfacepatch.h
+    llsyswellitem.h
+    llsyswellwindow.h    
     lltable.h
     llteleporthistory.h
     lltexglobalcolor.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fa6ce4f1d8..f42ce2136f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1193,10 +1193,10 @@
         <real>6.0</real>
       </array>
     </map>
-    <key>CameraOffsetDefault</key>
+    <key>CameraOffsetRearView</key>
     <map>
       <key>Comment</key>
-      <string>Default camera offset from avatar</string>
+      <string>Initial camera offset from avatar in Rear View</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -1208,6 +1208,36 @@
         <real>0.75</real>
       </array>
     </map>
+    <key>CameraOffsetFrontView</key>
+    <map>
+      <key>Comment</key>
+      <string>Initial camera offset from avatar in Front View</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3</string>
+      <key>Value</key>
+      <array>
+        <real>2.2</real>
+        <real>0.0</real>
+        <real>0.0</real>
+      </array>
+    </map>
+    <key>CameraOffsetGroupView</key>
+    <map>
+      <key>Comment</key>
+      <string>Initial camera offset from avatar in Group View</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3</string>
+      <key>Value</key>
+      <array>
+        <real>-1.0</real>
+        <real>0.7</real>
+        <real>0.5</real>
+      </array>
+    </map>
     <key>CameraOffsetScale</key>
     <map>
       <key>Comment</key>
@@ -1245,6 +1275,17 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
+    <key>CameraPreset</key>
+    <map>
+      <key>Comment</key>
+      <string>Preset camera position - view (0 - rear, 1 - front, 2 - group)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ChatBarStealsFocus</key>
     <map>
       <key>Comment</key>
@@ -3134,14 +3175,14 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>FocusOffsetDefault</key>
+    <key>FocusOffsetRearView</key>
     <map>
       <key>Comment</key>
-      <string>Default focus point offset relative to avatar (x-axis is forward)</string>
+      <string>Initial focus point offset relative to avatar for the camera preset Rear View (x-axis is forward)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Vector3</string>
+      <string>Vector3D</string>
       <key>Value</key>
       <array>
         <real>1.0</real>
@@ -3149,6 +3190,36 @@
         <real>1.0</real>
       </array>
     </map>
+    <key>FocusOffsetFrontView</key>
+    <map>
+      <key>Comment</key>
+      <string>Initial focus point offset relative to avatar for the camera preset Front View</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3D</string>
+      <key>Value</key>
+      <array>
+        <real>0.0</real>
+        <real>0.0</real>
+        <real>0.0</real>
+      </array>
+    </map>
+    <key>FocusOffsetGroupView</key>
+    <map>
+      <key>Comment</key>
+      <string>Initial focus point offset relative to avatar for the camera preset Group View</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3D</string>
+      <key>Value</key>
+      <array>
+        <real>1.5</real>
+        <real>0.5</real>
+        <real>1.0</real>
+      </array>
+    </map>
     <key>FocusPosOnLogout</key>
     <map>
       <key>Comment</key>
@@ -4593,7 +4664,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <integer>20</integer>
+      <integer>130</integer>
     </map>
     <key>NextOwnerCopy</key>
     <map>
@@ -6827,8 +6898,30 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
+    </map>    
+    <key>ShowPGSearchAll</key>    
+    <map>
+      <key>Comment</key>
+      <string>Show/Hide Navigation Bar Favorites Panel</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>   
+    </map>
+    <key>ShowNavbarFavoritesPanel</key>    
+    <map>
+      <key>Comment</key>
+      <string>Show/Hide Navigation Bar Navigation Panel</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>   
     </map>
-    <key>ShowPGSearchAll</key>
+    <key>ShowNavbarNavigationPanel</key>        
     <map>
       <key>Comment</key>
       <string>Display results of search All that are flagged as PG</string>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index ce8b05d97a..513988789b 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -45,13 +45,15 @@
 #include "llfloatercamera.h"
 #include "llfloatercustomize.h"
 #include "llfloaterdirectory.h"
-#include "llfloatergroupinfo.h"
+
 #include "llfloaterland.h"
 #include "llfloatermute.h"
 #include "llfloatersnapshot.h"
 #include "llfloatertools.h"
 #include "llfloaterworldmap.h"
 
+#include "llgroupactions.h"
+
 #include "llfocusmgr.h"
 #include "llgroupmgr.h"
 #include "llhomelocationresponder.h"
@@ -280,6 +282,8 @@ LLAgent::LLAgent() :
 	mLastCameraMode( CAMERA_MODE_THIRD_PERSON ),
 	mViewsPushed(FALSE),
 
+	mCameraPreset(CAMERA_PRESET_REAR_VIEW),
+
 	mCustomAnim(FALSE),
 	mShowAvatar(TRUE),
 	mCameraAnimating( FALSE ),
@@ -293,7 +297,6 @@ LLAgent::LLAgent() :
 	mCameraFocusOffset(),
 	mCameraFOVDefault(DEFAULT_FIELD_OF_VIEW),
 
-	mCameraOffsetDefault(),
 	mCameraCollidePlane(),
 
 	mCurrentCameraDistance(2.f),		// meters, set in init()
@@ -405,9 +408,19 @@ void LLAgent::init()
 	setFlying( gSavedSettings.getBOOL("FlyingAtExit") );
 
 	mCameraFocusOffsetTarget = LLVector4(gSavedSettings.getVector3("CameraOffsetBuild"));
-	mCameraOffsetDefault = gSavedSettings.getVector3("CameraOffsetDefault");
+	
+	mCameraPreset = (ECameraPreset) gSavedSettings.getU32("CameraPreset");
+
+	mCameraOffsetInitial[CAMERA_PRESET_REAR_VIEW] = gSavedSettings.getVector3("CameraOffsetRearView");
+	mCameraOffsetInitial[CAMERA_PRESET_FRONT_VIEW] = gSavedSettings.getVector3("CameraOffsetFrontView");
+	mCameraOffsetInitial[CAMERA_PRESET_GROUP_VIEW] = gSavedSettings.getVector3("CameraOffsetGroupView");
+
+	mFocusOffsetInitial[CAMERA_PRESET_REAR_VIEW] = gSavedSettings.getVector3d("FocusOffsetRearView");
+	mFocusOffsetInitial[CAMERA_PRESET_FRONT_VIEW] = gSavedSettings.getVector3d("FocusOffsetFrontView");
+	mFocusOffsetInitial[CAMERA_PRESET_GROUP_VIEW] = gSavedSettings.getVector3d("FocusOffsetGroupView");
+
 	mCameraCollidePlane.clearVec();
-	mCurrentCameraDistance = mCameraOffsetDefault.magVec() * gSavedSettings.getF32("CameraOffsetScale");
+	mCurrentCameraDistance = getCameraOffsetInitial().magVec() * gSavedSettings.getF32("CameraOffsetScale");
 	mTargetCameraDistance = mCurrentCameraDistance;
 	mCameraZoomFraction = 1.f;
 	mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject");
@@ -928,6 +941,20 @@ LLHost LLAgent::getRegionHost() const
 // returns empty() if getRegion() == NULL
 //-----------------------------------------------------------------------------
 std::string LLAgent::getSLURL() const
+{
+	return buildSLURL(true);
+}
+
+//-----------------------------------------------------------------------------
+// getUnescapedSLURL()
+// returns empty() if getRegion() == NULL
+//-----------------------------------------------------------------------------
+std::string LLAgent::getUnescapedSLURL() const
+{
+	return buildSLURL(false);
+}
+
+std::string LLAgent::buildSLURL(const bool escape) const
 {
 	std::string slurl;
 	LLViewerRegion *regionp = getRegion();
@@ -937,7 +964,10 @@ std::string LLAgent::getSLURL() const
 		S32 x = llround( (F32)fmod( agentPos.mdV[VX], (F64)REGION_WIDTH_METERS ) );
 		S32 y = llround( (F32)fmod( agentPos.mdV[VY], (F64)REGION_WIDTH_METERS ) );
 		S32 z = llround( (F32)agentPos.mdV[VZ] );
-		slurl = LLSLURL::buildSLURL(regionp->getName(), x, y, z);
+		if (escape)
+			slurl = LLSLURL::buildSLURL(regionp->getName(), x, y, z);
+		else
+			slurl = LLSLURL::buildUnescapedSLURL(regionp->getName(), x, y, z);
 	}
 	return slurl;
 }
@@ -1885,7 +1915,7 @@ void LLAgent::cameraOrbitIn(const F32 meters)
 {
 	if (mFocusOnAvatar && mCameraMode == CAMERA_MODE_THIRD_PERSON)
 	{
-		F32 camera_offset_dist = llmax(0.001f, mCameraOffsetDefault.magVec() * gSavedSettings.getF32("CameraOffsetScale"));
+		F32 camera_offset_dist = llmax(0.001f, getCameraOffsetInitial().magVec() * gSavedSettings.getF32("CameraOffsetScale"));
 		
 		mCameraZoomFraction = (mTargetCameraDistance - meters) / camera_offset_dist;
 
@@ -3540,7 +3570,6 @@ LLVector3d LLAgent::calcThirdPersonFocusOffset()
 {
 	// ...offset from avatar
 	LLVector3d focus_offset;
-	focus_offset.setVec(gSavedSettings.getVector3("FocusOffsetDefault"));
 
 	LLQuaternion agent_rot = mFrameAgent.getQuaternion();
 	if (!mAvatarObject.isNull() && mAvatarObject->getParent())
@@ -3548,7 +3577,7 @@ LLVector3d LLAgent::calcThirdPersonFocusOffset()
 		agent_rot *= ((LLViewerObject*)(mAvatarObject->getParent()))->getRenderRotation();
 	}
 
-	focus_offset = focus_offset * agent_rot;
+	focus_offset = mFocusOffsetInitial[mCameraPreset] * agent_rot;
 	return focus_offset;
 }
 
@@ -3625,7 +3654,6 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 	LLVector3d	frame_center_global = mAvatarObject.isNull() ? getPositionGlobal() 
 															 : getPosGlobalFromAgent(mAvatarObject->mRoot.getWorldPosition());
 		
-	LLVector3   upAxis = getUpAxis();
 	BOOL		isConstrained = FALSE;
 	LLVector3d	head_offset;
 	head_offset.setVec(mThirdPersonHeadOffset);
@@ -3688,7 +3716,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 		}
 		else
 		{
-			local_camera_offset = mCameraZoomFraction * mCameraOffsetDefault * gSavedSettings.getF32("CameraOffsetScale");
+			local_camera_offset = mCameraZoomFraction * getCameraOffsetInitial() * gSavedSettings.getF32("CameraOffsetScale");
 			
 			// are we sitting down?
 			if (mAvatarObject.notNull() && mAvatarObject->getParent())
@@ -3885,6 +3913,12 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 }
 
 
+LLVector3 LLAgent::getCameraOffsetInitial()
+{
+	return mCameraOffsetInitial[mCameraPreset];
+}
+
+
 //-----------------------------------------------------------------------------
 // handleScrollWheel()
 //-----------------------------------------------------------------------------
@@ -3919,10 +3953,12 @@ void LLAgent::handleScrollWheel(S32 clicks)
 		}
 		else if (mFocusOnAvatar && mCameraMode == CAMERA_MODE_THIRD_PERSON)
 		{
-			F32 current_zoom_fraction = mTargetCameraDistance / (mCameraOffsetDefault.magVec() * gSavedSettings.getF32("CameraOffsetScale"));
+			F32 camera_offset_initial_mag = getCameraOffsetInitial().magVec();
+			
+			F32 current_zoom_fraction = mTargetCameraDistance / (camera_offset_initial_mag * gSavedSettings.getF32("CameraOffsetScale"));
 			current_zoom_fraction *= 1.f - pow(ROOT_ROOT_TWO, clicks);
 			
-			cameraOrbitIn(current_zoom_fraction * mCameraOffsetDefault.magVec() * gSavedSettings.getF32("CameraOffsetScale"));
+			cameraOrbitIn(current_zoom_fraction * camera_offset_initial_mag * gSavedSettings.getF32("CameraOffsetScale"));
 		}
 		else
 		{
@@ -4295,6 +4331,20 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
 }
 
 
+void LLAgent::switchCameraPreset(ECameraPreset preset)
+{
+	//zoom is supposed to be reset for the front and group views
+	mCameraZoomFraction = 1.f;
+
+	//focusing on avatar in that case means following him on movements
+	mFocusOnAvatar = TRUE;
+
+	mCameraPreset = preset;
+
+	gSavedSettings.setU32("CameraPreset", mCameraPreset);
+}
+
+
 //
 // Focus point management
 //
@@ -5493,8 +5543,8 @@ BOOL LLAgent::downGrabbed() const
 
 void update_group_floaters(const LLUUID& group_id)
 {
-	LLFloaterGroupInfo::refreshGroup(group_id);
-
+	
+	LLGroupActions::refresh(group_id);
 	//*TODO Implement group update for Profile View 
 	// still actual as of July 31, 2009 (DZ)
 
@@ -5542,7 +5592,7 @@ void LLAgent::processAgentDropGroup(LLMessageSystem *msg, void **)
 
 		LLGroupMgr::getInstance()->clearGroupData(group_id);
 		// close the floater for this group, if any.
-		LLFloaterGroupInfo::closeGroup(group_id);
+		LLGroupActions::closeGroup(group_id);
 		// refresh the group panel of the search window, if necessary.
 		LLFloaterDirectory::refreshGroup(group_id);
 	}
@@ -5621,7 +5671,7 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode
 
 				LLGroupMgr::getInstance()->clearGroupData(group_id);
 				// close the floater for this group, if any.
-				LLFloaterGroupInfo::closeGroup(group_id);
+				LLGroupActions::closeGroup(group_id);
 				// refresh the group panel of the search window,
 				//if necessary.
 				LLFloaterDirectory::refreshGroup(group_id);
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 0b1ff2e76b..ff9e7f574f 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -75,6 +75,19 @@ enum ECameraMode
 	CAMERA_MODE_FOLLOW
 };
 
+/** Camera Presets for CAMERA_MODE_THIRD_PERSON */
+enum ECameraPreset 
+{
+	/** Default preset, what the Third Person Mode actually was */
+	CAMERA_PRESET_REAR_VIEW,
+	
+	/** "Looking at the Avatar from the front" */
+	CAMERA_PRESET_FRONT_VIEW, 
+
+	/** "Above and to the left, over the shoulder, pulled back a little on the zoom" */
+	CAMERA_PRESET_GROUP_VIEW
+};
+
 enum EAnimRequest
 {
 	ANIM_REQUEST_START,
@@ -261,10 +274,12 @@ public:
 	LLViewerRegion	*getRegion() const;
 	LLHost			getRegionHost() const;
 	std::string		getSLURL() const;
+	std::string		getUnescapedSLURL() const;
 	BOOL			inPrelude();
 	BOOL 			buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK); // Utility to build a location string
 private:
 	LLViewerRegion	*mRegionp;
+	std::string  	buildSLURL(const bool escape) const;
 
 	//--------------------------------------------------------------------
 	// History
@@ -656,6 +671,27 @@ private:
 	ECameraMode		mCameraMode;					// Target mode after transition animation is done
 	ECameraMode		mLastCameraMode;
 
+	//--------------------------------------------------------------------
+	// Preset
+	//--------------------------------------------------------------------
+public:
+	void switchCameraPreset(ECameraPreset preset);
+
+private:
+	
+	/** Determines default camera offset depending on the current camera preset */
+	LLVector3 getCameraOffsetInitial();
+
+	/** Camera preset in Third Person Mode */
+	ECameraPreset mCameraPreset; 
+
+	/** Initial camera offsets */
+	std::map<ECameraPreset, LLVector3> mCameraOffsetInitial;
+
+	/** Initial focus offsets */
+	std::map<ECameraPreset, LLVector3d> mFocusOffsetInitial;
+
+
 	//--------------------------------------------------------------------
 	// Position
 	//--------------------------------------------------------------------
@@ -674,7 +710,6 @@ private:
 	F32				mCameraFOVZoomFactor;			// Amount of fov zoom applied to camera when zeroing in on an object
 	F32				mCameraCurrentFOVZoomFactor;	// Interpolated fov zoom
 	F32				mCameraFOVDefault;				// Default field of view that is basis for FOV zoom effect
-	LLVector3		mCameraOffsetDefault;			// Default third-person camera offset
 	LLVector4		mCameraCollidePlane;			// Colliding plane for camera
 	F32				mCameraZoomFraction;			// Mousewheel driven fraction of zoom
 	LLVector3		mCameraPositionAgent;			// Camera position in agent coordinates
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 281d73b18b..4e289efd1b 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -48,6 +48,7 @@
 #include "llviewermessage.h"	// for handle_lure
 #include "llviewerregion.h"
 
+
 // static
 void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::string& name)
 {
@@ -78,6 +79,19 @@ void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::strin
 	LLRecentPeople::instance().add(id);
 }
 
+// static
+void LLAvatarActions::requestFriendshipDialog(const LLUUID& id)
+{
+	if(id.isNull())
+	{
+		return;
+	}
+
+	std::string full_name;
+	gCacheName->getFullName(id, full_name);
+	requestFriendshipDialog(id, full_name);
+}
+
 // static
 void LLAvatarActions::removeFriendDialog(const LLUUID& id)
 {
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index 73325d21f1..f3c411e033 100644
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -44,6 +44,11 @@ public:
 	 */
 	static void requestFriendshipDialog(const LLUUID& id, const std::string& name);
 
+	/**
+	 * Show a dialog explaining what friendship entails, then request friendship.
+	 */
+	static void requestFriendshipDialog(const LLUUID& id);
+
 	/**
 	 * Show a friend removal dialog.
 	 */
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 40dd20dfa4..a85f8710c7 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -117,24 +117,6 @@ void LLAvatarList::draw()
 	}
 }
 
-//virtual
-BOOL LLAvatarList::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	LLScrollListItem* hit_item = hitItem(x, y);
-	if (NULL == hit_item)
-	{
-		std::vector<LLScrollListItem*> selectedItems = getAllSelected();
-		std::vector<LLScrollListItem*>::const_iterator it = selectedItems.begin();
-
-		for (; it != selectedItems.end(); ++it)
-		{
-			(*it)->setSelected(FALSE);
-		}
-		return TRUE;
-	}
-	return LLScrollListCtrl::handleMouseDown(x, y, mask);
-}
-
 std::vector<LLUUID> LLAvatarList::getSelectedIDs()
 {
 	LLUUID selected_id;
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
index 991e9fa145..8b419dbb57 100644
--- a/indra/newview/llavatarlist.h
+++ b/indra/newview/llavatarlist.h
@@ -59,14 +59,6 @@ public:
 	virtual	~LLAvatarList() {}
 
 	/*virtual*/ void	draw();
-	/**
-	 * Overrides base-class behavior of Mouse Down Event.
-	 * 
-	 * LLScrollListCtrl::handleMouseDown version calls setFocus which select the first item if nothing selected.
-	 * We need to deselect all items if perform click not over the any item. Otherwise calls base method.
-	 * See EXT-246
-	 */
-	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
 
 	BOOL update(const std::vector<LLUUID>& all_buddies,
 		const std::string& name_filter = LLStringUtil::null);
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 9eb8369c4c..bfb2d26870 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -1,34 +1,34 @@
 /** 
-* @file llbottomtray.cpp
-* @brief LLBottomTray class implementation
-*
-* $LicenseInfo:firstyear=2009&license=viewergpl$
-* 
-* Copyright (c) 2009, Linden Research, Inc.
-* 
-* Second Life Viewer Source Code
-* The source code in this file ("Source Code") is provided by Linden Lab
-* to you under the terms of the GNU General Public License, version 2.0
-* ("GPL"), unless you have obtained a separate licensing agreement
-* ("Other License"), formally executed by you and Linden Lab.  Terms of
-* the GPL can be found in doc/GPL-license.txt in this distribution, or
-* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
-* 
-* There are special exceptions to the terms and conditions of the GPL as
-* it is applied to this Source Code. View the full text of the exception
-* in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at
-* http://secondlifegrid.net/programs/open_source/licensing/flossexception
-* 
-* By copying, modifying or distributing this software, you acknowledge
-* that you have read and understood your obligations described above,
-* and agree to abide by those obligations.
-* 
-* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-* COMPLETENESS OR PERFORMANCE.
-* $/LicenseInfo$
-*/
+ * @file llbottomtray.cpp
+ * @brief LLBottomTray class implementation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
 
 #include "llviewerprecompiledheaders.h" // must be first include
 #include "llbottomtray.h"
@@ -37,6 +37,7 @@
 #include "llchiclet.h"
 #include "llfloaterreg.h"
 #include "llflyoutbutton.h"
+#include "lllayoutstack.h"
 #include "llnearbychatbar.h"
 #include "llsplitbutton.h"
 #include "llfloatercamera.h"
@@ -47,20 +48,23 @@ LLBottomTray::LLBottomTray(const LLSD&)
 	mIMWell(NULL),
 	mSysWell(NULL),
 	mTalkBtn(NULL),
-	mNearbyChatBar(NULL)
+	mNearbyChatBar(NULL),
+	mToolbarStack(NULL)
+
 {
 	mFactoryMap["chat_bar"] = LLCallbackMap(LLBottomTray::createNearbyChatBar, NULL);
 
 	LLUICtrlFactory::getInstance()->buildPanel(this,"panel_bottomtray.xml");
 
-	mChicletPanel = getChild<LLChicletPanel>("chiclet_list",TRUE,FALSE);
-	mIMWell = getChild<LLNotificationChiclet>("im_well",TRUE,FALSE);
-	mSysWell = getChild<LLNotificationChiclet>("sys_well",TRUE,FALSE);
+	mChicletPanel = getChild<LLChicletPanel>("chiclet_list");
+	mIMWell = getChild<LLNotificationChiclet>("im_well");
+	mSysWell = getChild<LLNotificationChiclet>("sys_well");
 
+	mSysWell->setNotificationChicletWindow(LLFloaterReg::getInstance("syswell_window"));
 	mChicletPanel->setChicletClickedCallback(boost::bind(&LLBottomTray::onChicletClick,this,_1));
 
-	LLSplitButton* presets = getChild<LLSplitButton>("presets", TRUE, FALSE);
-	if (presets) presets->setSelectionCallback(LLFloaterCamera::onClickCameraPresets);
+	LLSplitButton* presets = getChild<LLSplitButton>("presets");
+	presets->setSelectionCallback(LLFloaterCamera::onClickCameraPresets);
 
 	LLIMMgr::getInstance()->addSessionObserver(this);
 
@@ -75,9 +79,10 @@ LLBottomTray::LLBottomTray(const LLSD&)
 
 BOOL LLBottomTray::postBuild()
 {
-	 mNearbyChatBar = getChild<LLNearbyChatBar>("chat_bar");
+	mNearbyChatBar = getChild<LLNearbyChatBar>("chat_bar");
+	mToolbarStack = getChild<LLLayoutStack>("toolbar_stack");
 
-	 return TRUE;
+	return TRUE;
 }
 
 LLBottomTray::~LLBottomTray()
@@ -152,13 +157,14 @@ void LLBottomTray::setVisible(BOOL visible)
 {
 	LLPanel::setVisible(visible);
 
-	LLView* stack = getChild<LLView>("toolbar_stack",TRUE,FALSE);
-
-	if (stack)
+	// *NOTE: we must check mToolbarStack against NULL because sewtVisible is called from the 
+	// LLPanel::initFromParams BEFORE postBuild is called and child controls are not exist yet
+	if (NULL != mToolbarStack)
 	{
 		BOOL visibility = gAgent.cameraMouselook() ? false : true;
 
-		for ( child_list_const_iter_t child_it = stack->getChildList()->begin(); child_it != stack->getChildList()->end(); child_it++)
+		for ( child_list_const_iter_t child_it = mToolbarStack->getChildList()->begin(); 
+			child_it != mToolbarStack->getChildList()->end(); child_it++)
 		{
 			LLView* viewp = *child_it;
 			
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index ffb0f9ae4f..fec533f9f3 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -38,6 +38,7 @@
 
 class LLChicletPanel;
 class LLLineEditor;
+class LLLayoutStack;
 class LLNotificationChiclet;
 class LLTalkButton;
 class LLNearbyChatBar;
@@ -80,6 +81,8 @@ protected:
 	LLNotificationChiclet* 	mSysWell;
 	LLTalkButton* 		mTalkBtn;
 	LLNearbyChatBar*	mNearbyChatBar;
+	LLLayoutStack*		mToolbarStack;
+
 };
 
 #endif // LL_LLBOTTOMPANEL_H
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp
index 118385ab58..91945038aa 100644
--- a/indra/newview/llchannelmanager.cpp
+++ b/indra/newview/llchannelmanager.cpp
@@ -58,15 +58,14 @@ LLChannelManager::~LLChannelManager()
 //--------------------------------------------------------------------------
 void LLChannelManager::onLoginCompleted()
 {
-	S32 hidden_notifications = 0;
+	S32 away_notifications = 0;
 
 	for(std::vector<ChannelElem>::iterator it = mChannelList.begin(); it !=  mChannelList.end(); ++it)
 	{
-		//(*it).channel->showToasts();
-		hidden_notifications +=(*it).channel->getNumberOfHiddenToasts();
+		away_notifications +=(*it).channel->getNumberOfHiddenToasts();
 	}
 
-	if(!hidden_notifications)
+	if(!away_notifications)
 	{
 		LLScreenChannel::setStartUpToastShown();
 		return;
@@ -81,15 +80,19 @@ void LLChannelManager::onLoginCompleted()
 	if(!mStartUpChannel)
 		return;
 
-	static_cast<LLUICtrl*>(mStartUpChannel)->setCommitCallback(boost::bind(&LLChannelManager::enableShowToasts, this));
-	mStartUpChannel->setNumberOfHiddenToasts(hidden_notifications);
-	mStartUpChannel->createOverflowToast(gSavedSettings.getS32("ChannelBottomPanelMargin"), gSavedSettings.getS32("StartUpToastTime"));
+	static_cast<LLUICtrl*>(mStartUpChannel)->setCommitCallback(boost::bind(&LLChannelManager::removeStartUpChannel, this));
+	mStartUpChannel->createStartUpToast(away_notifications, gSavedSettings.getS32("ChannelBottomPanelMargin"), gSavedSettings.getS32("StartUpToastTime"));
 }
 
 //--------------------------------------------------------------------------
-void LLChannelManager::enableShowToasts()
+void LLChannelManager::removeStartUpChannel()
 {
-	LLScreenChannel::setStartUpToastShown();
+	if(!mStartUpChannel)
+		return;
+
+	mStartUpChannel->setVisible(FALSE);
+	mStartUpChannel->closeStartUpToast();
+	getRootView()->removeChild(mStartUpChannel);
 	delete mStartUpChannel;
 	mStartUpChannel = NULL;
 }
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index ac8e81d7ef..6adc79713a 100644
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@@ -102,7 +102,7 @@ public:
 
 	// On LoginCompleted - show StartUp toast
 	void onLoginCompleted();
-	void enableShowToasts();
+	void removeStartUpChannel();
 
 	//TODO: make protected? in order to be shure that channels are created only by notification handlers
 	LLScreenChannel*	createChannel(LLChannelManager::Params& p);
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 46a2179e8d..7a118deb8a 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -122,6 +122,8 @@ BOOL LLChatBar::postBuild()
 {
 	getChild<LLUICtrl>("Say")->setCommitCallback(boost::bind(&LLChatBar::onClickSay, this, _1));
 
+	// * NOTE: mantipov: getChild with default parameters returns dummy widget.
+	// Seems this class will be completle removed
 	// attempt to bind to an existing combo box named gesture
 	setGestureCombo(getChild<LLComboBox>( "Gesture", TRUE, FALSE));
 
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 2b455485ca..a63477a442 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -82,8 +82,10 @@ void	LLChatItemCtrl::reshape		(S32 width, S32 height, BOOL called_from_parent )
 {
 	LLPanel::reshape(width, height,called_from_parent);
 
-	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text",false,false);
+	// *NOTE: we must check if child items exist because reshape is called from the 
+	// LLView::initFromParams BEFORE postBuild is called and child controls are not exist yet
+	LLPanel* caption = findChild<LLPanel>("msg_caption", false);
+	LLChatMsgBox* msg_text = findChild<LLChatMsgBox>("msg_text" ,false);
 	if(caption && msg_text)
 	{
 		LLRect caption_rect = caption->getRect();
@@ -125,17 +127,14 @@ std::string LLChatItemCtrl::appendTime()
 
 void	LLChatItemCtrl::addText		(const std::string& message)
 {
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text",false,false);
-	if(msg_text)
-		msg_text->addText(message);
+	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
+	msg_text->addText(message);
 	mMessages.push_back(message);
 }
 
 void	LLChatItemCtrl::setMessage	(const LLChat& msg)
 {
-	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
-	if(!caption)
-		return;
+	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
 
 	std::string str_sender;
 
@@ -145,20 +144,19 @@ void	LLChatItemCtrl::setMessage	(const LLChat& msg)
 	else
 		str_sender = LLTrans::getString("You");;
 
-	caption->getChild<LLTextBox>("sender_name",false,false)->setText(str_sender);
+	caption->getChild<LLTextBox>("sender_name", false)->setText(str_sender);
 	
 	std::string tt = appendTime();
 	
-	caption->getChild<LLTextBox>("msg_time",false,false)->setText(tt);
+	caption->getChild<LLTextBox>("msg_time", false)->setText(tt);
 
 
-	caption->getChild<LLAvatarIconCtrl>("avatar_icon",false,false)->setValue(msg.mFromID);
+	caption->getChild<LLAvatarIconCtrl>("avatar_icon", false)->setValue(msg.mFromID);
 
 	mOriginalMessage = msg;
 
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text",false,false);
-	if(msg_text)
-		msg_text->setText(msg.mText);
+	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
+	msg_text->setText(msg.mText);
 
 	LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
 	if(mOriginalMessage.mSourceType != CHAT_SOURCE_AGENT)
@@ -170,17 +168,13 @@ void	LLChatItemCtrl::setMessage	(const LLChat& msg)
 
 void	LLChatItemCtrl::snapToMessageHeight	()
 {
-	LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text",false,false);
-	if(!text_box)
-		return;///actually assert fits better
+	LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text", false);
 	S32 new_height = text_box->getTextPixelHeight();
 	LLRect panel_rect = getRect();
 
 	S32 caption_height = 0;
-	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
-	if(caption)
-		caption_height = caption->getRect().getHeight();
-
+	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
+	caption_height = caption->getRect().getHeight();
 
 	panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth()	, caption_height + new_height);
 	
@@ -193,14 +187,11 @@ void	LLChatItemCtrl::snapToMessageHeight	()
 
 void	LLChatItemCtrl::setWidth(S32 width)
 {
-	LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text",false,false);
-	if(!text_box)
-		return;///actually assert fits better
-
+	LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text", false);
 	text_box->reshape(width - msg_left_offset - msg_right_offset,100/*its not magic number, we just need any number*/);
 
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text",false,false);
-	if(msg_text && mOriginalMessage.mText.length())
+	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
+	if(mOriginalMessage.mText.length())
 		msg_text->setText(mOriginalMessage.mText);
 	
 	for(size_t i=0;i<mMessages.size();++i)
@@ -212,58 +203,41 @@ void	LLChatItemCtrl::setWidth(S32 width)
 
 void LLChatItemCtrl::onMouseLeave			(S32 x, S32 y, MASK mask)
 {
-	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
-	if(!caption)
-		return;
+	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
 	LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
-	if(msg_inspector)
-		msg_inspector->setVisible(false);
+	msg_inspector->setVisible(false);
 	
 }
 void LLChatItemCtrl::onMouseEnter				(S32 x, S32 y, MASK mask)
 {
 	if(mOriginalMessage.mSourceType != CHAT_SOURCE_AGENT)
 		return;
-	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
-	if(!caption)
-		return;
+	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
 	LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
-	if(msg_inspector)
-		msg_inspector->setVisible(true);
+	msg_inspector->setVisible(true);
 }
 
 BOOL	LLChatItemCtrl::handleMouseDown	(S32 x, S32 y, MASK mask)
 {
 	if(mOriginalMessage.mSourceType != CHAT_SOURCE_AGENT)
 		return LLPanel::handleMouseDown(x,y,mask);
-	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
-	if(caption)
+	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
+	LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
+	S32 local_x = x - msg_inspector->getRect().mLeft - caption->getRect().mLeft;
+	S32 local_y = y - msg_inspector->getRect().mBottom - caption->getRect().mBottom;
+	if(msg_inspector->pointInView(local_x, local_y))
 	{
-		LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
-		if(msg_inspector)
-		{
-			S32 local_x = x - msg_inspector->getRect().mLeft - caption->getRect().mLeft;
-			S32 local_y = y - msg_inspector->getRect().mBottom - caption->getRect().mBottom;
-			if(msg_inspector->pointInView(local_x, local_y))
-			{
-				LLFloaterReg::showInstance("mini_inspector", mOriginalMessage.mFromID);
-			}
-		}
+		LLFloaterReg::showInstance("mini_inspector", mOriginalMessage.mFromID);
 	}
 	return LLPanel::handleMouseDown(x,y,mask);
 }
 
 void	LLChatItemCtrl::setHeaderVisibility(EShowItemHeader e)
 {
-	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
-	if(!caption)
-		return;
+	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
 
-	LLUICtrl* icon = caption->getChild<LLUICtrl>("avatar_icon",false,false);
-	LLUICtrl* name = caption->getChild<LLUICtrl>("sender_name",false,false);
-
-	if(icon == 0 || name == 0)
-		return;
+	LLUICtrl* icon = caption->getChild<LLUICtrl>("avatar_icon", false);
+	LLUICtrl* name = caption->getChild<LLUICtrl>("sender_name", false);
 
 	icon->setVisible(e == CHATITEMHEADER_SHOW_ONLY_ICON || e==CHATITEMHEADER_SHOW_BOTH);
 	name->setVisible(e == CHATITEMHEADER_SHOW_ONLY_NAME || e==CHATITEMHEADER_SHOW_BOTH);
@@ -272,20 +246,15 @@ void	LLChatItemCtrl::setHeaderVisibility(EShowItemHeader e)
 
 bool	LLChatItemCtrl::canAddText	()
 {
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text",false,false);
-	if(!msg_text )
-		return false;
+	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
 	return msg_text->getTextLinesNum()<10;
 }
 
 BOOL	LLChatItemCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-	LLPanel* caption = getChild<LLPanel>("msg_caption",false,false);
-	if(!caption)
-		return LLPanel::handleRightMouseDown(x,y,mask);
-	LLUICtrl* avatar_icon = caption->getChild<LLUICtrl>("avatar_icon",false,false);
-	if(!avatar_icon)
-		return LLPanel::handleRightMouseDown(x,y,mask);
+	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
+	LLUICtrl* avatar_icon = caption->getChild<LLUICtrl>("avatar_icon", false);
+
 	S32 local_x = x - avatar_icon->getRect().mLeft - caption->getRect().mLeft;
 	S32 local_y = y - avatar_icon->getRect().mBottom - caption->getRect().mBottom;
 
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 3b88bcfe20..80e27bd366 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -39,7 +39,6 @@
 #include "lliconctrl.h"
 #include "llimpanel.h"				// LLFloaterIMPanel
 #include "llimview.h"
-#include "llfloatergroupinfo.h"
 #include "llfloaterreg.h"
 #include "llmenugl.h"
 #include "lloutputmonitorctrl.h"
@@ -78,6 +77,7 @@ LLNotificationChiclet::LLNotificationChiclet(const Params& p)
 : LLChiclet(p)
 , mButton(NULL)
 , mCounterCtrl(NULL)
+, mNotificationChicletWindow(NULL)
 {
 	LLButton::Params button_params = p.button;
 	button_params.rect(p.rect());
@@ -403,9 +403,7 @@ void LLIMChiclet::onMenuItemClicked(const LLSD& user_data)
 	}
 	else if("add" == level)
 	{
-		std::string name;
-		gCacheName->getFullName(other_participant_id,name);
-		LLAvatarActions::requestFriendshipDialog(other_participant_id,name);
+		LLAvatarActions::requestFriendshipDialog(other_participant_id);
 	}
 	else if("remove" == level)
 	{
@@ -417,7 +415,7 @@ void LLIMChiclet::onMenuItemClicked(const LLSD& user_data)
 	}
 	else if("info" == level)
 	{
-		LLFloaterGroupInfo::showFromUUID(other_participant_id);
+		LLGroupActions::show(other_participant_id);
 	}
 }
 
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index a748141a14..103443ccd8 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -363,10 +363,15 @@ public:
 
 	/*virtual*/ ~ LLNotificationChiclet();
 
+	// Notification Chiclet Window
+	void	setNotificationChicletWindow(LLFloater* wnd) { mNotificationChicletWindow = wnd; }
+
 protected:
 	LLNotificationChiclet(const Params& p);
 	friend class LLUICtrlFactory;
 
+	LLFloater*	mNotificationChicletWindow;
+
 protected:
 	LLButton* mButton;
 	LLChicletNotificationCounterCtrl* mCounterCtrl;
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 3964fbfa74..9cb3ea127f 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -168,6 +168,18 @@ void LLFavoritesBarCtrl::reshape(S32 width, S32 height, BOOL called_from_parent)
 	LLUICtrl::reshape(width, height, called_from_parent);
 }
 
+LLXMLNodePtr LLFavoritesBarCtrl::getButtonXMLNode()
+{
+	LLXMLNodePtr buttonXMLNode = NULL;
+	bool success = LLUICtrlFactory::getLayeredXMLNode("favorites_bar_button.xml", buttonXMLNode);
+	if (!success)
+	{
+		llwarns << "Unable to read xml file with button for Favorites Bar: favorites_bar_button.xml" << llendl;
+		buttonXMLNode = NULL;
+	}
+	return buttonXMLNode;
+}
+
 void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 {
 	LLInventoryModel::item_array_t items;
@@ -177,21 +189,25 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 		return;
 	}
 
-	const S32 buttonHPad = LLUI::sSettingGroups["config"]->getS32("ButtonHPad");
-	const S32 buttonHGap = 2;
+	static LLXMLNodePtr buttonXMLNode = getButtonXMLNode();
+	if (buttonXMLNode.isNull())
+	{
+		return;
+	}
+
+	S32 buttonWidth = 120; //default value
+	buttonXMLNode->getAttributeS32("width", buttonWidth);
+	S32 buttonHGap = 2; // default value
+	buttonXMLNode->getAttributeS32("left", buttonHGap);
+
 	const S32 buttonVGap = 2;
-	static LLButton::Params default_button_params(LLUICtrlFactory::getDefaultParams<LLButton>());
-	std::string flat_icon			= "transparent.j2c";
-	std::string hover_icon			= default_button_params.image_unselected.name;
-	std::string hover_icon_selected	= default_button_params.image_selected.name;
 	
-	S32 curr_x = buttonHGap;
-
 	S32 count = items.count();
 
+	const S32 buttonHPad = LLUI::sSettingGroups["config"]->getS32("ButtonHPad");
 	const S32 chevron_button_width = mFont->getWidth(">>") + buttonHPad * 2;
 
-	S32 buttons_space = bar_width - curr_x;
+	S32 buttons_space = bar_width - buttonHGap;
 
 	S32 first_drop_down_item = count;
 
@@ -199,7 +215,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 	S32 buttons_width = 0;
 	for (S32 i = 0; i < count; ++i)
 	{
-		buttons_width += mFont->getWidth(items.get(i)->getName()) + buttonHPad * 2 + buttonHGap;
+		buttons_width += buttonWidth + buttonHGap;
 		if (buttons_width > buttons_space)
 		{
 			// There is no space for all buttons.
@@ -207,7 +223,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 			buttons_space -= chevron_button_width + buttonHGap;
 			while (i >= 0 && buttons_width > buttons_space)
 			{
-				buttons_width -= mFont->getWidth(items.get(i)->getName()) + buttonHPad * 2 + buttonHGap;
+				buttons_width -= buttonWidth + buttonHGap;
 				i--;
 			}
 			first_drop_down_item = i + 1; // First item behind visible items
@@ -259,37 +275,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 			}
 		}
 
-		// Adding buttons
-		for(S32 i = mFirstDropDownItem -1; i >= 0; i--)
-		{
-
-			LLInventoryItem* item = items.get(i);
-
-			S32 buttonWidth = mFont->getWidth(item->getName()) + buttonHPad * 2;
-
-			LLRect rect;
-			rect.setOriginAndSize(curr_x, buttonVGap, buttonWidth, getRect().getHeight()-buttonVGap);
-
-			LLButton::Params bparams;
-			bparams.image_unselected.name(flat_icon);
-			bparams.image_disabled.name(flat_icon);
-			bparams.image_selected.name(hover_icon_selected);
-			bparams.image_hover_selected.name(hover_icon_selected);
-			bparams.image_disabled_selected.name(hover_icon_selected);
-			bparams.image_hover_unselected.name(hover_icon);
-			bparams.follows.flags (FOLLOWS_LEFT | FOLLOWS_BOTTOM);
-			bparams.rect (rect);
-			bparams.tab_stop(false);
-			bparams.font(mFont);
-			bparams.name(item->getName());
-			bparams.tool_tip(item->getName());
-			bparams.click_callback.function(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
-			bparams.rightclick_callback.function(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID()));
-
-			addChildInBack(LLUICtrlFactory::create<LLButton> (bparams));
-
-			curr_x += buttonWidth + buttonHGap;
-		}
+		createButtons(items, buttonXMLNode, buttonWidth, buttonHGap);
 	}
 
 	// Chevron button
@@ -307,6 +293,11 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 		}
 		else
 		{
+			static LLButton::Params default_button_params(LLUICtrlFactory::getDefaultParams<LLButton>());
+			std::string flat_icon			= "transparent.j2c";
+			std::string hover_icon			= default_button_params.image_unselected.name;
+			std::string hover_icon_selected	= default_button_params.image_selected.name;
+
 			LLButton::Params bparams;
 
 			LLRect rect;
@@ -341,6 +332,37 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 	}
 }
 
+
+void LLFavoritesBarCtrl::createButtons(const LLInventoryModel::item_array_t &items, const LLXMLNodePtr &buttonXMLNode, S32 buttonWidth, S32 buttonHGap)
+{
+	S32 curr_x = buttonHGap;
+	// Adding buttons
+	for(S32 i = mFirstDropDownItem -1; i >= 0; i--)
+	{
+		LLInventoryItem* item = items.get(i);
+
+		LLButton* fav_btn = LLUICtrlFactory::defaultBuilder<LLButton>(buttonXMLNode, this, NULL);
+		if (NULL == fav_btn)
+		{
+			llwarns << "Unable to create button for landmark: " << item->getName() << llendl;
+			continue;
+		}
+
+		// change only left and save bottom
+		fav_btn->setOrigin(curr_x, fav_btn->getRect().mBottom);
+		fav_btn->setFont(mFont);
+		fav_btn->setName(item->getName());
+		fav_btn->setLabel(item->getName());
+		fav_btn->setToolTip(item->getName());
+		fav_btn->setCommitCallback(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
+		fav_btn->setRightClickedCallback(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID(), _1, _2, _3,_4 ));
+		sendChildToBack(fav_btn);
+
+		curr_x += buttonWidth + buttonHGap;
+	}
+}
+
+
 BOOL LLFavoritesBarCtrl::postBuild()
 {
 	// make the popup menu available
@@ -462,10 +484,8 @@ void LLFavoritesBarCtrl::showDropDownMenu()
 			item_params.label(item_name);
 			
 			item_params.on_click.function(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
-			item_params.rightclick_callback.function(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID()));
-
 			LLMenuItemCallGL *menu_item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
-
+			menu_item->setRightClickedCallback(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this,item->getUUID(),_1,_2,_3,_4));
 			// Check whether item name wider than menu
 			if ((S32) menu_item->getNominalWidth() > bar_width)
 			{
@@ -514,7 +534,7 @@ void LLFavoritesBarCtrl::onButtonClick(LLUUID item_id)
 	LLInvFVBridgeAction::doAction(item_id,&gInventory);
 }
 
-void LLFavoritesBarCtrl::onButtonRightClick(LLUUID item_id)
+void LLFavoritesBarCtrl::onButtonRightClick( LLUUID item_id,LLView* fav_button,S32 x,S32 y,MASK mask)
 {
 	mSelectedItemID = item_id;
 	
@@ -525,10 +545,7 @@ void LLFavoritesBarCtrl::onButtonRightClick(LLUUID item_id)
 	}
 	
 	menu->updateParent(LLMenuGL::sMenuContainer);
-
-	S32 x,y;
-	LLUI::getCursorPositionLocal(this, &x, &y);
-	LLMenuGL::showPopup(this, menu, x, y);
+	LLMenuGL::showPopup(fav_button, menu, x, y);
 }
 
 void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata)
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
index a559692331..7da33e2f6e 100644
--- a/indra/newview/llfavoritesbar.h
+++ b/indra/newview/llfavoritesbar.h
@@ -61,10 +61,12 @@ public:
 
 protected:
 	void updateButtons(U32 bar_width);
+	void createButtons(const LLInventoryModel::item_array_t &items, const LLXMLNodePtr &root, S32 buttonWidth, S32 buttonHGap);
+	LLXMLNodePtr getButtonXMLNode();
 	BOOL collectFavoriteItems(LLInventoryModel::item_array_t &items);
 
 	void onButtonClick(LLUUID id);
-	void onButtonRightClick(LLUUID id);
+	void onButtonRightClick(LLUUID id,LLView* button,S32 x,S32 y,MASK mask);
 	
 	void doToSelected(const LLSD& userdata);
 	
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 8cba42dea5..94ea20893a 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -140,17 +140,17 @@ void LLFloaterCamera::onClickCameraPresets(LLUICtrl* ctrl, const LLSD& param)
 	if ("rear_view" == name)
 	{
 		LLFirstTimeTipsManager::showTipsFor(LLFirstTimeTipsManager::FTT_CAMERA_PRESET_REAR, ctrl);
-		gAgent.resetView(TRUE, TRUE);
+		gAgent.switchCameraPreset(CAMERA_PRESET_REAR_VIEW);
 	}
-	else if ("3/4_view" == name)
+	else if ("group_view" == name)
 	{
 		LLFirstTimeTipsManager::showTipsFor(LLFirstTimeTipsManager::FTT_CAMERA_PRESET_GROUP);
-		//*TODO implement 3/4 view
+		gAgent.switchCameraPreset(CAMERA_PRESET_GROUP_VIEW);
 	}
 	else if ("front_view" == name)
 	{
 		LLFirstTimeTipsManager::showTipsFor(LLFirstTimeTipsManager::FTT_CAMERA_PRESET_FRONT);
-		//*TODO implement front view
+		gAgent.switchCameraPreset(CAMERA_PRESET_FRONT_VIEW);
 	}
 
 }
@@ -165,8 +165,7 @@ void LLFloaterCamera::updatePosition()
 	LLBottomTray* tray = LLBottomTray::getInstance();
 	if (!tray) return;
 
-	LLButton* camera_button = tray->getChild<LLButton>("camera_btn", TRUE, FALSE);
-	if (!camera_button) return;
+	LLButton* camera_button = tray->getChild<LLButton>("camera_btn");
 
 	//align centers of a button and a floater
 	S32 x = camera_button->calcScreenRect().getCenterX() - getRect().getWidth()/2;
@@ -281,14 +280,10 @@ void LLFloaterCamera::onClickBtn(ECameraControlMode mode)
 
 void LLFloaterCamera::assignButton2Mode(ECameraControlMode mode, const std::string& button_name)
 {
-	LLButton* button = getChild<LLButton>(button_name, TRUE, FALSE);
-	llassert_always(button);
+	LLButton* button = getChild<LLButton>(button_name);
 	
-	if (button)
-	{
-		button->setClickedCallback(boost::bind(&LLFloaterCamera::onClickBtn, this, mode));
-		mMode2Button[mode] = button;
-	}
+	button->setClickedCallback(boost::bind(&LLFloaterCamera::onClickBtn, this, mode));
+	mMode2Button[mode] = button;
 }
 
 void LLFloaterCamera::initMode2TipTypeMap()
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
index 7f03d63b3e..f49f854620 100644
--- a/indra/newview/llfloatergroups.cpp
+++ b/indra/newview/llfloatergroups.cpp
@@ -273,7 +273,7 @@ void LLPanelGroups::onBtnSearch(void* userdata)
 
 void LLPanelGroups::create()
 {
-	LLGroupActions::create();
+	LLGroupActions::createGroup();
 }
 
 void LLPanelGroups::activate()
@@ -293,7 +293,7 @@ void LLPanelGroups::info()
 	LLUUID group_id;
 	if (group_list && (group_id = group_list->getCurrentID()).notNull())
 	{
-		LLGroupActions::info(group_id);
+		LLGroupActions::show(group_id);
 	}
 }
 
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp
index a486ef565a..33a99facad 100644
--- a/indra/newview/llfloaterinventory.cpp
+++ b/indra/newview/llfloaterinventory.cpp
@@ -64,7 +64,6 @@
 #include "llmenugl.h"
 #include "llpreviewanim.h"
 #include "llpreviewgesture.h"
-#include "llpreviewlandmark.h"
 #include "llpreviewnotecard.h"
 #include "llpreviewscript.h"
 #include "llpreviewsound.h"
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 63ac44da4f..c5e07c6596 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -51,7 +51,6 @@
 #include "llfloateravatarpicker.h"
 #include "llfloaterauction.h"
 #include "llfloatergroups.h"
-#include "llfloatergroupinfo.h"
 #include "llavataractions.h"
 #include "lllineeditor.h"
 #include "llnamelistctrl.h"
@@ -79,6 +78,8 @@
 #include "roles_constants.h"
 #include "lltrans.h"
 
+#include "llgroupactions.h"
+
 static std::string OWNER_ONLINE 	= "0";
 static std::string OWNER_OFFLINE	= "1";
 static std::string OWNER_GROUP 		= "2";
@@ -806,7 +807,7 @@ void LLPanelLandGeneral::onClickProfile(void* data)
 	if (parcel->getIsGroupOwned())
 	{
 		const LLUUID& group_id = parcel->getGroupID();
-		LLFloaterGroupInfo::showFromUUID(group_id);
+		LLGroupActions::show(group_id);
 	}
 	else
 	{
@@ -1080,7 +1081,7 @@ void LLPanelLandObjects::onDoubleClickOwner(void *userdata)
 		BOOL is_group = cell->getValue().asString() == OWNER_GROUP;
 		if (is_group)
 		{
-			LLFloaterGroupInfo::showFromUUID(owner_id);
+			LLGroupActions::show(owner_id);
 		}
 		else
 		{
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp
index de3cd5d4e3..19552ca9c9 100644
--- a/indra/newview/llfloaterlandholdings.cpp
+++ b/indra/newview/llfloaterlandholdings.cpp
@@ -42,7 +42,6 @@
 
 #include "llagent.h"
 #include "llfloaterreg.h"
-#include "llfloatergroupinfo.h"
 #include "llfloaterworldmap.h"
 #include "llproductinforequest.h"
 #include "llscrolllistctrl.h"
@@ -56,6 +55,8 @@
 #include "llviewermessage.h"
 #include "lluictrlfactory.h"
 
+#include "llgroupactions.h"
+
 // protected
 LLFloaterLandHoldings::LLFloaterLandHoldings(const LLSD& key)
 :	LLFloater(key),
@@ -323,7 +324,7 @@ void LLFloaterLandHoldings::onGrantList(void* data)
 	LLUUID group_id = list->getCurrentID();
 	if (group_id.notNull())
 	{
-		LLFloaterGroupInfo::showFromUUID(group_id);
+		LLGroupActions::show(group_id);
 	}
 }
 
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index 7042882084..0a3d97245b 100644
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -212,12 +212,9 @@ void LLFloaterNotificationConsole::addChannel(const std::string& name, bool open
 
 void LLFloaterNotificationConsole::removeChannel(const std::string& name)
 {
-	LLPanel* panelp = getChild<LLPanel>(name, TRUE, FALSE);
-	if (panelp)
-	{
-		getChildRef<LLLayoutStack>("notification_channels").removePanel(panelp);
-		delete panelp;
-	}
+	LLPanel* panelp = getChild<LLPanel>(name);
+	getChildRef<LLLayoutStack>("notification_channels").removePanel(panelp);
+	delete panelp;
 
 	updateResizeLimits();
 }
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 7312808bd6..cafaa6dd79 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -43,7 +43,6 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
-#include "llfloatergroupinfo.h"
 #include "llavataractions.h"
 #include "llinventorymodel.h"
 #include "lllineeditor.h"
@@ -59,6 +58,7 @@
 #include "llviewerregion.h"
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
+#include "llgroupactions.h"
 
 #include "lluictrlfactory.h"
 
@@ -554,7 +554,7 @@ void LLFloaterProperties::onClickOwner()
 	if(!item) return;
 	if(item->getPermissions().isGroupOwned())
 	{
-		LLFloaterGroupInfo::showFromUUID(item->getPermissions().getGroup());
+		LLGroupActions::show(item->getPermissions().getGroup());
 	}
 	else
 	{
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 57acbb147d..098a5197df 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -51,12 +51,13 @@
 #include "llfocusmgr.h"
 #include "lllandmarklist.h"
 #include "lllineeditor.h"
-#include "llpreviewlandmark.h"
 #include "llregionhandle.h"
 #include "llscrolllistctrl.h"
 #include "llslurl.h"
+#include "lltabcontainer.h"
 #include "lltextbox.h"
 #include "lltracker.h"
+#include "llinventorymodel.h"
 #include "llviewerinventory.h"	// LLViewerInventoryItem
 #include "llviewermenu.h"
 #include "llviewerregion.h"
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 30f4447283..b14f23f9cf 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -36,12 +36,74 @@
 #include "llgroupactions.h"
 
 #include "llagent.h"
-#include "llfloatergroupinfo.h"
 #include "llfloaterreg.h"
 #include "llimview.h" // for gIMMgr
 #include "llgroupmgr.h"
 #include "llavataractions.h"
 #include "llviewercontrol.h"
+#include "llsidetray.h"
+
+#include "llcommandhandler.h"
+
+//
+// Globals
+//
+
+class LLGroupHandler : public LLCommandHandler
+{
+public:
+	// requires trusted browser to trigger
+	LLGroupHandler() : LLCommandHandler("group", true) { }
+	bool handle(const LLSD& tokens, const LLSD& query_map,
+				LLWebBrowserCtrl* web)
+	{
+		if (tokens.size() < 1)
+		{
+			return false;
+		}
+
+		if (tokens[0].asString() == "create")
+		{
+			LLGroupActions::createGroup();
+			return true;
+		}
+
+		if (tokens.size() < 2)
+		{
+			return false;
+		}
+
+		if (tokens[0].asString() == "list")
+		{
+			if (tokens[1].asString() == "show")
+			{
+				LLFloaterReg::showInstance("contacts", "groups");
+				return true;
+			}
+            return false;
+		}
+
+		LLUUID group_id;
+		if (!group_id.set(tokens[0], FALSE))
+		{
+			return false;
+		}
+
+		if (tokens[1].asString() == "about")
+		{
+			if (group_id.isNull())
+				return true;
+
+			LLGroupActions::show(group_id);
+
+			return true;
+		}
+		return false;
+	}
+};
+LLGroupHandler gGroupHandler;
+
+
 
 // LLGroupActions::teleport helper
 //
@@ -167,12 +229,6 @@ void LLGroupActions::search()
 	LLFloaterReg::showInstance("search", LLSD().insert("panel", "group"));
 }
 
-// static
-void LLGroupActions::create()
-{
-	LLFloaterGroupInfo::showCreateGroup(NULL);
-}
-
 // static
 void LLGroupActions::leave(const LLUUID& group_id)
 {
@@ -208,14 +264,66 @@ void LLGroupActions::activate(const LLUUID& group_id)
 	gAgent.sendReliableMessage();
 }
 
+bool	isGroupUIVisible()
+{
+	LLPanel* panel = LLSideTray::getInstance()->findChild<LLPanel>("panel_group_info_sidetray");
+	if(!panel)
+		return false;
+	return panel->getVisible();
+}
+
 // static
-void LLGroupActions::info(const LLUUID& group_id)
+void LLGroupActions::show(const LLUUID& group_id)
 {
 	if (group_id.isNull())
 		return;
 
-	LLFloaterGroupInfo::showFromUUID(group_id);	
+	LLSD params;
+	params["group_id"] = group_id;
+	params["open_tab_name"] = "panel_group_info_sidetray";
+
+	LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
+}
+
+//static 
+void LLGroupActions::refresh(const LLUUID& group_id)
+{
+	if(!isGroupUIVisible())
+		return;
+
+	LLSD params;
+	params["group_id"] = group_id;
+	params["open_tab_name"] = "panel_group_info_sidetray";
+	params["action"] = "refresh";
+
+	LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
+}
+
+//static 
+void LLGroupActions::createGroup()
+{
+	LLSD params;
+	params["group_id"] = LLUUID::null;
+	params["open_tab_name"] = "panel_group_info_sidetray";
+	params["action"] = "create";
+
+	LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
+
 }
+//static
+void LLGroupActions::closeGroup(const LLUUID& group_id)
+{
+	if(!isGroupUIVisible())
+		return;
+
+	LLSD params;
+	params["group_id"] = group_id;
+	params["open_tab_name"] = "panel_group_info_sidetray";
+	params["action"] = "close";
+
+	LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
+}
+
 
 // static
 void LLGroupActions::startChat(const LLUUID& group_id)
diff --git a/indra/newview/llgroupactions.h b/indra/newview/llgroupactions.h
index b6ddb4511a..70170d3cfe 100644
--- a/indra/newview/llgroupactions.h
+++ b/indra/newview/llgroupactions.h
@@ -47,11 +47,6 @@ public:
 	 */
 	static void search();
 
-	/**
-	 * Invokes group creation floater.
-	 */
-	static void create();
-
 	/**
 	 * Invokes "Leave Group" floater.
 	 */
@@ -63,9 +58,24 @@ public:
 	static void activate(const LLUUID& group_id);
 
 	/**
-	 * Show group information dialog.
+	 * Show group information panel.
+	 */
+	static void show(const LLUUID& group_id);
+
+	/**
+	 * Refresh group information panel.
+	 */
+	static void refresh(const LLUUID& group_id);
+
+	/**
+	 * Refresh group information panel.
+	 */
+	static void createGroup();
+
+	/**
+	 * Close group information panel.
 	 */
-	static void info(const LLUUID& group_id);
+	static void closeGroup		(const LLUUID& group_id);
 
 	/**
 	 * Start group instant messaging session.
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index a8d97c6afb..0ba1019765 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -51,7 +51,8 @@
 #include "lleconomy.h"
 #include "llviewerwindow.h"
 #include "llfloaterdirectory.h"
-#include "llfloatergroupinfo.h"
+#include "llpanelgroup.h"
+#include "llgroupactions.h"
 #include "lluictrlfactory.h"
 #include <boost/regex.hpp>
 
@@ -1210,7 +1211,7 @@ void LLGroupMgr::processEjectGroupMemberReply(LLMessageSystem* msg, void ** data
 	// If we had a failure, the group panel needs to be updated.
 	if (!success)
 	{
-		LLFloaterGroupInfo::refreshGroup(group_id);
+		LLGroupActions::refresh(group_id);
 	}
 }
 
@@ -1230,7 +1231,7 @@ void LLGroupMgr::processJoinGroupReply(LLMessageSystem* msg, void ** data)
 
 		LLGroupMgr::getInstance()->clearGroupData(group_id);
 		// refresh the floater for this group, if any.
-		LLFloaterGroupInfo::refreshGroup(group_id);
+		LLGroupActions::refresh(group_id);
 		// refresh the group panel of the search window, if necessary.
 		LLFloaterDirectory::refreshGroup(group_id);
 	}
@@ -1252,7 +1253,7 @@ void LLGroupMgr::processLeaveGroupReply(LLMessageSystem* msg, void ** data)
 
 		LLGroupMgr::getInstance()->clearGroupData(group_id);
 		// close the floater for this group, if any.
-		LLFloaterGroupInfo::closeGroup(group_id);
+		LLGroupActions::closeGroup(group_id);
 		// refresh the group panel of the search window, if necessary.
 		LLFloaterDirectory::refreshGroup(group_id);
 	}
@@ -1288,8 +1289,10 @@ void LLGroupMgr::processCreateGroupReply(LLMessageSystem* msg, void ** data)
 
 		gAgent.mGroups.push_back(gd);
 
-		LLFloaterGroupInfo::closeCreateGroup();
-		LLFloaterGroupInfo::showFromUUID(group_id,"roles_tab");
+		LLPanelGroup::refreshCreatedGroup(group_id);
+		//FIXME
+		//LLFloaterGroupInfo::closeCreateGroup();
+		//LLFloaterGroupInfo::showFromUUID(group_id,"roles_tab");
 	}
 	else
 	{
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 879f106b1f..eeb127c878 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -51,9 +51,9 @@
 #include "llchat.h"
 #include "llchiclet.h"
 #include "llconsole.h"
+#include "llgroupactions.h"
 #include "llfloater.h"
 #include "llfloatercall.h"
-#include "llfloatergroupinfo.h"
 #include "llavataractions.h"
 #include "llimview.h"
 #include "llinventory.h"
@@ -1581,7 +1581,8 @@ void LLFloaterIMPanel::onClickGroupInfo( void* userdata )
 	//  Bring up the Profile window
 	LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
 
-	LLFloaterGroupInfo::showFromUUID(self->mSessionUUID);
+	LLGroupActions::show(self->mSessionUUID);
+
 }
 
 // static
@@ -2120,7 +2121,7 @@ BOOL LLIMFloater::postBuild()
 
 	childSetCommitCallback("chat_editor", onSendMsg, this);
 	
-	mHistoryEditor = getChild<LLViewerTextEditor>("im_text", true, false);
+	mHistoryEditor = getChild<LLViewerTextEditor>("im_text");
 		
 	setTitle(LLIMModel::instance().getName(mSessionID));
 	setDocked(true);
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index bf09774203..2ef643e3f7 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -67,7 +67,6 @@
 #include "llmenugl.h"
 #include "llpreviewanim.h"
 #include "llpreviewgesture.h"
-#include "llpreviewlandmark.h"
 #include "llpreviewnotecard.h"
 #include "llpreviewscript.h"
 #include "llpreviewsound.h"
@@ -2899,10 +2898,6 @@ void LLLandmarkBridge::performAction(LLFolderView* folder, LLInventoryModel* mod
 			key["id"] = item->getUUID();
 
 			LLSideTray::getInstance()->showPanel("panel_places", key);
-			
-			// Floater preview_landmark disabled, 
-			// its functionality moved to Side Tray Places Panel 
-			//LLFloaterReg::showInstance("preview_landmark", LLSD(item->getUUID()), TAKE_FOCUS_YES);
 		}
 	}
 	else 
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 7986d7c861..e2dc7d69a1 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -55,7 +55,7 @@
 #include "llviewerinventory.h"
 #include "llviewerparcelmgr.h"
 #include "llviewercontrol.h"
-
+#include "llurllineeditorctrl.h"
 //============================================================================
 /*
  * "ADD LANDMARK" BUTTON UPDATING LOGIC
@@ -163,12 +163,38 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mInfoBtn(NULL),
 	mAddLandmarkBtn(NULL)
 {
+	// Lets replace default LLLineEditor with LLLocationLineEditor
+	// to make needed escaping while copying and cutting url
+	this->removeChild(mTextEntry);
+	delete mTextEntry;
+
+	// 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;
+
+	LLLineEditor::Params params = p.combo_editor;
+	params.rect(text_entry_rect);
+	params.default_text(LLStringUtil::null);
+	params.max_length_bytes(p.max_chars);
+	params.commit_callback.function(boost::bind(&LLComboBox::onTextCommit, this, _2));
+	params.keystroke_callback(boost::bind(&LLComboBox::onTextEntry, this, _1));
+	params.focus_lost_callback(NULL);
+	params.handle_edit_keys_directly(true);
+	params.commit_on_focus_lost(false);
+	params.follows.flags(FOLLOWS_ALL);
+	mTextEntry = LLUICtrlFactory::create<LLURLLineEditor>(params);
+	this->addChild(mTextEntry);
+	// LLLineEditor is replaced with LLLocationLineEditor
+
 	// "Place information" button.
 	LLButton::Params info_params = p.info_button;
 	mInfoBtn = LLUICtrlFactory::create<LLButton>(info_params);
 	mInfoBtn->setClickedCallback(boost::bind(&LLLocationInputCtrl::onInfoButtonClicked, this));
 	addChild(mInfoBtn);
-	
+
 	// "Add landmark" button.
 	LLButton::Params al_params = p.add_landmark_button;
 	if (p.add_landmark_image_enabled())
@@ -187,6 +213,7 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	addChild(mAddLandmarkBtn);
 	
 	setPrearrangeCallback(boost::bind(&LLLocationInputCtrl::onLocationPrearrange, this, _2));
+	getTextEntry()->setMouseUpCallback(boost::bind(&LLLocationInputCtrl::onTextEditorMouseUp, this, _2,_3,_4));
 
 	updateWidgetlayout();
 
@@ -234,24 +261,20 @@ BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect*
 	// Let the buttons show their tooltips.
 	if (LLUICtrl::handleToolTip(x, y, msg, sticky_rect_screen) && !msg.empty())
 	{
-		LLLocationHistory* lh = LLLocationHistory::getInstance();
-		const std::string tooltip = lh->getToolTip(msg);
+		if (mList->getRect().pointInRect(x, y)) {
+			LLLocationHistory* lh = LLLocationHistory::getInstance();
+			const std::string tooltip = lh->getToolTip(msg);
 
-		if (!tooltip.empty()) {
-			msg = tooltip;
+			if (!tooltip.empty()) {
+				msg = tooltip;
+			}
 		}
 
 		return TRUE;
 	}
 
-	// Cursor is above the text entry.
 	msg = LLUI::sShowXUINames ? getShowNamesToolTip() : "";
-	if (mTextEntry && sticky_rect_screen)
-	{
-		*sticky_rect_screen = mTextEntry->calcScreenRect();
-	}
-
-	return TRUE;
+	return mTextEntry->getRect().pointInRect(x, y);
 }
 
 BOOL LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask)
@@ -328,19 +351,19 @@ void LLLocationInputCtrl::handleLoginComplete()
 void LLLocationInputCtrl::onFocusReceived()
 {
 	prearrangeList();
-	setText(gAgent.getSLURL());
-	if (mTextEntry)
-		mTextEntry->endSelection(); // we don't want handleMouseUp() to "finish" the selection
 }
 
 void LLLocationInputCtrl::onFocusLost()
 {
 	LLUICtrl::onFocusLost();
 	refreshLocation();
+	if(mTextEntry->hasSelection()){
+		mTextEntry->deselect();
+	}
 }
 void	LLLocationInputCtrl::draw(){
 	
-	if(!hasFocus()){
+	if(!hasFocus() && gSavedSettings.getBOOL("ShowCoordinatesOption")){
 		refreshLocation();
 	}
 	LLComboBox::draw();
@@ -378,6 +401,13 @@ void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data)
 	rebuildLocationHistory(filter);
 	mList->mouseOverHighlightNthItem(-1); // Clear highlight on the last selected item.
 }
+void LLLocationInputCtrl::onTextEditorMouseUp(S32 x, S32 y, MASK mask)
+{
+	if (!mTextEntry->hasSelection()) {
+			setText(gAgent.getUnescapedSLURL());
+			mTextEntry->selectAll();
+	}
+}
 
 void LLLocationInputCtrl::refresh()
 {
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index bda67fd313..0196aae4e7 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -103,6 +103,7 @@ private:
 	void					onInfoButtonClicked();
 	void					onLocationHistoryLoaded();
 	void					onLocationPrearrange(const LLSD& data);
+	void 					onTextEditorMouseUp(S32 x, S32 y, MASK mask);
 	void					onLandmarkLoaded(LLLandmark* lm);
 	void					onAddLandmarkButtonClicked();
 	void					onAgentParcelChange();
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 96c8f3e2e9..fc425d1b33 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -373,8 +373,7 @@ void LLFloaterMove::updatePosition()
 	LLBottomTray* tray = LLBottomTray::getInstance();
 	if (!tray) return;
 
-	LLButton* movement_btn = tray->getChild<LLButton>(BOTTOM_TRAY_BUTTON_NAME, TRUE, FALSE);
-	if (!movement_btn) return;
+	LLButton* movement_btn = tray->getChild<LLButton>(BOTTOM_TRAY_BUTTON_NAME);
 
 	//align centers of a button and a floater
 	S32 x = movement_btn->calcScreenRect().getCenterX() - getRect().getWidth()/2;
@@ -569,8 +568,7 @@ void LLPanelStandStopFlying::updatePosition()
 	LLBottomTray* tray = LLBottomTray::getInstance();
 	if (!tray) return;
 
-	LLButton* movement_btn = tray->getChild<LLButton>(BOTTOM_TRAY_BUTTON_NAME, TRUE, FALSE);
-	if (!movement_btn) return;
+	LLButton* movement_btn = tray->getChild<LLButton>(BOTTOM_TRAY_BUTTON_NAME);
 
 	//align centers of a button and a floater
 	S32 x = movement_btn->calcScreenRect().getCenterX() - getRect().getWidth()/2;
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index b980490434..0f719f29e9 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -56,6 +56,7 @@
 #include "llworldmap.h"
 #include "llappviewer.h"
 #include "llviewercontrol.h"
+#include "llfavoritesbar.h"
 
 //-- LLTeleportHistoryMenuItem -----------------------------------------------
 
@@ -200,6 +201,9 @@ LLNavigationBar::LLNavigationBar()
 
 	// set a listener function for LoginComplete event
 	LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLNavigationBar::handleLoginComplete, this));
+
+	// Necessary for focus movement among child controls
+	setFocusRoot(TRUE);
 }
 
 LLNavigationBar::~LLNavigationBar()
@@ -246,6 +250,9 @@ BOOL LLNavigationBar::postBuild()
 		return FALSE;
 	}
 
+	mDefaultNbRect = getRect();
+	mDefaultFpRect = getChild<LLFavoritesBarCtrl>("favorite")->getRect();
+
 	// we'll be notified on teleport history changes
 	LLTeleportHistory::getInstance()->setHistoryChangedCallback(
 			boost::bind(&LLNavigationBar::onTeleportHistoryChanged, this));
@@ -278,6 +285,11 @@ BOOL LLNavigationBar::handleRightMouseUp(S32 x, S32 y, MASK mask)
 		{
 			mLocationContextMenu->buildDrawLabels();
 			mLocationContextMenu->updateParent(LLMenuGL::sMenuContainer);
+			LLLineEditor* textEntry =mCmbLocation->getTextEntry();  
+			if(textEntry && !textEntry->hasSelection() ){
+				textEntry->setText(gAgent.getUnescapedSLURL());
+				textEntry->selectAll();
+			}
 			LLMenuGL::showPopup(this, mLocationContextMenu, x, y);
 		}
 		return TRUE;
@@ -605,3 +617,131 @@ void LLNavigationBar::clearHistoryCache()
 	lh->save();	
 	mPurgeTPHistoryItems= true;
 }
+
+void LLNavigationBar::showNavigationPanel(BOOL visible)
+{
+	bool fpVisible = gSavedSettings.getBOOL("ShowNavbarFavoritesPanel");
+
+	LLFavoritesBarCtrl* fb = getChild<LLFavoritesBarCtrl>("favorite");
+	LLPanel* navPanel = getChild<LLPanel>("navigation_panel");
+
+	LLRect nbRect(getRect());
+	LLRect fbRect(fb->getRect());
+
+	navPanel->setVisible(visible);
+
+	if (visible)
+	{
+		if (fpVisible)
+		{
+			// Navigation Panel must be shown. Favorites Panel is visible.
+
+			nbRect.setLeftTopAndSize(nbRect.mLeft, nbRect.mTop, nbRect.getWidth(), mDefaultNbRect.getHeight());
+			fbRect.setLeftTopAndSize(fbRect.mLeft, mDefaultFpRect.mTop, fbRect.getWidth(), fbRect.getHeight());
+
+			// this is duplicated in 'else' section because it should be called BEFORE fb->reshape
+			reshape(nbRect.getWidth(), nbRect.getHeight());
+			setRect(nbRect);
+
+			fb->reshape(fbRect.getWidth(), fbRect.getHeight());
+			fb->setRect(fbRect);
+		}
+		else
+		{
+			// Navigation Panel must be shown. Favorites Panel is hidden.
+
+			S32 height = mDefaultNbRect.getHeight() - mDefaultFpRect.getHeight();
+			nbRect.setLeftTopAndSize(nbRect.mLeft, nbRect.mTop, nbRect.getWidth(), height);
+
+			reshape(nbRect.getWidth(), nbRect.getHeight());
+			setRect(nbRect);
+		}
+	}
+	else
+	{
+		if (fpVisible)
+		{
+			// Navigation Panel must be hidden. Favorites Panel is visible.
+
+			nbRect.setLeftTopAndSize(nbRect.mLeft, nbRect.mTop, nbRect.getWidth(), fbRect.getHeight());
+			fbRect.setLeftTopAndSize(fbRect.mLeft, fbRect.getHeight(), fbRect.getWidth(), fbRect.getHeight());
+
+			// this is duplicated in 'else' section because it should be called BEFORE fb->reshape
+			reshape(nbRect.getWidth(), nbRect.getHeight());
+			setRect(nbRect);
+
+			fb->reshape(fbRect.getWidth(), fbRect.getHeight());
+			fb->setRect(fbRect);
+		}
+		else
+		{
+			// Navigation Panel must be hidden. Favorites Panel is hidden.
+
+			nbRect.setLeftTopAndSize(nbRect.mLeft, nbRect.mTop, nbRect.getWidth(), 0);
+
+			reshape(nbRect.getWidth(), nbRect.getHeight());
+			setRect(nbRect);
+		}
+	}
+}
+
+void LLNavigationBar::showFavoritesPanel(BOOL visible)
+{
+	bool npVisible = gSavedSettings.getBOOL("ShowNavbarNavigationPanel");
+
+	LLFavoritesBarCtrl* fb = getChild<LLFavoritesBarCtrl>("favorite");
+
+	LLRect nbRect(getRect());
+	LLRect fbRect(fb->getRect());
+
+	if (visible)
+	{
+		if (npVisible)
+		{
+			// Favorites Panel must be shown. Navigation Panel is visible.
+
+			S32 fbHeight = fbRect.getHeight();
+			S32 newHeight = nbRect.getHeight() + fbHeight;
+
+			nbRect.setLeftTopAndSize(nbRect.mLeft, nbRect.mTop, nbRect.getWidth(), newHeight);
+			fbRect.setLeftTopAndSize(mDefaultFpRect.mLeft, mDefaultFpRect.mTop, fbRect.getWidth(), fbRect.getHeight());
+		}
+		else
+		{
+			// Favorites Panel must be shown. Navigation Panel is hidden.
+
+			S32 fpHeight = mDefaultFpRect.getHeight();
+			nbRect.setLeftTopAndSize(nbRect.mLeft, nbRect.mTop, nbRect.getWidth(), fpHeight);
+			fbRect.setLeftTopAndSize(fbRect.mLeft, fpHeight, fbRect.getWidth(), fpHeight);
+		}
+
+		reshape(nbRect.getWidth(), nbRect.getHeight());
+		setRect(nbRect);
+
+		fb->reshape(fbRect.getWidth(), fbRect.getHeight());
+		fb->setRect(fbRect);
+	}
+	else
+	{
+		if (npVisible)
+		{
+			// Favorites Panel must be hidden. Navigation Panel is visible.
+
+			S32 fbHeight = fbRect.getHeight();
+			S32 newHeight = nbRect.getHeight() - fbHeight;
+
+			nbRect.setLeftTopAndSize(nbRect.mLeft, nbRect.mTop, nbRect.getWidth(), newHeight);
+		}
+		else
+		{
+			// Favorites Panel must be hidden. Navigation Panel is hidden.
+
+			nbRect.setLeftTopAndSize(nbRect.mLeft, nbRect.mTop, nbRect.getWidth(), 0);
+		}
+
+		reshape(nbRect.getWidth(), nbRect.getHeight());
+		setRect(nbRect);
+	}
+
+	fb->setVisible(visible);
+}
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index 1c93a05348..c533953a02 100644
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -60,6 +60,9 @@ public:
 
 	void handleLoginComplete();
 	void clearHistoryCache();
+
+	void showNavigationPanel(BOOL visible);
+	void showFavoritesPanel(BOOL visible);
 	
 private:
 	LLNavigationBar();
@@ -101,6 +104,8 @@ private:
 	LLButton*					mBtnHome;
 	LLSearchEditor*				mLeSearch;
 	LLLocationInputCtrl*		mCmbLocation;
+	LLRect						mDefaultNbRect;
+	LLRect						mDefaultFpRect;
 	boost::signals2::connection	mParcelMgrConnection;
 	bool						mPurgeTPHistoryItems;
 	bool						mUpdateTypedLocationHistory;
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 1fa1e2a09d..c89715e815 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -48,11 +48,20 @@
 #include "llnearbychathandler.h"
 #include "llchannelmanager.h"
 
+//for LLViewerTextEditor support
+#include "llagent.h" 			// gAgent
+#include "llfloaterscriptdebug.h"
+#include "llviewertexteditor.h"
+#include "llstylemap.h"
+
+
 static const S32 RESIZE_BAR_THICKNESS = 3;
 
 LLNearbyChat::LLNearbyChat(const LLSD& key) :
 	LLFloater(key),
-	mEChatTearofState(CHAT_PINNED)
+	mEChatTearofState(CHAT_PINNED),
+	mChatCaptionPanel(NULL),
+	mChatHistoryEditor(NULL)
 {
 }
 
@@ -94,23 +103,14 @@ BOOL LLNearbyChat::postBuild()
 
 	gSavedSettings.declareS32("nearbychat_showicons_and_names",2,"NearByChat header settings",true);
 
-	/*
-	LLChatItemsContainerCtrl* panel = getChild<LLChatItemsContainerCtrl>("chat_history",false,false);
-	if(panel)
-	{
-		panel->setHeaderVisibility((EShowItemHeader)gSavedSettings.getS32("nearbychat_showicons_and_names"));
-	}
-	*/
-	
+	mChatCaptionPanel = getChild<LLPanel>("chat_caption", false);
+	mChatHistoryEditor = getChild<LLViewerTextEditor>("Chat History Editor");
+
 	reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
 	
 	return LLFloater::postBuild();
 }
 
-#include "llagent.h" 			// gAgent
-#include "llfloaterscriptdebug.h"
-#include "llviewertexteditor.h"
-#include "llstylemap.h"
 
 LLColor4 nearbychat_get_text_color(const LLChat& chat)
 {
@@ -215,15 +215,6 @@ void nearbychat_add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, cons
 
 void	LLNearbyChat::addMessage(const LLChat& chat)
 {
-	/*
-	LLChatItemsContainerCtrl* panel = getChild<LLChatItemsContainerCtrl>("chat_history",false,false);
-	if(!panel)
-		return;
-	panel->addMessage(message);
-	*/
-
-	//"Chat History Editor" !!!!!
-
 	LLColor4 color = nearbychat_get_text_color(chat);
 	
 
@@ -241,13 +232,12 @@ void	LLNearbyChat::addMessage(const LLChat& chat)
 	
 	// could flash the chat button in the status bar here. JC
 
-	LLViewerTextEditor*	history_editor = getChild<LLViewerTextEditor>("Chat History Editor");
 
-	history_editor->setParseHTML(TRUE);
-	history_editor->setParseHighlights(TRUE);
+	mChatHistoryEditor->setParseHTML(TRUE);
+	mChatHistoryEditor->setParseHighlights(TRUE);
 	
 	if (!chat.mMuted)
-		nearbychat_add_timestamped_line(history_editor, chat, color);
+		nearbychat_add_timestamped_line(mChatHistoryEditor, chat, color);
 }
 
 void LLNearbyChat::onNearbySpeakers()
@@ -270,8 +260,6 @@ void LLNearbyChat::reshape(S32 width, S32 height, BOOL called_from_parent)
 	
 	LLFloater::reshape(width, height, called_from_parent);
 
-	LLPanel* caption = getChild<LLPanel>("chat_caption",false,false);
-
 	LLRect resize_rect;
 	resize_rect.setLeftTopAndSize( 0, height, width, RESIZE_BAR_THICKNESS);
 	if (mResizeBar[LLResizeBar::TOP])
@@ -301,25 +289,23 @@ void LLNearbyChat::reshape(S32 width, S32 height, BOOL called_from_parent)
 		mResizeBar[LLResizeBar::RIGHT]->setRect(resize_rect);
 	}
 
-
+	// *NOTE: we must check mChatCaptionPanel and mChatHistoryEditor against NULL because reshape is called from the 
+	// LLView::initFromParams BEFORE postBuild is called and child controls are not exist yet
 	LLRect caption_rect;
-	if (caption)
+	if (NULL != mChatCaptionPanel)
 	{
-		caption_rect = caption->getRect();
+		caption_rect = mChatCaptionPanel->getRect();
 		caption_rect.setLeftTopAndSize( 2, height - RESIZE_BAR_THICKNESS, width - 4, caption_rect.getHeight());
-		caption->reshape( width - 4, caption_rect.getHeight(), 1);
-		caption->setRect(caption_rect);
+		mChatCaptionPanel->reshape( width - 4, caption_rect.getHeight(), 1);
+		mChatCaptionPanel->setRect(caption_rect);
 	}
 	
-	//LLPanel* scroll_panel = getChild<LLPanel>("chat_history",false,false);
-	LLViewerTextEditor*	scroll_panel = getChild<LLViewerTextEditor>("Chat History Editor");
-	
-	if (scroll_panel)
+	if (NULL != mChatHistoryEditor)
 	{
-		LLRect scroll_rect = scroll_panel->getRect();
+		LLRect scroll_rect = mChatHistoryEditor->getRect();
 		scroll_rect.setLeftTopAndSize( 2, height - caption_rect.getHeight() - RESIZE_BAR_THICKNESS, width - 4, height - caption_rect.getHeight() - RESIZE_BAR_THICKNESS*2);
-		scroll_panel->reshape( width - 4, height - caption_rect.getHeight() - RESIZE_BAR_THICKNESS*2, 1);
-		scroll_panel->setRect(scroll_rect);
+		mChatHistoryEditor->reshape( width - 4, height - caption_rect.getHeight() - RESIZE_BAR_THICKNESS*2, 1);
+		mChatHistoryEditor->setRect(scroll_rect);
 	}
 	
 	//
@@ -342,57 +328,47 @@ void LLNearbyChat::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 BOOL	LLNearbyChat::handleMouseDown	(S32 x, S32 y, MASK mask)
 {
-	LLPanel* caption = getChild<LLPanel>("chat_caption",false,false);
-	if(caption)
+	LLUICtrl* nearby_speakers_btn = mChatCaptionPanel->getChild<LLUICtrl>("nearby_speakers_btn");
+	LLUICtrl* tearoff_btn = mChatCaptionPanel->getChild<LLUICtrl>("tearoff_btn");
+	LLUICtrl* close_btn = mChatCaptionPanel->getChild<LLUICtrl>("close_btn");
+	
+	S32 caption_local_x = x - mChatCaptionPanel->getRect().mLeft;
+	S32 caption_local_y = y - mChatCaptionPanel->getRect().mBottom;
+	
+	S32 local_x = caption_local_x - nearby_speakers_btn->getRect().mLeft;
+	S32 local_y = caption_local_y - nearby_speakers_btn->getRect().mBottom;
+	if(nearby_speakers_btn->pointInView(local_x, local_y))
 	{
-		LLUICtrl* nearby_speakers_btn = caption->getChild<LLUICtrl>("nearby_speakers_btn");
-		LLUICtrl* tearoff_btn = caption->getChild<LLUICtrl>("tearoff_btn");
-		LLUICtrl* close_btn = caption->getChild<LLUICtrl>("close_btn");
-		
-		S32 caption_local_x = x - caption->getRect().mLeft;
-		S32 caption_local_y = y - caption->getRect().mBottom;
-		
-		if(nearby_speakers_btn && tearoff_btn)
-		{
-			S32 local_x = caption_local_x - nearby_speakers_btn->getRect().mLeft;
-			S32 local_y = caption_local_y - nearby_speakers_btn->getRect().mBottom;
-			if(nearby_speakers_btn->pointInView(local_x, local_y))
-			{
-				onNearbySpeakers();
-				bringToFront( x, y );
-				return true;
-			}
-			local_x = caption_local_x - tearoff_btn->getRect().mLeft;
-			local_y = caption_local_y- tearoff_btn->getRect().mBottom;
-			if(tearoff_btn->pointInView(local_x, local_y))
-			{
-				onTearOff();
-				bringToFront( x, y );
-				return true;
-			}
+		onNearbySpeakers();
+		bringToFront( x, y );
+		return true;
+	}
+	local_x = caption_local_x - tearoff_btn->getRect().mLeft;
+	local_y = caption_local_y- tearoff_btn->getRect().mBottom;
+	if(tearoff_btn->pointInView(local_x, local_y))
+	{
+		onTearOff();
+		bringToFront( x, y );
+		return true;
+	}
 
-			if(close_btn)
-			{
-				local_x = caption_local_x - close_btn->getRect().mLeft;
-				local_y = caption_local_y - close_btn->getRect().mBottom;
-				if(close_btn->pointInView(local_x, local_y))
-				{
-					setVisible(false);
-					bringToFront( x, y );
-					return true;
-				}
-			}
-		}
+	local_x = caption_local_x - close_btn->getRect().mLeft;
+	local_y = caption_local_y - close_btn->getRect().mBottom;
+	if(close_btn->pointInView(local_x, local_y))
+	{
+		setVisible(false);
+		bringToFront( x, y );
+		return true;
+	}
 
-		if(mEChatTearofState == CHAT_UNPINNED && caption->pointInView(caption_local_x, caption_local_y) )
-		{
-			//start draggind
-			gFocusMgr.setMouseCapture(this);
-			mStart_Y = y;
-			mStart_X = x;
-			bringToFront( x, y );
-			return true;
-		}
+	if(mEChatTearofState == CHAT_UNPINNED && mChatCaptionPanel->pointInView(caption_local_x, caption_local_y) )
+	{
+		//start draggind
+		gFocusMgr.setMouseCapture(this);
+		mStart_Y = y;
+		mStart_X = x;
+		bringToFront( x, y );
+		return true;
 	}
 	
 	return LLFloater::handleMouseDown(x,y,mask);
@@ -425,8 +401,7 @@ BOOL	LLNearbyChat::handleHover(S32 x, S32 y, MASK mask)
 void	LLNearbyChat::pinn_panel()
 {
 	mEChatTearofState = CHAT_PINNED;
-	LLPanel* caption = getChild<LLPanel>("chat_caption",false,false);
-	LLIconCtrl* tearoff_btn = caption->getChild<LLIconCtrl>("tearoff_btn",false,false);
+	LLIconCtrl* tearoff_btn = mChatCaptionPanel->getChild<LLIconCtrl>("tearoff_btn",false);
 	
 	tearoff_btn->setValue("inv_item_landmark_visited.tga");
 
@@ -445,8 +420,7 @@ void	LLNearbyChat::pinn_panel()
 void	LLNearbyChat::float_panel()
 {
 	mEChatTearofState = CHAT_UNPINNED;
-	LLPanel* caption = getChild<LLPanel>("chat_caption",false,false);
-	LLIconCtrl* tearoff_btn = caption->getChild<LLIconCtrl>("tearoff_btn",false,false);
+	LLIconCtrl* tearoff_btn = mChatCaptionPanel->getChild<LLIconCtrl>("tearoff_btn", false);
 	
 	tearoff_btn->setValue("inv_item_landmark.tga");
 	mResizeBar[LLResizeBar::BOTTOM]->setVisible(true);
@@ -456,50 +430,20 @@ void	LLNearbyChat::float_panel()
 	translate(4,4);
 }
 
-void LLNearbyChat::onNearbyChatContextMenuItemClicked(const LLSD& userdata)
+void	LLNearbyChat::onNearbyChatContextMenuItemClicked(const LLSD& userdata)
 {
-	/*
-	LLChatItemsContainerCtrl* panel = getChild<LLChatItemsContainerCtrl>("chat_history",false,false);
-	if(!panel)
-		return;
-
-	std::string str = userdata.asString();
-	if(str == "show_buddy_icons")
-		panel->setHeaderVisibility(CHATITEMHEADER_SHOW_ONLY_ICON);
-	else if(str == "show_names")
-		panel->setHeaderVisibility(CHATITEMHEADER_SHOW_ONLY_NAME);
-	else if(str == "show_icons_and_names")
-		panel->setHeaderVisibility(CHATITEMHEADER_SHOW_BOTH);
-
-	gSavedSettings.setS32("nearbychat_showicons_and_names", (S32)panel->getHeaderVisibility());
-	*/
 }
 bool	LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata)
 {
 	std::string str = userdata.asString();
 	if(str == "nearby_people")
 		onNearbySpeakers();	
-	/*
-	LLChatItemsContainerCtrl* panel = getChild<LLChatItemsContainerCtrl>("chat_history",false,false);
-	if(!panel)
-		return false;
-	
-	if(str == "show_buddy_icons")
-		return panel->getHeaderVisibility() == CHATITEMHEADER_SHOW_ONLY_ICON;
-	else if(str == "show_names")
-		return panel->getHeaderVisibility() == CHATITEMHEADER_SHOW_ONLY_NAME;
-	else if(str == "show_icons_and_names")
-		return panel->getHeaderVisibility() == CHATITEMHEADER_SHOW_BOTH;
-	else if(str == "nearby_people")
-		onNearbySpeakers();
-	*/
 	return false;
 }
 
 BOOL LLNearbyChat::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-	LLPanel* caption = getChild<LLPanel>("chat_caption",false,false);
-	if(caption && caption->pointInView(x - caption->getRect().mLeft, y - caption->getRect().mBottom) )
+	if(mChatCaptionPanel->pointInView(x - mChatCaptionPanel->getRect().mLeft, y - mChatCaptionPanel->getRect().mBottom) )
 	{
 		LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
 
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index 670a394c95..efa2e479e6 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -38,6 +38,7 @@
 #include "llchat.h"
 
 class LLResizeBar;
+class LLViewerTextEditor;
 
 class LLNearbyChat: public LLFloater
 {
@@ -87,6 +88,8 @@ private:
 
 	//LLResizeBar*		mResizeBar[RESIZE_BAR_COUNT];
 	LLHandle<LLView>	mPopupMenuHandle;
+	LLPanel*			mChatCaptionPanel;
+	LLViewerTextEditor*	mChatHistoryEditor;
 };
 
 #endif
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 83f8d14b5f..50e31e85e4 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -179,25 +179,29 @@ LLNearbyChatBar::LLNearbyChatBar()
 //virtual
 BOOL LLNearbyChatBar::postBuild()
 {
-	mChatBox = getChild<LLLineEditor>("chat_box",TRUE,FALSE);
+	mChatBox = getChild<LLLineEditor>("chat_box");
 
-	if (mChatBox)
-	{
-		mChatBox->setCommitCallback(boost::bind(&LLNearbyChatBar::onChatBoxCommit, this));
-		mChatBox->setKeystrokeCallback(&onChatBoxKeystroke, this);
-		mChatBox->setFocusLostCallback(&onChatBoxFocusLost, this);
-
-		mChatBox->setIgnoreArrowKeys(TRUE);
-		mChatBox->setCommitOnFocusLost( FALSE );
-		mChatBox->setRevertOnEsc( FALSE );
-		mChatBox->setIgnoreTab(TRUE);
-		mChatBox->setPassDelete(TRUE);
-		mChatBox->setReplaceNewlinesWithSpaces(FALSE);
-		mChatBox->setMaxTextLength(1023);
-		mChatBox->setEnableLineHistory(TRUE);
-	}
+	mChatBox->setCommitCallback(boost::bind(&LLNearbyChatBar::onChatBoxCommit, this));
+	mChatBox->setKeystrokeCallback(&onChatBoxKeystroke, this);
+	mChatBox->setFocusLostCallback(&onChatBoxFocusLost, this);
+
+	mChatBox->setIgnoreArrowKeys(TRUE);
+	mChatBox->setCommitOnFocusLost( FALSE );
+	mChatBox->setRevertOnEsc( FALSE );
+	mChatBox->setIgnoreTab(TRUE);
+	mChatBox->setPassDelete(TRUE);
+	mChatBox->setReplaceNewlinesWithSpaces(FALSE);
+	mChatBox->setMaxTextLength(1023);
+	mChatBox->setEnableLineHistory(TRUE);
+
+	mTalkBtn = getChild<LLTalkButton>("talk");
 
-	mTalkBtn = getChild<LLTalkButton>("talk",TRUE,FALSE);
+	// Speak button should be initially disabled because
+	// it takes some time between logging in to world and connecting to voice channel.
+	mTalkBtn->setEnabled(FALSE);
+
+	// Registering Chat Bar to receive Voice client status change notifications.
+	gVoiceClient->addObserver(this);
 
 	return TRUE;
 }
@@ -208,6 +212,12 @@ LLNearbyChatBar* LLNearbyChatBar::getInstance()
 	return LLBottomTray::getInstance() ? LLBottomTray::getInstance()->getNearbyChatBar() : NULL;
 }
 
+//static
+bool LLNearbyChatBar::instanceExists()
+{
+	return LLBottomTray::instanceExists() && LLBottomTray::getInstance()->getNearbyChatBar() != NULL;
+}
+
 std::string LLNearbyChatBar::getCurrentChat()
 {
 	return mChatBox ? mChatBox->getText() : LLStringUtil::null;
@@ -616,6 +626,27 @@ public:
 	}
 };
 
+void LLNearbyChatBar::onChange(EStatusType status, const std::string &channelURI, bool proximal)
+{
+	// Time it takes to connect to voice channel might be pretty long,
+	// so don't expect user login or STATUS_VOICE_ENABLED to be followed by STATUS_JOINED.
+	BOOL enable = FALSE;
+
+	switch (status)
+	{
+	// Do not add STATUS_VOICE_ENABLED because voice chat is 
+	// inactive until STATUS_JOINED
+	case STATUS_JOINED:
+		enable = TRUE;
+		break;
+	default:
+		enable = FALSE;
+		break;
+	}
+
+	mTalkBtn->setEnabled(enable);
+}
+
 // Creating the object registers with the dispatcher.
 LLChatHandler gChatHandler;
 
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h
index b640aedf7a..4b0c42c3c0 100644
--- a/indra/newview/llnearbychatbar.h
+++ b/indra/newview/llnearbychatbar.h
@@ -38,6 +38,7 @@
 #include "llgesturemgr.h"
 #include "llchat.h"
 #include "llchiclet.h"
+#include "llvoiceclient.h"
 
 class LLGestureComboBox
 	: public LLComboBox
@@ -65,6 +66,7 @@ protected:
 
 class LLNearbyChatBar
 :	public LLPanel
+,   public LLVoiceClientStatusObserver
 {
 public:
 	// constructor for inline chat-bars (e.g. hosted in chat history window)
@@ -75,6 +77,8 @@ public:
 
 	static LLNearbyChatBar* getInstance();
 
+	static bool instanceExists();
+
 	LLLineEditor* getChatBox() { return mChatBox; }
 
 	std::string getCurrentChat();
@@ -87,6 +91,11 @@ public:
 	static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate);
 	static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
 
+	/**
+	 * Implements LLVoiceClientStatusObserver::onChange()
+	 */
+	/*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal);
+
 protected:
 	static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str);
 	static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata);
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index cb1b65a604..837f924c44 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -62,7 +62,7 @@ LLNearbyChatHandler::LLNearbyChatHandler(e_notification_type type, const LLSD& i
 	mChannel = LLChannelManager::getInstance()->createChannel(p);
 	mChannel->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_TOP); 
 	mChannel->setOverflowFormatString("You have %d unread nearby chat messages");
-	mChannel->setStoreToasts(false);
+	mChannel->setCanStoreToasts(false);
 }
 LLNearbyChatHandler::~LLNearbyChatHandler()
 {
@@ -93,11 +93,11 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 	
 	item->setVisible(true);
 
-
-	LLToast* toast = mChannel->addToast(id, item);
-	
-	toast->setOnMouseEnterCallback(boost::bind(&LLNearbyChatHandler::onToastDestroy, this, toast));
-	toast->setAndStartTimer(gSavedSettings.getS32("NotificationToastTime"));
+	LLToast::Params p;
+	p.id = id;
+	p.panel = item;
+	p.on_mouse_enter = boost::bind(&LLNearbyChatHandler::onToastDestroy, this, _1);
+	mChannel->addToast(p);	
 }
 
 void LLNearbyChatHandler::onToastDestroy(LLToast* toast)
diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
index 06826998bf..7003879dbf 100644
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/indra/newview/llnotificationalerthandler.cpp
@@ -67,21 +67,20 @@ LLAlertHandler::~LLAlertHandler()
 //--------------------------------------------------------------------------
 void LLAlertHandler::processNotification(const LLSD& notify)
 {
-	LLToast* toast = NULL;
-	
 	LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
 
 	if (notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "load")
 	{
 		LLToastAlertPanel* alert_dialog = new LLToastAlertPanel(notification, mIsModal);
-		
-		toast = mChannel->addToast(notification->getID(), (LLToastPanel*)alert_dialog);
-		if(!toast)
-			return;
-		toast->setHideButtonEnabled(false);
-		toast->setOnToastDestroyCallback((boost::bind(&LLAlertHandler::onToastDestroy, this, toast)));
-		toast->setCanFade(false);
-		toast->setModal(mIsModal);
+		LLToast::Params p;
+		p.id = notification->getID();
+		p.notification = notification;
+		p.panel = dynamic_cast<LLToastPanel*>(alert_dialog);
+		p.enable_hide_btn = false;
+		p.can_fade = false;
+		p.is_modal = mIsModal;
+		p.on_toast_destroy = boost::bind(&LLAlertHandler::onToastDestroy, this, _1);
+		mChannel->addToast(p);
 	}
 	else if (notify["sigtype"].asString() == "change")
 	{
diff --git a/indra/newview/llnotificationgrouphandler.cpp b/indra/newview/llnotificationgrouphandler.cpp
index ad09f43c10..9a6a041c35 100644
--- a/indra/newview/llnotificationgrouphandler.cpp
+++ b/indra/newview/llnotificationgrouphandler.cpp
@@ -37,6 +37,8 @@
 #include "llagent.h"
 #include "llbottomtray.h"
 #include "llviewercontrol.h"
+#include "llfloaterreg.h"
+#include "llsyswellwindow.h"
 
 using namespace LLNotificationsUI;
 
@@ -65,18 +67,17 @@ LLGroupHandler::~LLGroupHandler()
 //--------------------------------------------------------------------------
 void LLGroupHandler::processNotification(const LLSD& notify)
 {
-	LLToast* toast = NULL;
-
 	LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
 	if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change")
 	{
-			LLPanel* notify_box = new LLToastGroupNotifyPanel(notification);
-			toast = mChannel->addToast(notification->getID(), notify_box);
-			if(!toast)
-				return;			
-			toast->setAndStartTimer(gSavedSettings.getS32("NotificationToastTime")); 
-			toast->setOnToastDestroyCallback((boost::bind(&LLGroupHandler::onToastDestroy, this, toast)));
-			mChiclet->setCounter(mChiclet->getCounter() + 1);
+		LLPanel* notify_box = new LLToastGroupNotifyPanel(notification);
+		LLToast::Params p;
+		p.id = notification->getID();
+		p.notification = notification;
+		p.panel = notify_box;
+		p.on_toast_destroy = boost::bind(&LLGroupHandler::onToastDestroy, this, _1);
+		mChannel->addToast(p);
+		mChiclet->setCounter(mChiclet->getCounter() + 1);
 	}
 	else if (notify["sigtype"].asString() == "delete")
 	{
@@ -88,6 +89,14 @@ void LLGroupHandler::processNotification(const LLSD& notify)
 void LLGroupHandler::onToastDestroy(LLToast* toast)
 {
 	mChiclet->setCounter(mChiclet->getCounter() - 1);
+
+	LLToastPanel* panel = dynamic_cast<LLToastPanel*>(toast->getPanel());
+	LLFloaterReg::getTypedInstance<LLSysWellWindow>("syswell_window")->removeItemByID(panel->getID());
+
+	// turning hovering off mannualy because onMouseLeave won't happen if a toast was closed using a keyboard
+	if(toast->hasFocus())
+		mChannel->setHovering(false);
+
 	toast->close();
 }
 
diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index 9037fc82ab..2e5fdd9ed5 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -127,12 +127,14 @@ public:
 	LLInfoHandler(e_notification_type type, const LLSD& id);
 	virtual ~LLInfoHandler();
 
-
+	// base interface functions
 	virtual void processNotification(const LLSD& notify);
 	virtual void onToastDestroy(LLToast* toast);
 	virtual void onChicletClick(void);
 	virtual void onChicletClose(void);
 
+	// own handlers
+	void onStoreToast(LLPanel* info_panel, LLUUID id);
 protected:
 };
 
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 91156ae542..6c7fb8a0be 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -31,14 +31,13 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-
 #include "llpanelavatar.h"
 
 #include "llagent.h"
+#include "llavataractions.h"
 #include "llavatarconstants.h"
 #include "llcallingcard.h"
 #include "llcombobox.h"
-#include "llavataractions.h"
 #include "llimview.h"
 #include "lltexteditor.h"
 #include "lltexturectrl.h"
@@ -117,136 +116,240 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 static LLDefaultChildRegistry::Register<LLDropTarget> r("drop_target");
 
-//////////////////////////////////////////////////////////////////////////
+static LLRegisterPanelClassWrapper<LLPanelAvatarProfile> t_panel_profile("panel_profile");
+static LLRegisterPanelClassWrapper<LLPanelAvatarMeProfile> t_panel_me_profile("panel_me_profile");
+static LLRegisterPanelClassWrapper<LLPanelAvatarNotes> t_panel_notes("panel_notes");
+
 //-----------------------------------------------------------------------------
-// LLPanelProfileTab()
+// LLPanelAvatarNotes()
 //-----------------------------------------------------------------------------
-//////////////////////////////////////////////////////////////////////////
-LLPanelProfileTab::LLPanelProfileTab(const LLUUID& avatar_id) 
- : LLPanel()
- , mAvatarId(LLUUID::null)
- , mProfileType(PT_UNKNOWN)
+LLPanelAvatarNotes::LLPanelAvatarNotes()
+: LLPanelProfileTab()
+{
+
+}
+
+void LLPanelAvatarNotes::updateData()
 {
-	setAvatarId(avatar_id);
+	LLAvatarPropertiesProcessor::getInstance()->sendDataRequest(getAvatarId(),APT_NOTES);
 }
 
-LLPanelProfileTab::LLPanelProfileTab(const Params& params )
- : LLPanel()
- , mAvatarId(LLUUID::null)
- , mProfileType(PT_UNKNOWN)
+BOOL LLPanelAvatarNotes::postBuild()
 {
+	childSetCommitCallback("status_check", boost::bind(&LLPanelAvatarNotes::onCommitRights, this), NULL);
+	childSetCommitCallback("map_check", boost::bind(&LLPanelAvatarNotes::onCommitRights, this), NULL);
+	childSetCommitCallback("objects_check", boost::bind(&LLPanelAvatarNotes::onCommitRights, this), NULL);
+
+	childSetCommitCallback("add_friend", boost::bind(&LLPanelAvatarNotes::onAddFriendButtonClick, this),NULL);
+	childSetCommitCallback("im", boost::bind(&LLPanelAvatarNotes::onIMButtonClick, this), NULL);
+	childSetCommitCallback("call", boost::bind(&LLPanelAvatarNotes::onCallButtonClick, this), NULL);
+	childSetCommitCallback("teleport", boost::bind(&LLPanelAvatarNotes::onTeleportButtonClick, this), NULL);
+	childSetCommitCallback("share", boost::bind(&LLPanelAvatarNotes::onShareButtonClick, this), NULL);
 
+	LLTextEditor* te = getChild<LLTextEditor>("notes_edit");
+	te->setCommitCallback(boost::bind(&LLPanelAvatarNotes::onCommitNotes,this));
+	te->setCommitOnFocusLost(TRUE);
+
+	resetControls();
+	resetData();
+
+	return TRUE;
 }
 
-LLPanelProfileTab::~LLPanelProfileTab()
+void LLPanelAvatarNotes::onOpen(const LLSD& key)
+{
+	LLPanelProfileTab::onOpen(key);
+
+	fillRightsData();
+
+	//Disable "Add Friend" button for friends.
+	childSetEnabled("add_friend", !LLAvatarActions::isFriend(getAvatarId()));
+}
+
+void LLPanelAvatarNotes::fillRightsData()
 {
-	if(mAvatarId.notNull())
+	const LLRelationship* relation = LLAvatarTracker::instance().getBuddyInfo(getAvatarId());
+	// If true - we are viewing friend's profile, enable check boxes and set values.
+	if(relation)
 	{
-		LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
+		S32 rights = relation->getRightsGrantedTo();
+
+		childSetValue("status_check",LLRelationship::GRANT_ONLINE_STATUS & rights ? TRUE : FALSE);
+		childSetValue("map_check",LLRelationship::GRANT_MAP_LOCATION & rights ? TRUE : FALSE);
+		childSetValue("objects_check",LLRelationship::GRANT_MODIFY_OBJECTS & rights ? TRUE : FALSE);
+
+		childSetEnabled("status_check",TRUE);
+		childSetEnabled("map_check",TRUE);
+		childSetEnabled("objects_check",TRUE);
 	}
 }
 
-void LLPanelProfileTab::setAvatarId(const LLUUID& avatar_id)
+void LLPanelAvatarNotes::onCommitNotes()
+{
+	std::string notes = childGetValue("notes_edit").asString();
+	LLAvatarPropertiesProcessor::getInstance()-> sendNotes(getAvatarId(),notes);
+}
+
+void LLPanelAvatarNotes::onCommitRights()
+{
+	S32 rights = 0;
+
+	if(childGetValue("status_check").asBoolean())
+		rights |= LLRelationship::GRANT_ONLINE_STATUS;
+	if(childGetValue("map_check").asBoolean())
+		rights |= LLRelationship::GRANT_MAP_LOCATION;
+	if(childGetValue("objects_check").asBoolean())
+		rights |= LLRelationship::GRANT_MODIFY_OBJECTS;
+
+	LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(getAvatarId(),rights);
+}
+
+void LLPanelAvatarNotes::processProperties(void* data, EAvatarProcessorType type)
 {
-	if(avatar_id.notNull())
+	if(APT_NOTES == type)
 	{
-		if(mAvatarId.notNull())
+		LLAvatarNotes* avatar_notes = static_cast<LLAvatarNotes*>(data);
+		if(avatar_notes && getAvatarId() == avatar_notes->target_id)
 		{
-			LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId,this);
+			childSetValue("notes_edit",avatar_notes->notes);
+			childSetEnabled("notes edit", true);
+
+			LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
 		}
-		mAvatarId = avatar_id;
-		LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(),this);
-		setProfileType();
 	}
 }
 
-void LLPanelProfileTab::setProfileType()
+void LLPanelAvatarNotes::resetData()
 {
-	mProfileType = (gAgentID == mAvatarId) ? PT_OWN : PT_OTHER;
+	childSetValue("notes_edit",LLStringUtil::null);
+	// Default value is TRUE
+	childSetValue("status_check", TRUE);
 }
 
-void LLPanelProfileTab::onOpen(const LLSD& key)
+void LLPanelAvatarNotes::resetControls()
+{
+	//Disable "Add Friend" button for friends.
+	childSetEnabled("add_friend", TRUE);
+
+	childSetEnabled("status_check",FALSE);
+	childSetEnabled("map_check",FALSE);
+	childSetEnabled("objects_check",FALSE);
+}
+
+void LLPanelAvatarNotes::onAddFriendButtonClick()
 {
-	onActivate(key);
+	LLAvatarActions::requestFriendshipDialog(getAvatarId());
 }
 
-void LLPanelProfileTab::onActivate(const LLUUID& id)
+void LLPanelAvatarNotes::onIMButtonClick()
 {
-	setAvatarId(id);
-	scrollToTop();
-	updateData();
+	LLAvatarActions::startIM(getAvatarId());
 }
 
-void LLPanelProfileTab::onAddFriend()
+void LLPanelAvatarNotes::onTeleportButtonClick()
 {
-	if (getAvatarId().notNull())
+	LLAvatarActions::offerTeleport(getAvatarId());
+}
+
+void LLPanelAvatarNotes::onCallButtonClick()
+{
+	//*TODO not implemented.
+}
+
+void LLPanelAvatarNotes::onShareButtonClick()
+{
+	//*TODO not implemented.
+}
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+
+LLPanelProfileTab::LLPanelProfileTab()
+: LLPanel()
+, mAvatarId(LLUUID::null)
+{
+}
+
+LLPanelProfileTab::~LLPanelProfileTab()
+{
+	if(getAvatarId().notNull())
 	{
-		std::string name;
-		gCacheName->getFullName(getAvatarId(),name);
-		LLAvatarActions::requestFriendshipDialog(getAvatarId(), name);
+		LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
 	}
 }
 
-void LLPanelProfileTab::onIM()
+void LLPanelProfileTab::setAvatarId(const LLUUID& id)
 {
-	if (getAvatarId().notNull())
+	if(id.notNull())
 	{
-		std::string name;
-		gCacheName->getFullName(getAvatarId(), name);
-		gIMMgr->addSession(name, IM_NOTHING_SPECIAL, getAvatarId());
+		if(getAvatarId().notNull())
+		{
+			LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId,this);
+		}
+		mAvatarId = id;
+		LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(),this);
 	}
 }
 
-void LLPanelProfileTab::onTeleport()
+void LLPanelProfileTab::onOpen(const LLSD& key)
 {
-	if(getAvatarId().notNull())
+	// Don't reset panel if we are opening it for same avatar.
+	if(getAvatarId() != key.asUUID())
 	{
-		LLAvatarActions::offerTeleport(getAvatarId());
+		resetControls();
+		resetData();
+
+		scrollToTop();
 	}
+
+	// Update data even if we are viewing same avatar profile as some data might been changed.
+	setAvatarId(key.asUUID());
+	updateData();
 }
 
 void LLPanelProfileTab::scrollToTop()
 {
-	LLScrollContainer* scrollContainer = getChild<LLScrollContainer>("profile_scroll", FALSE, FALSE);
-	if (NULL != scrollContainer)
-	{
-		scrollContainer->goToTop();
-	}
+	LLScrollContainer* scrollContainer = getChild<LLScrollContainer>("profile_scroll");
+	scrollContainer->goToTop();
 }
 
 //////////////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-// LLPanelAvatarProfile()
-//-----------------------------------------------------------------------------
 //////////////////////////////////////////////////////////////////////////
-LLPanelAvatarProfile::LLPanelAvatarProfile(const LLUUID& avatar_id /* = LLUUID::null */)
- : LLPanelProfileTab(avatar_id), mUpdated(false), mEditMode(false), mStatusCombobox(NULL), mStatusMessage(NULL)
-{
-	updateData();
-}
+//////////////////////////////////////////////////////////////////////////
 
-LLPanelAvatarProfile::LLPanelAvatarProfile(const Params& params )
- : LLPanelProfileTab(params), mUpdated(false), mEditMode(false), mStatusCombobox(NULL), mStatusMessage(NULL)
+LLPanelAvatarProfile::LLPanelAvatarProfile()
+: LLPanelProfileTab()
 {
 }
 
-LLPanelAvatarProfile::~LLPanelAvatarProfile()
+BOOL LLPanelAvatarProfile::postBuild()
 {
-	if(getAvatarId().notNull())
-	{
-		LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
-	}
+	childSetActionTextbox("homepage_edit", boost::bind(&LLPanelAvatarProfile::onHomepageTextboxClicked, this));
+	childSetCommitCallback("add_friend",(boost::bind(&LLPanelAvatarProfile::onAddFriendButtonClick,this)),NULL);
+	childSetCommitCallback("im",(boost::bind(&LLPanelAvatarProfile::onIMButtonClick,this)),NULL);
+	childSetCommitCallback("call",(boost::bind(&LLPanelAvatarProfile::onCallButtonClick,this)),NULL);
+	childSetCommitCallback("teleport",(boost::bind(&LLPanelAvatarProfile::onTeleportButtonClick,this)),NULL);
+	childSetCommitCallback("share",(boost::bind(&LLPanelAvatarProfile::onShareButtonClick,this)),NULL);
+
+	LLTextureCtrl* pic = getChild<LLTextureCtrl>("2nd_life_pic");
+	pic->setFallbackImageName("default_land_picture.j2c");
+
+	pic = getChild<LLTextureCtrl>("real_world_pic");
+	pic->setFallbackImageName("default_land_picture.j2c");
+
+	resetControls();
+	resetData();
+
+	return TRUE;
 }
 
-void* LLPanelAvatarProfile::create(void* data /* = NULL */)
+void LLPanelAvatarProfile::onOpen(const LLSD& key)
 {
-	LLSD* id = NULL;
-	if(data)
-	{
-		id = static_cast<LLSD*>(data);
-		return new LLPanelAvatarProfile(LLUUID(id->asUUID()));
-	}
-	return new LLPanelAvatarProfile();
+	LLPanelProfileTab::onOpen(key);
+
+	//Disable "Add Friend" button for friends.
+	childSetEnabled("add_friend", !LLAvatarActions::isFriend(getAvatarId()));
 }
 
 void LLPanelAvatarProfile::updateData()
@@ -258,6 +361,37 @@ void LLPanelAvatarProfile::updateData()
 	}
 }
 
+void LLPanelAvatarProfile::resetControls()
+{
+	childSetVisible("status_panel", true);
+	childSetVisible("profile_buttons_panel", true);
+	childSetVisible("title_groups_text", true);
+	childSetVisible("sl_groups", true);
+	childSetEnabled("add_friend", true);
+
+	childSetVisible("user_name", false);
+	childSetVisible("status_me_panel", false);
+	childSetVisible("profile_me_buttons_panel", false);
+	childSetVisible("account_actions_panel", false);
+	childSetVisible("partner_edit_link", false);
+}
+
+void LLPanelAvatarProfile::resetData()
+{
+	childSetValue("2nd_life_pic",LLUUID::null);
+	childSetValue("real_world_pic",LLUUID::null);
+	childSetValue("online_status",LLStringUtil::null);
+	childSetValue("status_message",LLStringUtil::null);
+	childSetValue("sl_description_edit",LLStringUtil::null);
+	childSetValue("fl_description_edit",LLStringUtil::null);
+	childSetValue("sl_groups",LLStringUtil::null);
+	childSetValue("homepage_edit",LLStringUtil::null);
+	childSetValue("register_date",LLStringUtil::null);
+	childSetValue("acc_status_text",LLStringUtil::null);
+	childSetTextArg("partner_text", "[FIRST]", LLStringUtil::null);
+	childSetTextArg("partner_text", "[LAST]", LLStringUtil::null);
+}
+
 void LLPanelAvatarProfile::processProperties(void* data, EAvatarProcessorType type)
 {
 	if(APT_PROPERTIES == type)
@@ -265,120 +399,94 @@ void LLPanelAvatarProfile::processProperties(void* data, EAvatarProcessorType ty
 		const LLAvatarData* avatar_data = static_cast<const LLAvatarData*>(data);
 		if(avatar_data && getAvatarId() == avatar_data->avatar_id)
 		{
-			childSetValue("register_date", avatar_data->born_on);
-			childSetValue("sl_description_edit", avatar_data->about_text);
-			childSetValue("fl_description_edit",avatar_data->fl_about_text);
-			childSetValue("2nd_life_pic", avatar_data->image_id);
-			childSetValue("real_world_pic", avatar_data->fl_image_id);
-			childSetValue("homepage_edit", avatar_data->profile_url);
-
-			if (!isEditMode())
-			{
-				setCaptionText(avatar_data);
-				if (avatar_data->partner_id.notNull())
-				{
-					std::string first, last;
-					BOOL found = gCacheName->getName(avatar_data->partner_id, first, last);
-					if (found)
-					{
-						childSetTextArg("partner_text", "[FIRST]", first);
-						childSetTextArg("partner_text", "[LAST]", last);
-					}
-				}
-				else
-				{
-					childSetTextArg("partner_text", "[FIRST]", getString("no_partner_text"));
-				}
-			}
-			else
-			{
-				childSetValue("show_in_search_checkbox", (BOOL)(avatar_data->flags & AVATAR_ALLOW_PUBLISH));
-			}
-
-
-			bool online = avatar_data->flags & AVATAR_ONLINE;
-			if(LLAvatarActions::isFriend(avatar_data->avatar_id))
-			{
-				// Online status NO could be because they are hidden
-				// If they are a friend, we may know the truth!
-				online = LLAvatarTracker::instance().isBuddyOnline(avatar_data->avatar_id);
-			}
-			childSetValue("online_status", online ?
-				"Online" : "Offline");
-			childSetColor("online_status", online ? 
-				LLColor4::green : LLColor4::red);
-
-			LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
-		}
-		if (isOwnProfile() && NULL != mStatusCombobox)
-		{
-			std::string status;
-			if (gAgent.getAFK())
-			{
-				status = "away";
-			}
-			else if (gAgent.getBusy())
-			{
-				status = "busy";
-			}
-			else
-			{
-				status = "online";
-			}
-			mStatusCombobox->setValue(status);
-		}
-		if (isOwnProfile())
-		{
-			std::string full_name;
-			gCacheName->getFullName(mAvatarId, full_name);
-			childSetValue("user_name", full_name);
+			processProfileProperties(avatar_data);
 		}
 	}
 	else if(APT_GROUPS == type)
 	{
 		LLAvatarGroups* avatar_groups = static_cast<LLAvatarGroups*>(data);
-		if(avatar_groups)
+		if(avatar_groups && getAvatarId() == avatar_groups->avatar_id)
 		{
-			std::string groups;
-			if (!avatar_groups->group_list.empty()) {
-				LLAvatarGroups::group_list_t::const_iterator it = avatar_groups->group_list.begin();
-				LLAvatarGroups::LLGroupData group_data = *it;
-				groups+= group_data.group_name;
-				while (++it != avatar_groups->group_list.end())
-				{
-					group_data = *it;				
-					groups += ", ";
-					groups += group_data.group_name;
-					
-				}
-			}
-			childSetValue("sl_groups",groups);
+			processGroupProperties(avatar_groups);
 		}
 	}
 }
 
-void LLPanelAvatarProfile::clear()
+void LLPanelAvatarProfile::processProfileProperties(const LLAvatarData* avatar_data)
 {
-	clearControls();
+	fillCommonData(avatar_data);
+
+	fillPartnerData(avatar_data);
+
+	fillOnlineStatus(avatar_data);
+
+	fillAccountStatus(avatar_data);
 }
 
-void LLPanelAvatarProfile::clearControls()
+void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_groups)
 {
-	childSetValue("2nd_life_pic",LLUUID::null);
-	childSetValue("real_world_pic",LLUUID::null);
-	childSetValue("online_status",LLStringUtil::null);
-	childSetValue("status_message",LLStringUtil::null);
-	childSetValue("sl_description_edit",LLStringUtil::null);
-	childSetValue("fl_description_edit",LLStringUtil::null);
-	childSetValue("sl_groups",LLStringUtil::null);
-	childSetValue("homepage_edit",LLStringUtil::null);
-	childSetValue("register_date",LLStringUtil::null);
-	childSetValue("acc_status_text",LLStringUtil::null);
-	childSetTextArg("partner_text", "[FIRST]", LLStringUtil::null);
-	childSetTextArg("partner_text", "[LAST]", LLStringUtil::null);
+	std::string groups;
+	LLAvatarGroups::group_list_t::const_iterator it = avatar_groups->group_list.begin();
+	const LLAvatarGroups::group_list_t::const_iterator it_end = avatar_groups->group_list.end();
+
+	if(it_end != it)
+	{
+		groups = (*it).group_name;
+		++it;
+	}
+	for(; it_end != it; ++it)
+	{
+		LLAvatarGroups::LLGroupData group_data = *it;
+		groups += ", ";
+		groups += group_data.group_name;
+	}
+	childSetValue("sl_groups",groups);
+}
+
+void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data)
+{
+	childSetValue("register_date", avatar_data->born_on);
+	childSetValue("sl_description_edit", avatar_data->about_text);
+	childSetValue("fl_description_edit",avatar_data->fl_about_text);
+	childSetValue("2nd_life_pic", avatar_data->image_id);
+	childSetValue("real_world_pic", avatar_data->fl_image_id);
+	childSetValue("homepage_edit", avatar_data->profile_url);
+}
+
+void LLPanelAvatarProfile::fillPartnerData(const LLAvatarData* avatar_data)
+{
+	if (avatar_data->partner_id.notNull())
+	{
+		std::string first, last;
+		BOOL found = gCacheName->getName(avatar_data->partner_id, first, last);
+		if (found)
+		{
+			childSetTextArg("partner_text", "[FIRST]", first);
+			childSetTextArg("partner_text", "[LAST]", last);
+		}
+	}
+	else
+	{
+		childSetTextArg("partner_text", "[FIRST]", getString("no_partner_text"));
+	}
+}
+
+void LLPanelAvatarProfile::fillOnlineStatus(const LLAvatarData* avatar_data)
+{
+	bool online = avatar_data->flags & AVATAR_ONLINE;
+	if(LLAvatarActions::isFriend(avatar_data->avatar_id))
+	{
+		// Online status NO could be because they are hidden
+		// If they are a friend, we may know the truth!
+		online = LLAvatarTracker::instance().isBuddyOnline(avatar_data->avatar_id);
+	}
+	childSetValue("online_status", online ?
+		"Online" : "Offline");
+	childSetColor("online_status", online ? 
+		LLColor4::green : LLColor4::red);
 }
 
-void LLPanelAvatarProfile::setCaptionText(const LLAvatarData* avatar_data)
+void LLPanelAvatarProfile::fillAccountStatus(const LLAvatarData* avatar_data)
 {
 	std::string caption_text = avatar_data->caption_text;
 	if(caption_text.empty())
@@ -432,130 +540,126 @@ void LLPanelAvatarProfile::setCaptionText(const LLAvatarData* avatar_data)
 	childSetValue("acc_status_text", caption_text);
 }
 
+void LLPanelAvatarProfile::onUrlTextboxClicked(std::string url)
+{
+	LLWeb::loadURL(url);
+}
+
+void LLPanelAvatarProfile::onHomepageTextboxClicked()
+{
+	std::string url = childGetValue("homepage_edit").asString();
+	if(!url.empty())
+	{
+		onUrlTextboxClicked(url);
+	}
+}
+
 void LLPanelAvatarProfile::onAddFriendButtonClick()
 {
-	onAddFriend();
+	LLAvatarActions::requestFriendshipDialog(getAvatarId());
 }
 
 void LLPanelAvatarProfile::onIMButtonClick()
 {
-	onIM();
+	LLAvatarActions::startIM(getAvatarId());
 }
 
 void LLPanelAvatarProfile::onTeleportButtonClick()
 {
-	onTeleport();
+	LLAvatarActions::offerTeleport(getAvatarId());
 }
 
 void LLPanelAvatarProfile::onCallButtonClick()
 {
-
+	//*TODO not implemented
 }
 
 void LLPanelAvatarProfile::onShareButtonClick()
 {
-
+	//*TODO not implemented
 }
 
-/*virtual*/ BOOL LLPanelAvatarProfile::postBuild(void)
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+
+LLPanelAvatarMeProfile::LLPanelAvatarMeProfile()
+: LLPanelAvatarProfile()
 {
-	mStatusCombobox = getChild<LLComboBox>("status_combo", TRUE, FALSE);
-	if (NULL != mStatusCombobox)
-	{
-		mStatusCombobox->setCommitCallback(boost::bind(&LLPanelAvatarProfile::onStatusChanged, this));
-	}
-	mStatusMessage =  getChild<LLLineEditor>("status_me_message_edit", TRUE, FALSE);
-	if (NULL != mStatusMessage)
-	{
-		mStatusMessage->setCommitCallback(boost::bind(&LLPanelAvatarProfile::onStatusMessageChanged, this));
-	}
+}
 
-	if (!isEditMode())
-	{
-		childSetActionTextbox("homepage_edit", boost::bind(&LLPanelAvatarProfile::onHomepageTextboxClicked, this));
-		childSetActionTextbox("payment_update_link", boost::bind(&LLPanelAvatarProfile::onUpdateAccountTextboxClicked, this));
-		childSetActionTextbox("my_account_link", boost::bind(&LLPanelAvatarProfile::onMyAccountTextboxClicked, this));
-		childSetActionTextbox("partner_edit_link", boost::bind(&LLPanelAvatarProfile::onPartnerEditTextboxClicked, this));
-	}
+BOOL LLPanelAvatarMeProfile::postBuild()
+{
+	LLPanelAvatarProfile::postBuild();
 
-	childSetCommitCallback("add_friend",(boost::bind(&LLPanelAvatarProfile::onAddFriendButtonClick,this)),NULL);
-	childSetCommitCallback("im",(boost::bind(&LLPanelAvatarProfile::onIMButtonClick,this)),NULL);
-	childSetCommitCallback("call",(boost::bind(&LLPanelAvatarProfile::onCallButtonClick,this)),NULL);
-	childSetCommitCallback("teleport",(boost::bind(&LLPanelAvatarProfile::onTeleportButtonClick,this)),NULL);
-	childSetCommitCallback("share",(boost::bind(&LLPanelAvatarProfile::onShareButtonClick,this)),NULL);
+	mStatusCombobox = getChild<LLComboBox>("status_combo");
 
-	LLTextureCtrl* pic = getChild<LLTextureCtrl>("2nd_life_pic",TRUE,FALSE);
-	if(pic)
-	{
-		pic->setFallbackImageName("default_land_picture.j2c");
-	}
-	pic = getChild<LLTextureCtrl>("real_world_pic",TRUE,FALSE);
-	if(pic)
-	{
-		pic->setFallbackImageName("default_land_picture.j2c");
-	}
+	childSetCommitCallback("status_combo", boost::bind(&LLPanelAvatarMeProfile::onStatusChanged, this), NULL);
+	childSetCommitCallback("status_me_message_text", boost::bind(&LLPanelAvatarMeProfile::onStatusMessageChanged, this), NULL);
+	childSetActionTextbox("payment_update_link", boost::bind(&LLPanelAvatarMeProfile::onUpdateAccountTextboxClicked, this));
+	childSetActionTextbox("my_account_link", boost::bind(&LLPanelAvatarMeProfile::onMyAccountTextboxClicked, this));
+	childSetActionTextbox("partner_edit_link", boost::bind(&LLPanelAvatarMeProfile::onPartnerEditTextboxClicked, this));
 
-	clearControls();
-	updateChildrenList();
+	resetControls();
+	resetData();
 
 	return TRUE;
 }
 
-void LLPanelAvatarProfile::onOpen(const LLSD& key)
+void LLPanelAvatarMeProfile::onOpen(const LLSD& key)
 {
-	onActivate(key);
-	updateChildrenList();
+	LLPanelProfileTab::onOpen(key);
+
+	std::string full_name;
+	gCacheName->getFullName(getAvatarId(), full_name);
+	childSetValue("user_name", full_name);
 }
 
+void LLPanelAvatarMeProfile::processProfileProperties(const LLAvatarData* avatar_data)
+{
+	fillCommonData(avatar_data);
+
+	fillPartnerData(avatar_data);
 
-void LLPanelAvatarProfile::updateChildrenList()
+	fillStatusData(avatar_data);
+
+	fillAccountStatus(avatar_data);
+}
+
+void LLPanelAvatarMeProfile::fillStatusData(const LLAvatarData* avatar_data)
 {
-	switch (mProfileType)
+	std::string status;
+	if (gAgent.getAFK())
 	{
-	case PT_OWN:
-		if (mUpdated || isEditMode())
-		{
-			return;
-		}
-		childSetVisible("user_name", true);
-		childSetVisible("status_panel", false);
-		childSetVisible("profile_buttons_panel", false);
-		childSetVisible("title_groups_text", false);
-		childSetVisible("sl_groups", false);
-		mUpdated = true;
-		childSetVisible("status_me_panel", true);
-		childSetVisible("profile_me_buttons_panel", true);
-
-		break;
-	case PT_OTHER:
-		childSetVisible("user_name", false);
-		childSetVisible("status_me_panel", false);
-		childSetVisible("profile_me_buttons_panel", false);
-
-		childSetVisible("status_panel", true);
-		childSetVisible("profile_buttons_panel", true);
-		childSetVisible("title_groups_text", true);
-		childSetVisible("sl_groups", true);
-
-		// account actions
-		childSetVisible("account_actions_panel", false);
-		childSetVisible("partner_edit_link", false);
-
-		//hide for friends
-		childSetEnabled("add_friend", !LLAvatarActions::isFriend(getAvatarId()));
-
-		//need to update profile view on every activate
-		mUpdated = false;
-		break;
-	case PT_UNKNOWN: break;//do nothing 
-	default:
-		llassert(false);
+		status = "away";
+	}
+	else if (gAgent.getBusy())
+	{
+		status = "busy";
+	}
+	else
+	{
+		status = "online";
 	}
+
+	mStatusCombobox->setValue(status);
+}
+
+void LLPanelAvatarMeProfile::resetControls()
+{
+	childSetVisible("user_name", true);
+	childSetVisible("status_panel", false);
+	childSetVisible("profile_buttons_panel", false);
+	childSetVisible("title_groups_text", false);
+	childSetVisible("sl_groups", false);
+	childSetVisible("status_me_panel", true);
+	childSetVisible("profile_me_buttons_panel", true);
 }
-void LLPanelAvatarProfile::onStatusChanged()
+
+void LLPanelAvatarMeProfile::onStatusChanged()
 {
 	LLSD::String status = mStatusCombobox->getValue().asString();
-	
+
 	if ("online" == status)
 	{
 		gAgent.clearAFK();
@@ -572,169 +676,24 @@ void LLPanelAvatarProfile::onStatusChanged()
 		gAgent.setBusy();
 		LLNotifications::instance().add("BusyModeSet");
 	}
-	else
-	{
-	}
-
 }
 
-void LLPanelAvatarProfile::onStatusMessageChanged()
+void LLPanelAvatarMeProfile::onStatusMessageChanged()
 {
 	updateData();
 }
 
-//static
-void LLPanelAvatarProfile::onUrlTextboxClicked(std::string url)
-{
-	LLWeb::loadURL(url);
-}
-
-void LLPanelAvatarProfile::onHomepageTextboxClicked()
-{
-	onUrlTextboxClicked(childGetValue("homepage_edit").asString());
-}
-
-void LLPanelAvatarProfile::onUpdateAccountTextboxClicked()
+void LLPanelAvatarMeProfile::onUpdateAccountTextboxClicked()
 {
 	onUrlTextboxClicked(getString("payment_update_link_url"));
 }
 
-void LLPanelAvatarProfile::onMyAccountTextboxClicked()
+void LLPanelAvatarMeProfile::onMyAccountTextboxClicked()
 {
 	onUrlTextboxClicked(getString("my_account_link_url"));
 }
 
-void LLPanelAvatarProfile::onPartnerEditTextboxClicked()
+void LLPanelAvatarMeProfile::onPartnerEditTextboxClicked()
 {
 	onUrlTextboxClicked(getString("partner_edit_link_url"));
 }
-
-//-----------------------------------------------------------------------------
-// LLPanelAvatarNotes()
-//-----------------------------------------------------------------------------
-LLPanelAvatarNotes::LLPanelAvatarNotes(const LLUUID& id /* = LLUUID::null */)
-:LLPanelProfileTab(id)
-{
-	updateData();
-}
-
-LLPanelAvatarNotes::LLPanelAvatarNotes(const Params& params)
-: LLPanelProfileTab(params)
-{
-
-}
-
-LLPanelAvatarNotes::~LLPanelAvatarNotes()
-{
-	if(getAvatarId().notNull())
-	{
-		LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
-	}
-}
-
-void* LLPanelAvatarNotes::create(void* data)
-{
-	if(data)
-	{
-		LLSD* id = static_cast<LLSD*>(data);
-		return new LLPanelAvatarNotes(LLUUID(id->asUUID()));
-	}
-	return new LLPanelAvatarNotes();
-}
-
-void LLPanelAvatarNotes::updateData()
-{
-	LLAvatarPropertiesProcessor::getInstance()->sendDataRequest(getAvatarId(),APT_NOTES);
-
-	const LLRelationship* relation = LLAvatarTracker::instance().getBuddyInfo(getAvatarId());
-	if(relation)
-	{
-		childSetEnabled("status_check",TRUE);
-		childSetEnabled("map_check",TRUE);
-		childSetEnabled("objects_check",TRUE);
-
-		S32 rights = relation->getRightsGrantedTo();
-
-		childSetValue("status_check",LLRelationship::GRANT_ONLINE_STATUS & rights ? TRUE : FALSE);
-		childSetValue("map_check",LLRelationship::GRANT_MAP_LOCATION & rights ? TRUE : FALSE);
-		childSetValue("objects_check",LLRelationship::GRANT_MODIFY_OBJECTS & rights ? TRUE : FALSE);
-	}
-}
-
-BOOL LLPanelAvatarNotes::postBuild()
-{
-	childSetCommitCallback("status_check",boost::bind(&LLPanelAvatarNotes::onCommitRights,this),NULL);
-	childSetCommitCallback("map_check",boost::bind(&LLPanelAvatarNotes::onCommitRights,this),NULL);
-	childSetCommitCallback("objects_check",boost::bind(&LLPanelAvatarNotes::onCommitRights,this),NULL);
-
-	childSetCommitCallback("add_friend",(boost::bind(&LLPanelAvatarProfile::onAddFriend,this)),NULL);
-	childSetCommitCallback("im",(boost::bind(&LLPanelAvatarProfile::onIM,this)),NULL);
-//	childSetCommitCallback("call",(boost::bind(&LLPanelAvatarProfile::onCallButtonClick,this)));
-	childSetCommitCallback("teleport",(boost::bind(&LLPanelAvatarProfile::onTeleport,this)),NULL);
-//	childSetCommitCallback("share",(boost::bind(&LLPanelAvatarProfile::onShareButtonClick,this)));
-
-	LLTextEditor* te = getChild<LLTextEditor>("notes_edit",TRUE,FALSE);
-	if(te) 
-	{
-		te->setCommitCallback(boost::bind(&LLPanelAvatarNotes::onCommitNotes,this));
-		te->setCommitOnFocusLost(TRUE);
-	}
-
-	return TRUE;
-}
-
-void LLPanelAvatarNotes::onCommitNotes()
-{
-	std::string notes = childGetValue("notes_edit").asString();
-	LLAvatarPropertiesProcessor::getInstance()-> sendNotes(getAvatarId(),notes);
-}
-
-void LLPanelAvatarNotes::onCommitRights()
-{
-	S32 rights = 0;
-
-	if(childGetValue("status_check").asBoolean())
-		rights |= LLRelationship::GRANT_ONLINE_STATUS;
-	if(childGetValue("map_check").asBoolean())
-		rights |= LLRelationship::GRANT_MAP_LOCATION;
-	if(childGetValue("objects_check").asBoolean())
-		rights |= LLRelationship::GRANT_MODIFY_OBJECTS;
-
-	LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(getAvatarId(),rights);
-}
-
-void LLPanelAvatarNotes::clear()
-{
-	childSetValue("notes_edit",LLStringUtil::null);
-
-	childSetEnabled("status_check",FALSE);
-	childSetEnabled("map_check",FALSE);
-	childSetEnabled("objects_check",FALSE);
-}
-
-void LLPanelAvatarNotes::processProperties(void* data, EAvatarProcessorType type)
-{
-	if(APT_NOTES == type)
-	{
-		LLAvatarNotes* avatar_notes = static_cast<LLAvatarNotes*>(data);
-		if(avatar_notes && getAvatarId() == avatar_notes->target_id)
-		{
-			childSetValue("notes_edit",avatar_notes->notes);
-			childSetEnabled("notes edit", true);
-
-			LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
-		}
-	}
-}
-
-void LLPanelAvatarNotes::onActivate(const LLUUID& id)
-{
-	LLPanelProfileTab::onActivate(id);
-	updateChildrenList();
-}
-
-void LLPanelAvatarNotes::updateChildrenList()
-{
-	//hide for friends
-	childSetEnabled("add_friend", !LLAvatarActions::isFriend(getAvatarId()));
-}
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 2b0fbaf193..a6cf2a2d27 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -45,137 +45,199 @@ enum EOnlineStatus
 	ONLINE_STATUS_YES     = 1
 };
 
-
-class LLPanelProfileTab 
+/**
+* Base class for any Profile View or Me Profile Panel.
+*/
+class LLPanelProfileTab
 	: public LLPanel
 	, public LLAvatarPropertiesObserver
 {
 public:
-	
-	LLPanelProfileTab(const LLUUID& avatar_id);
-	LLPanelProfileTab(const Params& params );
 
-	void setAvatarId(const LLUUID& avatar_id);
+	/**
+	 * Sets avatar ID, sets panel as observer of avatar related info replies from server.
+	 */
+	virtual void setAvatarId(const LLUUID& id);
 
-	const LLUUID& getAvatarId(){return mAvatarId;}
+	/**
+	 * Returns avatar ID.
+	 */
+	virtual const LLUUID& getAvatarId() { return mAvatarId; }
 
+	/**
+	 * Sends update data request to server.
+	 */
 	virtual void updateData() = 0;
 
+	/**
+	 * Clears panel data if viewing avatar info for first time and sends update data request.
+	 */
 	virtual void onOpen(const LLSD& key);
 
-	virtual void onActivate(const LLUUID& id);
+	/**
+	 * Resets controls visibility, state, etc.
+	 */
+	virtual void resetControls(){};
 
-	typedef enum e_profile_type
-	{
-		PT_UNKNOWN,
-		PT_OWN,
-		PT_OTHER
-	} EProfileType;
+	/**
+	 * Clears all data received from server.
+	 */
+	virtual void resetData(){};
 
-	virtual void onAddFriend();
+	/*virtual*/ ~LLPanelProfileTab();
 
-	virtual void onIM();
-
-	virtual void onTeleport();
+protected:
 
-	virtual void clear(){};
+	LLPanelProfileTab();
 
-protected:
-	virtual ~LLPanelProfileTab();
-	void setProfileType();
+	/**
+	 * Scrolls panel to top when viewing avatar info for first time.
+	 */
+	void scrollToTop();
 
 private:
-	void scrollToTop();
 
-protected:
-	e_profile_type mProfileType;
 	LLUUID mAvatarId;
 };
 
-class LLPanelAvatarProfile 
+/**
+* Panel for displaying Avatar's first and second life related info.
+*/
+class LLPanelAvatarProfile
 	: public LLPanelProfileTab
 {
 public:
-	LLPanelAvatarProfile(const LLUUID& avatar_id = LLUUID::null);
-	LLPanelAvatarProfile(const Params& params );
-	~LLPanelAvatarProfile();
-	
-	static void* create(void* data);
+	LLPanelAvatarProfile();
+
+	/*virtual*/ void onOpen(const LLSD& key);
 
+	/**
+	 * Processes data received from server.
+	 */
 	/*virtual*/ void processProperties(void* data, EAvatarProcessorType type);
 
-	void updateData();
+	/*virtual*/ BOOL postBuild();
 
-	void clear();
+	/*virtual*/ void updateData();
 
-	virtual void clearControls();
+	/*virtual*/ void resetControls();
 
-	/*virtual*/ BOOL postBuild(void);
-	/*virtual*/ void onOpen(const LLSD& key);
+	/*virtual*/ void resetData();
 
-private:
-	bool isOwnProfile(){return PT_OWN == mProfileType;}
-	bool isEditMode(){return mEditMode;}
-	void updateChildrenList();
-	void onStatusChanged();
-	void onStatusMessageChanged();
-	void setCaptionText(const LLAvatarData* avatar_data);
+protected:
 
-	static void onUrlTextboxClicked(std::string url);
-	void onHomepageTextboxClicked();
-	void onUpdateAccountTextboxClicked();
-	void onMyAccountTextboxClicked();
-	void onPartnerEditTextboxClicked();
+	/**
+	 * Process profile related data received from server.
+	 */
+	virtual void processProfileProperties(const LLAvatarData* avatar_data);
+
+	/**
+	 * Processes group related data received from server.
+	 */
+	virtual void processGroupProperties(const LLAvatarGroups* avatar_groups);
+
+	/**
+	 * Fills common for Avatar profile and Me Profile fields.
+	 */
+	virtual void fillCommonData(const LLAvatarData* avatar_data);
+
+	/**
+	 * Fills partner data.
+	 */
+	virtual void fillPartnerData(const LLAvatarData* avatar_data);
+
+	/**
+	 * Fills Avatar's online status.
+	 */
+	virtual void fillOnlineStatus(const LLAvatarData* avatar_data);
+	
+	/**
+	 * Fills account status.
+	 */
+	virtual void fillAccountStatus(const LLAvatarData* avatar_data);
 
+	void onUrlTextboxClicked(std::string url);
+	void onHomepageTextboxClicked();
 	void onAddFriendButtonClick();
 	void onIMButtonClick();
 	void onCallButtonClick();
 	void onTeleportButtonClick();
 	void onShareButtonClick();
+};
+
+/**
+ * Panel for displaying own first and second life related info.
+ */
+class LLPanelAvatarMeProfile
+	: public LLPanelAvatarProfile
+{
+public:
+	LLPanelAvatarMeProfile();
+
+	/*virtual*/ BOOL postBuild();
+
+protected:
+
+	/*virtual*/ void onOpen(const LLSD& key);
+
+	/*virtual*/ void processProfileProperties(const LLAvatarData* avatar_data);
 
+	/**
+	 * Fills Avatar status data.
+	 */
+	virtual void fillStatusData(const LLAvatarData* avatar_data);
+
+	/*virtual*/ void resetControls();
 
 protected:
-	bool mEditMode;
+
+	void onStatusChanged();
+	void onStatusMessageChanged();
+	void onUpdateAccountTextboxClicked();
+	void onMyAccountTextboxClicked();
+	void onPartnerEditTextboxClicked();
 
 private:
-	bool mUpdated;
-	LLComboBox * mStatusCombobox;
-	LLLineEditor * mStatusMessage;
-};
 
+	LLComboBox* mStatusCombobox;
+};
 
+/**
+* Panel for displaying Avatar's notes and modifying friend's rights.
+*/
 class LLPanelAvatarNotes 
 	: public LLPanelProfileTab
 {
 public:
-	LLPanelAvatarNotes(const LLUUID& id = LLUUID::null);
-	LLPanelAvatarNotes(const Params& params );
-	~LLPanelAvatarNotes();
+	LLPanelAvatarNotes();
 
-	static void* create(void* data);
+	/*virtual*/ void onOpen(const LLSD& key);
 
-	void onActivate(const LLUUID& id);
+	/*virtual*/ BOOL postBuild();
 
-	BOOL postBuild(void);
+	/*virtual*/ void processProperties(void* data, EAvatarProcessorType type);
 
-	void onCommitRights();
+	/*virtual*/ void updateData();
 
-	void onCommitNotes();
+protected:
 
-	void clear();
+	/*virtual*/ void resetControls();
 
-	void processProperties(void* data, EAvatarProcessorType type);
+	/*virtual*/ void resetData();
 
-	void updateData();
+	/**
+	 * Fills rights data for friends.
+	 */
+	void fillRightsData();
 
-protected:
+	void onCommitRights();
+	void onCommitNotes();
 
-	void updateChildrenList();
+	void onAddFriendButtonClick();
+	void onIMButtonClick();
+	void onCallButtonClick();
+	void onTeleportButtonClick();
+	void onShareButtonClick();
 };
 
-
-
-// helper funcs
-void add_left_label(LLPanel *panel, const std::string& name, S32 y);
-
 #endif // LL_LLPANELAVATAR_H
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 3acaa6b68e..086b06c1a3 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -35,10 +35,6 @@
 
 #include "llagent.h"
 #include "llbutton.h"
-#include "llpanelgroupgeneral.h"
-#include "llpanelgrouproles.h"
-#include "llpanelgrouplandmoney.h"
-#include "llpanelgroupnotices.h"
 #include "lltabcontainer.h"
 #include "lltextbox.h"
 #include "llviewermessage.h"
@@ -46,26 +42,31 @@
 #include "llviewerwindow.h"
 #include "llappviewer.h"
 #include "llnotifications.h"
+#include "llfloaterreg.h"
 #include "llfloater.h"
 
-// static
-void* LLPanelGroupTab::createTab(void* data)
-{
-	LLUUID* group_id = static_cast<LLUUID*>(data);
-	return new LLPanelGroupTab(*group_id);
-}
+#include "llsidetraypanelcontainer.h"
+
+#include "llpanelgroupnotices.h"
+#include "llpanelgroupgeneral.h"
+
+#include "llsidetray.h"
+#include "llaccordionctrltab.h"
+
+static LLRegisterPanelClassWrapper<LLPanelGroup> t_panel_group("panel_group_info_sidetray");
 
-LLPanelGroupTab::LLPanelGroupTab(const LLUUID& group_id)
+
+
+LLPanelGroupTab::LLPanelGroupTab()
 	: LLPanel(),
-	  mGroupID(group_id),
 	  mAllowEdit(TRUE),
 	  mHasModal(FALSE)
 {
+	mGroupID = LLUUID::null;
 }
 
 LLPanelGroupTab::~LLPanelGroupTab()
 {
-	mObservers.clear();
 }
 
 BOOL LLPanelGroupTab::isVisibleByAgent(LLAgent* agentp)
@@ -76,39 +77,10 @@ BOOL LLPanelGroupTab::isVisibleByAgent(LLAgent* agentp)
 
 BOOL LLPanelGroupTab::postBuild()
 {
-	// Hook up the help button callback.
-	LLButton* button = findChild<LLButton>("help_button");
-	if (button)
-	{
-		button->setCommitCallback(boost::bind(&LLPanelGroupTab::handleClickHelp, this));
-	}
-	mHelpText = getString("help_text");
 	return TRUE;
 }
 
-void LLPanelGroupTab::addObserver(LLPanelGroupTabObserver *obs)
-{
-	mObservers.insert(obs);
-}
-
-void LLPanelGroupTab::removeObserver(LLPanelGroupTabObserver *obs)
-{
-	mObservers.erase(obs);
-}
-
-void LLPanelGroupTab::notifyObservers()
-{
-
-	for (observer_list_t::iterator iter = mObservers.begin();
-		 iter != mObservers.end(); )
-	{
-		LLPanelGroupTabObserver* observer = *iter;
-		observer->tabChanged();
 
-		// safe way to incrament since changed may delete entries! (@!##%@!@&*!)
-		iter = mObservers.upper_bound(observer); 
-	}
-}
 
 void LLPanelGroupTab::handleClickHelp()
 {
@@ -125,384 +97,240 @@ void LLPanelGroupTab::handleClickHelp()
 	}
 }
 
-LLPanelGroup::LLPanelGroup(const LLUUID& group_id)
-:	LLPanel(),
-	LLGroupMgrObserver( group_id ),
-	mCurrentTab( NULL ),
-	mRequestedTab( NULL ),
-	mTabContainer( NULL ),
-	mIgnoreTransition( FALSE ),
-	mApplyBtn( NULL ),
-	mForceClose( FALSE ),
-	mAllowEdit( TRUE ),
-	mShowingNotifyDialog( FALSE )
+LLPanelGroup::LLPanelGroup()
+:	LLPanel()
+	,LLGroupMgrObserver( LLUUID() )
+	,mAllowEdit(TRUE)
 {
 	// Set up the factory callbacks.
-	mFactoryMap["general_tab"]	= LLCallbackMap(LLPanelGroupGeneral::createTab, &mID);
-	mFactoryMap["roles_tab"]	= LLCallbackMap(LLPanelGroupRoles::createTab, &mID);
-	mFactoryMap["notices_tab"]	= LLCallbackMap(LLPanelGroupNotices::createTab, &mID);
-	mFactoryMap["land_money_tab"]= LLCallbackMap(LLPanelGroupLandMoney::createTab, &mID);
 	// Roles sub tabs
-	mFactoryMap["members_sub_tab"] = LLCallbackMap(LLPanelGroupMembersSubTab::createTab, &mID);
-	mFactoryMap["roles_sub_tab"] = LLCallbackMap(LLPanelGroupRolesSubTab::createTab, &mID);
-	mFactoryMap["actions_sub_tab"] = LLCallbackMap(LLPanelGroupActionsSubTab::createTab, &mID);
-
 	LLGroupMgr::getInstance()->addObserver(this);
+
 }
 
+
 LLPanelGroup::~LLPanelGroup()
 {
 	LLGroupMgr::getInstance()->removeObserver(this);
-
-	for (S32 i=mTabContainer->getTabCount() - 1; i >=0; --i)
-	{
-		LLPanelGroupTab* panelp = (LLPanelGroupTab*) mTabContainer->getPanelByIndex(i);
-		if ( panelp )
-			panelp->removeObserver(this);
-	}
 }
 
-void LLPanelGroup::updateTabVisibility()
+void LLPanelGroup::onOpen(const LLSD& key)
 {
-	for (S32 i = mTabContainer->getTabCount() - 1; i >=0; --i)
+	LLUUID group_id = key["group_id"];
+	if(!key.has("action"))
 	{
-		LLPanelGroupTab* panelp = (LLPanelGroupTab*) mTabContainer->getPanelByIndex(i);
+		setGroupID(group_id);
+		return;
+	}
 
-		BOOL visible = panelp->isVisibleByAgent(&gAgent) || gAgent.isGodlike();
-		mTabContainer->enableTabButton(i, visible);
+	std::string str_action = key["action"];
 
-		if ( !visible && mCurrentTab == panelp )
-		{
-			//we are disabling the currently selected tab
-			//select the previous one
-			mTabContainer->selectPrevTab();
-			mCurrentTab = (LLPanelGroupTab*) mTabContainer->getCurrentPanel();
-		}
+	if(str_action == "refresh")
+	{
+		if(mID == group_id)
+			refreshData();
+	}
+	else if(str_action == "close")
+	{
+		onBackBtnClick();
+	}
+	else if(str_action == "create")
+	{
+		setGroupID(LLUUID::null);
 	}
-}
-
 
+}
 
 BOOL LLPanelGroup::postBuild()
 {
-	mTabContainer = getChild<LLTabContainer>("group_tab_container");
-
-	if (mTabContainer)
-	{
-		mCurrentTab = dynamic_cast<LLPanelGroupTab*>(mTabContainer->getCurrentPanel());
-		llassert_always(mCurrentTab);
-		
-		// Add click callback.
-		mTabContainer->setCommitCallback(boost::bind(&LLPanelGroup::handleClickTab, this));
-		
-		// Setup pabels
-		for (S32 i = mTabContainer->getTabCount() - 1; i >=0; --i)
-		{
-			LLPanel* tab_panel = mTabContainer->getPanelByIndex(i);
-			LLPanelGroupTab* panelp = dynamic_cast<LLPanelGroupTab*>(tab_panel);
-			if (panelp)
-			{
-				// Pass on whether or not to allow edit to tabs.
-				panelp->setAllowEdit(mAllowEdit);
-				panelp->addObserver(this);
-			}
-		}
-		updateTabVisibility();
-
-		// Act as though this tab was just activated.
-		mCurrentTab->activate();
-	}
-
 	mDefaultNeedsApplyMesg = getString("default_needs_apply_text");
 	mWantApplyMesg = getString("want_apply_text");
 
-	LLButton* button = getChild<LLButton>("btn_ok");
-	button->setClickedCallback(onBtnOK, this);
-	button->setVisible(mAllowEdit);
-	
-	button = getChild<LLButton>("btn_cancel");
-	button->setClickedCallback(onBtnCancel, this);
-	button->setVisible(mAllowEdit);
+	LLButton* button;
 
 	button = getChild<LLButton>("btn_apply");
 	button->setClickedCallback(onBtnApply, this);
-	button->setVisible(mAllowEdit);
-	button->setEnabled(FALSE);
-	mApplyBtn = button;
+	button->setVisible(true);
+	button->setEnabled(false);
+
 
 	button = getChild<LLButton>("btn_refresh");
 	button->setClickedCallback(onBtnRefresh, this);
 	button->setVisible(mAllowEdit);
 
+	getChild<LLButton>("btn_create")->setVisible(false);
+
+	childSetCommitCallback("btn_create",boost::bind(&LLPanelGroup::onBtnCreate,this),NULL);
+	childSetCommitCallback("back",boost::bind(&LLPanelGroup::onBackBtnClick,this),NULL);
+
+	LLPanelGroupTab* panel_general = findChild<LLPanelGroupTab>("group_general_tab_panel");
+	LLPanelGroupTab* panel_roles = findChild<LLPanelGroupTab>("group_roles_tab_panel");
+	LLPanelGroupTab* panel_notices = findChild<LLPanelGroupTab>("group_notices_tab_panel");
+	LLPanelGroupTab* panel_land = findChild<LLPanelGroupTab>("group_land_tab_panel");
+
+	if(panel_general)	mTabs.push_back(panel_general);
+	if(panel_roles)		mTabs.push_back(panel_roles);
+	if(panel_notices)	mTabs.push_back(panel_notices);
+	if(panel_land)		mTabs.push_back(panel_land);
+	
 	return TRUE;
 }
 
-void LLPanelGroup::changed(LLGroupChange gc)
+void LLPanelGroup::reshape(S32 width, S32 height, BOOL called_from_parent )
 {
-	updateTabVisibility();
-	// Notify the currently active panel that group manager information has changed.
-	LLPanelGroupTab* panelp = (LLPanelGroupTab*) mTabContainer->getCurrentPanel();
+	LLPanel::reshape(width, height, called_from_parent );
 
-	if (panelp)
-	{
-		panelp->update(gc);
-	}
+	LLButton* button = getChild<LLButton>("btn_apply");
+	LLRect btn_rect = button->getRect();
+	btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
+	button->setRect(btn_rect);
+
+	button = getChild<LLButton>("btn_create");
+	btn_rect = button->getRect();
+	btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
+	button->setRect(btn_rect);
+
+
+	button = getChild<LLButton>("btn_refresh");
+	btn_rect = button->getRect();
+	btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
+	button->setRect(btn_rect);
 }
 
-// PanelGroupTab observer trigger
-void LLPanelGroup::tabChanged()
+void LLPanelGroup::onBackBtnClick()
 {
-	//some tab information has changed,....enable/disable the apply button
-	//based on if they need an apply
-	if ( mApplyBtn )
+	LLSideTrayPanelContainer* parent = dynamic_cast<LLSideTrayPanelContainer*>(getParent());
+	if(parent)
 	{
-		std::string mesg;
-		mApplyBtn->setEnabled(mCurrentTab->needsApply(mesg));
+		parent->openPreviousPanel();
 	}
 }
 
-void LLPanelGroup::handleClickTab()
+void LLPanelGroup::onBtnCreate()
 {
-	// If we are already handling a transition,
-	// ignore this.
-	if (mIgnoreTransition)
-	{
+	LLPanelGroupGeneral* panel_general = findChild<LLPanelGroupGeneral>("group_general_tab_panel");
+	if(!panel_general)
 		return;
-	}
-
-	mRequestedTab = (LLPanelGroupTab*) mTabContainer->getCurrentPanel();
-
-	// Make sure they aren't just clicking the same tab...
-	if (mRequestedTab == mCurrentTab)
-	{
-		return;
-	}
+	std::string apply_mesg;
+	panel_general->apply(apply_mesg);//yes yes you need to call apply to create...
+}
 
-	// Try to switch from the current panel to the panel the user selected.
-	attemptTransition();
+void LLPanelGroup::onBtnRefresh(void* user_data)
+{
+	LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
+	self->refreshData();
 }
 
-void LLPanelGroup::setGroupID(const LLUUID& group_id)
+void LLPanelGroup::onBtnApply(void* user_data)
 {
-	LLRect rect(getRect());
+	LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
+	self->apply();
+}
 
-	LLGroupMgr::getInstance()->removeObserver(this);
-	mID = group_id;
-	LLGroupMgr::getInstance()->addObserver(this);
 
-	//*TODO:  this is really bad, we should add a method
-	// where the panels can just update themselves
-	// on a group id change.  Similar to update() but with a group
-	// id change.
+void LLPanelGroup::changed(LLGroupChange gc)
+{
+	for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
+		(*it)->update(gc);
 
-	// For now, rebuild panel
-	//delete children and rebuild panel
-	deleteAllChildren();
-	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_group.xml");
+	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mID);
+	if(gdatap)
+		childSetValue("group_name", gdatap->mName);
 }
 
-void LLPanelGroup::selectTab(std::string tab_name)
+void LLPanelGroup::notifyObservers()
 {
-	const BOOL recurse = TRUE;
+	for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
+		(*it)->update(GC_ALL);
 
-	LLPanelGroupTab* tabp = findChild<LLPanelGroupTab>(tab_name, recurse);
-
-	if ( tabp && mTabContainer )
-	{
-		mTabContainer->selectTabPanel(tabp);
-		handleClickTab();
-	}
+	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mID);
+	if(gdatap)
+		childSetValue("group_name", gdatap->mName);
 }
 
-BOOL LLPanelGroup::canClose()
-{
-	if (mShowingNotifyDialog) return FALSE;
-	if (mCurrentTab && mCurrentTab->hasModal()) return FALSE;
-	if (mForceClose || !mAllowEdit) return TRUE;
 
-	// Try to switch from the current panel to nothing, indicating a close action.
-	mRequestedTab = NULL;
-	return attemptTransition();
-}
 
-BOOL LLPanelGroup::attemptTransition()
+void LLPanelGroup::setGroupID(const LLUUID& group_id)
 {
-	// Check if the current tab needs to be applied.
-	std::string mesg;
-	if (mCurrentTab && mCurrentTab->needsApply(mesg))
-	{
-		// If no message was provided, give a generic one.
-		if (mesg.empty())
-		{
-			mesg = mDefaultNeedsApplyMesg;
-		}
-		// Create a notify box, telling the user about the unapplied tab.
-		LLSD args;
-		args["NEEDS_APPLY_MESSAGE"] = mesg;
-		args["WANT_APPLY_MESSAGE"] = mWantApplyMesg;
-		LLNotifications::instance().add("PanelGroupApply", args, LLSD(),
-			boost::bind(&LLPanelGroup::handleNotifyCallback, this, _1, _2));
-		mShowingNotifyDialog = TRUE;
-		
-		// We need to reselect the current tab, since it isn't finished.
-		if (mTabContainer)
-		{
-			// selectTabPanel is going to trigger another
-			// click event.  We want to ignore it so that
-			// mRequestedTab is not updated.
-			mIgnoreTransition = TRUE;
-			mTabContainer->selectTabPanel( mCurrentTab );
-			mIgnoreTransition = FALSE;
-		}
-		// Returning FALSE will block a close action from finishing until
-		// we get a response back from the user.
-		return FALSE;
-	}
-	else
-	{
-		// The current panel didn't have anything it needed to apply.
-		if ( mRequestedTab )
-		{
-			transitionToTab();
-		}
-		// Returning TRUE will allow any close action to proceed.
-		return TRUE;
-	}
-}
+	LLGroupMgr::getInstance()->removeObserver(this);
+	mID = group_id;
+	LLGroupMgr::getInstance()->addObserver(this);
 
-void LLPanelGroup::transitionToTab()
-{
-	// Tell the current panel that it is being deactivated.
-	if (mCurrentTab)
-	{
-		mCurrentTab->deactivate();
-	}
+	for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
+		(*it)->setGroupID(group_id);
+
+	LLButton* button_apply = getChild<LLButton>("btn_apply");
+	LLButton* button_refresh = getChild<LLButton>("btn_refresh");
+	LLButton* button_create = getChild<LLButton>("btn_create");
+
+
+	bool is_null_group_id = group_id == LLUUID::null;
 	
-	// If the requested panel exists, activate it.
-	if (mRequestedTab)
-	{
-		// This is now the current tab;
-		mCurrentTab = mRequestedTab;
-		mCurrentTab->activate();
-	}
-	else // NULL requested indicates a close action.
-	{
-		closePanel();
-	}
-}
+	button_apply->setVisible(!is_null_group_id);
+	button_refresh->setVisible(!is_null_group_id);
+	button_create->setVisible(is_null_group_id);
 
-bool LLPanelGroup::handleNotifyCallback(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	mShowingNotifyDialog = FALSE;
-	switch (option)
-	{
-	case 0: // "Apply Changes"
-		// Try to apply changes, and switch to the requested tab.
-		if ( !apply() )
-		{
-			// There was a problem doing the apply.
-			// Skip switching tabs.
-			break;
-		}
+	LLAccordionCtrlTab* tab_general = findChild<LLAccordionCtrlTab>("group_general_tab");
+	LLAccordionCtrlTab* tab_roles = findChild<LLAccordionCtrlTab>("group_roles_tab");
+	LLAccordionCtrlTab* tab_notices = findChild<LLAccordionCtrlTab>("group_notices_tab");
+	LLAccordionCtrlTab* tab_land = findChild<LLAccordionCtrlTab>("group_land_tab");
 
-		// This panel's info successfully applied.
-		// Switch to the next panel.
-		mIgnoreTransition = TRUE;
-		mTabContainer->selectTabPanel( mRequestedTab );
-		mIgnoreTransition = FALSE;
-		transitionToTab();
-		break;
-	case 1: // "Ignore Changes"
-		// Switch to the requested panel without applying changes
-		// (Changes may already have been applied in the previous block)
-		mCurrentTab->cancel();
-		mIgnoreTransition = TRUE;
-		mTabContainer->selectTabPanel( mRequestedTab );
-		mIgnoreTransition = FALSE;
-		transitionToTab();
-		break;
-	case 2: // "Cancel"
-	default:
-		// Do nothing.  The user is canceling the action.
-		// If we were quitting, we didn't really mean it.
-		LLAppViewer::instance()->abortQuit();
-		break;
+	if(is_null_group_id)//creating new group
+	{
+		if(!tab_general->getDisplayChildren())
+			tab_general->changeOpenClose(tab_general->getDisplayChildren());
+		
+		if(tab_roles->getDisplayChildren())
+			tab_roles->changeOpenClose(tab_roles->getDisplayChildren());
+		if(tab_notices->getDisplayChildren())
+			tab_notices->changeOpenClose(tab_notices->getDisplayChildren());
+		if(tab_land->getDisplayChildren())
+			tab_land->changeOpenClose(tab_land->getDisplayChildren());
+
+		tab_roles->canOpenClose(false);
+		tab_notices->canOpenClose(false);
+		tab_land->canOpenClose(false);
 	}
-	return false;
-}
-
-// static
-void LLPanelGroup::onBtnOK(void* user_data)
-{
-	LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
-	// If we are able to apply changes, then close.
-	if(self->apply())
+	else
 	{
-		self->closePanel();
+		tab_roles->canOpenClose(true);
+		tab_notices->canOpenClose(true);
+		tab_land->canOpenClose(true);
 	}
 }
 
-// static
-void LLPanelGroup::onBtnCancel(void* user_data)
-{
-	LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
-	self->closePanel();
-}
-
-// static
-void LLPanelGroup::onBtnApply(void* user_data)
-{
-	LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
-	self->apply();
-}
-
-bool LLPanelGroup::apply()
+bool	LLPanelGroup::apply(LLPanelGroupTab* tab)
 {
-	// Pass this along to the currently visible tab.
-	if (!mTabContainer)
+	if(!tab)
 		return false;
 
-	LLPanelGroupTab* panelp = dynamic_cast<LLPanelGroupTab*>(mTabContainer->getCurrentPanel());
-	if (!panelp)
-		return false;
-	
 	std::string mesg;
-	if ( !panelp->needsApply(mesg) )
-	{
-		// We don't need to apply anything.
-		// We're done.
+	if ( !tab->needsApply(mesg) )
 		return true;
-	}
-
-	// Ignore the needs apply message.
-	// Try to do the actual apply.
+	
 	std::string apply_mesg;
-	if ( panelp->apply( apply_mesg ) )
-	{
-		// Everything worked.  We're done.
+	if(tab->apply( apply_mesg ) )
 		return true;
-	}
-
-	// There was a problem doing the actual apply.
-	// Inform the user.
+		
 	if ( !apply_mesg.empty() )
 	{
 		LLSD args;
 		args["MESSAGE"] = apply_mesg;
 		LLNotifications::instance().add("GenericAlert", args);
 	}
-
 	return false;
 }
 
-// static
-void LLPanelGroup::onBtnRefresh(void* user_data)
+bool LLPanelGroup::apply()
 {
-	LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
-	self->refreshData();
+	return apply(findChild<LLPanelGroupTab>("group_general_tab_panel")) 
+		&& apply(findChild<LLPanelGroupTab>("group_roles_tab_panel"))
+		&& apply(findChild<LLPanelGroupTab>("group_notices_tab_panel"))
+		&& apply(findChild<LLPanelGroupTab>("group_land_tab_panel"))
+		;
 }
 
+
 // virtual
 void LLPanelGroup::draw()
 {
@@ -513,18 +341,22 @@ void LLPanelGroup::draw()
 		mRefreshTimer.stop();
 		childEnable("btn_refresh");
 	}
-	if (mCurrentTab)
-	{
-		std::string mesg;
-		childSetEnabled("btn_apply", mCurrentTab->needsApply(mesg));
-	}
 
+	bool enable = false;
+	std::string mesg;
+	for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
+		enable = enable || (*it)->needsApply(mesg);
+
+	childSetEnabled("btn_apply", enable);
 }
 
 void LLPanelGroup::refreshData()
 {
 	LLGroupMgr::getInstance()->clearGroupData(getID());
-	mCurrentTab->activate();
+	
+	for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
+		(*it)->activate();
+	
 
 	// 5 second timeout
 	childDisable("btn_refresh");
@@ -532,20 +364,6 @@ void LLPanelGroup::refreshData()
 	mRefreshTimer.setTimerExpirySec(5);
 }
 
-void LLPanelGroup::closePanel()
-{
-	// Pass this to the parent, if it is a floater.
-	LLView* viewp = getParent();
-	LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
-	if (floaterp)
-	{
-		// First, set the force close flag, since the floater
-		// will be asking us whether it can close.
-		mForceClose = TRUE;
-		// Tell the parent floater to close.
-		floaterp->closeFloater();
-	}
-}
 
 void LLPanelGroup::showNotice(const std::string& subject,
 							  const std::string& message,
@@ -553,7 +371,8 @@ void LLPanelGroup::showNotice(const std::string& subject,
 							  const std::string& inventory_name,
 							  LLOfferInfo* inventory_offer)
 {
-	if (mCurrentTab->getName() != "notices_tab")
+	LLPanelGroupNotices* panel_notices = findChild<LLPanelGroupNotices>("group_notices_tab_panel");
+	if(!panel_notices)
 	{
 		// We need to clean up that inventory offer.
 		if (inventory_offer)
@@ -562,8 +381,37 @@ void LLPanelGroup::showNotice(const std::string& subject,
 		}
 		return;
 	}
+	panel_notices->showNotice(subject,message,has_inventory,inventory_name,inventory_offer);
+}
 
-	LLPanelGroupNotices* notices = static_cast<LLPanelGroupNotices*>(mCurrentTab);
 
-	notices->showNotice(subject,message,has_inventory,inventory_name,inventory_offer);
+
+
+//static
+void LLPanelGroup::refreshCreatedGroup(const LLUUID& group_id)
+{
+	LLPanelGroup* panel = LLSideTray::getInstance()->findChild<LLPanelGroup>("panel_group_info_sidetray");
+	if(!panel)
+		return;
+	panel->setGroupID(group_id);
 }
+
+//static
+
+void LLPanelGroup::showNotice(const std::string& subject,
+					   const std::string& message,
+					   const LLUUID& group_id,
+					   const bool& has_inventory,
+					   const std::string& inventory_name,
+					   LLOfferInfo* inventory_offer)
+{
+	LLPanelGroup* panel = LLSideTray::getInstance()->findChild<LLPanelGroup>("panel_group_info_sidetray");
+	if(!panel)
+		return;
+
+	if(panel->getID() != group_id)//???? only for current group_id or switch panels? FIXME
+		return;
+	panel->showNotice(subject,message,has_inventory,inventory_name,inventory_offer);
+
+}
+
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index 55c7494a44..e5e1d1b6ad 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -45,93 +45,79 @@ class LLPanelGroupTab;
 class LLTabContainer;
 class LLAgent;
 
-class LLPanelGroupTabObserver
-{
-public:
-	LLPanelGroupTabObserver() {};
-	virtual ~LLPanelGroupTabObserver(){};
-	virtual void tabChanged() = 0;
-};
 
 class LLPanelGroup : public LLPanel,
-					 public LLGroupMgrObserver, 
-					 public LLPanelGroupTabObserver
+					 public LLGroupMgrObserver 
 {
 public:
-	LLPanelGroup(const LLUUID& group_id);
+	LLPanelGroup();
 	virtual ~LLPanelGroup();
 
 	virtual BOOL postBuild();
 
-	static void onBtnOK(void*);
-	static void onBtnCancel(void*);
-	static void onBtnApply(void*);
-	static void onBtnRefresh(void*);
-	void handleClickTab();
-
 	void setGroupID(const LLUUID& group_id);
-	void selectTab(std::string tab_name);
-
-	// Called when embedded in a floater during a close attempt.
-	BOOL canClose();
-	
-	// Checks if the current tab needs to be applied, and tries to switch to the requested tab.
-	BOOL attemptTransition();
-	
-	// Switches to the requested tab (will close() if requested is NULL)
-	void transitionToTab();
-
-	void updateTabVisibility();
-
-	// Used by attemptTransition to query the user's response to a tab that needs to apply. 
-	bool handleNotifyCallback(const LLSD& notification, const LLSD& response);
 
-	bool apply();
-	void refreshData();
-	void closePanel();
 	void draw();
 
+	void onOpen(const LLSD& key);
+
 	// Group manager observer trigger.
 	virtual void changed(LLGroupChange gc);
 
-	// PanelGroupTab observer trigger
-	virtual void tabChanged();
-
-	void setAllowEdit(BOOL v) { mAllowEdit = v; }
-
 	void showNotice(const std::string& subject,
 					const std::string& message,
 					const bool& has_inventory,
 					const std::string& inventory_name,
 					LLOfferInfo* inventory_offer);
+
+	void notifyObservers();
+
+	bool apply();
+	void refreshData();
+
+	virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+
+	void setAllowEdit(BOOL v) { mAllowEdit = v; }
+
+	
+	static void refreshCreatedGroup(const LLUUID& group_id);
+
+	static void showNotice(const std::string& subject,
+						   const std::string& message,
+						   const LLUUID& group_id,
+						   const bool& has_inventory,
+						   const std::string& inventory_name,
+						   LLOfferInfo* inventory_offer);
+
+	
 protected:
-	LLPanelGroupTab*		mCurrentTab;
-	LLPanelGroupTab*		mRequestedTab;
-	LLTabContainer*	mTabContainer;
-	BOOL mIgnoreTransition;
+	void onBtnCreate();
+	void onBackBtnClick();
 
-	LLButton* mApplyBtn;
+	static void onBtnApply(void*);
+	static void onBtnRefresh(void*);
+
+
+protected:
+	bool	apply(LLPanelGroupTab* tab);
 
 	LLTimer mRefreshTimer;
 
-	BOOL mForceClose;
+	BOOL mAllowEdit;
 
 	std::string mDefaultNeedsApplyMesg;
 	std::string mWantApplyMesg;
 
-	BOOL mAllowEdit;
-	BOOL mShowingNotifyDialog;
+	std::vector<LLPanelGroupTab* > mTabs;
+
 };
 
 class LLPanelGroupTab : public LLPanel
 {
 public:
-	LLPanelGroupTab(const LLUUID& group_id);
+	LLPanelGroupTab();
 	virtual ~LLPanelGroupTab();
 
-	// Factory that returns a new LLPanelGroupFoo tab.
-	static void* createTab(void* data);
-
 	// Triggered when the tab becomes active.
 	virtual void activate() { }
 	
@@ -168,20 +154,19 @@ public:
 
 	void setAllowEdit(BOOL v) { mAllowEdit = v; }
 
-	void addObserver(LLPanelGroupTabObserver *obs);
-	void removeObserver(LLPanelGroupTabObserver *obs);
-	void notifyObservers();
+	virtual void setGroupID(const LLUUID& id) {mGroupID = id;};
+
+	void notifyObservers() {};
+
+	const LLUUID& getGroupID() const { return mGroupID;}
 
 protected:
 	LLUUID	mGroupID;
-	LLTabContainer*	mTabContainer;
 	std::string	mHelpText;
 
 	BOOL mAllowEdit;
 	BOOL mHasModal;
 
-	typedef std::set<LLPanelGroupTabObserver*> observer_list_t;
-	observer_list_t mObservers;
 };
 
 #endif // LL_LLPANELGROUP_H
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index b1b464b4e4..d63e112357 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -37,7 +37,6 @@
 #include "lluictrlfactory.h"
 #include "llagent.h"
 #include "roles_constants.h"
-#include "llfloatergroupinfo.h"
 
 // UI elements
 #include "llbutton.h"
@@ -45,6 +44,7 @@
 #include "llcombobox.h"
 #include "lldbstrings.h"
 #include "llavataractions.h"
+#include "llgroupactions.h"
 #include "lllineeditor.h"
 #include "llnamebox.h"
 #include "llnamelistctrl.h"
@@ -57,21 +57,16 @@
 #include "lltrans.h"
 #include "llviewerwindow.h"
 
+static LLRegisterPanelClassWrapper<LLPanelGroupGeneral> t_panel_group_general("panel_group_general");
+
 // consts
 const S32 MATURE_CONTENT = 1;
 const S32 NON_MATURE_CONTENT = 2;
 const S32 DECLINE_TO_STATE = 0;
 
-// static
-void* LLPanelGroupGeneral::createTab(void* data)
-{
-	LLUUID* group_id = static_cast<LLUUID*>(data);
-	return new LLPanelGroupGeneral(*group_id);
-}
-
 
-LLPanelGroupGeneral::LLPanelGroupGeneral(const LLUUID& group_id)
-:	LLPanelGroupTab(group_id),
+LLPanelGroupGeneral::LLPanelGroupGeneral()
+:	LLPanelGroupTab(),
 	mPendingMemberUpdate(FALSE),
 	mChanged(FALSE),
 	mFirstUse(TRUE),
@@ -311,7 +306,8 @@ void LLPanelGroupGeneral::onClickInfo(void *userdata)
 
 	lldebugs << "open group info: " << self->mGroupID << llendl;
 
-	LLFloaterGroupInfo::showFromUUID(self->mGroupID);
+	LLGroupActions::show(self->mGroupID);
+
 }
 
 // static
@@ -888,3 +884,150 @@ void LLPanelGroupGeneral::updateChanged()
 		}
 	}
 }
+
+void LLPanelGroupGeneral::reset()
+{
+	mCtrlReceiveNotices->set(false);
+	
+	
+	mCtrlListGroup->set(true);
+	
+	mCtrlReceiveNotices->setEnabled(true);
+	mCtrlReceiveNotices->setVisible(true);
+
+	mCtrlListGroup->setEnabled(true);
+
+	mGroupNameEditor->setEnabled(TRUE);
+	mEditCharter->setEnabled(TRUE);
+
+	mCtrlShowInGroupList->setEnabled(TRUE);
+	mComboMature->setEnabled(TRUE);
+	
+	mCtrlOpenEnrollment->setEnabled(TRUE);
+	
+	mCtrlEnrollmentFee->setEnabled(TRUE);
+	
+	mSpinEnrollmentFee->setEnabled(TRUE);
+	mSpinEnrollmentFee->set((F32)0);
+
+	mBtnJoinGroup->setVisible(FALSE);
+	mBtnInfo->setVisible(FALSE);
+	mGroupName->setVisible(FALSE);
+
+	mGroupNameEditor->setVisible(true);
+
+	mComboActiveTitle->setVisible(false);
+	mInsignia->setImageAssetID(mDefaultIconID);
+
+	{
+		std::string empty_str = "";
+		mEditCharter->setText(empty_str);
+	}
+	
+	{
+		LLSD row;
+		row["columns"][0]["value"] = "no members yet";
+
+		mListVisibleMembers->deleteAllItems();
+		mListVisibleMembers->setEnabled(FALSE);
+		mListVisibleMembers->addElement(row);
+	}
+
+	mBtnJoinGroup->setVisible(false);
+
+	{
+		mComboMature->setEnabled(true);
+		mComboMature->setVisible( !gAgent.isTeen() );
+	}
+
+
+	resetDirty();
+}
+
+void	LLPanelGroupGeneral::resetDirty()
+{
+	// List all the controls we want to check for changes...
+	LLUICtrl *check_list[] =
+	{
+		mGroupNameEditor,
+		mGroupName,
+		mFounderName,
+		mInsignia,
+		mEditCharter,
+		mCtrlShowInGroupList,
+		mComboMature,
+		mCtrlOpenEnrollment,
+		mCtrlEnrollmentFee,
+		mSpinEnrollmentFee,
+		mCtrlReceiveNotices,
+		mCtrlListGroup,
+		mActiveTitleLabel,
+		mComboActiveTitle
+	};
+
+	for( size_t i=0; i<LL_ARRAY_SIZE(check_list); i++ )
+	{
+		if( check_list[i] )
+			check_list[i]->resetDirty() ;
+	}
+
+
+}
+
+void LLPanelGroupGeneral::setGroupID(const LLUUID& id)
+{
+	LLPanelGroupTab::setGroupID(id);
+
+	if(id == LLUUID::null)
+	{
+		reset();
+		return;
+	}
+
+	BOOL accept_notices = FALSE;
+	BOOL list_in_profile = FALSE;
+	LLGroupData data;
+	if(gAgent.getGroupData(mGroupID,data))
+	{
+		accept_notices = data.mAcceptNotices;
+		list_in_profile = data.mListInProfile;
+	}
+	mCtrlReceiveNotices = getChild<LLCheckBoxCtrl>("receive_notices");
+	if (mCtrlReceiveNotices)
+	{
+		mCtrlReceiveNotices->set(accept_notices);
+		mCtrlReceiveNotices->setEnabled(data.mID.notNull());
+	}
+	
+	mCtrlListGroup = getChild<LLCheckBoxCtrl>("list_groups_in_profile");
+	if (mCtrlListGroup)
+	{
+		mCtrlListGroup->set(list_in_profile);
+		mCtrlListGroup->setEnabled(data.mID.notNull());
+	}
+
+	mActiveTitleLabel = getChild<LLTextBox>("active_title_label");
+	
+	mComboActiveTitle = getChild<LLComboBox>("active_title");
+
+	if (mGroupID.isNull())
+	{
+		mGroupNameEditor->setEnabled(TRUE);
+		mEditCharter->setEnabled(TRUE);
+
+		mCtrlShowInGroupList->setEnabled(TRUE);
+		mComboMature->setEnabled(TRUE);
+		mCtrlOpenEnrollment->setEnabled(TRUE);
+		mCtrlEnrollmentFee->setEnabled(TRUE);
+		mSpinEnrollmentFee->setEnabled(TRUE);
+
+		mBtnJoinGroup->setVisible(FALSE);
+		mBtnInfo->setVisible(FALSE);
+		mGroupName->setVisible(FALSE);
+	}
+
+	resetDirty();
+
+	activate();
+}
+
diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h
index c04b40819d..e7028228b0 100644
--- a/indra/newview/llpanelgroupgeneral.h
+++ b/indra/newview/llpanelgroupgeneral.h
@@ -49,11 +49,10 @@ class LLSpinCtrl;
 class LLPanelGroupGeneral : public LLPanelGroupTab
 {
 public:
-	LLPanelGroupGeneral(const LLUUID& group_id);
+	LLPanelGroupGeneral();
 	virtual ~LLPanelGroupGeneral();
 
 	// LLPanelGroupTab
-	static void* createTab(void* data);
 	virtual void activate();
 	virtual bool needsApply(std::string& mesg);
 	virtual bool apply(std::string& mesg);
@@ -66,7 +65,13 @@ public:
 	
 	virtual void draw();
 
+	virtual void setGroupID(const LLUUID& id);
+
 private:
+	void	reset();
+
+	void	resetDirty();
+
 	static void onFocusEdit(LLFocusableElement* ctrl, void* data);
 	static void onCommitAny(LLUICtrl* ctrl, void* data);
 	static void onCommitUserOnly(LLUICtrl* ctrl, void* data);
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index 39a9f231b2..d95240e30c 100644
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -59,7 +59,54 @@
 #include "llfloaterworldmap.h"
 #include "llviewermessage.h"
 
+static LLRegisterPanelClassWrapper<LLPanelGroupLandMoney> t_panel_group_money("panel_group_land_money");
+
+
+
 ////////////////////////////////////////////////////////////////////////////
+//*************************************************
+//** LLGroupMoneyTabEventHandler::impl Functions **
+//*************************************************
+
+class LLGroupMoneyTabEventHandlerImpl
+{
+public:
+	LLGroupMoneyTabEventHandlerImpl(LLButton* earlier_buttonp,
+		 LLButton* later_buttonp,
+		 LLTextEditor* text_editorp,
+		 LLPanel* tabpanelp,
+		 const std::string& loading_text,
+		 S32 interval_length_days,
+		 S32 max_interval_days);
+	~LLGroupMoneyTabEventHandlerImpl();
+
+	bool getCanClickLater();
+	bool getCanClickEarlier();
+
+	void updateButtons();
+
+	void setGroupID(const LLUUID&	group_id) { mGroupID = group_id; } ;
+	const LLUUID&	getGroupID() const { return mGroupID;} 
+
+
+//member variables
+public:
+	LLUUID mPanelID;
+	LLUUID mGroupID;
+
+	LLPanel* mTabPanelp;
+
+	int mIntervalLength;
+	int mMaxInterval;
+	int mCurrentInterval;
+
+	LLTextEditor* mTextEditorp;
+	LLButton*     mEarlierButtonp;
+	LLButton*     mLaterButtonp;
+
+	std::string mLoadingText;
+};
+
 
 class LLGroupMoneyTabEventHandler
 {
@@ -70,7 +117,6 @@ public:
 								LLTabContainer* tab_containerp,
 								LLPanel* panelp,
 								const std::string& loading_text,
-								const LLUUID& group_id,
 								S32 interval_length_days,
 								S32 max_interval_days);
 	virtual ~LLGroupMoneyTabEventHandler();
@@ -82,14 +128,17 @@ public:
 	virtual void onClickLater();
 	virtual void onClickTab();
 
+	void setGroupID(const LLUUID&	group_id) { if(mImplementationp) mImplementationp->setGroupID(group_id); } ;
+
 	static void clickEarlierCallback(void* data);
 	static void clickLaterCallback(void* data);
 
+
+
 	static LLMap<LLUUID, LLGroupMoneyTabEventHandler*> sInstanceIDs;
 	static std::map<LLPanel*, LLGroupMoneyTabEventHandler*> sTabsToHandlers;
 protected:
-	class impl;
-	impl* mImplementationp;
+	LLGroupMoneyTabEventHandlerImpl* mImplementationp;
 };
 
 class LLGroupMoneyDetailsTabEventHandler : public LLGroupMoneyTabEventHandler
@@ -100,8 +149,8 @@ public:
 									   LLTextEditor* text_editorp,
 									   LLTabContainer* tab_containerp,
 									   LLPanel* panelp,
-									   const std::string& loading_text,
-									   const LLUUID& group_id);
+									   const std::string& loading_text
+									   );
 	virtual ~LLGroupMoneyDetailsTabEventHandler();
 
 	virtual void requestData(LLMessageSystem* msg);
@@ -117,8 +166,8 @@ public:
 									 LLTextEditor* text_editorp,
 									 LLTabContainer* tab_containerp,
 									 LLPanel* panelp,
-									 const std::string& loading_text,
-									 const LLUUID& group_id);
+									 const std::string& loading_text
+									 );
 	virtual ~LLGroupMoneySalesTabEventHandler();
 
 	virtual void requestData(LLMessageSystem* msg);
@@ -131,8 +180,8 @@ public:
 	LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editor,
 										LLTabContainer* tab_containerp,
 										LLPanel* panelp,
-										const std::string& loading_text,
-										const LLUUID& group_id);
+										const std::string& loading_text
+										);
 	virtual ~LLGroupMoneyPlanningTabEventHandler();
 
 	virtual void requestData(LLMessageSystem* msg);
@@ -144,7 +193,7 @@ public:
 class LLPanelGroupLandMoney::impl
 {
 public:
-	impl(LLPanelGroupLandMoney& panel, const LLUUID& group_id); //constructor
+	impl(LLPanelGroupLandMoney& panel); //constructor
 	virtual ~impl();
 
 	void requestGroupLandInfo();
@@ -178,7 +227,6 @@ public:
 
 	LLScrollListCtrl* mGroupParcelsp;
 
-	LLUUID mGroupID;
 	LLUUID mTransID;
 
 	bool mBeenActivated;
@@ -192,9 +240,8 @@ public:
 //*******************************************
 //** LLPanelGroupLandMoney::impl Functions **
 //*******************************************
-LLPanelGroupLandMoney::impl::impl(LLPanelGroupLandMoney& panel, const LLUUID& group_id)
-	: mPanel(panel),
-	  mGroupID(group_id)
+LLPanelGroupLandMoney::impl::impl(LLPanelGroupLandMoney& panel)
+	: mPanel(panel)
 {
 	mTransID = LLUUID::null;
 
@@ -227,7 +274,7 @@ void LLPanelGroupLandMoney::impl::requestGroupLandInfo()
 	mTransID.generate();
 	mGroupParcelsp->deleteAllItems();
 
-	send_places_query(mGroupID, mTransID, "", query_flags, LLParcel::C_ANY, "");
+	send_places_query(mPanel.mGroupID, mTransID, "", query_flags, LLParcel::C_ANY, "");
 }
 
 void LLPanelGroupLandMoney::impl::onMapButton()
@@ -277,7 +324,7 @@ bool LLPanelGroupLandMoney::impl::applyContribution()
 	    new_contribution <= sqm_avail )
 	{
 		// update group info and server
-		if(!gAgent.setGroupContribution(mGroupID, new_contribution))
+		if(!gAgent.setGroupContribution(mPanel.mGroupID, new_contribution))
 		{
 			// should never happen...
 			llwarns << "Unable to set contribution." << llendl;
@@ -304,7 +351,7 @@ int LLPanelGroupLandMoney::impl::getStoredContribution()
 	LLGroupData group_data;
 
 	group_data.mContribution = 0;
-	gAgent.getGroupData(mGroupID, group_data);
+	gAgent.getGroupData(mPanel.mGroupID, group_data);
 
 	return group_data.mContribution;
 }
@@ -403,7 +450,7 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
 		if ( trans_id != mTransID ) return;
 		// This power was removed to make group roles simpler
 		//if ( !gAgent.hasPowerInGroup(mGroupID, GP_LAND_VIEW_OWNED) ) return;
-		if (!gAgent.isInGroup(mGroupID)) return;
+		if (!gAgent.isInGroup(mPanel.mGroupID)) return;
 
 		std::string name;
 		std::string desc;
@@ -487,25 +534,22 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
 //** LLPanelGroupLandMoney Functions **
 //*************************************
 
-//static 
-void* LLPanelGroupLandMoney::createTab(void* data)
-{
-	LLUUID* group_id = static_cast<LLUUID*>(data);
-	return new LLPanelGroupLandMoney(*group_id);
-}
 
 //static
 LLMap<LLUUID, LLPanelGroupLandMoney*> LLPanelGroupLandMoney::sGroupIDs;
 
-LLPanelGroupLandMoney::LLPanelGroupLandMoney(const LLUUID& group_id) :
-	LLPanelGroupTab(group_id) 
+LLPanelGroupLandMoney::LLPanelGroupLandMoney() :
+	LLPanelGroupTab() 
 {
-	mImplementationp = new impl(*this, group_id);
+	//FIXME - add setGroupID();
+	mImplementationp = new impl(*this);
 
 	//problem what if someone has both the group floater open and the finder
 	//open to the same group?  Some maps that map group ids to panels
 	//will then only be working for the last panel for a given group id :(
-	LLPanelGroupLandMoney::sGroupIDs.addData(group_id, this);
+
+	//FIXME - add to setGroupID()
+	//LLPanelGroupLandMoney::sGroupIDs.addData(group_id, this);
 }
 
 LLPanelGroupLandMoney::~LLPanelGroupLandMoney()
@@ -719,8 +763,7 @@ BOOL LLPanelGroupLandMoney::postBuild()
 												   textp,
 												   tabcp,
 												   panelp,
-												   loading_text,
-												   mGroupID);
+												   loading_text);
 	}
 
 	textp = getChild<LLTextEditor>("group_money_planning_text", true);
@@ -737,8 +780,7 @@ BOOL LLPanelGroupLandMoney::postBuild()
 			new LLGroupMoneyPlanningTabEventHandler(textp,
 													tabcp,
 													panelp,
-													loading_text,
-													mGroupID);
+													loading_text);
 	}
 
 	//pull out the widgets for the L$ sales tab
@@ -759,8 +801,7 @@ BOOL LLPanelGroupLandMoney::postBuild()
 												 textp,
 												 tabcp,
 												 panelp,
-												 loading_text,
-												 mGroupID);
+												 loading_text);
 	}
 
 	return LLPanelGroupTab::postBuild();
@@ -787,56 +828,15 @@ void LLPanelGroupLandMoney::processPlacesReply(LLMessageSystem* msg, void**)
 	selfp->mImplementationp->processGroupLand(msg);
 }
 
-//*************************************************
-//** LLGroupMoneyTabEventHandler::impl Functions **
-//*************************************************
-
-class LLGroupMoneyTabEventHandler::impl
-{
-public:
-	impl(LLButton* earlier_buttonp,
-		 LLButton* later_buttonp,
-		 LLTextEditor* text_editorp,
-		 LLPanel* tabpanelp,
-		 const std::string& loading_text,
-		 const LLUUID& group_id,
-		 S32 interval_length_days,
-		 S32 max_interval_days);
-	~impl();
-
-	bool getCanClickLater();
-	bool getCanClickEarlier();
-
-	void updateButtons();
-
-//member variables
-public:
-	LLUUID mGroupID;
-	LLUUID mPanelID;
-
-	LLPanel* mTabPanelp;
-
-	int mIntervalLength;
-	int mMaxInterval;
-	int mCurrentInterval;
-
-	LLTextEditor* mTextEditorp;
-	LLButton*     mEarlierButtonp;
-	LLButton*     mLaterButtonp;
 
-	std::string mLoadingText;
-};
-
-LLGroupMoneyTabEventHandler::impl::impl(LLButton* earlier_buttonp,
+LLGroupMoneyTabEventHandlerImpl::LLGroupMoneyTabEventHandlerImpl(LLButton* earlier_buttonp,
 										LLButton* later_buttonp,
 										LLTextEditor* text_editorp,
 										LLPanel* tabpanelp,
 										const std::string& loading_text,
-										const LLUUID& group_id,
 										S32 interval_length_days,
 										S32 max_interval_days)
 {
-	mGroupID = group_id;
 	mPanelID.generate();
 
 	mIntervalLength = interval_length_days;
@@ -851,21 +851,21 @@ LLGroupMoneyTabEventHandler::impl::impl(LLButton* earlier_buttonp,
 	mLoadingText = loading_text;
 }
 
-LLGroupMoneyTabEventHandler::impl::~impl()
+LLGroupMoneyTabEventHandlerImpl::~LLGroupMoneyTabEventHandlerImpl()
 {
 }
 
-bool LLGroupMoneyTabEventHandler::impl::getCanClickEarlier()
+bool LLGroupMoneyTabEventHandlerImpl::getCanClickEarlier()
 {
 	return (mCurrentInterval < mMaxInterval);
 }
 
-bool LLGroupMoneyTabEventHandler::impl::getCanClickLater()
+bool LLGroupMoneyTabEventHandlerImpl::getCanClickLater()
 {
 	return ( mCurrentInterval > 0 );
 }
 
-void LLGroupMoneyTabEventHandler::impl::updateButtons()
+void LLGroupMoneyTabEventHandlerImpl::updateButtons()
 {
 	if ( mEarlierButtonp )
 	{
@@ -890,16 +890,14 @@ LLGroupMoneyTabEventHandler::LLGroupMoneyTabEventHandler(LLButton* earlier_butto
 														 LLTabContainer* tab_containerp,
 														 LLPanel* panelp,
 														 const std::string& loading_text,
-														 const LLUUID& group_id,
 														 S32 interval_length_days,
 														 S32 max_interval_days)
 {
-	mImplementationp = new impl(earlier_buttonp,
+	mImplementationp = new LLGroupMoneyTabEventHandlerImpl(earlier_buttonp,
 								later_buttonp,
 								text_editorp,
 								panelp,
 								loading_text,
-								group_id,
 								interval_length_days,
 								max_interval_days);
 
@@ -998,15 +996,13 @@ LLGroupMoneyDetailsTabEventHandler::LLGroupMoneyDetailsTabEventHandler(LLButton*
 																	   LLTextEditor* text_editorp,
 																	   LLTabContainer* tab_containerp,
 																	   LLPanel* panelp,
-																	   const std::string& loading_text,
-																	   const LLUUID& group_id)
+																	   const std::string& loading_text)
 	: LLGroupMoneyTabEventHandler(earlier_buttonp,
 								  later_buttonp,
 								  text_editorp,
 								  tab_containerp,
 								  panelp,
 								  loading_text,
-								  group_id,
 								  SUMMARY_INTERVAL,
 								  SUMMARY_MAX)
 {
@@ -1022,7 +1018,7 @@ void LLGroupMoneyDetailsTabEventHandler::requestData(LLMessageSystem* msg)
 	msg->nextBlockFast(_PREHASH_AgentData);
 	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
 	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID() );
-	msg->addUUIDFast(_PREHASH_GroupID,  mImplementationp->mGroupID );
+	msg->addUUIDFast(_PREHASH_GroupID,  mImplementationp->getGroupID() );
 	msg->nextBlockFast(_PREHASH_MoneyData);
 	msg->addUUIDFast(_PREHASH_RequestID, mImplementationp->mPanelID );
 	msg->addS32Fast(_PREHASH_IntervalDays, mImplementationp->mIntervalLength );
@@ -1043,7 +1039,7 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
 {
 	LLUUID group_id;
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_GroupID, group_id );
-	if (mImplementationp->mGroupID != group_id) 
+	if (mImplementationp->getGroupID() != group_id) 
 	{
 		llwarns << "Group Account details not for this group!" << llendl;
 		return;
@@ -1133,15 +1129,13 @@ LLGroupMoneySalesTabEventHandler::LLGroupMoneySalesTabEventHandler(LLButton* ear
 																   LLTextEditor* text_editorp,
 																   LLTabContainer* tab_containerp,
 																   LLPanel* panelp,
-																   const std::string& loading_text,
-																   const LLUUID& group_id)
+																   const std::string& loading_text)
 	: LLGroupMoneyTabEventHandler(earlier_buttonp,
 								  later_buttonp,
 								  text_editorp,
 								  tab_containerp,
 								  panelp,
 								  loading_text,
-								  group_id,
 								  SUMMARY_INTERVAL,
 								  SUMMARY_MAX)
 {
@@ -1157,7 +1151,7 @@ void LLGroupMoneySalesTabEventHandler::requestData(LLMessageSystem* msg)
 	msg->nextBlockFast(_PREHASH_AgentData);
 	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
 	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID() );
-	msg->addUUIDFast(_PREHASH_GroupID, mImplementationp->mGroupID );
+	msg->addUUIDFast(_PREHASH_GroupID, mImplementationp->getGroupID() );
 	msg->nextBlockFast(_PREHASH_MoneyData);
 	msg->addUUIDFast(_PREHASH_RequestID, mImplementationp->mPanelID );
 	msg->addS32Fast(_PREHASH_IntervalDays, mImplementationp->mIntervalLength );
@@ -1178,7 +1172,7 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
 {
 	LLUUID group_id;
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_GroupID, group_id );
-	if (mImplementationp->mGroupID != group_id) 
+	if (mImplementationp->getGroupID() != group_id) 
 	{
 		llwarns << "Group Account Transactions not for this group!" << llendl;
 		return;
@@ -1305,15 +1299,13 @@ void LLPanelGroupLandMoney::processGroupAccountTransactionsReply(LLMessageSystem
 LLGroupMoneyPlanningTabEventHandler::LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editorp,
 																		 LLTabContainer* tab_containerp,
 																		 LLPanel* panelp,
-																		 const std::string& loading_text,
-																		 const LLUUID& group_id)
+																		 const std::string& loading_text)
 	: LLGroupMoneyTabEventHandler(NULL,
 								  NULL,
 								  text_editorp,
 								  tab_containerp,
 								  panelp,
 								  loading_text,
-								  group_id,
 								  SUMMARY_INTERVAL,
 								  SUMMARY_MAX)
 {
@@ -1329,7 +1321,7 @@ void LLGroupMoneyPlanningTabEventHandler::requestData(LLMessageSystem* msg)
 	msg->nextBlockFast(_PREHASH_AgentData);
 	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
 	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID() );
-	msg->addUUIDFast(_PREHASH_GroupID, mImplementationp->mGroupID );
+	msg->addUUIDFast(_PREHASH_GroupID, mImplementationp->getGroupID() );
 	msg->nextBlockFast(_PREHASH_MoneyData);
 	msg->addUUIDFast(_PREHASH_RequestID, mImplementationp->mPanelID );
 	msg->addS32Fast(_PREHASH_IntervalDays, mImplementationp->mIntervalLength);
@@ -1350,7 +1342,7 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
 {
 	LLUUID group_id;
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_GroupID, group_id );
-	if (mImplementationp->mGroupID != group_id) 
+	if (mImplementationp->getGroupID() != group_id) 
 	{
 		llwarns << "Group Account Summary received not for this group!" << llendl;
 		return;
@@ -1468,3 +1460,141 @@ void LLPanelGroupLandMoney::processGroupAccountSummaryReply(LLMessageSystem* msg
 
 	self->processReply(msg, data);
 }
+
+void LLPanelGroupLandMoney::setGroupID(const LLUUID& id)
+{
+	LLPanelGroupLandMoney::sGroupIDs.removeData(mGroupID);
+	LLPanelGroupTab::setGroupID(id);
+	LLPanelGroupLandMoney::sGroupIDs.addData(mGroupID, this);
+
+
+	bool can_view = gAgent.isInGroup(mGroupID);
+
+	mImplementationp->mGroupOverLimitIconp = 
+		getChild<LLIconCtrl>("group_over_limit_icon");
+	mImplementationp->mGroupOverLimitTextp = 
+		getChild<LLTextBox>("group_over_limit_text");
+
+	mImplementationp->mYourContributionEditorp 
+		= getChild<LLLineEditor>("your_contribution_line_editor");
+	if ( mImplementationp->mYourContributionEditorp )
+	{
+		LLLineEditor* editor = mImplementationp->mYourContributionEditorp;
+
+	    editor->setCommitCallback(mImplementationp->contributionCommitCallback, this);
+		editor->setKeystrokeCallback(mImplementationp->contributionKeystrokeCallback, this);
+	}
+
+	mImplementationp->mMapButtonp = getChild<LLButton>("map_button");
+
+	mImplementationp->mGroupParcelsp = 
+		getChild<LLScrollListCtrl>("group_parcel_list");
+
+	if ( mImplementationp->mGroupParcelsp )
+	{
+		mImplementationp->mGroupParcelsp->setCommitCallback(boost::bind(&LLButton::setEnabled, mImplementationp->mMapButtonp, true));
+		mImplementationp->mGroupParcelsp->setCommitOnSelectionChange(true);
+	}
+
+	mImplementationp->mCantViewParcelsText = getString("cant_view_group_land_text");
+	mImplementationp->mCantViewAccountsText = getString("cant_view_group_accounting_text");
+	
+	if ( mImplementationp->mMapButtonp )
+	{
+		mImplementationp->mMapButtonp->setClickedCallback(LLPanelGroupLandMoney::impl::mapCallback, mImplementationp);
+	}
+
+	if ( mImplementationp->mGroupOverLimitTextp )
+	{
+		mImplementationp->mGroupOverLimitTextp->setVisible(FALSE);
+	}
+
+	if ( mImplementationp->mGroupOverLimitIconp )
+	{
+		mImplementationp->mGroupOverLimitIconp->setVisible(FALSE);
+	}
+
+	if ( !can_view )
+	{
+		if ( mImplementationp->mGroupParcelsp )
+		{
+			mImplementationp->mGroupParcelsp->setCommentText(
+							mImplementationp->mCantViewParcelsText);
+			mImplementationp->mGroupParcelsp->setEnabled(FALSE);
+		}
+	}
+
+
+
+	LLButton* earlierp, *laterp;
+	LLTextEditor* textp;
+	LLPanel* panelp;
+
+	LLTabContainer* tabcp = getChild<LLTabContainer>("group_money_tab_container");
+
+	if ( tabcp )
+	{
+		S32 i;
+		S32 tab_count = tabcp->getTabCount();
+
+		for (i = tab_count - 1; i >=0; --i)
+		{
+			tabcp->enableTabButton(i, can_view );
+		}
+	}
+
+	std::string loading_text = getString("loading_txt");
+	
+	//pull out the widgets for the L$ details tab
+	earlierp = getChild<LLButton>("earlier_details_button", true);
+	laterp = getChild<LLButton>("later_details_button", true);
+	textp = getChild<LLTextEditor>("group_money_details_text", true);
+	panelp = getChild<LLPanel>("group_money_details_tab", true);
+
+	if ( !can_view )
+	{
+		textp->setText(mImplementationp->mCantViewAccountsText);
+	}
+	else
+	{
+		if(mImplementationp->mMoneyDetailsTabEHp == 0)
+			mImplementationp->mMoneyDetailsTabEHp = new LLGroupMoneyDetailsTabEventHandler(earlierp,laterp,textp,tabcp,panelp,loading_text);
+		mImplementationp->mMoneyDetailsTabEHp->setGroupID(mGroupID);
+	}
+
+	textp = getChild<LLTextEditor>("group_money_planning_text", true);
+	
+
+	if ( !can_view )
+	{
+		textp->setText(mImplementationp->mCantViewAccountsText);
+	}
+	else
+	{
+		panelp = getChild<LLPanel>("group_money_planning_tab", true);
+		if(mImplementationp->mMoneyPlanningTabEHp == 0)
+			mImplementationp->mMoneyPlanningTabEHp = new LLGroupMoneyPlanningTabEventHandler(textp,tabcp,panelp,loading_text);
+		mImplementationp->mMoneyPlanningTabEHp->setGroupID(mGroupID);
+	}
+
+	//pull out the widgets for the L$ sales tab
+	textp = getChild<LLTextEditor>("group_money_sales_text", true);
+
+
+	if ( !can_view )
+	{
+		textp->setText(mImplementationp->mCantViewAccountsText);
+	}
+	else
+	{
+		earlierp = getChild<LLButton>("earlier_sales_button", true);
+		laterp = getChild<LLButton>("later_sales_button", true);
+		panelp = getChild<LLPanel>("group_money_sales_tab", true);
+		if(mImplementationp->mMoneySalesTabEHp == NULL) 
+			mImplementationp->mMoneySalesTabEHp = new LLGroupMoneySalesTabEventHandler(earlierp,laterp,textp,tabcp,panelp,loading_text);
+		mImplementationp->mMoneySalesTabEHp->setGroupID(mGroupID);
+	}
+
+	activate();
+}
+
diff --git a/indra/newview/llpanelgrouplandmoney.h b/indra/newview/llpanelgrouplandmoney.h
index 748485745b..73c52cdf2e 100644
--- a/indra/newview/llpanelgrouplandmoney.h
+++ b/indra/newview/llpanelgrouplandmoney.h
@@ -44,13 +44,11 @@
 class LLPanelGroupLandMoney : public LLPanelGroupTab
 {
 public:
-	LLPanelGroupLandMoney(const LLUUID& group_id);
+	LLPanelGroupLandMoney();
 	virtual ~LLPanelGroupLandMoney();
 	virtual BOOL postBuild();
 	virtual BOOL isVisibleByAgent(LLAgent* agentp);
 
-	static void* createTab(void* data);
-
 	virtual void activate();
 	virtual bool needsApply(std::string& mesg);
 	virtual bool apply(std::string& mesg);
@@ -64,6 +62,8 @@ public:
 	static void processGroupAccountDetailsReply(LLMessageSystem* msg,  void** data);
 	static void processGroupAccountTransactionsReply(LLMessageSystem* msg, void** data);
 	static void processGroupAccountSummaryReply(LLMessageSystem* msg, void** data);
+
+	virtual void setGroupID(const LLUUID& id);
 	
 protected:
 	class impl;
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 15ae374447..f06342ebfc 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -58,6 +58,9 @@
 #include "llviewermessage.h"
 #include "llnotifications.h"
 
+static LLRegisterPanelClassWrapper<LLPanelGroupNotices> t_panel_group_notices("panel_group_notices");
+
+
 /////////////////////////
 // LLPanelGroupNotices //
 /////////////////////////
@@ -207,12 +210,13 @@ std::string build_notice_date(const U32& the_time)
 	return dateStr;
 }
 
-LLPanelGroupNotices::LLPanelGroupNotices(const LLUUID& group_id) :
-	LLPanelGroupTab(group_id),
+LLPanelGroupNotices::LLPanelGroupNotices() :
+	LLPanelGroupTab(),
 	mInventoryItem(NULL),
 	mInventoryOffer(NULL)
 {
-	sInstances[group_id] = this;
+	
+	
 }
 
 LLPanelGroupNotices::~LLPanelGroupNotices()
@@ -228,12 +232,6 @@ LLPanelGroupNotices::~LLPanelGroupNotices()
 	}
 }
 
-// static
-void* LLPanelGroupNotices::createTab(void* data)
-{
-	LLUUID* group_id = static_cast<LLUUID*>(data);
-	return new LLPanelGroupNotices(*group_id);
-}
 
 BOOL LLPanelGroupNotices::isVisibleByAgent(LLAgent* agentp)
 {
@@ -590,3 +588,17 @@ void LLPanelGroupNotices::arrangeNoticeView(ENoticeView view_type)
 		mBtnOpenAttachment->setEnabled(FALSE);
 	}
 }
+void LLPanelGroupNotices::setGroupID(const LLUUID& id)
+{
+	sInstances.erase(mGroupID);
+	LLPanelGroupTab::setGroupID(id);
+	sInstances[mGroupID] = this;
+
+	mBtnNewMessage->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_NOTICES_SEND));
+
+	LLGroupDropTarget* target = getChild<LLGroupDropTarget> ("drop_target");
+	target->setPanel (this);
+	target->setGroup (mGroupID);
+	
+	activate();
+}
diff --git a/indra/newview/llpanelgroupnotices.h b/indra/newview/llpanelgroupnotices.h
index a0712f1770..c41a5f501b 100644
--- a/indra/newview/llpanelgroupnotices.h
+++ b/indra/newview/llpanelgroupnotices.h
@@ -47,11 +47,10 @@ class LLScrollListCtrl;
 class LLPanelGroupNotices : public LLPanelGroupTab
 {
 public:
-	LLPanelGroupNotices(const LLUUID& group_id);
+	LLPanelGroupNotices();
 	virtual ~LLPanelGroupNotices();
 
 	// LLPanelGroupTab
-	static void* createTab(void* data);
 	virtual void activate();
 	//virtual bool needsApply(std::string& mesg);
 	//virtual bool apply(std::string& mesg);
@@ -70,6 +69,8 @@ public:
 					const std::string& inventory_name,
 					LLOfferInfo* inventory_offer);
 
+	virtual void setGroupID(const LLUUID& id);
+
 private:
 	static void onClickRemoveAttachment(void* data);
 	static void onClickOpenAttachment(void* data);
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 50e1f84cad..ab614fea53 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -55,6 +55,8 @@
 
 #include "roles_constants.h"
 
+static LLRegisterPanelClassWrapper<LLPanelGroupRoles> t_panel_group_roles("panel_group_roles");
+
 bool agentCanRemoveFromRole(const LLUUID& group_id,
 							const LLUUID& role_id)
 {
@@ -108,14 +110,9 @@ bool agentCanAddToRole(const LLUUID& group_id,
 }
 
 // static
-void* LLPanelGroupRoles::createTab(void* data)
-{
-	LLUUID* group_id = static_cast<LLUUID*>(data);
-	return new LLPanelGroupRoles(*group_id);
-}
 
-LLPanelGroupRoles::LLPanelGroupRoles(const LLUUID& group_id)
-:	LLPanelGroupTab(group_id),
+LLPanelGroupRoles::LLPanelGroupRoles()
+:	LLPanelGroupTab(),
 	mCurrentTab(NULL),
 	mRequestedTab( NULL ),
 	mSubTabContainer( NULL ),
@@ -126,13 +123,6 @@ LLPanelGroupRoles::LLPanelGroupRoles(const LLUUID& group_id)
 
 LLPanelGroupRoles::~LLPanelGroupRoles()
 {
-	int i;
-	for (i = 0; i < mSubTabContainer->getTabCount(); ++i)
-	{
-		LLPanelGroupSubTab* subtabp = (LLPanelGroupSubTab*) mSubTabContainer->getPanelByIndex(i);
-
-		subtabp->removeObserver(this);
-	}
 }
 
 BOOL LLPanelGroupRoles::postBuild()
@@ -161,7 +151,7 @@ BOOL LLPanelGroupRoles::postBuild()
 		if (!subtabp->postBuildSubTab(this))
 			return FALSE;
 
-		subtabp->addObserver(this);
+		//subtabp->addObserver(this);
 	}
 
 	// Set the current tab to whatever is currently being shown.
@@ -387,7 +377,8 @@ std::string LLPanelGroupRoles::getHelpText() const
 void LLPanelGroupRoles::update(LLGroupChange gc)
 {
 	if (mGroupID.isNull()) return;
-
+	
+	
 	LLPanelGroupTab* panelp = (LLPanelGroupTab*) mSubTabContainer->getCurrentPanel();
 	if (panelp)
 	{
@@ -397,6 +388,7 @@ void LLPanelGroupRoles::update(LLGroupChange gc)
 	{
 		llwarns << "LLPanelGroupRoles::update() -- No subtab to update!" << llendl;
 	}
+	
 }
 
 void LLPanelGroupRoles::activate()
@@ -464,17 +456,12 @@ BOOL LLPanelGroupRoles::hasModal()
 	return panelp->hasModal();
 }
 
-// PanelGroupTab observer trigger
-void LLPanelGroupRoles::tabChanged()
-{
-	notifyObservers();
-}
 
 ////////////////////////////
 // LLPanelGroupSubTab
 ////////////////////////////
-LLPanelGroupSubTab::LLPanelGroupSubTab(const LLUUID& group_id)
-:	LLPanelGroupTab(group_id),
+LLPanelGroupSubTab::LLPanelGroupSubTab()
+:	LLPanelGroupTab(),
 	mHeader(NULL),
 	mFooter(NULL),
 	mSearchLineEditor(NULL),
@@ -847,15 +834,11 @@ void LLPanelGroupSubTab::setFooterEnabled(BOOL enable)
 // LLPanelGroupMembersSubTab
 ////////////////////////////
 
-// static
-void* LLPanelGroupMembersSubTab::createTab(void* data)
-{
-	LLUUID* group_id = static_cast<LLUUID*>(data);
-	return new LLPanelGroupMembersSubTab(*group_id);
-}
 
-LLPanelGroupMembersSubTab::LLPanelGroupMembersSubTab(const LLUUID& group_id)
-: 	LLPanelGroupSubTab(group_id),
+static LLRegisterPanelClassWrapper<LLPanelGroupMembersSubTab> t_panel_group_members_subtab("panel_group_members_subtab");
+
+LLPanelGroupMembersSubTab::LLPanelGroupMembersSubTab()
+: 	LLPanelGroupSubTab(),
 	mMembersList(NULL),
 	mAssignedRolesList(NULL),
 	mAllowedActionsList(NULL),
@@ -1708,15 +1691,10 @@ void LLPanelGroupMembersSubTab::updateMembers()
 // LLPanelGroupRolesSubTab
 ////////////////////////////
 
-// static
-void* LLPanelGroupRolesSubTab::createTab(void* data)
-{
-	LLUUID* group_id = static_cast<LLUUID*>(data);
-	return new LLPanelGroupRolesSubTab(*group_id);
-}
+static LLRegisterPanelClassWrapper<LLPanelGroupRolesSubTab> t_panel_group_roles_subtab("panel_group_roles_subtab");
 
-LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab(const LLUUID& group_id)
-  : LLPanelGroupSubTab(group_id),
+LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab()
+  : LLPanelGroupSubTab(),
 	mRolesList(NULL),
 	mAssignedMembersList(NULL),
 	mAllowedActionsList(NULL),
@@ -2418,15 +2396,11 @@ void LLPanelGroupRolesSubTab::saveRoleChanges()
 // LLPanelGroupActionsSubTab
 ////////////////////////////
 
-// static
-void* LLPanelGroupActionsSubTab::createTab(void* data)
-{
-	LLUUID* group_id = static_cast<LLUUID*>(data);
-	return new LLPanelGroupActionsSubTab(*group_id);
-}
+static LLRegisterPanelClassWrapper<LLPanelGroupActionsSubTab> t_panel_group_actions_subtab("panel_group_actions_subtab");
 
-LLPanelGroupActionsSubTab::LLPanelGroupActionsSubTab(const LLUUID& group_id)
-: LLPanelGroupSubTab(group_id)
+
+LLPanelGroupActionsSubTab::LLPanelGroupActionsSubTab()
+: LLPanelGroupSubTab()
 {
 }
 
@@ -2598,3 +2572,30 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
 		LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mGroupID);
 	}
 }
+void LLPanelGroupRoles::setGroupID(const LLUUID& id)
+{
+	LLPanelGroupTab::setGroupID(id);
+	
+	LLPanelGroupMembersSubTab* group_members_tab = findChild<LLPanelGroupMembersSubTab>("members_sub_tab");
+	LLPanelGroupRolesSubTab*  group_roles_tab = findChild<LLPanelGroupRolesSubTab>("roles_sub_tab");
+	LLPanelGroupActionsSubTab* group_actions_tab = findChild<LLPanelGroupActionsSubTab>("actions_sub_tab");
+
+	if(group_members_tab) group_members_tab->setGroupID(id);
+	if(group_roles_tab) group_roles_tab->setGroupID(id);
+	if(group_actions_tab) group_actions_tab->setGroupID(id);
+	
+	activate();
+
+	if (!mSubTabContainer) return ;
+
+	// Hook up each sub-tabs callback and widgets.
+	for (S32 i = 0; i < mSubTabContainer->getTabCount(); ++i)
+	{
+		LLPanel* panel = mSubTabContainer->getPanelByIndex(i);
+		LLPanelGroupSubTab* subtabp = dynamic_cast<LLPanelGroupSubTab*>(panel);
+		if (subtabp)
+			subtabp->postBuildSubTab(this);
+	}
+}
+
+
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h
index 3ceaae1313..9519263bba 100644
--- a/indra/newview/llpanelgrouproles.h
+++ b/indra/newview/llpanelgrouproles.h
@@ -49,11 +49,10 @@ class LLTextEditor;
 
 typedef std::map<std::string,std::string> icon_map_t;
 
-class LLPanelGroupRoles : public LLPanelGroupTab,
-						  public LLPanelGroupTabObserver
+class LLPanelGroupRoles : public LLPanelGroupTab
 {
 public:
-	LLPanelGroupRoles(const LLUUID& group_id);
+	LLPanelGroupRoles();
 	virtual ~LLPanelGroupRoles();
 
 	// Allow sub tabs to ask for sibling controls.
@@ -64,7 +63,7 @@ public:
 	virtual BOOL postBuild();
 	virtual BOOL isVisibleByAgent(LLAgent* agentp);
 
-	static void* createTab(void* data);
+	
 	void handleClickSubTab();
 
 	// Checks if the current tab needs to be applied, and tries to switch to the requested tab.
@@ -87,8 +86,7 @@ public:
 	virtual void cancel();
 	virtual void update(LLGroupChange gc);
 
-	// PanelGroupTab observer trigger
-	virtual void tabChanged();
+	virtual void setGroupID(const LLUUID& id);
 
 protected:
 	LLPanelGroupTab*		mCurrentTab;
@@ -104,7 +102,7 @@ protected:
 class LLPanelGroupSubTab : public LLPanelGroupTab
 {
 public:
-	LLPanelGroupSubTab(const LLUUID& group_id);
+	LLPanelGroupSubTab();
 	virtual ~LLPanelGroupSubTab();
 
 	virtual BOOL postBuild();
@@ -164,13 +162,11 @@ protected:
 class LLPanelGroupMembersSubTab : public LLPanelGroupSubTab
 {
 public:
-	LLPanelGroupMembersSubTab(const LLUUID& group_id);
+	LLPanelGroupMembersSubTab();
 	virtual ~LLPanelGroupMembersSubTab();
 
 	virtual BOOL postBuildSubTab(LLView* root);
 
-	static void* createTab(void* data);
-
 	static void onMemberSelect(LLUICtrl*, void*);
 	void handleMemberSelect();
 
@@ -229,13 +225,11 @@ protected:
 class LLPanelGroupRolesSubTab : public LLPanelGroupSubTab
 {
 public:
-	LLPanelGroupRolesSubTab(const LLUUID& group_id);
+	LLPanelGroupRolesSubTab();
 	virtual ~LLPanelGroupRolesSubTab();
 
 	virtual BOOL postBuildSubTab(LLView* root);
 
-	static void* createTab(void* data);
-
 	virtual void activate();
 	virtual void deactivate();
 	virtual bool needsApply(std::string& mesg);
@@ -290,12 +284,11 @@ protected:
 class LLPanelGroupActionsSubTab : public LLPanelGroupSubTab
 {
 public:
-	LLPanelGroupActionsSubTab(const LLUUID& group_id);
+	LLPanelGroupActionsSubTab();
 	virtual ~LLPanelGroupActionsSubTab();
 
 	virtual BOOL postBuildSubTab(LLView* root);
 
-	static void* createTab(void* data);
 
 	virtual void activate();
 	virtual void deactivate();
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 0d50d7c781..a8e3fd3195 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -638,6 +638,11 @@ void LLPanelPeople::onTabSelected(const LLSD& param)
 	std::string tab_name = getChild<LLPanel>(param.asString())->getName();
 	mNearbyListUpdater->setActive(tab_name == NEARBY_TAB_NAME);
 	updateButtons();
+
+	if (GROUP_TAB_NAME == tab_name)
+		mFilterEditor->setLabel(getString("groups_filter_label"));
+	else
+		mFilterEditor->setLabel(getString("people_filter_label"));
 }
 
 void LLPanelPeople::onAvatarListDoubleClicked(LLAvatarList* list)
@@ -669,9 +674,7 @@ void LLPanelPeople::onAddFriendButtonClicked()
 	LLUUID id = getCurrentItemID();
 	if (id.notNull())
 	{
-		std::string name;
-		gCacheName->getFullName(id, name);
-		LLAvatarActions::requestFriendshipDialog(id, name);
+		LLAvatarActions::requestFriendshipDialog(id);
 	}
 }
 
@@ -693,9 +696,7 @@ void LLPanelPeople::onDeleteFriendButtonClicked()
 
 void LLPanelPeople::onGroupInfoButtonClicked()
 {
-	LLUUID group_id = getCurrentItemID();
-	if (group_id.notNull())
-		LLGroupActions::info(group_id);
+	LLGroupActions::show(getCurrentItemID());
 }
 
 void LLPanelPeople::onChatButtonClicked()
@@ -763,7 +764,7 @@ void LLPanelPeople::onGroupPlusMenuItemClicked(const LLSD& userdata)
 	if (chosen_item == "join_group")
 		LLGroupActions::search();
 	else if (chosen_item == "new_group")
-		LLGroupActions::create();
+		LLGroupActions::createGroup();
 }
 
 void LLPanelPeople::onCallButtonClicked()
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 19aef93d7e..d515b03ea9 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -56,7 +56,6 @@
 #include "llcombobox.h"
 #include "lluiconstants.h"
 #include "lldbstrings.h"
-#include "llfloatergroupinfo.h"
 #include "llfloatergroups.h"
 #include "llfloaterreg.h"
 #include "llavataractions.h"
@@ -65,6 +64,7 @@
 #include "lluictrlfactory.h"
 #include "llspinctrl.h"
 #include "roles_constants.h"
+#include "llgroupactions.h"
 
 ///----------------------------------------------------------------------------
 /// Class llpanelpermissions
@@ -820,7 +820,7 @@ void LLPanelPermissions::onClickOwner(void *data)
 	{
 		LLUUID group_id;
 		LLSelectMgr::getInstance()->selectGetGroup(group_id);
-		LLFloaterGroupInfo::showFromUUID(group_id);
+		LLGroupActions::show(group_id);
 	}
 	else
 	{
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index e8d6ff9ec9..afcd8c735c 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -57,12 +57,13 @@ static const std::string XML_PICKS_LIST = "back_panel";
 
 #define PICK_ITEMS_BETWEEN 5
 
+static LLRegisterPanelClassWrapper<LLPanelPicks> t_panel_picks("panel_picks");
 
 //-----------------------------------------------------------------------------
 // LLPanelPicks
 //-----------------------------------------------------------------------------
 LLPanelPicks::LLPanelPicks()
-:	LLPanelProfileTab(LLUUID::null),
+:	LLPanelProfileTab(),
 	mPopupMenu(NULL),
 	mSelectedPickItem(NULL),
 	mProfilePanel(NULL),
@@ -100,7 +101,6 @@ void LLPanelPicks::processProperties(void* data, EAvatarProcessorType type)
 			childSetTextArg("pick_title", "[NAME]",name);
 
 			LLView* picks_list = getPicksList();
-			if(!picks_list) return;
 			
 			// to restore selection of the same item later
 			LLUUID pick_id_selected(LLUUID::null);
@@ -131,7 +131,7 @@ void LLPanelPicks::processProperties(void* data, EAvatarProcessorType type)
 				picture->setPickId(pick_id);
 				picture->setCreatorId(getAvatarId());
 
-				LLAvatarPropertiesProcessor::instance().addObserver(mAvatarId, picture);
+				LLAvatarPropertiesProcessor::instance().addObserver(getAvatarId(), picture);
 				picture->update();
 				mPickItemList.push_back(picture);
 				if (pick_id_selected != LLUUID::null && 
@@ -152,14 +152,11 @@ void LLPanelPicks::processProperties(void* data, EAvatarProcessorType type)
 void LLPanelPicks::clear()
 {
 	LLView* scroll = getPicksList();
-	if(scroll)
+	picture_list_t::const_iterator it = mPickItemList.begin();
+	for(; mPickItemList.end() != it; ++it)
 	{
-		picture_list_t::const_iterator it = mPickItemList.begin();
-		for(; mPickItemList.end() != it; ++it)
-		{
-			scroll->removeChild(*it);
-			delete *it;
-		}
+		scroll->removeChild(*it);
+		delete *it;
 	}
 	mPickItemList.clear();
 	mSelectedPickItem = NULL;
@@ -225,7 +222,7 @@ void LLPanelPicks::reshapePickItem(LLView* const pick_item, const S32 last_botto
 
 LLView* LLPanelPicks::getPicksList() const
 {
-	return getChild<LLView>(XML_PICKS_LIST, TRUE, FALSE);
+	return getChild<LLView>(XML_PICKS_LIST);
 }
 
 BOOL LLPanelPicks::postBuild()
@@ -261,6 +258,8 @@ void LLPanelPicks::onOpen(const LLSD& key)
 	// Disable buttons when viewing profile for first time
 	if(getAvatarId() != id)
 	{
+		clear();
+
 		childSetEnabled(XML_BTN_INFO,FALSE);
 		childSetEnabled(XML_BTN_TELEPORT,FALSE);
 		childSetEnabled(XML_BTN_SHOW_ON_MAP,FALSE);
@@ -373,7 +372,7 @@ void LLPanelPicks::updateButtons()
 	int picks_num = mPickItemList.size();
 	childSetEnabled(XML_BTN_INFO, picks_num > 0);
 
-	if (mAvatarId == gAgentID)
+	if (getAvatarId() == gAgentID)
 	{
 		childSetEnabled(XML_BTN_NEW, picks_num < MAX_AVATAR_PICKS);
 		childSetEnabled(XML_BTN_DELETE, picks_num > 0);
@@ -403,12 +402,14 @@ void LLPanelPicks::setSelectedPickItem(LLPickItem* item)
 
 BOOL LLPanelPicks::isMouseInPick( S32 x, S32 y )
 {
-	LLScrollContainer* scroll = getChild<LLScrollContainer>("profile_scroll");
-	if (!scroll->parentPointInView(x, y)) return FALSE;
-
 	S32 x_l = x;
 	S32 y_l = y;
 	
+	if(!getChild<LLUICtrl>("profile_scroll")->getRect().pointInRect(x, y))
+	{
+		return FALSE;
+	}
+
 	picture_list_t::const_iterator it = mPickItemList.begin();
 	for(; mPickItemList.end() != it; ++it)
 	{
@@ -516,11 +517,8 @@ void LLPickItem::init(LLPickData* pick_data)
 	mPosGlobal = pick_data->pos_global;
 	mLocation = pick_data->location_text;
 
-	LLTextureCtrl* picture = getChild<LLTextureCtrl>("picture", TRUE, FALSE);
-	if (picture)
-	{
-		picture->setImageAssetID(pick_data->snapshot_id);
-	}
+	LLTextureCtrl* picture = getChild<LLTextureCtrl>("picture");
+	picture->setImageAssetID(pick_data->snapshot_id);
 }
 
 void LLPickItem::setPickName(const std::string& name)
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index a2d491c2cf..0931333ed9 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -115,7 +115,7 @@ BOOL LLPanelPlaceInfo::postBuild()
 	mScrollingPanel = getChild<LLPanel>("scrolling_panel");
 	mInfoPanel = getChild<LLPanel>("info_panel");
 	mMediaPanel = getChild<LLMediaPanel>("media_panel");
-	if (!(mMediaPanel && mInfoPanel && mScrollingPanel))
+	if (!mMediaPanel)
 		return FALSE;
 
 	return TRUE;
@@ -241,9 +241,6 @@ void LLPanelPlaceInfo::setParcelID(const LLUUID& parcel_id)
 
 void LLPanelPlaceInfo::setInfoType(INFO_TYPE type)
 {
-	if (!mInfoPanel)
-	    return;
-
 	if (type != PLACE)
 		toggleMediaPanel(FALSE);
 	
@@ -291,7 +288,7 @@ BOOL LLPanelPlaceInfo::isMediaPanelVisible()
 
 void LLPanelPlaceInfo::toggleMediaPanel(BOOL visible)
 {
-    if (!(mMediaPanel && mInfoPanel))
+    if (!mMediaPanel)
         return;
 
     if (visible)
@@ -439,7 +436,7 @@ void LLPanelPlaceInfo::displayAgentParcelInfo()
 
 	LLParcelData parcel_data;
 	parcel_data.desc = parcel->getDesc();
-	parcel_data.flags = parcel->getParcelFlags();
+	parcel_data.flags = region->getSimAccess();
 	parcel_data.name = parcel->getName();
 	parcel_data.sim_name = gAgent.getRegion()->getName();
 	parcel_data.snapshot_id = parcel->getSnapshotID();
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 191c43791d..7461d150c8 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -293,7 +293,7 @@ void LLPanelPlaces::onTeleportButtonClicked()
 			payload["asset_id"] = mItem->getAssetUUID();
 			LLNotifications::instance().add("TeleportFromLandmark", LLSD(), payload);
 		}
-		else if (mPlaceInfoType == "remote_place")
+		else if (mPlaceInfoType == "remote_place" || mPlaceInfoType == "agent")
 		{
 			LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
 			if (!mPosGlobal.isExactlyZero() && worldmap_instance)
@@ -380,6 +380,11 @@ void LLPanelPlaces::toggleMediaPanel()
 		return;
 
 	mPlaceInfo->toggleMediaPanel(!mPlaceInfo->isMediaPanelVisible());
+	
+	// Refresh the current place info because
+	// the media panel controls can't refer to
+	// the remote parcel media.
+	onOpen(LLSD().insert("type", "agent"));
 }
 
 void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
@@ -445,10 +450,14 @@ void LLPanelPlaces::onAgentParcelChange()
 	if (!mPlaceInfo)
 		return;
 
-	if (mPlaceInfo->getVisible() && (mPlaceInfoType == "agent" || mPlaceInfoType == "create_landmark"))
+	if (mPlaceInfo->getVisible() && mPlaceInfoType == "create_landmark")
 	{
 		onOpen(LLSD().insert("type", mPlaceInfoType));
 	}
+	else if (mPlaceInfo->isMediaPanelVisible())
+	{
+		onOpen(LLSD().insert("type", "agent"));
+	}
 	else
 	{
 		updateVerbs();
@@ -463,6 +472,7 @@ void LLPanelPlaces::updateVerbs()
 	bool is_place_info_visible = mPlaceInfo->getVisible();
 	bool is_agent_place_info_visible = mPlaceInfoType == "agent";
 	bool is_create_landmark_visible = mPlaceInfoType == "create_landmark";
+	bool is_media_panel_visible = mPlaceInfo->isMediaPanelVisible();
 	
 	mTeleportBtn->setVisible(!is_create_landmark_visible);
 	mShareBtn->setVisible(!is_create_landmark_visible);
@@ -477,15 +487,18 @@ void LLPanelPlaces::updateVerbs()
 	{
 		if (is_agent_place_info_visible)
 		{
-			// We don't need to teleport to the current location so disable the button
-			mTeleportBtn->setEnabled(FALSE);
+			// We don't need to teleport to the current location
+			// so check if the location is not within the current parcel.
+			mTeleportBtn->setEnabled(!is_media_panel_visible &&
+									 !mPosGlobal.isExactlyZero() &&
+									 !LLViewerParcelMgr::getInstance()->inAgentParcel(mPosGlobal));
 		}
 		else if (mPlaceInfoType == "landmark" || mPlaceInfoType == "remote_place")
 		{
 			mTeleportBtn->setEnabled(TRUE);
 		}
 
-		mShowOnMapBtn->setEnabled(TRUE);
+		mShowOnMapBtn->setEnabled(!is_media_panel_visible);
 	}
 	else
 	{
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index f97105caa8..017a7312a1 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -32,20 +32,16 @@
 
 #include "llviewerprecompiledheaders.h"
 #include "llpanelprofile.h"
-#include "lltabcontainer.h"
-#include "llpanelpicks.h"
+
 #include "llagent.h"
-#include "llcommandhandler.h"
 #include "llavataractions.h"
+#include "llcommandhandler.h"
+#include "llpanelpicks.h"
+#include "lltabcontainer.h"
 
 static const std::string PANEL_PICKS = "panel_picks";
-static const std::string PANEL_NOTES = "panel_notes";
 static const std::string PANEL_PROFILE = "panel_profile";
 
-static LLRegisterPanelClassWrapper<LLPanelAvatarProfile> t_panel_profile(PANEL_PROFILE);
-static LLRegisterPanelClassWrapper<LLPanelPicks> t_panel_picks(PANEL_PICKS);
-
-
 class LLAgentHandler : public LLCommandHandler
 {
 public:
@@ -74,34 +70,45 @@ LLAgentHandler gAgentHandler;
 
 
 LLPanelProfile::LLPanelProfile()
-:	LLPanel(),
-	mTabContainer(NULL)
-{
-}
-
-LLPanelProfile::~LLPanelProfile()
+ : LLPanel()
+ , mTabCtrl(NULL)
+ , mAvatarId(LLUUID::null)
 {
 }
 
 BOOL LLPanelProfile::postBuild()
 {
-	mTabContainer = getChild<LLTabContainer>("tabs");
-	mTabContainer->setCommitCallback(boost::bind(&LLPanelProfile::onTabSelected, this, _2));
+	mTabCtrl = getChild<LLTabContainer>("tabs");
+
+	getTabCtrl()->setCommitCallback(boost::bind(&LLPanelProfile::onTabSelected, this, _2));
 
 	LLPanelPicks* panel_picks = getChild<LLPanelPicks>(PANEL_PICKS);
 	panel_picks->setProfilePanel(this);
-	mTabs[PANEL_PICKS] = panel_picks;
 
-	mTabs[PANEL_PROFILE] = getChild<LLPanelAvatarProfile>(PANEL_PROFILE);
+	getTabContainer()[PANEL_PICKS] = panel_picks;
+	getTabContainer()[PANEL_PROFILE] = getChild<LLPanelAvatarProfile>(PANEL_PROFILE);
 
 	return TRUE;
 }
 
+void LLPanelProfile::onOpen(const LLSD& key)
+{
+	if (key.has("open_tab_name"))
+	{
+		// onOpen from selected panel will be called from onTabSelected callback
+		getTabCtrl()->selectTabByName(key["open_tab_name"]);
+	}
+	else
+	{
+		getTabCtrl()->getCurrentPanel()->onOpen(getAvatarId());
+	}
+}
+
 //*TODO redo panel toggling
 void LLPanelProfile::togglePanel(LLPanel* panel)
 {
 	// TRUE - we need to open/expand "panel"
-	BOOL expand = this->getChildList()->back() != panel;  // mTabContainer->getVisible();
+	bool expand = getChildList()->back() != panel;  // mTabCtrl->getVisible();
 
 	if (expand)
 	{
@@ -128,29 +135,31 @@ void LLPanelProfile::togglePanel(LLPanel* panel)
 	else 
 	{
 		this->setAllChildrenVisible(TRUE);
-		if (panel->getParent() == this) removeChild(panel);
-		sendChildToBack(mTabContainer);
-		mTabContainer->getCurrentPanel()->onOpen(mAvatarId);
+		if (panel->getParent() == this) 
+		{
+			removeChild(panel);
+		}
+		sendChildToBack(getTabCtrl());
+		getTabCtrl()->getCurrentPanel()->onOpen(getAvatarId());
 	}
 }
 
-
 void LLPanelProfile::onTabSelected(const LLSD& param)
 {
 	std::string tab_name = param.asString();
-	if (NULL != mTabs[tab_name])
+	if (NULL != getTabContainer()[tab_name])
 	{
-		mTabs[tab_name]->onOpen(mAvatarId);
+		getTabContainer()[tab_name]->onOpen(getAvatarId());
 	}
 }
 
 void LLPanelProfile::setAllChildrenVisible(BOOL visible)
 {
 	const child_list_t* child_list = getChildList();
-	for (child_list_const_iter_t child_it = child_list->begin(); child_it != child_list->end(); ++child_it)
+	child_list_const_iter_t child_it = child_list->begin();
+	for (; child_it != child_list->end(); ++child_it)
 	{
 		LLView* viewp = *child_it;
 		viewp->setVisible(visible);
 	}
 }
-
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 2f6d53a859..b55963ec4a 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -39,34 +39,42 @@
 
 class LLTabContainer;
 
+/**
+* Base class for Profile View and Me Profile.
+*/
 class LLPanelProfile : public LLPanel
 {
 	LOG_CLASS(LLPanelProfile);
 
 public:
-	virtual BOOL postBuild();
+	/*virtual*/ BOOL postBuild();
 
-	virtual void onOpen(const LLSD& key) {};
+	/*virtual*/ void onOpen(const LLSD& key);
 
 	virtual void togglePanel(LLPanel*);
 
 protected:
+
 	LLPanelProfile();
-	~LLPanelProfile();
 
-	void onTabSelected(const LLSD& param);
+	virtual void onTabSelected(const LLSD& param);
+
+	virtual void setAllChildrenVisible(BOOL visible);
+
+	LLTabContainer* getTabCtrl() { return mTabCtrl; }
 
-	void setAllChildrenVisible(BOOL visible);
+	const LLUUID& getAvatarId() { return mAvatarId; }
 
+	void setAvatarId(const LLUUID& avatar_id) { mAvatarId = avatar_id; }
 
-	LLTabContainer* mTabContainer;
-	
 	typedef std::map<std::string, LLPanelProfileTab*> profile_tabs_t;
-	profile_tabs_t mTabs;
 
+	profile_tabs_t& getTabContainer() { return mTabContainer; }
+
+private:
+	LLTabContainer* mTabCtrl;	
+	profile_tabs_t mTabContainer;
 	LLUUID mAvatarId;
 };
 
-
-
 #endif //LL_LLPANELPROFILE_H
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 00254ee8ee..cd18dc4462 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -39,14 +39,12 @@
 #include "llpanelprofile.h"
 
 static LLRegisterPanelClassWrapper<LLPanelProfileView> t_panel_target_profile("panel_profile_view");
-static LLRegisterPanelClassWrapper<LLPanelAvatarNotes> t_panel_notes("panel_notes");
 
-static std::string PANEL_PROFILE = "panel_profile";
-static std::string PANEL_PICKS = "panel_picks";
 static std::string PANEL_NOTES = "panel_notes";
 
 LLPanelProfileView::LLPanelProfileView()
 :	LLPanelProfile()
+,	mCacheNameCallbackConnected(false)
 {
 }
 
@@ -57,32 +55,39 @@ LLPanelProfileView::~LLPanelProfileView(void)
 /*virtual*/ 
 void LLPanelProfileView::onOpen(const LLSD& key)
 {
-	LLUUID id = key["id"];
-	if (key.has("open_tab_name"))
-		mTabContainer->selectTabByName(key["open_tab_name"]);
-
-	if(id.notNull() && mAvatarId != id)
+	LLUUID id;
+	if(key.has("id"))
 	{
-		mAvatarId = id;
-
-		mTabs[PANEL_PROFILE]->clear();
-		mTabs[PANEL_PICKS]->clear();
-		mTabs[PANEL_NOTES]->clear();
+		id = key["id"];
+	}
+	if(id.notNull() && getAvatarId() != id)
+	{
+		setAvatarId(id);
 	}
 
-	mTabContainer->getCurrentPanel()->onOpen(mAvatarId);
+	LLPanelProfile::onOpen(key);
+
+	// *HACK Profile View is created before gCacheName, as a result we can't call addObserver()
+	// in postBuild() and have to connect callback here.
+	// This will call addObserver() once per LLPanelProfileView instance.
+	if(!mCacheNameCallbackConnected)
+	{
+		gCacheName->addObserver(boost::bind(&LLPanelProfileView::cacheNameCallback, this, _1, _2, _3, _4));
+		mCacheNameCallbackConnected = true;
+	}
 
+	// getFullName() will return "(Loading...)" for non cached names, 
+	// in this case cacheNameCallback() will resolve the name.
 	std::string full_name;
-	gCacheName->getFullName(mAvatarId,full_name);
+	gCacheName->getFullName(getAvatarId(),full_name);
 	childSetValue("user_name",full_name);
 }
 
-
 BOOL LLPanelProfileView::postBuild()
 {
 	LLPanelProfile::postBuild();
 
-	mTabs[PANEL_NOTES] = (getChild<LLPanelAvatarNotes>(PANEL_NOTES));
+	getTabContainer()[PANEL_NOTES] = getChild<LLPanelAvatarNotes>(PANEL_NOTES);
 
 	childSetCommitCallback("back",boost::bind(&LLPanelProfileView::onBackBtnClick,this),NULL);
 	
@@ -100,3 +105,11 @@ void LLPanelProfileView::onBackBtnClick()
 		parent->openPreviousPanel();
 	}
 }
+
+void LLPanelProfileView::cacheNameCallback(const LLUUID& id, const std::string& first_name, const std::string& last_name, BOOL is_group)
+{
+	if(getAvatarId() == id)
+	{
+		childSetValue("user_name", first_name + " " + last_name);
+	}
+}
diff --git a/indra/newview/llpanelprofileview.h b/indra/newview/llpanelprofileview.h
index 6c5fc77951..4d5e2997c1 100644
--- a/indra/newview/llpanelprofileview.h
+++ b/indra/newview/llpanelprofileview.h
@@ -35,24 +35,46 @@
 
 #include "llpanel.h"
 #include "llpanelprofile.h"
+#include "llavatarpropertiesprocessor.h"
 
 class LLPanelProfile;
 class LLPanelProfileTab;
 
+
+/**
+* Panel for displaying Avatar's profile. It consists of three sub panels - Profile,
+* Picks and Notes.
+*/
 class LLPanelProfileView : public LLPanelProfile
 {
 	LOG_CLASS(LLPanelProfileView);
 	friend class LLUICtrlFactory;
 
 public:
+
 	LLPanelProfileView();
 
-	~LLPanelProfileView(void);
+	/*virtual*/ ~LLPanelProfileView();
 
-	void onOpen(const LLSD& key);
+	/*virtual*/ void onOpen(const LLSD& key);
 	
-	BOOL postBuild();
+	/*virtual*/ BOOL postBuild();
+
+	// LLCacheName will call this function when avatar name is loaded from server.
+	// This is required to display names that have not been cached yet.
+	void cacheNameCallback(
+		const LLUUID& id, 
+		const std::string& first_name,
+		const std::string& last_name,
+		BOOL is_group);
+
+protected:
+
 	void onBackBtnClick();
+
+private:
+
+	bool mCacheNameCallbackConnected;
 };
 
 #endif //LL_LLPANELPROFILEVIEW_H
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 5ae79f6c63..10561f5701 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -37,7 +37,10 @@
 #include "lltextbox.h"
 #include "llscreenchannel.h"
 
+#include "lltoastpanel.h"
 #include "llviewercontrol.h"
+#include "llfloaterreg.h"
+#include "lltrans.h"
 
 #include <algorithm>
 
@@ -46,9 +49,10 @@ using namespace LLNotificationsUI;
 bool LLScreenChannel::mWasStartUpToastShown = false;
 
 //--------------------------------------------------------------------------
-LLScreenChannel::LLScreenChannel(): mUnreadToastsPanel(NULL), 
+LLScreenChannel::LLScreenChannel(): mOverflowToastPanel(NULL), 
+									mStartUpToastPanel(NULL),
 									mToastAlignment(NA_BOTTOM), 
-									mStoreToasts(true),
+									mCanStoreToasts(true),
 									mHiddenToastsNum(0),
 									mOverflowToastHidden(false),
 									mIsHovering(false),
@@ -56,10 +60,8 @@ LLScreenChannel::LLScreenChannel(): mUnreadToastsPanel(NULL),
 {	
 	setFollows(FOLLOWS_RIGHT | FOLLOWS_BOTTOM | FOLLOWS_TOP);  
 
-	//TODO: load as a resource string
-	mOverflowFormatString = "You have %d more notification";
+	mOverflowFormatString = LLTrans::getString("OverflowInfoChannelString");
 
-	mToastList.clear();
 	setMouseOpaque( false );
 }
 
@@ -85,44 +87,48 @@ void LLScreenChannel::reshape(S32 width, S32 height, BOOL called_from_parent)
 }
 
 //--------------------------------------------------------------------------
-LLToast* LLScreenChannel::addToast(LLUUID id, LLPanel* panel, bool is_not_tip)
-{	
-	ToastElem new_toast_elem(id, panel);
+void LLScreenChannel::addToast(LLToast::Params p)
+{
+	bool isSysWellWndShown = LLFloaterReg::getInstance("syswell_window")->getVisible();
+	// we show toast in the following cases:
+	//	- the StartUp Toast is already hidden and the SysWell's window is hidden
+	//  - the SysWell's window is shown, but notification is a tip. We can't store it, so we show it
+	//	- the channel has a CENTRE allignment, so it is intended for alerts. We always show alerts
+	bool show_toast = (mWasStartUpToastShown && !isSysWellWndShown) || (isSysWellWndShown && p.is_tip) || mToastAlignment == NA_CENTRE;
+	bool store_toast = !show_toast && !p.is_tip && mCanStoreToasts;
+
+	// if we can't show or store a toast, then do nothing, just send ignore to a notification 
+	if(!show_toast && !store_toast)
+	{
+		if(p.notification)
+		{
+			p.notification->setIgnored(TRUE);
+			p.notification->respond(p.notification->getResponseTemplate());
+		}
+		return;
+	}
+
+	ToastElem new_toast_elem(p);
 
 	mOverflowToastHidden = false;
 	
-	mToastList.push_back(new_toast_elem);
 	getRootView()->addChild(new_toast_elem.toast);
 	new_toast_elem.toast->setOnFadeCallback(boost::bind(&LLScreenChannel::onToastFade, this, new_toast_elem.toast));
 	if(mControlHovering)
 	{
 		new_toast_elem.toast->setOnToastHoverCallback(boost::bind(&LLScreenChannel::onToastHover, this, _1, _2));
 	}
-
-	// don't show toasts until StartUp toast will fade, but show alerts
-	if(!mWasStartUpToastShown && mToastAlignment != NA_CENTRE)
-	{
-		new_toast_elem.toast->stopTimer();
-		// Count and store only non tip notifications
-		if(is_not_tip)
-		{
-			mHiddenToastsNum++;			
-			storeToast(new_toast_elem);
-		}
-		else
-		{
-			// destroy tip toasts at once
-			new_toast_elem.toast->close();			
-		}
-		// remove toast from channel
-		mToastList.pop_back();
-	}
-	else
+	
+	if(show_toast)
 	{
+		mToastList.push_back(new_toast_elem);
 		showToasts();
+	}	
+	else // store_toast
+	{
+		mHiddenToastsNum++;
+		storeToast(new_toast_elem);
 	}
-
-	return new_toast_elem.toast;
 }
 
 //--------------------------------------------------------------------------
@@ -130,11 +136,12 @@ void LLScreenChannel::onToastFade(LLToast* toast)
 {	
 	std::vector<ToastElem>::iterator it = find(mToastList.begin(), mToastList.end(), static_cast<LLPanel*>(toast));
 		
-	bool destroy_toast = toast->isViewed() || !mStoreToasts || !toast->getCanBeStored();
+	// *TODO: toast->isViewed() - seems unnecessary
+	bool destroy_toast = toast->isViewed() || !mCanStoreToasts || !toast->getCanBeStored();
 	if(destroy_toast)
 	{
 		mToastList.erase(it);
-		toast->mOnToastDestroy(toast, LLSD());
+		toast->mOnToastDestroy(toast);
 	}
 	else
 	{
@@ -149,7 +156,14 @@ void LLScreenChannel::onToastFade(LLToast* toast)
 
 void LLScreenChannel::storeToast(ToastElem& toast_elem)
 {
+	// do not store clones
+	std::vector<ToastElem>::iterator it = find(mStoredToastList.begin(), mStoredToastList.end(), toast_elem.id);
+	if( it != mStoredToastList.end() )
+		return;
+
+	toast_elem.toast->stopTimer();
 	mStoredToastList.push_back(toast_elem);
+	mOnStoreToast(toast_elem.toast->getPanel(), toast_elem.id);
 }
 
 //--------------------------------------------------------------------------
@@ -172,17 +186,75 @@ void LLScreenChannel::loadStoredToastsToChannel()
 	showToasts();
 }
 
+//--------------------------------------------------------------------------
+void LLScreenChannel::loadStoredToastByIDToChannel(LLUUID id)
+{
+	std::vector<ToastElem>::iterator it = find(mStoredToastList.begin(), mStoredToastList.end(), id);
+
+	if( it == mStoredToastList.end() )
+		return;
+
+	mOverflowToastHidden = false;
+
+	LLToast* toast = (*it).toast;
+	toast->resetTimer();
+	mToastList.push_back((*it));
+	mStoredToastList.erase(it);
+
+	showToasts();
+}
+
+//--------------------------------------------------------------------------
+void LLScreenChannel::removeStoredToastByID(LLUUID id)
+{
+	// *TODO: may be remove this function
+	std::vector<ToastElem>::iterator it = find(mStoredToastList.begin(), mStoredToastList.end(), id);
+
+	if( it == mStoredToastList.end() )
+		return;
+
+	LLToast* toast = (*it).toast;
+	mStoredToastList.erase(it);
+	toast->discardNotification();
+}
+
 //--------------------------------------------------------------------------
 void LLScreenChannel::killToastByNotificationID(LLUUID id)
 {
+	// searching among toasts on a screen
 	std::vector<ToastElem>::iterator it = find(mToastList.begin(), mToastList.end(), id);
 	
 	if( it != mToastList.end())
 	{
 		LLToast* toast = (*it).toast;
-		mToastList.erase(it);
-		toast->mOnToastDestroy(toast, LLSD());
-		showToasts();
+		// if it is a notification toast and notification is UnResponded - then respond on it
+		// else - simply destroy a toast
+		//
+		// NOTE:	if a notification is unresponded this function will be called twice for the same toast.
+		//			At first, the notification will be discarded, at second (it will be caused by discarding),
+		//			the toast will be destroyed.
+		if(toast->getIsNotificationUnResponded())
+		{
+			toast->discardNotification();
+		}
+		else
+		{
+			mToastList.erase(it);
+			toast->mOnToastDestroy(toast);
+			showToasts();
+		}
+		return;
+	}
+
+	// searching among stored toasts
+	it = find(mStoredToastList.begin(), mStoredToastList.end(), id);
+
+	if( it != mStoredToastList.end() )
+	{
+		LLToast* toast = (*it).toast;
+		mStoredToastList.erase(it);
+		toast->discardNotification();
+		toast->mOnToastDestroy(toast);
 	}
 }
 
@@ -197,7 +269,7 @@ void LLScreenChannel::modifyToastByNotificationID(LLUUID id, LLPanel* panel)
 		LLPanel* old_panel = toast->getPanel();
 		toast->removeChild(old_panel);
 		delete old_panel;
-		toast->arrange(panel);
+		toast->insertPanel(panel);
 		toast->resetTimer();
 		showToasts();
 	}
@@ -297,15 +369,16 @@ void LLScreenChannel::showToastsTop()
 void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
 {
 	LLRect toast_rect;
-	mUnreadToastsPanel = new LLToast(NULL);
+	LLToast::Params p; // *TODO: fill structure
+	mOverflowToastPanel = new LLToast(p);
 
-	if(!mUnreadToastsPanel)
+	if(!mOverflowToastPanel)
 		return;
 
-	mUnreadToastsPanel->setOnFadeCallback(boost::bind(&LLScreenChannel::onOverflowToastHide, this));
+	mOverflowToastPanel->setOnFadeCallback(boost::bind(&LLScreenChannel::onOverflowToastHide, this));
 
-	LLTextBox* text_box = mUnreadToastsPanel->getChild<LLTextBox>("toast_text");
-	LLIconCtrl* icon = mUnreadToastsPanel->getChild<LLIconCtrl>("icon");
+	LLTextBox* text_box = mOverflowToastPanel->getChild<LLTextBox>("toast_text");
+	LLIconCtrl* icon = mOverflowToastPanel->getChild<LLIconCtrl>("icon");
 	std::string	text = llformat(mOverflowFormatString.c_str(),mHiddenToastsNum);
 	if(mHiddenToastsNum == 1)
 	{
@@ -316,41 +389,107 @@ void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
 		text += "s.";
 	}
 
-	toast_rect = mUnreadToastsPanel->getRect();
-	mUnreadToastsPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
+	toast_rect = mOverflowToastPanel->getRect();
+	mOverflowToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
 	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastMargin"), getRect().getWidth(), toast_rect.getHeight());	
-	mUnreadToastsPanel->setRect(toast_rect);
-	mUnreadToastsPanel->setAndStartTimer(timer);
-	getRootView()->addChild(mUnreadToastsPanel);
+	mOverflowToastPanel->setRect(toast_rect);
+	mOverflowToastPanel->setAndStartTimer(timer);
+	getRootView()->addChild(mOverflowToastPanel);
 
 	text_box->setValue(text);
 	text_box->setVisible(TRUE);
 	icon->setVisible(TRUE);
 
-	mUnreadToastsPanel->setVisible(TRUE);
+	mOverflowToastPanel->setVisible(TRUE);
 }
 
 //--------------------------------------------------------------------------
 void LLScreenChannel::onOverflowToastHide()
 {
 	mOverflowToastHidden = true;
+	// *TODO: check whether it is needed: closeOverflowToastPanel();	
+}
+
+//--------------------------------------------------------------------------
+void LLScreenChannel::closeOverflowToastPanel()
+{
+	if(mOverflowToastPanel != NULL)
+	{
+		mOverflowToastPanel->close();
+		mOverflowToastPanel = NULL;
+	}
+}
+
+//--------------------------------------------------------------------------
+void LLScreenChannel::createStartUpToast(S32 notif_num, S32 bottom, F32 timer)
+{
+	LLRect toast_rect;
+	LLToast::Params p; // *TODO: fill structure
+	mStartUpToastPanel = new LLToast(p);
+
+	if(!mStartUpToastPanel)
+		return;
+
+	mStartUpToastPanel->setOnFadeCallback(boost::bind(&LLScreenChannel::onStartUpToastHide, this));
+
+	LLTextBox* text_box = mStartUpToastPanel->getChild<LLTextBox>("toast_text");
+	LLIconCtrl* icon = mStartUpToastPanel->getChild<LLIconCtrl>("icon");
+
+	std::string mStartUpFormatString;
+
+	if(notif_num == 1)
+	{
+		mStartUpFormatString = LLTrans::getString("StartUpNotification");
+	}
+	else
+	{
+		mStartUpFormatString = LLTrans::getString("StartUpNotifications");
+	}
+	
+
+	std::string	text = llformat(mStartUpFormatString.c_str(), notif_num);
+
+	toast_rect = mStartUpToastPanel->getRect();
+	mStartUpToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
+	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastMargin"), getRect().getWidth(), toast_rect.getHeight());	
+	mStartUpToastPanel->setRect(toast_rect);
+	mStartUpToastPanel->setAndStartTimer(timer);
+	getRootView()->addChild(mStartUpToastPanel);
+
+	text_box->setValue(text);
+	text_box->setVisible(TRUE);
+	icon->setVisible(TRUE);
+
+	mStartUpToastPanel->setVisible(TRUE);
+}
+
+//--------------------------------------------------------------------------
+void LLScreenChannel::updateStartUpString(S32 num)
+{
+	// *TODO: update string if notifications are arriving while the StartUp toast is on a screen
+}
+
+//--------------------------------------------------------------------------
+void LLScreenChannel::onStartUpToastHide()
+{
 	onCommit();
 }
 
 //--------------------------------------------------------------------------
-void LLScreenChannel::closeUnreadToastsPanel()
+void LLScreenChannel::closeStartUpToast()
 {
-	if(mUnreadToastsPanel != NULL)
+	if(mStartUpToastPanel != NULL)
 	{
-		mUnreadToastsPanel->close();
-		mUnreadToastsPanel = NULL;
+		LLScreenChannel::setStartUpToastShown();
+		mStartUpToastPanel->close();
+		mStartUpToastPanel = NULL;
 	}
 }
 
 //--------------------------------------------------------------------------
 void LLScreenChannel::hideToastsFromScreen()
 {
-	closeUnreadToastsPanel();
+	closeOverflowToastPanel();
 	for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end(); it++)
 		(*it).toast->setVisible(FALSE);
 }
@@ -367,6 +506,24 @@ void LLScreenChannel::removeToastsFromChannel()
 	mToastList.clear();
 }
 
+//--------------------------------------------------------------------------
+void LLScreenChannel::removeAndStoreAllVisibleToasts()
+{
+	if(mToastList.size() == 0)
+		return;
+
+	hideToastsFromScreen();
+	for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end(); it++)
+	{
+		mStoredToastList.push_back(*it);
+		mOnStoreToast((*it).toast->getPanel(), (*it).id);
+		(*it).toast->stopTimer();
+		(*it).toast->setVisible(FALSE);
+	}
+
+	mToastList.clear();
+}
+
 //--------------------------------------------------------------------------
 void LLScreenChannel::onToastHover(LLToast* toast, bool mouse_enter)
 {
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index 579f41eac8..1ca70c72d0 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -71,7 +71,7 @@ public:
 	
 	// Operating with toasts
 	// add a toast to a channel
-	LLToast*	addToast(LLUUID id, LLPanel* panel, bool is_not_tip = true);
+	void		addToast(LLToast::Params p);
 	// kill or modify a toast by its ID
 	void		killToastByNotificationID(LLUUID id);
 	void		modifyToastByNotificationID(LLUUID id, LLPanel* panel);
@@ -83,8 +83,16 @@ public:
 	void		showToasts();
 	//
 	void		loadStoredToastsToChannel();
-	// 
-	void 		closeUnreadToastsPanel();
+	// finds a toast among stored by its ID and throws it on a screen to a channel
+	void		loadStoredToastByIDToChannel(LLUUID id);
+	// removes a toast from stored finding it by its ID 
+	void		removeStoredToastByID(LLUUID id);
+	// remove all toasts from screen and store them
+	void		removeAndStoreAllVisibleToasts();
+	// close the Overflow Toast
+	void 		closeOverflowToastPanel();
+	// close the StartUp Toast
+	void		closeStartUpToast();
 
 	// Channel's behavior-functions
 	// set whether a channel will control hovering inside itself or not
@@ -92,14 +100,17 @@ public:
 	// set Hovering flag for a channel
 	void		setHovering(bool hovering) { mIsHovering = hovering; }
 	// set whether a channel will store faded toasts or not
-	void		setStoreToasts(bool store) { mStoreToasts = store; }
+	void		setCanStoreToasts(bool store) { mCanStoreToasts = store; }
 	// tell all channels that the StartUp toast was shown and allow them showing of toasts
 	static void	setStartUpToastShown() { mWasStartUpToastShown = true; }
+	//
+	static bool	getStartUpToastShown() { return mWasStartUpToastShown; }
 
 	// Channel's other interface functions functions
-	S32			getNumberOfHiddenToasts() { return mHiddenToastsNum;}
-	// TODO: split StartUp and Overflow toasts
-	void		setNumberOfHiddenToasts(S32 num) { mHiddenToastsNum = num;}
+	// get number of hidden notifications from a channel
+	S32		getNumberOfHiddenToasts() { return mHiddenToastsNum;}
+	// update number of notifications in the StartUp Toast
+	void	updateStartUpString(S32 num);
 	e_notification_toast_alignment getToastAlignment() {return mToastAlignment;}
 
 	// Channel's callbacks
@@ -114,9 +125,10 @@ private:
 	{
 		LLUUID		id;
 		LLToast*	toast;
-		ToastElem(LLUUID lluuid, LLPanel* panel) : id(lluuid)
+
+		ToastElem(LLToast::Params p) : id(p.id)
 		{
-			toast = new LLToast(panel);
+			toast = new LLToast(p);
 		}
 
 		ToastElem(const ToastElem& toast_elem)
@@ -140,6 +152,7 @@ private:
 	void	onToastHover(LLToast* toast, bool mouse_enter);
 	void	onToastFade(LLToast* toast);
 	void	onOverflowToastHide();
+	void	onStartUpToastHide();
 
 	//
 	void	storeToast(ToastElem& toast_elem);
@@ -149,22 +162,29 @@ private:
 	void	showToastsCentre();
 	void	showToastsTop();
 	
-	// create the OverflowToast
+	// create the Overflow Toast
 	void	createOverflowToast(S32 bottom, F32 timer);
 
+	// create the StartUp Toast
+	void	createStartUpToast(S32 notif_num, S32 bottom, F32 timer);
+
 	// Channel's flags
 	static bool	mWasStartUpToastShown;
 	bool		mControlHovering;
 	bool		mIsHovering;
-	bool		mStoreToasts;
+	bool		mCanStoreToasts;
 	bool		mOverflowToastHidden;
 	// 
 	e_notification_toast_alignment	mToastAlignment;
 
+	// attributes for the Overflow Toast
 	S32			mHiddenToastsNum;
-	LLToast*	mUnreadToastsPanel;
+	LLToast*	mOverflowToastPanel;	
 	std::string mOverflowFormatString;
 
+	// attributes for the StartUp Toast	
+	LLToast* mStartUpToastPanel;
+
 	std::vector<ToastElem>		mToastList;
 	std::vector<ToastElem>		mStoredToastList;
 	std::map<LLToast*, bool>	mToastEventStack;
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index fec4798f7b..438b1b558f 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -281,7 +281,7 @@ bool        LLSideTray::addTab          ( const std::string& tab_name
 
 LLSideTrayTab* LLSideTray::getTab(const std::string& name)
 {
-	return getChild<LLSideTrayTab>(name,false,false);
+	return getChild<LLSideTrayTab>(name,false);
 }
 
 
@@ -311,7 +311,7 @@ bool LLSideTray::selectTabByName	(const std::string& name)
 {
 	LLSideTrayTab* side_bar = getTab(name);
 
-	if(side_bar == NULL || side_bar == mActiveTab)
+	if(side_bar == mActiveTab)
 		return false;
 	//deselect old tab
 	toggleTabButton(mActiveTab);
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h
index 1f8b6b402f..b691a42db1 100644
--- a/indra/newview/llsidetray.h
+++ b/indra/newview/llsidetray.h
@@ -89,10 +89,13 @@ private:
 	LLView*	mMainPanel;
 };
 
-
-class LLSideTray : public LLPanel
+// added inheritance from LLDestroyClass<LLSideTray> to enable Side Tray perform necessary actions 
+// while disconnecting viewer in LLAppViewer::disconnectViewer().
+// LLDestroyClassList::instance().fireCallbacks() calls destroyClass method. See EXT-245.
+class LLSideTray : public LLPanel, private LLDestroyClass<LLSideTray>
 {
 	friend class LLUICtrlFactory;
+	friend class LLDestroyClass<LLSideTray>;
 public:
 
 	LOG_CLASS(LLSideTray);
@@ -216,6 +219,15 @@ protected:
 
 
 	void		setPanelRect	();
+
+private:
+	// Implementation of LLDestroyClass<LLSideTray>
+	static void destroyClass()
+	{
+		// Disable SideTray to avoid crashes. EXT-245
+		if (LLSideTray::instanceCreated())
+			LLSideTray::getInstance()->setEnabled(FALSE);
+	}
 	
 
 private:
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index bd93f5dd28..ffadeeddf2 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -105,6 +105,13 @@ std::string LLSLURL::buildSLURL(const std::string& regionname, S32 x, S32 y, S32
 	return slurl;
 }
 
+// static
+std::string LLSLURL::buildUnescapedSLURL(const std::string& regionname, S32 x, S32 y, S32 z)
+{
+	std::string unescapedslurl = PREFIX_SLURL + regionname + llformat("/%d/%d/%d",x,y,z);
+	return unescapedslurl;
+}
+
 // static
 bool LLSLURL::matchPrefix(const std::string& url, const std::string& prefix)
 {
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h
index 05788623d9..5c9fea3e96 100644
--- a/indra/newview/llslurl.h
+++ b/indra/newview/llslurl.h
@@ -69,10 +69,15 @@ public:
 	static bool isSLURLHelp(const std::string& url);
 
 	/**
-	 * builds: http://slurl.com/secondlife/RegionName/x/y/z/
+	 * builds: http://slurl.com/secondlife/Region%20Name/x/y/z/ escaping result url.
 	 */
 	static std::string buildSLURL(const std::string& regionname, S32 x, S32 y, S32 z);
 
+	/**
+	 * builds: http://slurl.com/secondlife/Region Name/x/y/z/ without escaping result url.
+	 */
+	static std::string buildUnescapedSLURL(const std::string& regionname, S32 x, S32 y, S32 z);
+
 	/**
 	 * Strip protocol part from the URL.
 	 */
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 12fb811328..569e7b3397 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -48,6 +48,7 @@
 #include "llfloaterscriptdebug.h"
 #include "llhudicon.h"
 #include "llfloaterinventory.h"
+#include "llnavigationbar.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
 #include "llmenugl.h"
@@ -244,6 +245,30 @@ void LLStatusBar::draw()
 	LLPanel::draw();
 }
 
+BOOL LLStatusBar::handleRightMouseUp(S32 x, S32 y, MASK mask)
+{
+	if (mHideNavbarContextMenu)
+	{
+		mHideNavbarContextMenu->buildDrawLabels();
+		mHideNavbarContextMenu->updateParent(LLMenuGL::sMenuContainer);
+		LLMenuGL::showPopup(this, mHideNavbarContextMenu, x, y);
+	}
+
+	return TRUE;
+}
+
+BOOL LLStatusBar::postBuild()
+{
+	mCommitCallbackRegistrar.add("HideNavbarMenu.Action", boost::bind(&LLStatusBar::onHideNavbarContextMenuItemClicked, this, _2));
+	mEnableCallbackRegistrar.add("HideNavbarMenu.EnableMenuItem", boost::bind(&LLStatusBar::onHideNavbarContextMenuItemEnabled, this, _2));
+
+	mHideNavbarContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_hide_navbar.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+	gMenuHolder->addChild(mHideNavbarContextMenu);
+
+	gMenuBarView->setRightClickedCallback(boost::bind(&LLStatusBar::onMainMenuRightClicked, this, _1, _2, _3, _4));
+
+	return TRUE;
+}
 
 // Per-frame updates of visibility
 void LLStatusBar::refresh()
@@ -716,6 +741,48 @@ void LLStatusBar::setupDate()
 	}
 }
 
+bool LLStatusBar::onHideNavbarContextMenuItemEnabled(const LLSD& userdata)
+{
+	std::string item = userdata.asString();
+
+	if (item == "show_navbar_navigation_panel")
+	{
+		return gSavedSettings.getBOOL("ShowNavbarNavigationPanel");
+	}
+	else if (item == "show_navbar_favorites_panel")
+	{
+		return gSavedSettings.getBOOL("ShowNavbarFavoritesPanel");
+	}
+
+	return FALSE;
+}
+
+void LLStatusBar::onHideNavbarContextMenuItemClicked(const LLSD& userdata)
+{
+	std::string item = userdata.asString();
+
+	if (item == "show_navbar_navigation_panel")
+	{
+		BOOL state = !gSavedSettings.getBOOL("ShowNavbarNavigationPanel");
+
+		LLNavigationBar::getInstance()->showNavigationPanel(state);
+		gSavedSettings.setBOOL("ShowNavbarNavigationPanel", state);
+	}
+	else if (item == "show_navbar_favorites_panel")
+	{
+		BOOL state = !gSavedSettings.getBOOL("ShowNavbarFavoritesPanel");
+
+		LLNavigationBar::getInstance()->showFavoritesPanel(state);
+		gSavedSettings.setBOOL("ShowNavbarFavoritesPanel", state);
+	}
+}
+
+
+void LLStatusBar::onMainMenuRightClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask)
+{
+	handleRightMouseUp(x, y, mask);
+}
+
 // static
 void LLStatusBar::onCommitSearch(LLUICtrl*, void* data)
 {
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 84dd761930..0cb3551768 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -34,6 +34,7 @@
 #define LL_LLSTATUSBAR_H
 
 #include "llpanel.h"
+#include <llmenugl.h>
 
 // "Constants" loaded from settings.xml at start time
 extern S32 STATUS_BAR_HEIGHT;
@@ -57,6 +58,9 @@ public:
 	
 	/*virtual*/ void draw();
 
+	/*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL postBuild();
+
 	// MANIPULATORS
 	void		setBalance(S32 balance);
 	void		debitBalance(S32 debit);
@@ -87,6 +91,10 @@ private:
 	// simple method to setup the part that holds the date
 	void setupDate();
 
+	bool onHideNavbarContextMenuItemEnabled(const LLSD& userdata);
+	void onHideNavbarContextMenuItemClicked(const LLSD& userdata);
+
+	void onMainMenuRightClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask);
 	static void onCommitSearch(LLUICtrl*, void* data);
 	static void onClickSearch(void* data);
 	static void onClickStatGraph(void* data);
@@ -106,6 +114,7 @@ private:
 	S32				mSquareMetersCommitted;
 	LLFrameTimer*	mBalanceTimer;
 	LLFrameTimer*	mHealthTimer;
+	LLMenuGL*		mHideNavbarContextMenu;
 	
 	static std::vector<std::string> sDays;
 	static std::vector<std::string> sMonths;
diff --git a/indra/newview/llsyswellitem.cpp b/indra/newview/llsyswellitem.cpp
new file mode 100644
index 0000000000..5ed8a8b604
--- /dev/null
+++ b/indra/newview/llsyswellitem.cpp
@@ -0,0 +1,105 @@
+/** 
+ * @file llsyswellitem.cpp
+ * @brief                                    // TODO
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+
+#include "llviewerprecompiledheaders.h" // must be first include
+
+#include "llsyswellitem.h"
+
+#include "llwindow.h"
+#include "v4color.h"
+
+//---------------------------------------------------------------------------------
+LLSysWellItem::LLSysWellItem(const Params& p) : LLScrollingPanel(p),
+												mTitle(NULL),
+												mCloseBtn(NULL),
+												mIcon(NULL)
+{
+	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_sys_well_item.xml");
+
+	mTitle = getChild<LLTextBox>("title");
+	mCloseBtn = getChild<LLButton>("close_btn");
+	mIcon = getChild<LLIconCtrl>("icon");
+
+	mTitle->setValue(p.title);
+	mCloseBtn->setClickedCallback(boost::bind(&LLSysWellItem::onClickCloseBtn,this));
+
+	mID = p.notification_id;
+}
+
+//---------------------------------------------------------------------------------
+LLSysWellItem::~LLSysWellItem()
+{
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellItem::setTitle( std::string title )
+{
+	mTitle->setValue(title);
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellItem::onClickCloseBtn()
+{
+	mOnItemClose(this);
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellItem::updatePanel(BOOL allow_modify)
+{
+	//nothing to do here
+}
+
+//---------------------------------------------------------------------------------
+BOOL LLSysWellItem::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	if(!mCloseBtn->getRect().pointInRect(x, y))
+		mOnItemClick(this);
+
+	return LLPanel::handleMouseDown(x, y, mask);
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellItem::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+	setTransparentColor(LLColor4(0.3f, 0.3f, 0.3f, 1.0f));
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellItem::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+	setTransparentColor(LLColor4(0.0f, 0.0f, 0.0f, 0.0f));
+}
+
+//---------------------------------------------------------------------------------
+
+
diff --git a/indra/newview/llsyswellitem.h b/indra/newview/llsyswellitem.h
new file mode 100644
index 0000000000..b0761f2790
--- /dev/null
+++ b/indra/newview/llsyswellitem.h
@@ -0,0 +1,90 @@
+/** 
+ * @file llsyswellitem.h
+ * @brief                                    // TODO
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSYSWELLITEM_H
+#define LL_LLSYSWELLITEM_H
+
+#include "llscrollingpanellist.h"
+#include "lltextbox.h"
+#include "llbutton.h"
+#include "lliconctrl.h"
+
+#include <string>
+
+class LLSysWellItem : public LLScrollingPanel 
+{
+public:
+	struct Params :	public LLInitParam::Block<Params, LLPanel::Params>
+	{
+		LLUUID        	notification_id;
+		std::string		title;
+        Params()        {};
+	};
+
+
+	LLSysWellItem(const Params& p);
+	virtual	~LLSysWellItem();
+
+	void updatePanel(BOOL allow_modify);
+
+	// title
+	void setTitle( std::string title );
+
+	// get item's ID
+	LLUUID getID() { return mID; }
+
+	// handlers
+	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+	virtual void onMouseEnter(S32 x, S32 y, MASK mask);
+	virtual void onMouseLeave(S32 x, S32 y, MASK mask);
+
+	//callbacks
+	typedef boost::function<void (LLSysWellItem* item)> syswell_item_callback_t;
+	typedef boost::signals2::signal<void (LLSysWellItem* item)> syswell_item_signal_t;
+	syswell_item_signal_t mOnItemClose;	
+	syswell_item_signal_t mOnItemClick;	
+	boost::signals2::connection setOnItemCloseCallback(syswell_item_callback_t cb) { return mOnItemClose.connect(cb); }
+	boost::signals2::connection setOnItemClickCallback(syswell_item_callback_t cb) { return mOnItemClick.connect(cb); }
+
+private:
+
+	void onClickCloseBtn();
+
+	LLTextBox*	mTitle;
+	LLButton*	mCloseBtn;
+	LLIconCtrl*	mIcon;
+	LLUUID		mID;
+};
+
+#endif // LL_LLSYSWELLITEM_H
+
+
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
new file mode 100644
index 0000000000..c8eea5e7b4
--- /dev/null
+++ b/indra/newview/llsyswellwindow.cpp
@@ -0,0 +1,210 @@
+/** 
+ * @file llsyswellwindow.cpp
+ * @brief                                    // TODO
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+
+#include "llviewerprecompiledheaders.h" // must be first include
+
+#include "llsyswellwindow.h"
+
+#include "llbottomtray.h"
+#include "llviewercontrol.h"
+
+
+//---------------------------------------------------------------------------------
+LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLFloater(LLSD()),
+													mChannel(NULL),
+													mScrollContainer(NULL),
+													mNotificationList(NULL)
+{
+	// Ho to use:
+	// LLFloaterReg::showInstance("syswell_window");
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_sys_well.xml", NULL);
+}
+
+//---------------------------------------------------------------------------------
+BOOL LLSysWellWindow::postBuild()
+{
+	mCloseBtn = getChild<LLButton>("close_btn");
+	mScrollContainer = getChild<LLScrollContainer>("notification_list_container");
+	mNotificationList = getChild<LLScrollingPanelList>("notification_list");
+
+	mCloseBtn->setClickedCallback(boost::bind(&LLSysWellWindow::onClickCloseBtn,this));
+
+	return TRUE;
+}
+
+//---------------------------------------------------------------------------------
+LLSysWellWindow::~LLSysWellWindow()
+{
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellWindow::addItem(LLSysWellItem::Params p)
+{
+	// do not add clones
+	if( findItemByID(p.notification_id) >= 0 )
+		return;
+
+	LLSysWellItem* new_item = new LLSysWellItem(p);
+	mNotificationList->addPanel(dynamic_cast<LLScrollingPanel*>(new_item));
+	reshapeWindow();
+	adjustWindowPosition();
+
+	new_item->setOnItemCloseCallback(boost::bind(&LLSysWellWindow::onItemClose, this, _1));
+	new_item->setOnItemClickCallback(boost::bind(&LLSysWellWindow::onItemClick, this, _1));
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellWindow::clear()
+{
+ // *TODO: fill later
+}
+
+//---------------------------------------------------------------------------------
+S32 LLSysWellWindow::findItemByID(const LLUUID& id)
+{
+	const LLScrollingPanelList::panel_list_t list = mNotificationList->getPanelList();
+	if(list.size() == 0)
+		return -1;
+
+	LLScrollingPanelList::panel_list_t::const_iterator it = list.begin(); 
+	S32 index = 0;
+	while(it != list.end())
+	{
+		if( dynamic_cast<LLSysWellItem*>(*it)->getID() == id )
+			break;
+		++it;
+		++index;
+	}
+
+	if(it == list.end())
+		return -1;
+	else
+		return index;
+
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellWindow::removeItemByID(const LLUUID& id)
+{
+	S32 index = findItemByID(id);
+
+	if(index >= 0)
+		mNotificationList->removePanel(index);
+	else
+		return;
+
+	reshapeWindow();
+	adjustWindowPosition();
+	// hide chiclet window if there are no items left
+	S32 items_left = mNotificationList->getPanelList().size();
+	if(items_left == 0)
+		setVisible(FALSE);
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellWindow::onItemClick(LLSysWellItem* item)
+{
+	LLUUID id = item->getID();
+	mChannel->loadStoredToastByIDToChannel(id);
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellWindow::onItemClose(LLSysWellItem* item)
+{
+	LLUUID id = item->getID();
+	removeItemByID(id);
+	mChannel->killToastByNotificationID(id);
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellWindow::onClickCloseBtn()
+{
+	setVisible(false);
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellWindow::setVisible(BOOL visible)
+{
+	// on Show adjust position of SysWell chiclet's window
+	if(visible)
+	{
+		mChannel->removeAndStoreAllVisibleToasts();
+		adjustWindowPosition();
+	}
+
+	LLFloater::setVisible(visible);
+}
+
+//---------------------------------------------------------------------------------
+void LLSysWellWindow::adjustWindowPosition()
+{
+	const S32 WINDOW_MARGIN	= 5;
+
+	LLRect btm_rect = LLBottomTray::getInstance()->getRect();
+	LLRect this_rect = getRect();
+	setOrigin(btm_rect.mRight - this_rect.getWidth() - WINDOW_MARGIN, WINDOW_MARGIN); 
+}
+//---------------------------------------------------------------------------------
+void LLSysWellWindow::reshapeWindow()
+{
+	// Get scrollbar size
+	const LLUICachedControl<S32> SCROLLBAR_SIZE("UIScrollbarSize", 0);
+
+	// Get item list	
+	const LLScrollingPanelList::panel_list_t list = mNotificationList->getPanelList();
+
+	// window's size constants
+	const S32 WINDOW_HEADER_HEIGHT	= 30;
+	const S32 MAX_WINDOW_HEIGHT		= 200;
+	const S32 MIN_WINDOW_WIDTH		= 320;
+
+	// Get height and border's width for a scrolling panel list
+	S32 list_height			= mNotificationList->getRect().getHeight();
+	S32 list_border_width	= mScrollContainer->getBorderWidth() * 2;
+
+	// Check that the floater doesn't exceed its parent view limits after reshape
+	S32 new_height = list_height + WINDOW_HEADER_HEIGHT + list_border_width;
+
+	if(new_height > MAX_WINDOW_HEIGHT)
+	{
+		reshape(MIN_WINDOW_WIDTH + SCROLLBAR_SIZE, MAX_WINDOW_HEIGHT, FALSE);
+	}
+	else
+	{
+		reshape(MIN_WINDOW_WIDTH, new_height, FALSE);
+	}
+}
+
+//---------------------------------------------------------------------------------
+
+
+
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
new file mode 100644
index 0000000000..9554f3cb82
--- /dev/null
+++ b/indra/newview/llsyswellwindow.h
@@ -0,0 +1,89 @@
+/** 
+ * @file llsyswellwindow.h
+ * @brief                                    // TODO
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSYSWELLWINDOW_H
+#define LL_LLSYSWELLWINDOW_H
+
+#include "llsyswellitem.h"
+
+#include "llfloater.h"
+#include "llbutton.h"
+#include "llscreenchannel.h"
+#include "llscrollcontainer.h"
+
+#include "boost/shared_ptr.hpp"
+
+
+
+class LLSysWellWindow : public LLFloater
+{
+	friend class LLFloaterReg;
+
+public:
+    LLSysWellWindow(const LLSD& key);
+    ~LLSysWellWindow();
+	BOOL postBuild();
+
+	// change attributes
+	void setChannel(LLNotificationsUI::LLScreenChannel*	channel) {mChannel = channel;}
+
+	// Operating with items
+	void addItem(LLSysWellItem::Params p);
+    void clear( void );
+	void removeItemByID(const LLUUID& id);
+	S32	 findItemByID(const LLUUID& id);
+
+	// Operating with outfit
+	virtual void setVisible(BOOL visible);
+	void adjustWindowPosition();
+
+	// Handlers
+	void onItemClick(LLSysWellItem* item);
+	void onItemClose(LLSysWellItem* item);
+
+private:
+
+	void onClickCloseBtn();
+	void reshapeWindow();
+
+	// pointer to a corresponding channel's instance
+	LLNotificationsUI::LLScreenChannel*	mChannel;
+
+	LLButton*				mCloseBtn;
+	LLScrollContainer*		mScrollContainer;
+	LLScrollingPanelList*	mNotificationList;
+};
+
+#endif // LL_LLSYSWELLWINDOW_H
+
+
+
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 8a7c7708b9..a67ef85f87 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -41,36 +41,61 @@
 using namespace LLNotificationsUI;
 
 //--------------------------------------------------------------------------
-LLToast::LLToast(LLPanel* panel) : 
-				    LLFloater(LLSD()), 
-					mTimerValue(5),  
-					mIsViewed(false), 
-					mPanel(panel), 
-					mCanFade(true),
-					mHideBtn(NULL),
-					mIsModal(false),
-					mCanBeStored(true),
-					mHideBtnPressed(false)
+LLToast::LLToast(LLToast::Params p) :	LLFloater(LLSD()), 
+										mPanel(p.panel), 
+										mTimerValue(p.timer_period),  
+										mID(p.id),  
+										mCanFade(p.can_fade),
+										mCanBeStored(p.can_be_stored),
+										mHideBtnEnabled(p.enable_hide_btn),
+										mIsModal(p.is_modal),
+										mIsTipNotification(p.is_tip),
+										mHideBtn(NULL),
+										mNotification(p.notification),
+										mIsViewed(false), 
+										mHideBtnPressed(false)
 {
-	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_toast.xml");
+	LLUICtrlFactory::getInstance()->buildFloater(this, "panel_toast.xml", NULL);
 
-	mHideBtn = getChild<LLButton>("hide_btn");
-	if(mHideBtn)
+	if(mPanel)
+	{
+		insertPanel(mPanel);
+	}
+
+	if(mHideBtnEnabled)
 	{
+		mHideBtn = getChild<LLButton>("hide_btn");
 		mHideBtn->setClickedCallback(boost::bind(&LLToast::hide,this));
 	}
-	if(mPanel)
+
+	if(mIsModal)
 	{
-		arrange(mPanel);
+		gFocusMgr.setMouseCapture( this );
+		gFocusMgr.setTopCtrl( this );
+		setFocus(TRUE);
 	}
 
-	// disable unnecessary Floater's functionality
-	setTitleVisible(FALSE);
-	setCanMinimize(FALSE);
-	setCanClose(FALSE);
-	setCanTearOff(FALSE);
-	setCanResize(FALSE);
-	setCanDrag(FALSE);
+
+	if(!p.on_toast_destroy.empty())
+		mOnToastDestroy.connect(p.on_toast_destroy);
+
+	if(!p.on_mouse_enter.empty())
+		mOnMousEnter.connect(p.on_mouse_enter);
+}
+
+//--------------------------------------------------------------------------
+BOOL LLToast::postBuild()
+{
+	if(mCanFade)
+	{
+		mTimer.start();
+	}
+	else
+	{
+		mTimer.stop();
+	}
+
+	return TRUE;
 }
 
 //--------------------------------------------------------------------------
@@ -124,7 +149,7 @@ void LLToast::hide()
 	setVisible(FALSE);
 	mIsViewed = false;
 	mTimer.stop();
-	mOnFade(this, LLSD());
+	mOnFade(this);
 }
 
 //--------------------------------------------------------------------------
@@ -142,12 +167,12 @@ void LLToast::tick()
 	{
 		setVisible(FALSE);
 		mTimer.stop();
-		mOnFade(this, LLSD()); 
+		mOnFade(this); 
 	}
 }
 
 //--------------------------------------------------------------------------
-void LLToast::arrange(LLPanel* panel)
+void LLToast::insertPanel(LLPanel* panel)
 {
 	LLRect panel_rect, toast_rect;
 
@@ -213,13 +238,12 @@ void LLToast::onMouseEnter(S32 x, S32 y, MASK mask)
 	sendChildToFront(mHideBtn);
 	if(mHideBtn && mHideBtn->getEnabled())
 		mHideBtn->setVisible(TRUE);
-	mOnMousEnter(this, LLSD());
+	mOnMousEnter(this);
 }
 
 //--------------------------------------------------------------------------
 void LLToast::onMouseLeave(S32 x, S32 y, MASK mask)
 {	
-	llinfos << "MOUSE LEAVE: x = " << x << "y = " << y << llendl;
 	mOnToastHover(this, MOUSE_LEAVE);
 
 	if(mCanFade && !mIsViewed)
@@ -249,5 +273,26 @@ BOOL LLToast::handleMouseDown(S32 x, S32 y, MASK mask)
 	return LLFloater::handleMouseDown(x, y, mask);
 }
 
+//--------------------------------------------------------------------------
+void LLToast::discardNotification()
+{
+	if(mNotification)
+	{
+		mNotification->setIgnored(TRUE);
+		mNotification->respond(mNotification->getResponseTemplate());
+	}
+}
+
+//--------------------------------------------------------------------------
+bool LLToast::getIsNotificationUnResponded()
+{
+	if(mNotification)
+	{
+		return !mNotification->isRespondedTo();
+	}
+	return false;
+}
+
+//--------------------------------------------------------------------------
 
 
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index f998754585..a4dee1e386 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -37,7 +37,9 @@
 #include "llpanel.h"
 #include "llfloater.h"
 #include "lltimer.h"
-#include "lldate.h"
+#include "llnotifications.h"
+
+#include "llviewercontrol.h"
 
 #define MOUSE_LEAVE false
 #define MOUSE_ENTER true
@@ -52,53 +54,108 @@ namespace LLNotificationsUI
 class LLToast : public LLFloater
 {
 public:
-	LLToast(LLPanel* panel);
+	typedef boost::function<void (LLToast* toast)> toast_callback_t;
+	typedef boost::signals2::signal<void (LLToast* toast)> toast_signal_t;
+
+	struct Params :	public LLInitParam::Block<Params, LLFloater::Params>
+	{
+		LLPanel*			panel;
+		LLUUID				id;	 //notification or message ID
+		LLNotificationPtr	notification;
+		F32					timer_period;
+		toast_callback_t	on_toast_destroy;
+		toast_callback_t	on_mouse_enter;
+		bool				can_fade;
+		bool				can_be_stored;
+		bool				enable_hide_btn;
+		bool				is_modal;
+		bool				is_tip;
+
+		Params() :	can_fade(true),
+					can_be_stored(true),
+					is_modal(false),
+					is_tip(false),
+					enable_hide_btn(true),
+					panel(NULL),
+					timer_period(gSavedSettings.getS32("NotificationToastTime"))
+
+		{};
+	};
+
+	LLToast(LLToast::Params p);
 	virtual ~LLToast();
+	BOOL postBuild();
 
+	// Toast handlers
 	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-	//
-	bool isViewed() { return mIsViewed; }
-	
-	void setCanFade(bool can_fade);
+	virtual void onMouseEnter(S32 x, S32 y, MASK mask);
+	virtual void onMouseLeave(S32 x, S32 y, MASK mask);
 
+	// Operating with toasts
+	// insert a panel to a toast
+	void insertPanel(LLPanel* panel);
+	// get toast's panel
+	LLPanel* getPanel() { return mPanel; }
+	// discard notification
+	void discardNotification();
+	// enable/disable Toast's Hide button
 	void setHideButtonEnabled(bool enabled);
-
-	void setCanBeStored(bool can_be_stored) { mCanBeStored = can_be_stored; }
-	bool getCanBeStored() { return mCanBeStored; }
-	//
+	// initialize and start Toast's timer
 	void setAndStartTimer(F32 period);
-	//
+	// 
 	void resetTimer() { mTimer.start(); }
+	//
 	void stopTimer() { mTimer.stop(); }
+	//
 	void close() { die(); }
+	//
 	virtual void draw();
+	//
 	virtual void setVisible(BOOL show);
-	virtual void onMouseEnter(S32 x, S32 y, MASK mask);
-	virtual void onMouseLeave(S32 x, S32 y, MASK mask);
+	//
 	virtual void hide();
-	LLPanel* getPanel() { return mPanel; }
-	void arrange(LLPanel* panel);
+
+
+
+	// get/set Toast's flags or states
+	// get information whether the notification corresponding to the toast is responded or not
+	bool getIsNotificationUnResponded();
+	//
+	bool isViewed() { return mIsViewed; }
+	//
+	void setCanFade(bool can_fade);
+	//
+	void setCanBeStored(bool can_be_stored) { mCanBeStored = can_be_stored; }
+	//
+	bool getCanBeStored() { return mCanBeStored; }
+	//
 	void setModal(bool modal);
 
 
 	// Registers callbacks for events
-	boost::signals2::connection setOnFadeCallback(commit_callback_t cb) { return mOnFade.connect(cb); }
-	boost::signals2::connection setOnMouseEnterCallback(commit_callback_t cb) { return mOnMousEnter.connect(cb); }
-	boost::signals2::connection setOnToastDestroyCallback(commit_callback_t cb) { return mOnToastDestroy.connect(cb); }
+	toast_signal_t mOnFade;
+	toast_signal_t mOnMousEnter;
+	toast_signal_t mOnToastDestroy;
+	boost::signals2::connection setOnFadeCallback(toast_callback_t cb) { return mOnFade.connect(cb); }
+	boost::signals2::connection setOnMouseEnterCallback(toast_callback_t cb) { return mOnMousEnter.connect(cb); }
+	boost::signals2::connection setOnToastDestroyCallback(toast_callback_t cb) { return mOnToastDestroy.connect(cb); }
+
 	typedef boost::function<void (LLToast* toast, bool mouse_enter)> toast_hover_check_callback_t;
 	typedef boost::signals2::signal<void (LLToast* toast, bool mouse_enter)> toast_hover_check_signal_t;
 	toast_hover_check_signal_t mOnToastHover;	
 	boost::signals2::connection setOnToastHoverCallback(toast_hover_check_callback_t cb) { return mOnToastHover.connect(cb); }
 
-	commit_signal_t mOnFade;
-	commit_signal_t mOnMousEnter;
-	commit_signal_t mOnToastDestroy;
 
 private:
 
+	// check timer
 	bool	timerHasExpired();
+	// on timer finished function
 	void	tick();
 
+	LLUUID				mID;
+	LLNotificationPtr	mNotification;
+
 	LLTimer		mTimer;
 	F32			mTimerValue;
 
@@ -107,9 +164,11 @@ private:
 
 	LLColor4	mBgColor;
 	bool		mIsViewed;
+	bool		mIsTipNotification;
 	bool		mCanFade;
 	bool		mIsModal;
 	bool		mCanBeStored;
+	bool		mHideBtnEnabled;
 	bool		mHideBtnPressed;
 };
 
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp
index f5ed7f8710..8a61f6cfda 100644
--- a/indra/newview/lltoastgroupnotifypanel.cpp
+++ b/indra/newview/lltoastgroupnotifypanel.cpp
@@ -44,7 +44,6 @@
 #include "lluiconstants.h"
 #include "llui.h"
 #include "llviewercontrol.h"
-#include "llfloatergroupinfo.h"
 #include "lltrans.h"
 #include "llinitparam.h"
 
@@ -76,14 +75,14 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
 	const std::string& from_name = payload["sender_name"].asString();
 	std::stringstream from;
 	from << from_name << "/" << groupData.mName;
-	LLTextBox* pTitleText = this->getChild<LLTextBox>("title", TRUE, FALSE);
+	LLTextBox* pTitleText = this->getChild<LLTextBox>("title");
 	pTitleText->setValue(from.str());
 
 	//message body
 	const std::string& subject = payload["subject"].asString();
 	const std::string& message = payload["message"].asString();
 
-	LLTextEditor* pMessageText = getChild<	LLTextEditor>("message", TRUE, FALSE);
+	LLTextEditor* pMessageText = getChild<	LLTextEditor>("message");
 	pMessageText->setValue("");
 	pMessageText->setEnabled(FALSE);
 	pMessageText->setTakesFocus(FALSE);
@@ -113,7 +112,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
 
 	//attachment
 	BOOL hasInventory = payload["inventory_offer"].isDefined();
-	LLTextBox * pAttachLink = getChild<LLTextBox>("attachment", TRUE, FALSE);
+	LLTextBox * pAttachLink = getChild<LLTextBox>("attachment");
 	pAttachLink->setVisible(hasInventory);
 	if (hasInventory) {
 		pAttachLink->setValue(payload["inventory_name"]);
@@ -130,7 +129,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
 	}
 
 	//ok button
-	LLButton* pOkBtn = getChild<LLButton>("btn_ok", TRUE, FALSE);
+	LLButton* pOkBtn = getChild<LLButton>("btn_ok");
 	pOkBtn->setClickedCallback((boost::bind(&LLToastGroupNotifyPanel::onClickOk, this)));
 	setDefaultBtn(pOkBtn);
 }
@@ -167,8 +166,7 @@ void LLToastGroupNotifyPanel::onClickAttachment()
 	if (mInventoryOffer != NULL) {
 		mInventoryOffer->forceResponse(IOR_ACCEPT);
 
-		LLTextBox * pAttachLink = getChild<LLTextBox> ("attachment", TRUE,
-				FALSE);
+		LLTextBox * pAttachLink = getChild<LLTextBox> ("attachment");
 		static const LLUIColor textColor = LLUIColorTable::instance().getColor(
 				"GroupNotifyDimmedTextColor");
 		pAttachLink->setColor(textColor);
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp
index 79a7d45bbf..c39bac97a8 100644
--- a/indra/newview/lltoastpanel.cpp
+++ b/indra/newview/lltoastpanel.cpp
@@ -34,9 +34,28 @@
 
 #include "lltoastpanel.h"
 
-LLToastPanel::LLToastPanel(LLNotificationPtr& notification) {
+LLToastPanel::LLToastPanel(LLNotificationPtr& notification) 
+{
 	mNotification = notification;
 }
 
-LLToastPanel::~LLToastPanel() {
+LLToastPanel::~LLToastPanel() 
+{
 }
+
+std::string LLToastPanel::getTitle()
+{
+// *TODO: localize header of Title
+/*	std::string title;
+	std::string notification_type = mNotification->getType();
+
+	if( notification_type == "groupnotify" )
+	{
+		title = LLTrans::getString("TitleGroup");
+	}
+*/
+	return (mNotification->getName() + "\n" + mNotification->getMessage());
+}
+
+
+
diff --git a/indra/newview/lltoastpanel.h b/indra/newview/lltoastpanel.h
index 82e2a74672..2258eca273 100644
--- a/indra/newview/lltoastpanel.h
+++ b/indra/newview/lltoastpanel.h
@@ -36,6 +36,8 @@
 #include "llpanel.h"
 #include "llnotifications.h"
 
+#include <string>
+
 /**
  * Base class for all panels that can be added to the toast.
  * All toast panels should contain necessary logic for representing certain notification
@@ -46,6 +48,9 @@ class LLToastPanel: public LLPanel {
 public:
 	LLToastPanel(LLNotificationPtr&);
 	virtual ~LLToastPanel() = 0;
+
+	virtual std::string getTitle();
+	virtual const LLUUID& getID() { return mNotification->id();}
 protected:
 	LLNotificationPtr mNotification;
 };
diff --git a/indra/newview/llurllineeditorctrl.cpp b/indra/newview/llurllineeditorctrl.cpp
new file mode 100644
index 0000000000..046b3e619b
--- /dev/null
+++ b/indra/newview/llurllineeditorctrl.cpp
@@ -0,0 +1,97 @@
+/** 
+ * @file llurllineeditorctrl.cpp
+ * @brief LLURLLineEditor base class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llclipboard.h"
+#include "lluictrlfactory.h"
+
+#include "llurllineeditorctrl.h"
+
+#include "llweb.h"
+
+//Constructor
+LLURLLineEditor::LLURLLineEditor(const LLLineEditor::Params& p)
+: LLLineEditor(p){
+
+}
+
+// copy selection to clipboard
+void LLURLLineEditor::copy()
+{
+	if( canCopy() )
+	{
+		copyEscapedURLToClipboard();
+	}
+}
+
+// cut selection to clipboard
+void LLURLLineEditor::cut()
+{
+	if( canCut() )
+	{
+		// Prepare for possible rollback
+		LLURLLineEditorRollback rollback( this );
+
+		copyEscapedURLToClipboard();
+
+		deleteSelection();
+
+		// Validate new string and rollback the if needed.
+		BOOL need_to_rollback = ( mPrevalidateFunc && !mPrevalidateFunc( mText.getWString() ) );
+		if( need_to_rollback )
+		{
+			rollback.doRollback( this );
+			reportBadKeystroke();
+		}
+		else
+		if( mKeystrokeCallback )
+		{
+			mKeystrokeCallback( this );
+		}
+	}
+}
+// Copies escaped URL to clipboard
+void LLURLLineEditor::copyEscapedURLToClipboard()
+{
+	S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
+	S32 length = llabs( mSelectionStart - mSelectionEnd );
+
+	const std::string unescaped_text = wstring_to_utf8str(mText.getWString().substr(left_pos, length));
+	LLWString selected_escaped_text = utf8str_to_wstring(LLWeb::escapeURL(unescaped_text));
+	gClipboard.copyFromString( selected_escaped_text );
+}
+// Makes UISndBadKeystroke sound
+void LLURLLineEditor::reportBadKeystroke()
+{
+	make_ui_sound("UISndBadKeystroke");
+}
diff --git a/indra/newview/llurllineeditorctrl.h b/indra/newview/llurllineeditorctrl.h
new file mode 100644
index 0000000000..618f29dfbf
--- /dev/null
+++ b/indra/newview/llurllineeditorctrl.h
@@ -0,0 +1,100 @@
+/** 
+ * @file llurllineeditorctrl.h
+ * @brief Combobox-like location input control
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLURLLINEEDITOR_H_
+#define LLURLLINEEDITOR_H_
+
+#include "linden_common.h"
+
+#include "lllineeditor.h"
+#include "lluictrl.h"
+
+// LLURLLineEditor class performing escaping of an URL while copying or cutting the target text
+class LLURLLineEditor: public LLLineEditor {
+	LOG_CLASS( LLURLLineEditor);
+
+public:
+	// LLLineEditor overrides to do necessary escaping
+	/*virtual*/		void copy();
+	/*virtual*/ 	void cut();
+
+protected:
+	LLURLLineEditor(const Params&);
+	friend class LLUICtrlFactory;
+	friend class LLFloaterEditUI;
+
+private:
+	// util function to escape selected text and copy it to clipboard
+	void 			copyEscapedURLToClipboard();
+	// send a beep signal if keystroke is bad. As it is private at LLLineEditor we need own function
+	void			reportBadKeystroke();
+
+	// Helper class to do rollback if needed
+	class LLURLLineEditorRollback
+	{
+	public:
+		LLURLLineEditorRollback( LLURLLineEditor* ed )
+			:
+			mCursorPos( ed->mCursorPos ),
+			mScrollHPos( ed->mScrollHPos ),
+			mIsSelecting( ed->mIsSelecting ),
+			mSelectionStart( ed->mSelectionStart ),
+			mSelectionEnd( ed->mSelectionEnd )
+		{
+			mText = ed->getText();
+		}
+
+		void doRollback( LLURLLineEditor* ed )
+		{
+			ed->mCursorPos = mCursorPos;
+			ed->mScrollHPos = mScrollHPos;
+			ed->mIsSelecting = mIsSelecting;
+			ed->mSelectionStart = mSelectionStart;
+			ed->mSelectionEnd = mSelectionEnd;
+			ed->mText = mText;
+			ed->mPrevText = mText;
+		}
+
+		std::string getText()   { return mText; }
+
+	private:
+		std::string mText;
+		S32		mCursorPos;
+		S32		mScrollHPos;
+		BOOL	mIsSelecting;
+		S32		mSelectionStart;
+		S32		mSelectionEnd;
+	}; // end class LLURLLineEditorRollback
+
+};
+
+#endif /* LLURLLINEEDITOR_H_ */
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index f573a0858b..c1915d2ead 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -63,7 +63,6 @@
 #include "llfloaterfonttest.h"
 #include "llfloatergesture.h"
 #include "llfloatergodtools.h"
-#include "llfloatergroupinfo.h"
 #include "llfloatergroups.h"
 #include "llfloaterhardwaresettings.h"
 #include "llfloaterhtmlcurrency.h"
@@ -113,12 +112,12 @@
 
 #include "llpreviewanim.h"
 #include "llpreviewgesture.h"
-#include "llpreviewlandmark.h"
 #include "llpreviewnotecard.h"
 #include "llpreviewscript.h"
 #include "llpreviewsound.h"
 #include "llpreviewtexture.h"
 #include "llfloaterminiinspector.h"
+#include "llsyswellwindow.h"
 
 //class LLLLFloaterObjectIMInfo;
 
@@ -160,7 +159,6 @@ void LLViewerFloaterReg::registerFloaters()
 
 	LLFloaterReg::add("gestures", "floater_gesture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGesture>);
 	LLFloaterReg::add("god_tools", "floater_god_tools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGodTools>);
-	LLFloaterReg::add("group_info", "floater_groupinfo.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGroupInfo>);
 	LLFloaterReg::add("group_picker", "floater_choose_group.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGroupPicker>);
 
 	LLFloaterReg::add("hud", "floater_hud.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHUD>);
@@ -182,6 +180,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("mute_object", "floater_mute_object.xml", &LLFloaterMute::buildFloaterMuteObjectUI);
 	LLFloaterReg::add("mini_map", "floater_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMap>);
 	LLFloaterReg::add("mini_inspector", "panel_mini_inspector.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMiniInspector>);
+	LLFloaterReg::add("syswell_window", "floater_sys_well.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLSysWellWindow>);
 	
 	LLFloaterReg::add("notifications_console", "floater_notifications_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationConsole>);
 	LLFloaterReg::add("nearby_chat", "floater_nearby_chat.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNearbyChat>);
@@ -201,7 +200,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("pref_voicedevicesettings", "floater_device_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterVoiceDeviceSettings>);
 	LLFloaterReg::add("preview_anim", "floater_preview_animation.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewAnim>, "preview");
 	LLFloaterReg::add("preview_gesture", "floater_preview_gesture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewGesture>, "preview");
-	LLFloaterReg::add("preview_landmark", "floater_preview_existing_landmark.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewLandmark>, "preview");
 	LLFloaterReg::add("preview_notecard", "floater_preview_notecard.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewNotecard>, "preview");
 	LLFloaterReg::add("preview_script", "floater_script_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewLSL>, "preview");
 	LLFloaterReg::add("preview_scriptedit", "floater_live_lsleditor.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLLiveLSLEditor>, "preview");
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 66b1869aef..db65203950 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -102,7 +102,6 @@
 #include "llfloaterfonttest.h"
 #include "llfloatergesture.h"
 #include "llfloatergodtools.h"
-#include "llfloatergroupinfo.h"
 #include "llfloatergroupinvite.h"
 #include "llfloatergroups.h"
 #include "llfloaterhtml.h"
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f8b6e0f687..5849a40726 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -78,7 +78,6 @@
 #include "llfloaterbuycurrency.h"
 #include "llfloaterbuyland.h"
 #include "llfloaterchat.h"
-#include "llfloatergroupinfo.h"
 #include "llfloaterimagepreview.h"
 #include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
@@ -136,6 +135,7 @@
 #include "llfloaterworldmap.h"
 #include "llviewerdisplay.h"
 #include "llkeythrottle.h"
+#include "llgroupactions.h"
 
 #include <boost/tokenizer.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -640,7 +640,7 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
 
 	if (option == 2 && !group_id.isNull())
 	{
-		LLFloaterGroupInfo::showFromUUID(group_id);
+		LLGroupActions::show(group_id);
 		LLSD args;
 		args["MESSAGE"] = message;
 		LLNotifications::instance().add("JoinGroup", args, notification["payload"]);
@@ -1743,7 +1743,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			// Also send down the old path for now.
 			if (IM_GROUP_NOTICE_REQUESTED == dialog)
 			{
-				LLFloaterGroupInfo::showNotice(subj,mes,group_id,has_inventory,item_name,info);
+				
+				LLPanelGroup::showNotice(subj,mes,group_id,has_inventory,item_name,info);
 			}
 		}
 		break;
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 3aefa84295..8497a45466 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -45,7 +45,6 @@
 
 // Viewer includes
 #include "llagent.h"
-#include "llfloatergroupinfo.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
 #include "llfirstuse.h"
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index afee30293a..9e0713b494 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -50,7 +50,6 @@
 #include "llpreview.h"
 #include "llpreviewtexture.h"
 #include "llpreviewnotecard.h"
-#include "llpreviewlandmark.h"
 #include "llscrollbar.h"
 #include "llsidetray.h"
 #include "lltooldraganddrop.h"
@@ -1377,12 +1376,6 @@ void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item, llwchar wc
 	{
 		panel->setItem(item);
 	}
-
-//	LLPreviewLandmark* preview = LLFloaterReg::showTypedInstance<LLPreviewLandmark>("preview_landmark", LLSD(item->getUUID()), TAKE_FOCUS_YES);
-//	if (preview)
-//	{
-//		preview->setItem( item );
-//	}
 }
 
 void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, llwchar wc )
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index b502dbe6fc..2747763cd9 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1559,9 +1559,6 @@ void LLViewerWindow::initWorldUI()
 	getRootView()->sendChildToFront(gSnapshotFloaterView);
 
 	// new bottom panel
-	getRootView()->addChild(LLBottomTray::getInstance());
-	// Make sure Bottom Tray is behind Side Tray regardless "addChild" order.
-	getRootView()->sendChildToBack(LLBottomTray::getInstance());
 	LLRect rc = LLBottomTray::getInstance()->getRect();
 	rc.mLeft = 0;
 	rc.mRight = mRootView->getRect().getWidth();
@@ -1634,6 +1631,16 @@ void LLViewerWindow::initWorldUI()
 	navbar->translate(0, root_rect.getHeight() - menu_bar_height - navbar->getRect().getHeight()); // FIXME
 	navbar->setBackgroundColor(gMenuBarView->getBackgroundColor().get());
 	
+	if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel"))
+	{
+		navbar->showNavigationPanel(FALSE);
+	}
+
+	if (!gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"))
+	{
+		navbar->showFavoritesPanel(FALSE);
+	}
+
 	getRootView()->addChild(gStatusBar);
 	getRootView()->addChild(navbar);
 
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index f1d4520370..2304571cf1 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -1510,6 +1510,7 @@ std::string LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserv
 		CASE(STATUS_JOINED);
 		CASE(STATUS_LEFT_CHANNEL);
 		CASE(STATUS_VOICE_DISABLED);
+		CASE(STATUS_VOICE_ENABLED);
 		CASE(BEGIN_ERROR_STATUS);
 		CASE(ERROR_CHANNEL_FULL);
 		CASE(ERROR_CHANNEL_LOCKED);
@@ -5786,7 +5787,7 @@ bool LLVoiceClient::getMuteMic() const
 void LLVoiceClient::setUserPTTState(bool ptt)
 {
 	mUserPTTState = ptt;
-	LLNearbyChatBar::getInstance()->setPTTState(ptt);
+	if (LLNearbyChatBar::instanceExists()) LLNearbyChatBar::getInstance()->setPTTState(ptt);
 }
 
 bool LLVoiceClient::getUserPTTState()
@@ -5797,7 +5798,7 @@ bool LLVoiceClient::getUserPTTState()
 void LLVoiceClient::toggleUserPTTState(void)
 {
 	mUserPTTState = !mUserPTTState;
-	LLNearbyChatBar::getInstance()->setPTTState(mUserPTTState);
+	if (LLNearbyChatBar::instanceExists()) LLNearbyChatBar::getInstance()->setPTTState(mUserPTTState);
 }
 
 void LLVoiceClient::setVoiceEnabled(bool enabled)
@@ -5805,15 +5806,21 @@ void LLVoiceClient::setVoiceEnabled(bool enabled)
 	if (enabled != mVoiceEnabled)
 	{
 		mVoiceEnabled = enabled;
+		LLVoiceClientStatusObserver::EStatusType status;
+
 		if (enabled)
 		{
 			LLVoiceChannel::getCurrentVoiceChannel()->activate();
+			status = LLVoiceClientStatusObserver::STATUS_VOICE_ENABLED;
 		}
 		else
 		{
 			// Turning voice off looses your current channel -- this makes sure the UI isn't out of sync when you re-enable it.
 			LLVoiceChannel::getCurrentVoiceChannel()->deactivate();
+			status = LLVoiceClientStatusObserver::STATUS_VOICE_DISABLED;
 		}
+
+		notifyStatusObservers(status);
 	}
 }
 
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 8b3bbb68bb..fe99e787da 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -65,6 +65,11 @@ public:
 		STATUS_JOINED,
 		STATUS_LEFT_CHANNEL,
 		STATUS_VOICE_DISABLED,
+
+		// Adding STATUS_VOICE_ENABLED as pair status for STATUS_VOICE_DISABLED
+		// See LLVoiceClient::setVoiceEnabled()
+		STATUS_VOICE_ENABLED,
+
 		BEGIN_ERROR_STATUS,
 		ERROR_CHANNEL_FULL,
 		ERROR_CHANNEL_LOCKED,
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
new file mode 100644
index 0000000000..4525df31b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: mantipov: to use the "use_ellipses" attribute label should be LEFT aligned 
+untill LLFontGL::render() is fixed to avoid this requirement-->
+<!-- *NOTE: mantipov: top & height should be synchronized with <favorites_bar> in the panel_navigation_bar.xml-->
+<!-- All buttons in the Favorites bar will be created from this one -->
+<button
+ follows="left|bottom"
+ halign="left"
+ height="23"
+ image_disabled="transparent.j2c"
+ image_disabled_selected="PushButton_Selected"
+ image_hover_selected="PushButton_Selected"
+ image_hover_unselected="PushButton_Off"
+ image_selected="PushButton_Selected"
+ image_unselected="transparent.j2c"
+ layout="topleft"
+ left="2"
+ name="favorites_bar_btn"
+ tab_stop="false"
+ top="2"
+ use_ellipses="true"
+ width="120" />
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 0012294160..b0472eb7e2 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -157,7 +157,7 @@
              label="Range"
              layout="topleft"
              left="10"
-             max_val="40"
+             max_val="130"
              min_val="5"
              name="near_me_range"
              top="32"
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
new file mode 100644
index 0000000000..468d41e2f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater 
+ background_opaque="false"
+ background_visible="true" 
+ bevel_style="in"
+ bg_alpha_color="0.0 0.0 0.0 0.0"
+ height="60"
+ left="0"
+ top="0" 
+ follows="right|bottom"
+ layout="topleft"
+ name="notification_chiclet"
+ save_rect="true"
+ title=""
+ width="320"
+ can_minimize="false"
+ can_tear_off="false"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_close="false"
+ can_dock="false"
+>
+  <scroll_container
+   follows="top|bottom"
+   layout="topleft"
+   name="notification_list_container"
+   left="1"
+   top="30"
+   width="336"
+   height="30">
+    <scrolling_panel_list
+     follows="left|right"
+     layout="topleft"
+     name="notification_list"
+     left="0"
+     top="0"
+     height="20"
+     width="320" />
+  </scroll_container>
+
+  <panel 
+    top="0" 
+    width="320" 
+    height="30"
+    layout="topleft"
+    follows="top|left|right"
+    background_visible="true" 
+    background_opaque="false" 
+    bg_alpha_color="0.0 0.0 0.0 1.0" 
+    name="notification_caption"
+  >
+    <text
+      width="255" 
+      left="25" 
+      height="20" 
+      layout="topleft"
+      follows="left|right|top"
+      font="SansSerifBoldBig" 
+      text_color="white" 
+      word_wrap="true"
+      mouse_opaque="true" 
+      name="sender_name"
+    >
+      NOTIFICATIONS  
+    </text>
+    <button
+      top="5"
+      left="270"
+      width="15"
+      height="15"
+      layout="topleft"
+      follows="right"
+      label=""
+      toggle="true" 
+      image_unselected="arrow_up.tga"
+      image_disabled="arrow_up.tga"
+      image_selected="arrow_down.tga"
+      image_hover_selected="arrow_down.tga"
+      image_disabled_selected="arrow_down.tga"
+      name="tear_btn"
+    />    
+    <button 
+      top="5" 
+      left="300"
+      width="15" 
+      height="15"
+      layout="topleft"
+      follows="right"
+      label="" 
+      image_unselected="closebox.tga" 
+      image_disabled="closebox.tga"
+      image_selected="closebox.tga" 
+      image_hover_selected="closebox.tga"
+      image_disabled_selected="closebox.tga"
+      name="close_btn"
+    />
+  </panel>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 4c880f6dc0..91039539f9 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -127,8 +127,8 @@
                 <split_button.item
                  image_selected="camera_presets/camera_presets_34_view.png"
                  image_unselected="camera_presets/camera_presets_34_view.png"
-                 name="3/4_view"
-                 tool_tip="3/4 View" 
+                 name="group_view"
+                 tool_tip="Group View" 
                 />
                 <split_button.item
                  image_selected="camera_presets/camera_presets_fron_view.png"
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index fcae65dd69..b9a384bf8f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -4,6 +4,7 @@
  follows="all"
  height="514"
  label="General"
+ class="panel_group_general"
  layout="topleft"
  left="1"
  name="general_tab"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
new file mode 100644
index 0000000000..4f179d7a16
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+ 	follows="left|top|right|bottom"
+	height="660"
+	label="Group Info"
+ 	layout="topleft"
+	name="panel_group_info"
+	border="false"
+	width="300">
+    <panel.string
+     name="default_needs_apply_text">
+        There are unapplied changes on the current tab.
+    </panel.string>
+    <panel.string
+     name="want_apply_text">
+        Do you want to apply these changes?
+    </panel.string>
+
+	<button 
+     layout="topleft" 
+     name="back" 
+     left="5" 
+     top="5" 
+     width="20" 
+     height="20" 
+     label=""
+     follows="top|left"
+     image_selected="navbar_bg_button.tga"
+     image_unselected="navbar_bg_button.tga"
+     image_overlay="navbar_back.tga"/>
+    <text 
+     layout="topleft" 
+     top="5" 
+     left_pad="15" 
+     width="200" 
+     height="20" 
+     font="SansSerifBold" 
+     text_color="white" 
+     follows="top|left|right"
+     mouse_opaque="true" 
+     name="group_name">(Loading...)</text>
+    <button
+     top="632"
+     height="20"
+     font="SansSerifSmall"
+     label="Apply"
+     label_selected="Apply"
+     name="btn_apply"
+     left="5"
+     width="65" />
+    <button
+	 top="632"
+	 left="75"	 
+	 height="20"
+     ont="SansSerifSmall"
+     label="Refresh"
+     label_selected="Refresh"
+     name="btn_refresh"
+	 follows="top|left"
+     width="65" />
+    <button
+     top="632"
+     height="20"
+     font="SansSerifSmall"
+     label="Create"
+     label_selected="Create"
+     name="btn_create"
+     left="5"
+     visible="false"
+     width="65" />
+      <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="panel_me_profile">
+		<accordion_tab min_height="515" title="Group General" name="group_general_tab">
+        	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>
+		</accordion_tab>
+		<accordion_tab min_height="380" title="Group Roles" name="group_roles_tab" can_resize="false">
+        	<panel class="panel_group_roles" filename="panel_group_roles.xml" name="group_roles_tab_panel"/>
+		</accordion_tab>
+		<accordion_tab min_height="530" title="Group Notices" name="group_notices_tab" can_resize="false">
+			<panel class="panel_group_notices" filename="panel_group_notices.xml" name="group_notices_tab_panel"/>
+		</accordion_tab>
+		<accordion_tab min_height="270" title="Group Land Money" name="group_land_tab" can_resize="false">
+			<panel class="panel_group_land_money" filename="panel_group_land_money.xml" name="group_land_tab_panel"/>
+		</accordion_tab>
+	  </accordion>
+
+
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index b96421ca2f..c52994b43d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="514"
+ height="420"
  label="Land &amp; L$"
  layout="topleft"
  left="1"
@@ -281,7 +281,7 @@
              bg_readonly_color="0.784314 0.819608 0.8 1"
              follows="all"
              font="Monospace"
-             height="150"
+             height="180"
              layout="topleft"
              left="8"
              max_length="4096"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index dd6cd8c95e..132c06d028 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="true"
- height="530"
+ height="380"
  label="Members &amp; Roles"
  layout="topleft"
  left="1"
  name="roles_tab"
- top="530"
  width="280">
     <panel.string
      name="default_needs_apply_text">
@@ -31,7 +30,7 @@
     -->
     <panel
      follows="left|top"
-     height="24"
+     height="80"
      layout="topleft"
      left="10"
      name="members_header"
@@ -174,7 +173,7 @@
      left_delta="0"
      name="roles_tab_container"
      tab_position="top"
-     top="70"
+     top="80"
      width="265">
         <panel
          border="true"
@@ -185,6 +184,7 @@
          name="members_sub_tab"
          tool_tip="Members"
          top="16"
+         class="panel_group_members_subtab"
          width="265">
             <panel.string
              name="help_text">
@@ -279,6 +279,7 @@ clicking on their names.
          layout="topleft"
          left_delta="0"
          name="roles_sub_tab"
+         class="panel_group_roles_subtab"
          top_delta="0"
          width="265">
             <panel.string
@@ -384,6 +385,7 @@ including the Everyone and Owner Roles.
          layout="topleft"
          left_delta="0"
          name="actions_sub_tab"
+         class="panel_group_actions_subtab"
          top_delta="0"
          width="265">
             <panel.string
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 4904a0d40a..8d90c6ebf0 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -8,118 +8,124 @@
  layout="topleft"
  name="navigation_bar"
  width="600">
-     <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="23"
-     image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled"
-     image_overlay="Arrow_Left_Off"
-     image_selected="PushButton_Selected"
-     image_unselected="PushButton_Off"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     left="10"
-     name="back_btn"
-     picture_style="true"
-     tool_tip="Go back to previous location"
-     top="8"
-     width="31" />
-
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="23"
-     image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled"
-     image_overlay="Arrow_Right_Off"
-     image_selected="PushButton_Selected"
-     image_unselected="PushButton_Off"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     left_pad="0"
-     name="forward_btn"
-     picture_style="true"
-     tool_tip="Go forward one location"
-     top_delta="0"
-     width="31" />
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="23"
-     image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled"
-     image_overlay="Home_Off"
-     image_selected="PushButton_Selected"
-     image_unselected="PushButton_Off"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     left_pad="7"
-     name="home_btn"
-     picture_style="true"
-     tool_tip="Teleport to your home location"
-     top_delta="0"
-     width="32" />
-    <location_input
-     follows="left|right|top"
-     halign="right"
-     height="22"
-     label="Location"
-     layout="topleft"
-     left_pad="7"
-     max_chars="254"
-     mouse_opaque="false"
-     name="location_combo"
-     top_delta="0"
-     width="266">
-     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
-        <location_input.add_landmark_button
-         height="18"
-         name="location_combo_add"
-         width="20" />
-        <location_input.info_button
-         height="18"
-         name="location_combo_info"
-         width="20" />
-      -->
-    </location_input>
-
-<!--     <button -->
-<!--      follows="right|top" -->
-<!--      height="20" -->
-<!--      image_disabled="TextField_Search_Off" -->
-<!--      image_disabled_selected="TextField_Search_Off" -->
-<!--      image_hover_selected="TextField_Search_Off" -->
-<!--      image_hover_unselected="TextField_Search_Off" -->
-<!--      image_selected="TextField_Search_Off" -->
-<!--      image_unselected="TextField_Search_Off" -->
-<!--      layout="topleft" -->
-<!--      left_pad="5" -->
-<!--      mouse_opaque="false" -->
-<!--      name="search_bg" -->
-<!--      picture_style="true" -->
-<!--      top_delta="0" -->
-<!--      width="168" /> -->
-    
-    <search_editor
-     bevel_style="none"
-     border_style="line"
-     border.border_thickness="0"
-     commit_on_focus_lost="false"
-     follows="right|top"
-     halign="right"
-     height="22"
-     label="Search All"
-     layout="topleft"
-     left_pad="7"
-     mouse_opaque="false"
-     name="search_input"
-     tool_tip="Search All"
-     top_delta="0"
-     width="200" /> 
-    
-    
-
+	<panel
+	 background_visible="false"
+	 follows="left|top|right"
+	 height="60"
+	 layout="topleft"
+	 name="navigation_panel"
+	 width="600">	 
+	     <button
+	     follows="left|top"
+	     font="SansSerifSmall"
+	     height="23"
+	     image_disabled="PushButton_Disabled"
+	     image_disabled_selected="PushButton_Disabled"
+	     image_overlay="Arrow_Left_Off"
+	     image_selected="PushButton_Selected"
+	     image_unselected="PushButton_Off"
+	     hover_glow_amount="0.15"
+	     layout="topleft"
+	     left="10"
+	     name="back_btn"
+	     picture_style="true"
+	     tool_tip="Go back to previous location"
+	     top="3"
+	     width="31" />
+	
+	    <button
+	     follows="left|top"
+	     font="SansSerifSmall"
+	     height="23"
+	     image_disabled="PushButton_Disabled"
+	     image_disabled_selected="PushButton_Disabled"
+	     image_overlay="Arrow_Right_Off"
+	     image_selected="PushButton_Selected"
+	     image_unselected="PushButton_Off"
+	     hover_glow_amount="0.15"
+	     layout="topleft"
+	     left_pad="0"
+	     name="forward_btn"
+	     picture_style="true"
+	     tool_tip="Go forward one location"
+	     top_delta="0"
+	     width="31" />
+	    <button
+	     follows="left|top"
+	     font="SansSerifSmall"
+	     height="23"
+	     image_disabled="PushButton_Disabled"
+	     image_disabled_selected="PushButton_Disabled"
+	     image_overlay="Home_Off"
+	     image_selected="PushButton_Selected"
+	     image_unselected="PushButton_Off"
+	     hover_glow_amount="0.15"
+	     layout="topleft"
+	     left_pad="7"
+	     name="home_btn"
+	     picture_style="true"
+	     tool_tip="Teleport to your home location"
+	     top_delta="0"
+	     width="32" />
+	    <location_input
+	     follows="left|right|top"
+	     halign="right"
+	     height="22"
+	     label="Location"
+	     layout="topleft"
+	     left_pad="7"
+	     max_chars="254"
+	     mouse_opaque="false"
+	     name="location_combo"
+	     top_delta="0"
+	     width="266">
+	     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
+	        <location_input.add_landmark_button
+	         height="18"
+	         name="location_combo_add"
+	         width="20" />
+	        <location_input.info_button
+	         height="18"
+	         name="location_combo_info"
+	         width="20" />
+	      -->
+	    </location_input>
+	
+	<!--     <button -->
+	<!--      follows="right|top" -->
+	<!--      height="20" -->
+	<!--      image_disabled="TextField_Search_Off" -->
+	<!--      image_disabled_selected="TextField_Search_Off" -->
+	<!--      image_hover_selected="TextField_Search_Off" -->
+	<!--      image_hover_unselected="TextField_Search_Off" -->
+	<!--      image_selected="TextField_Search_Off" -->
+	<!--      image_unselected="TextField_Search_Off" -->
+	<!--      layout="topleft" -->
+	<!--      left_pad="5" -->
+	<!--      mouse_opaque="false" -->
+	<!--      name="search_bg" -->
+	<!--      picture_style="true" -->
+	<!--      top_delta="0" -->
+	<!--      width="168" /> -->
+	    
+	    <search_editor
+	     bevel_style="none"
+	     border_style="line"
+	     border.border_thickness="0"
+	     commit_on_focus_lost="false"
+	     follows="right|top"
+	     halign="right"
+	     height="22"
+	     label="Search All"
+	     layout="topleft"
+	     left_pad="7"
+	     mouse_opaque="false"
+	     name="search_input"
+	     tool_tip="Search All"
+	     top_delta="0"
+	     width="200" />        
+	</panel>
+	
     <favorites_bar
      follows="left|right|top"
      height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index dc12bb7239..bccc04e30c 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -20,7 +20,6 @@
     height="23"
     follows="left|top|right"
     max_length="270"
-    label="Filter People"
     name="filter_input"
     font="SansSerif"
     background_image="TextField_Search_Off"
@@ -494,4 +493,10 @@
   <string name="no_groups">
     No groups
   </string>
+  <string name="people_filter_label">
+    Filter People
+  </string>
+  <string name="groups_filter_label">
+    Filter Groups
+  </string>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 7d2f76da5e..2a49db8d4f 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -181,7 +181,7 @@
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </text>
                   </panel>
-            <text
+            <link
              type="string"
              follows="left|top|right"
              font="SansSerifSmall"
@@ -191,9 +191,10 @@
              left="10"
              name="homepage_edit"
              text_color="HTMLLinkColor"
+             hover_color="0.5 0.4 1 1"
              width="280">
                 TODO
-            </text>
+            </link>
             <text
              type="string"
              follows="left|top"
@@ -286,7 +287,7 @@
                  word_wrap="true">
                     [FIRST] [LAST]
                 </text>
-                <text
+                <link
                  type="string"
                  follows="top|right"
                  font="SansSerifSmall"
@@ -295,10 +296,11 @@
                  left_delta="0"
                  name="partner_edit_link"
                  text_color="HTMLLinkColor"
+                 hover_color="0.5 0.4 1 1"
                  top_delta="15"
                  width="40">
                     Edit
-                </text>
+                </link>
             </panel>
             <text
              type="string"
@@ -336,7 +338,7 @@
              top_pad="30"
              name="account_actions_panel"
              width="200">
-                <text
+                <link
                  type="string"
                  follows="left|top"
                  font="SansSerif"
@@ -345,12 +347,12 @@
                  left="0"
                  name="payment_update_link"
                  text_color="HTMLLinkColor"
+                 hover_color="0.5 0.4 1 1"
                  top="0"
                  width="100">
                     Update
-                </text>
-                <text
-                 type="string"
+                </link>
+                <link
                  follows="left|top"
                  font="SansSerif"
                  height="15"
@@ -358,10 +360,11 @@
                  left="70"
                  name="my_account_link"
                  text_color="HTMLLinkColor"
+                 hover_color="0.5 0.4 1 1"
                  top="0"
                  width="80">
                     My Account
-                </text>
+                </link>
             </panel-->
 
 
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 8953633276..a7b66d8555 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -50,9 +50,16 @@
         filename="panel_profile_view.xml"
         border="true"
       />
+      <panel 
+        class="panel_group_info_sidetray" 
+        name="panel_group_info_sidetray" 
+        filename="panel_group_info_sidetray.xml" 
+        label="Group Info" 
+        border="true"
+      />
+
     </panel_container>
   </sidetray_tab>
-  <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
     name="sidebar_places"
     tab_title="Places"
@@ -82,94 +89,14 @@
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
       <panel 
-        class="panel_me_profile" 
+        class="panel_me_profile_view" 
         name="panel_me_profile" 
         filename="panel_me_profile.xml"
         label="Me" 
         border="true"
       />
   </sidetray_tab>
-  
   <!--
-  <sidetray_tab 
-    name="sidebar_group"
-    mouse_opaque="false" 
-    background_visible="true" 
-    bg_opaque_color="0.5 0.5 0.5 1.0"
-    image="icn_voice-groupfocus.tga"
-    tab_title="Groups"
-    description="Manage Groups."
-  >
-    <accordion_tab 
-      name="group_accordion" 
-      title="Group General"
-      expanded="true"
-      collapsible="true" 
-      min_width="200" 
-      min_height="200" 
-      header_visible="true"
-    >
-      <panel 
-        class="panel_group_general" 
-        name="panel_group_general" 
-        filename="panel_group_general.xml" 
-        label="Group" 
-        border="true"
-      />
-    </accordion_tab>
-     <accordion_tab 
-      name="groupland_accordion" 
-      title="Group Land and Money"
-      expanded="false"
-      collapsible="true" 
-      min_width="200" 
-      min_height="200" 
-      header_visible="true"
-    >
-      <panel 
-        class="panel_group_land" 
-        name="panel_group_land" 
-        filename="panel_group_land_money.xml" 
-        label="Group" 
-        border="true"
-      />
-    </accordion_tab>
-     <accordion_tab 
-      name="groupnotices_accordion" 
-      title="Group Notices"
-      expanded="false"
-      collapsible="true" 
-      min_width="200" 
-      min_height="200" 
-      header_visible="true"
-    >
-      <panel 
-        class="panel_group_roles" 
-        name="panel_group_roles" 
-        filename="panel_group_roles.xml" 
-        label="Group" 
-        border="true"
-      />
-    </accordion_tab>
-     <accordion_tab 
-      name="grouproles_accordion" 
-      title="Group Roles"
-      expanded="false"
-      collapsible="true" 
-      min_width="200" 
-      min_height="200" 
-      header_visible="true"
-    >
-      <panel 
-        class="panel_group_roles" 
-        name="panel_group_roles" 
-        filename="panel_group_roles.xml" 
-        label="Group" 
-        border="true"
-      />
-    </accordion_tab>
-  </sidetray_tab>  
-  
 
  <sidetray_tab 	
     name="sidebar_previews" 
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
new file mode 100644
index 0000000000..eccb919b04
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+
+<panel
+	name="sys_well_item"
+	title="sys_well_item"
+  visible="false"
+  top="0" 
+  left="0" 
+	width="318"
+	height="35"
+  layout="topleft"
+  follows="top"
+  background_opaque="false"
+  background_visible="true"
+  bg_alpha_color="0.0 0.0 0.0 0.0" >
+
+  <icon
+    top="8"
+    left="8"
+    width="20"
+    height="20"
+    layout="topleft"
+    follows="left"
+    name="icon"
+    label=""
+    mouse_opaque="false"
+    image_name="lag_status_warning.tga" 
+    />
+
+  <text
+    top="2" 
+    left_pad="8" 
+    width="255" 
+    height="28" 
+    layout="topleft"
+    follows="right|left"
+    font="SansSerifBold" 
+    text_color="white"
+    use_ellipses="true" 
+    word_wrap="true"
+    mouse_opaque="false"
+    name="title" >
+    Select your streaming media preference. Select your streaming media preference.
+  </text>  
+  
+  <button
+    top="5" 
+    left_pad="5" 
+    width="15" 
+    height="15" 
+    layout="topleft"
+    follows="right"
+    name="close_btn" 
+    mouse_opaque="true"
+    label=""
+    image_unselected="toast_hide_btn.tga" 
+    image_disabled="toast_hide_btn.tga"
+    image_selected="toast_hide_btn.tga" 
+    image_hover_selected="toast_hide_btn.tga"
+    image_disabled_selected="toast_hide_btn.tga" 
+  />
+
+</panel> 
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index ba4915e074..f7d8cf948e 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
 
-<panel
+<floater
 	name="toast"
-	title="toast"
+	title=""
   visible="false"
   layout="topleft"
 	width="350"
@@ -14,6 +14,12 @@
   background_opaque="true"
   background_visible="true"
   bevel_style="in"
+  can_minimize="false"
+  can_tear_off="false"
+  can_resize="false"
+  can_drag_on_left="false"
+  can_close="false"
+  can_dock="false"  
   bg_alpha_color="0.3 0.3 0.3 1.0">
 
   <text
@@ -62,4 +68,4 @@
     image_hover_selected="toast_hide_btn.tga"
     image_disabled_selected="toast_hide_btn.tga"
   />
-</panel> 
+</floater> 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fb3d3b4dea..ec4898448a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -320,7 +320,14 @@
 	<string name="GroupNotifyViewPastNotices">View past notices or opt-out of receiving these messages here.</string>
 	<string name="GroupNotifyOpenAttachment">Open Attachment</string>
 	<string name="GroupNotifySaveAttachment">Save Attachment</string>
-	
+  <string name="TeleportOffer">Teleport offering</string>
+  <!-- start-up toast's string-->
+  <string name="StartUpNotification">%d new notification arrived while you were away...</string>
+  <string name="StartUpNotifications">%d new notifications arrived while you were away...</string>
+  <!-- overflow toast's string-->
+  <string name="OverflowInfoChannelString">You have %d more notification</string>
+  
+  
 	<!-- body parts -->
 	<string name="BodyPartsRightArm">Right Arm</string>
 	<string name="BodyPartsHead">Head</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index eb9bb99b20..777651c452 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -42,7 +42,7 @@
   <combo_list bg_writeable_color="MenuDefaultBgColor"/>
   <combo_editor name="Combo Text Entry"
                 text_pad_left="20"
-                select_on_focus="true"
+                select_on_focus="false"
                 font="SansSerifSmall"
                 bevel_style="none"
                 border_style="line"
-- 
cgit v1.3


From 73caee4208a4e05f66583de099502012fd8415ea Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 14 Aug 2009 21:50:02 +0000
Subject: svn merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 ->
 viewer-2.0.0-3 EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342
 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414
 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496

---
 indra/llrender/llfontgl.cpp                        |   4 +-
 indra/llui/llmenugl.cpp                            |  15 ---
 indra/llui/llmenugl.h                              |   3 -
 indra/llui/llscrollingpanellist.cpp                |  23 +++-
 indra/llui/llscrollingpanellist.h                  |   3 +
 indra/llui/llview.cpp                              |   9 +-
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/app_settings/settings.xml            |  13 +-
 indra/newview/llagent.cpp                          |   7 +
 indra/newview/llagent.h                            |   1 +
 indra/newview/llbottomtray.cpp                     |  16 ++-
 indra/newview/llbottomtray.h                       |   3 +
 indra/newview/llchatitemscontainerctrl.cpp         |   4 +-
 indra/newview/llchiclet.cpp                        |  43 ++++--
 indra/newview/llchiclet.h                          |  28 ++++
 indra/newview/llfavoritesbar.cpp                   | 114 +++++++++++++++-
 indra/newview/llfavoritesbar.h                     |  12 +-
 indra/newview/llgroupactions.cpp                   | 129 ------------------
 indra/newview/llgroupactions.h                     |   5 -
 indra/newview/lllandmarkactions.cpp                | 140 +++++++++++++++++--
 indra/newview/lllandmarkactions.h                  | 119 ++++++++++------
 indra/newview/lllocationinputctrl.cpp              | 139 +++++++++++++++++--
 indra/newview/lllocationinputctrl.h                |   9 +-
 indra/newview/llmoveview.cpp                       |   2 +
 indra/newview/llnavigationbar.cpp                  | 137 +++----------------
 indra/newview/llnavigationbar.h                    |   4 -
 indra/newview/llnearbychat.cpp                     |   8 ++
 indra/newview/llpanelgroup.cpp                     |  54 +++++---
 indra/newview/llpanelpeople.cpp                    | 149 +++++++++++++--------
 indra/newview/llpanelpeople.h                      |  10 +-
 indra/newview/llpanelteleporthistory.cpp           |   2 +-
 indra/newview/llscreenchannel.cpp                  |  20 +--
 indra/newview/llslurl.cpp                          |  13 ++
 indra/newview/llslurl.h                            |   5 +
 indra/newview/llstartup.cpp                        |  61 ++++++++-
 indra/newview/llsyswellitem.cpp                    |  10 +-
 indra/newview/llsyswellwindow.cpp                  |  50 ++++---
 indra/newview/llsyswellwindow.h                    |  11 +-
 indra/newview/lltoast.cpp                          |   7 +-
 indra/newview/lltoast.h                            |   4 -
 indra/newview/lltoastpanel.cpp                     |  12 +-
 indra/newview/llviewermenu.cpp                     |   9 +-
 indra/newview/llviewerwindow.cpp                   |   1 +
 indra/newview/llviewerwindow.h                     |   6 +
 indra/newview/skins/default/colors.xml             |   7 +
 .../skins/default/xui/en/favorites_bar_button.xml  |   2 +-
 .../skins/default/xui/en/floater_activeim.xml      |  30 +++++
 .../skins/default/xui/en/floater_nearby_chat.xml   |   1 +
 .../skins/default/xui/en/floater_sys_well.xml      |  81 ++---------
 .../skins/default/xui/en/menu_favorites.xml        |  54 ++++++--
 .../skins/default/xui/en/menu_hide_navbar.xml      |  33 +++++
 indra/newview/skins/default/xui/en/menu_navbar.xml |   9 +-
 .../skins/default/xui/en/panel_activeim_row.xml    |  47 +++++++
 .../skins/default/xui/en/panel_bottomtray.xml      |   2 +
 .../default/xui/en/panel_group_info_sidetray.xml   |   4 +-
 .../skins/default/xui/en/panel_navigation_bar.xml  |   1 +
 .../newview/skins/default/xui/en/panel_people.xml  | 119 +++++++++-------
 .../newview/skins/default/xui/en/panel_places.xml  | 131 ++++++++++--------
 .../skins/default/xui/en/panel_sys_well_item.xml   |   2 +-
 .../default/xui/en/panel_teleport_history.xml      |   2 +-
 indra/newview/skins/default/xui/en/strings.xml     |   2 +
 61 files changed, 1225 insertions(+), 718 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_activeim.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_hide_navbar.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_activeim_row.xml

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 32a008047c..177e13e27c 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -231,7 +231,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 
 
 	BOOL draw_ellipses = FALSE;
-	if (use_ellipses && halign == LEFT)
+	if (use_ellipses)
 	{
 		// check for too long of a string
 		if (getWidthF32(wstr.c_str(), 0, max_chars) * sScaleX > scaled_max_pixels)
@@ -398,9 +398,9 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 		gGL.end();
 	}
 
-	// *FIX: get this working in all alignment cases, etc.
 	if (draw_ellipses)
 	{
+		
 		// recursively render ellipses at end of string
 		// we've already reserved enough room
 		gGL.pushMatrix();
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index e5c32846a0..b51884f8c0 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3003,21 +3003,6 @@ BOOL LLMenuBarGL::handleMouseDown(S32 x, S32 y, MASK mask)
 	return LLMenuGL::handleMouseDown(x, y, mask);
 }
 
-/*
-BOOL LLMenuBarGL::handleRightMouseDown(S32 x, S32 y, MASK mask)
-{
-	// clicks on menu bar closes existing menus from other contexts but leave
-	// own menu open so that we get toggle behavior
-	if (!getHighlightedItem() || !getHighlightedItem()->isActive())
-	{
-		LLMenuGL::sMenuContainer->hideMenus();
-	}
-
-	return LLMenuGL::handleMouseDown(x, y, mask);
-}
-*/
-
-
 void LLMenuBarGL::draw()
 {
 	LLMenuItemGL* itemp = getHighlightedItem();
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 930276f7bc..1058877d10 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -709,9 +709,6 @@ public:
 	/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
 	/*virtual*/ BOOL handleJumpKey(KEY key);
 	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-//	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
-
-
 
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL jumpKeysActive();
diff --git a/indra/llui/llscrollingpanellist.cpp b/indra/llui/llscrollingpanellist.cpp
index 0159cdd12c..13fbe1d576 100644
--- a/indra/llui/llscrollingpanellist.cpp
+++ b/indra/llui/llscrollingpanellist.cpp
@@ -55,8 +55,6 @@ void LLScrollingPanelList::addPanel( LLScrollingPanel* panel )
 	addChildInBack( panel );
 	mPanelList.push_front( panel );
 
-	const S32 GAP_BETWEEN_PANELS = 6;
-
 	// Resize this view
 	S32 total_height = 0;
 	S32 max_width = 0;
@@ -83,6 +81,27 @@ void LLScrollingPanelList::addPanel( LLScrollingPanel* panel )
 	}
 }
 
+void LLScrollingPanelList::removePanel(LLScrollingPanel* panel) 
+{
+	U32 index = 0;
+	LLScrollingPanelList::panel_list_t::const_iterator iter;
+
+	if (!mPanelList.empty()) 
+	{
+		for (iter = mPanelList.begin(); iter != mPanelList.end(); ++iter, ++index) 
+		{
+			if (*iter == panel) 
+			{
+				break;
+			}
+		}
+		if(iter != mPanelList.end())
+		{
+			removePanel(index);
+		}
+	}
+}
+
 void LLScrollingPanelList::removePanel( U32 panel_index )
 {
 	if ( mPanelList.empty() || panel_index >= mPanelList.size() )
diff --git a/indra/llui/llscrollingpanellist.h b/indra/llui/llscrollingpanellist.h
index 5dc23facda..9da15822d0 100644
--- a/indra/llui/llscrollingpanellist.h
+++ b/indra/llui/llscrollingpanellist.h
@@ -68,6 +68,8 @@ public:
 	:	LLUICtrl(p) 
 	{}
 	
+	static const S32 GAP_BETWEEN_PANELS = 6;
+
 	typedef std::deque<LLScrollingPanel*>	panel_list_t;
 
 	virtual void setValue(const LLSD& value) {};
@@ -76,6 +78,7 @@ public:
 
 	void				clearPanels();
 	void				addPanel( LLScrollingPanel* panel );
+	void				removePanel( LLScrollingPanel* panel );
 	void				removePanel( U32 panel_index );
 	void				updatePanels(BOOL allow_modify);
 	const panel_list_t&	getPanelList() { return mPanelList; }
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index e3b61dfaa2..0ba028e1c8 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -947,16 +947,11 @@ BOOL LLView::handleDoubleClick(S32 x, S32 y, MASK mask)
 
 BOOL LLView::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	BOOL handled = FALSE;
 	if( getVisible() && getEnabled() )
 	{
-		handled = childrenHandleScrollWheel( x, y, clicks ) != NULL;
-		if( !handled && blockMouseEvent(x, y) )
-		{
-			handled = TRUE;
-		}
+		return childrenHandleScrollWheel( x, y, clicks ) != NULL;
 	}
-	return handled;
+	return FALSE;
 }
 
 BOOL LLView::handleRightMouseDown(S32 x, S32 y, MASK mask)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e52b523a7f..58d7a983a2 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -65,6 +65,7 @@ include_directories(
 set(viewer_SOURCE_FILES
     llaccordionctrltab.cpp
     llaccordionctrl.cpp
+    llactiveimwindow.cpp
     llagent.cpp
     llagentaccess.cpp
     llagentdata.cpp
@@ -508,6 +509,7 @@ set(viewer_HEADER_FILES
     ViewerInstall.cmake
     llaccordionctrltab.h
     llaccordionctrl.h
+    llactiveimwindow.h
     llagent.h
     llagentaccess.h
     llagentdata.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f42ce2136f..06873c599c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3216,7 +3216,7 @@
       <key>Value</key>
       <array>
         <real>1.5</real>
-        <real>0.5</real>
+        <real>0.7</real>
         <real>1.0</real>
       </array>
     </map>
@@ -9727,16 +9727,5 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>GroupTeleportMembersLimit</key>
-    <map>
-      <key>Comment</key>
-      <string>Max number of members of group to offer teleport</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>U32</string>
-      <key>Value</key>
-      <integer>100</integer>
-    </map>
   </map>
 </llsd>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 513988789b..4166d96219 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -5272,6 +5272,7 @@ BOOL LLAgent::buildLocationString(std::string& str, ELocationFormat fmt)
 		case LOCATION_FORMAT_NORMAL:
 			buffer = llformat("%s", region_name.c_str());
 			break;
+		case LOCATION_FORMAT_WITHOUT_SIM:
 		case LOCATION_FORMAT_FULL:
 			buffer = llformat("%s (%d, %d, %d)",
 							  region_name.c_str(),
@@ -5292,6 +5293,12 @@ BOOL LLAgent::buildLocationString(std::string& str, ELocationFormat fmt)
 							  region_name.c_str(),
 							  parcel_name.c_str());
 			break;
+		case LOCATION_FORMAT_WITHOUT_SIM:
+			buffer = llformat("%s, %s (%d, %d, %d)",
+									  region_name.c_str(),
+									  parcel_name.c_str(),
+									  pos_x, pos_y, pos_z);
+			break;
 		case LOCATION_FORMAT_FULL:
 			std::string sim_access_string = region->getSimAccessString();
 			buffer = llformat("%s, %s (%d, %d, %d)%s%s",
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index ff9e7f574f..3a8cf5fd97 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -268,6 +268,7 @@ public:
 	{
 		LOCATION_FORMAT_NORMAL,
 		LOCATION_FORMAT_LANDMARK,
+		LOCATION_FORMAT_WITHOUT_SIM,
 		LOCATION_FORMAT_FULL,
 	};
 	void			setRegion(LLViewerRegion *regionp);
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index bfb2d26870..2687feb68b 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -42,6 +42,7 @@
 #include "llsplitbutton.h"
 #include "llfloatercamera.h"
 #include "llimpanel.h"
+#include "llactiveimwindow.h"
 
 LLBottomTray::LLBottomTray(const LLSD&)
 :	mChicletPanel(NULL),
@@ -75,6 +76,8 @@ LLBottomTray::LLBottomTray(const LLSD&)
 
 	// Necessary for focus movement among child controls
 	setFocusRoot(TRUE);
+
+	LLActiveIMWindow::init(mIMWell);
 }
 
 BOOL LLBottomTray::postBuild()
@@ -104,8 +107,10 @@ void LLBottomTray::onChicletClick(LLUICtrl* ctrl)
 
 		// Show after comm window so it is frontmost (and hence will not
 		// auto-hide)
-		LLIMFloater::show(chiclet->getSessionId());
-		chiclet->setCounter(0);
+
+// this logic has been moved to LLIMChiclet::handleMouseDown
+//		LLIMFloater::show(chiclet->getSessionId());
+//		chiclet->setCounter(0);
 	}
 }
 
@@ -130,6 +135,7 @@ void LLBottomTray::sessionAdded(const LLUUID& session_id, const std::string& nam
 			chiclet->setOtherParticipantId(other_participant_id);
 		}
 	}
+	updateImChicletCount();
 }
 
 //virtual
@@ -139,6 +145,7 @@ void LLBottomTray::sessionRemoved(const LLUUID& session_id)
 	{
 		getChicletPanel()->removeChiclet(session_id);
 	}
+	updateImChicletCount();
 }
 
 //virtual
@@ -177,3 +184,8 @@ void LLBottomTray::setVisible(BOOL visible)
 		}
 	}
 }
+
+void LLBottomTray::updateImChicletCount() {
+	U32 chicletCount = mChicletPanel->getChicletCount();
+	mIMWell->setCounter(chicletCount);
+}
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index fec533f9f3..7f606339bc 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -68,6 +68,9 @@ public:
 	virtual void onFocusLost();
 	virtual void setVisible(BOOL visible);
 
+private:
+	void updateImChicletCount();
+
 protected:
 
 	LLBottomTray(const LLSD& key = LLSD());
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index a63477a442..45b322e106 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -246,7 +246,9 @@ void	LLChatItemCtrl::setHeaderVisibility(EShowItemHeader e)
 
 bool	LLChatItemCtrl::canAddText	()
 {
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
+	LLChatMsgBox* msg_text = findChild<LLChatMsgBox>("msg_text");
+	if(!msg_text)
+		return false;
 	return msg_text->getTextLinesNum()<10;
 }
 
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 80e27bd366..d98f03eccb 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -54,6 +54,9 @@ static LLDefaultChildRegistry::Register<LLTalkButton> t2("chiclet_talk");
 static LLDefaultChildRegistry::Register<LLNotificationChiclet> t3("chiclet_notification");
 static LLDefaultChildRegistry::Register<LLIMChiclet> t4("chiclet_im");
 
+boost::signals2::signal<LLChiclet* (const LLUUID&),
+		LLIMChiclet::CollectChicletCombiner<std::list<LLChiclet*> > >
+		LLIMChiclet::sFindChicletsSignal;
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
@@ -290,6 +293,16 @@ void LLIMChiclet::setOtherParticipantId(const LLUUID& other_participant_id)
 	}
 }
 
+LLUUID LLIMChiclet::getOtherParticipantId()
+{
+	LLUUID res = LLUUID::null;
+	if (mAvatarCtrl)
+	{
+		res = mAvatarCtrl->getAvatarId();
+	}
+	return res;
+}
+
 void LLIMChiclet::updateMenuItems()
 {
 	if(!mPopupMenu)
@@ -306,6 +319,13 @@ void LLIMChiclet::updateMenuItems()
 	}
 }
 
+BOOL LLIMChiclet::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	LLIMFloater::show(getSessionId());
+	setCounter(0);
+	return LLChiclet::handleMouseDown(x, y, mask);
+}
+
 void LLIMChiclet::setShowSpeaker(bool show)
 {
 	bool needs_resize = getShowSpeaker() != show;
@@ -491,16 +511,20 @@ LLChicletPanel::~LLChicletPanel()
 void im_chiclet_callback(LLChicletPanel* panel, const LLSD& data){
 	
 	LLUUID session_id = data["session_id"].asUUID();
-	LLChiclet* chiclet = panel->findChiclet<LLChiclet>(session_id);
-
-	if (chiclet)
-	{
-		chiclet->setCounter(data["num_unread"].asInteger());
+	std::list<LLChiclet*> chiclets = LLIMChiclet::sFindChicletsSignal(session_id);
+	std::list<LLChiclet *>::iterator iter;
+	for (iter = chiclets.begin(); iter != chiclets.end(); iter++) {
+		LLChiclet* chiclet = *iter;
+		if (chiclet != NULL)
+		{
+			chiclet->setCounter(data["num_unread"].asInteger());
+		}
+	    else
+	    {
+	    	llwarns << "Unable to set counter for chiclet " << session_id << llendl;
+	    }
 	}
-    else
-    {
-    	llwarns << "Unable to set counter for chiclet " << session_id << llendl;
-    }
+
 }
 
 
@@ -508,6 +532,7 @@ BOOL LLChicletPanel::postBuild()
 {
 	LLPanel::postBuild();
 	LLIMModel::instance().addChangedCallback(boost::bind(im_chiclet_callback, this, _1));
+	LLIMChiclet::sFindChicletsSignal.connect(boost::bind(&LLChicletPanel::findChiclet<LLChiclet>, this, _1));
 
 	return TRUE;
 }
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 103443ccd8..f66d799c25 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -263,6 +263,11 @@ public:
 	*/
 	virtual void setOtherParticipantId(const LLUUID& other_participant_id);
 
+	/*
+	 * Gets id of person/group user is chatting with.
+	 */
+	virtual LLUUID getOtherParticipantId();
+
 	/*
 	 * Shows/hides voice chat status control.
 	*/
@@ -326,6 +331,8 @@ protected:
 	*/
 	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
 
+	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+
 protected:
 	LLChicletAvatarIconCtrl* mAvatarCtrl;
 	LLChicletNotificationCounterCtrl* mCounterCtrl;
@@ -334,6 +341,27 @@ protected:
 	LLMenuGL* mPopupMenu;
 
 	bool mShowSpeaker;
+
+	template<typename Container>
+	struct CollectChicletCombiner {
+		typedef Container result_type;
+
+		template<typename InputIterator>
+		Container operator()(InputIterator first, InputIterator last) const {
+			Container c = Container();
+			for (InputIterator iter = first; iter != last; iter++) {
+				if (*iter != NULL) {
+					c.push_back(*iter);
+				}
+			}
+			return c;
+		}
+	};
+
+public:
+	static boost::signals2::signal<LLChiclet* (const LLUUID&),
+			CollectChicletCombiner<std::list<LLChiclet*> > >
+			sFindChicletsSignal;
 };
 
 /*
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 9cb3ea127f..9dfc7bcee7 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -41,8 +41,12 @@
 #include "llmenugl.h"
 
 #include "llagent.h"
+#include "llclipboard.h"
+#include "llinventoryclipboard.h"
 #include "llinventorybridge.h"
 #include "llinventorymodel.h"
+#include "llfloaterworldmap.h"
+#include "lllandmarkactions.h"
 #include "llsidetray.h"
 #include "lltoggleablemenu.h"
 #include "llviewerinventory.h"
@@ -71,11 +75,17 @@ struct LLFavoritesSort
 	}
 };
 
+LLFavoritesBarCtrl::Params::Params()
+: chevron_button_tool_tip("chevron_button_tool_tip")
+{
+}
+
 LLFavoritesBarCtrl::LLFavoritesBarCtrl(const LLFavoritesBarCtrl::Params& p)
 :	LLUICtrl(p),
 	mFont(p.font.isProvided() ? p.font() : LLFontGL::getFontSansSerifSmall()),
 	mPopupMenuHandle(),
-	mInventoryItemsPopupMenuHandle()
+	mInventoryItemsPopupMenuHandle(),
+	mChevronButtonToolTip(p.chevron_button_tool_tip)
 {
 	// Register callback for menus with current registrar (will be parent panel's registrar)
 	LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Favorites.DoToSelected",
@@ -314,6 +324,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 			bparams.tab_stop(false);
 			bparams.font(mFont);
 			bparams.name(">>");
+			bparams.tool_tip(mChevronButtonToolTip);
 			bparams.click_callback.function(boost::bind(&LLFavoritesBarCtrl::showDropDownMenu, this));
 
 			addChildInBack(LLUICtrlFactory::create<LLButton> (bparams));
@@ -548,6 +559,12 @@ void LLFavoritesBarCtrl::onButtonRightClick( LLUUID item_id,LLView* fav_button,S
 	LLMenuGL::showPopup(fav_button, menu, x, y);
 }
 
+void copy_slurl_to_clipboard_cb(const LLVector3d& posGlobal, std::string& slurl)
+{
+	gClipboard.copyFromString(utf8str_to_wstring(slurl));
+}
+
+
 void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata)
 {
 	std::string action = userdata.asString();
@@ -569,13 +586,102 @@ void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata)
 
 		LLSideTray::getInstance()->showPanel("panel_places", key);
 	}
-	else if (action == "rename")
+	else if (action == "copy_slurl")
 	{
-		// Would need to re-implement this:
-		// folder->startRenamingSelectedItem();
+		LLVector3d posGlobal;
+		LLLandmarkActions::getLandmarkGlobalPos(mSelectedItemID, posGlobal);
+
+		if (!posGlobal.isExactlyZero())
+		{
+			LLLandmarkActions::getSLURLfromPosGlobal(posGlobal, copy_slurl_to_clipboard_cb);
+		}
+	}
+	else if (action == "show_on_map")
+	{
+		LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+
+		LLVector3d posGlobal;
+		LLLandmarkActions::getLandmarkGlobalPos(mSelectedItemID, posGlobal);
+
+		if (!posGlobal.isExactlyZero() && worldmap_instance)
+		{
+			worldmap_instance->trackLocation(posGlobal);
+			LLFloaterReg::showInstance("world_map", "center");
+		}
+	}
+	else if (action == "cut")
+	{
+	}
+	else if (action == "copy")
+	{
+		LLInventoryClipboard::instance().add(mSelectedItemID);
+	}
+	else if (action == "paste")
+	{
+		pastFromClipboard();
 	}
 	else if (action == "delete")
 	{
 		gInventory.removeItem(mSelectedItemID);
 	}
 }
+
+BOOL LLFavoritesBarCtrl::isClipboardPasteable() const
+{
+	if (!LLInventoryClipboard::instance().hasContents())
+	{
+		return FALSE;
+	}
+
+	LLDynamicArray<LLUUID> objects;
+	LLInventoryClipboard::instance().retrieve(objects);
+	S32 count = objects.count();
+	for(S32 i = 0; i < count; i++)
+	{
+		const LLUUID &item_id = objects.get(i);
+
+		// Can't paste folders
+		const LLInventoryCategory *cat = gInventory.getCategory(item_id);
+		if (cat)
+		{
+			return FALSE;
+		}
+
+		const LLInventoryItem *item = gInventory.getItem(item_id);
+		if (item && LLAssetType::AT_LANDMARK != item->getType())
+		{
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+void LLFavoritesBarCtrl::pastFromClipboard() const
+{
+	LLInventoryModel* model = &gInventory;
+	if(model && isClipboardPasteable())
+	{
+		LLInventoryItem* item = NULL;
+		LLDynamicArray<LLUUID> objects;
+		LLInventoryClipboard::instance().retrieve(objects);
+		S32 count = objects.count();
+		LLUUID parent_id(mFavoriteFolderId);
+		for(S32 i = 0; i < count; i++)
+		{
+			item = model->getItem(objects.get(i));
+			if (item)
+			{
+				copy_inventory_item(
+					gAgent.getID(),
+					item->getPermissions().getOwner(),
+					item->getUUID(),
+					parent_id,
+					std::string(),
+					LLPointer<LLInventoryCallback>(NULL));
+			}
+		}
+	}
+}
+
+
+// EOF
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
index 7da33e2f6e..824b396add 100644
--- a/indra/newview/llfavoritesbar.h
+++ b/indra/newview/llfavoritesbar.h
@@ -40,7 +40,12 @@
 class LLFavoritesBarCtrl : public LLUICtrl, public LLInventoryObserver
 {
 public:
-	struct Params : public LLUICtrl::Params{};
+	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+	{
+		Optional<std::string> chevron_button_tool_tip;
+		Params();
+	};
+
 protected:
 	LLFavoritesBarCtrl(const Params&);
 	friend class LLUICtrlFactory;
@@ -69,6 +74,9 @@ protected:
 	void onButtonRightClick(LLUUID id,LLView* button,S32 x,S32 y,MASK mask);
 	
 	void doToSelected(const LLSD& userdata);
+	BOOL isClipboardPasteable() const;
+	void pastFromClipboard() const;
+
 	
 	void showDropDownMenu();
 
@@ -84,6 +92,8 @@ protected:
 
 	LLUUID mSelectedItemID;
 	LLRect mChevronRect;
+
+	std::string mChevronButtonToolTip;
 };
 
 
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index b14f23f9cf..7af77e2056 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -38,9 +38,6 @@
 #include "llagent.h"
 #include "llfloaterreg.h"
 #include "llimview.h" // for gIMMgr
-#include "llgroupmgr.h"
-#include "llavataractions.h"
-#include "llviewercontrol.h"
 #include "llsidetray.h"
 
 #include "llcommandhandler.h"
@@ -103,126 +100,6 @@ public:
 };
 LLGroupHandler gGroupHandler;
 
-
-
-// LLGroupActions::teleport helper
-//
-// Method is offerTeleport should be called.
-// First it checks, whether LLGroupMgr contains LLGroupMgrGroupData for this group already.
-// If it's there, processMembersList can be called, which builds vector of ID's for online members and
-// calls LLAvatarActions::offerTeleport.
-// If LLGroupMgr doesn't contain LLGroupMgrGroupData, then ID of group should be saved in
-// mID or queue, if mID is not empty. After that processQueue uses ID from mID or queue,
-// registers LLGroupTeleporter as observer at LLGroupMgr and sends request for group members.
-// LLGroupMgr notifies about response on this request by calling method 'changed'.
-// It calls processMembersList, sets mID to null, to indicate that current group is processed,
-// and calls processQueue to process remaining groups.
-// The reason of calling of LLGroupMgr::addObserver and LLGroupMgr::removeObserver in
-// processQueue and 'changed' methods is that LLGroupMgr notifies observers of only particular group,
-// so, for each group mID should be updated and addObserver/removeObserver is called.
-
-class LLGroupTeleporter : public LLGroupMgrObserver
-{
-public:
-	LLGroupTeleporter() : LLGroupMgrObserver(LLUUID()) {}
-
-	void offerTeleport(const LLUUID& group_id);
-
-	// LLGroupMgrObserver trigger
-	virtual void changed(LLGroupChange gc);
-private:
-	void processQueue();
-	void processMembersList(LLGroupMgrGroupData* gdatap);
-
-	std::queue<LLUUID> mGroupsQueue;
-};
-
-void LLGroupTeleporter::offerTeleport(const LLUUID& group_id)
-{
-	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id);
-
-	if (!gdatap || !gdatap->isMemberDataComplete())
-	{
-		if (mID.isNull())
-			mID = group_id;
-		else
-			// Not null mID means that user requested next group teleport before
-			// previous group is processed, so this group goes to queue
-			mGroupsQueue.push(group_id);
-
-		processQueue();
-	}
-	else
-	{
-		processMembersList(gdatap);
-	}
-}
-
-// Sends request for group in mID or one group in queue
-void LLGroupTeleporter::processQueue()
-{
-	// Get group from queue, if mID is empty
-	if (mID.isNull() && !mGroupsQueue.empty())
-	{
-		mID = mGroupsQueue.front();
-		mGroupsQueue.pop();
-	}
-
-	if (mID.notNull())
-	{
-		LLGroupMgr::getInstance()->addObserver(this);
-		LLGroupMgr::getInstance()->sendGroupMembersRequest(mID);
-	}
-}
-
-// Collects all online members of group and offers teleport to them
-void LLGroupTeleporter::processMembersList(LLGroupMgrGroupData* gdatap)
-{
-	U32 limit = gSavedSettings.getU32("GroupTeleportMembersLimit");
-
-	LLDynamicArray<LLUUID> ids;
-	for (LLGroupMgrGroupData::member_list_t::iterator iter = gdatap->mMembers.begin(); iter != gdatap->mMembers.end(); iter++)
-	{
-		LLGroupMemberData* member = iter->second;
-		if (!member)
-			continue;
-
-		if (member->getID() == gAgent.getID())
-			// No need to teleport own avatar
-			continue;
-
-		if (member->getOnlineStatus() == "Online")
-			ids.push_back(member->getID());
-
-		if ((U32)ids.size() >= limit)
-			break;
-	}
-
-	LLAvatarActions::offerTeleport(ids);
-}
-
-// LLGroupMgrObserver trigger
-void LLGroupTeleporter::changed(LLGroupChange gc)
-{
-	if (gc == GC_MEMBER_DATA)
-	{
-		LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mID);
-
-		if (gdatap && gdatap->isMemberDataComplete())
-			processMembersList(gdatap);
-
-		LLGroupMgr::getInstance()->removeObserver(this);
-
-		// group in mID is processed
-		mID.setNull();
-
-		// process other groups in queue, if any
-		processQueue();
-	}
-}
-
-static LLGroupTeleporter sGroupTeleporter;
-
 // static
 void LLGroupActions::search()
 {
@@ -348,12 +225,6 @@ void LLGroupActions::startChat(const LLUUID& group_id)
 	}
 }
 
-// static
-void LLGroupActions::offerTeleport(const LLUUID& group_id)
-{
-	sGroupTeleporter.offerTeleport(group_id);
-}
-
 //-- Private methods ----------------------------------------------------------
 
 // static
diff --git a/indra/newview/llgroupactions.h b/indra/newview/llgroupactions.h
index 70170d3cfe..eb366bd779 100644
--- a/indra/newview/llgroupactions.h
+++ b/indra/newview/llgroupactions.h
@@ -81,11 +81,6 @@ public:
 	 * Start group instant messaging session.
 	 */
 	static void startChat(const LLUUID& group_id);
-
-	/**
-	 * Offers teleport for online members of group
-	 */
-	static void offerTeleport(const LLUUID& group_id);
 	
 private:
 	static bool onLeaveGroup(const LLSD& notification, const LLSD& response);
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp
index b51064f226..608b9b20e6 100644
--- a/indra/newview/lllandmarkactions.cpp
+++ b/indra/newview/lllandmarkactions.cpp
@@ -33,16 +33,23 @@
 #include "llviewerprecompiledheaders.h"
 #include "lllandmarkactions.h"
 
-#include "llagent.h"
+#include "roles_constants.h"
+
 #include "llinventory.h"
-#include "llinventorymodel.h"
 #include "lllandmark.h"
-#include "lllandmarklist.h"
-#include "llnotifications.h"
 #include "llparcel.h"
+
+#include "llnotifications.h"
+
+#include "llagent.h"
+#include "llinventorymodel.h"
+#include "lllandmarklist.h"
+#include "llslurl.h"
 #include "llviewerinventory.h"
 #include "llviewerparcelmgr.h"
-#include "roles_constants.h"
+#include "llworldmap.h"
+#include "lllandmark.h"
+#include "llinventorymodel.h"
 
 // Returns true if the given inventory item is a landmark pointing to the current parcel.
 // Used to filter inventory items.
@@ -66,18 +73,53 @@ public:
 	}
 };
 
-bool LLLandmarkActions::landmarkAlreadyExists()
+class LLFetchLandmarksByName : public LLInventoryCollectFunctor
+{
+private:
+	std::string name;
+
+public:
+LLFetchLandmarksByName(std::string &landmark_name)
+:name(landmark_name)
+	{
+	}
+
+public:
+	/*virtual*/ bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+	{
+		if (!item || item->getType() != LLAssetType::AT_LANDMARK)
+			return false;
+
+		LLLandmark* landmark = gLandmarkList.getAsset(item->getAssetUUID());
+		if (!landmark) // the landmark not been loaded yet
+			return false;
+
+		if (item->getName() == name)
+		{
+			return true;
+		}
+
+		return false;
+	}
+};
+
+LLInventoryModel::item_array_t LLLandmarkActions::fetchLandmarksByName(std::string& name)
 {
-	// Determine whether there are landmarks pointing to the current parcel.
 	LLInventoryModel::cat_array_t cats;
 	LLInventoryModel::item_array_t items;
-	LLIsAgentParcelLandmark is_current_parcel_landmark;
+	LLFetchLandmarksByName fetchLandmarks(name);
 	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
-		cats,
-		items,
-		LLInventoryModel::EXCLUDE_TRASH,
-		is_current_parcel_landmark);
-
+			cats,
+			items,
+			LLInventoryModel::EXCLUDE_TRASH,
+			fetchLandmarks);
+	return items;
+}
+bool LLLandmarkActions::landmarkAlreadyExists()
+{
+	// Determine whether there are landmarks pointing to the current parcel.
+	LLInventoryModel::item_array_t items;
+	collectParcelLandmark(items);
 	return !items.empty();
 }
 
@@ -139,3 +181,75 @@ void LLLandmarkActions::createLandmarkHere()
 
 	createLandmarkHere(landmark_name, landmark_desc, folder_id);
 }
+
+void LLLandmarkActions::getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_signal_t signal)
+{
+	std::string sim_name;
+	bool gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal(global_pos, sim_name);
+	if (gotSimName)
+	{
+		std::string slurl = LLSLURL::buildSLURLfromPosGlobal(sim_name, global_pos);
+
+		signal(global_pos, slurl);
+
+		return;
+	}
+	else
+	{
+		U64 new_region_handle = to_region_handle(global_pos);
+
+		LLWorldMap::url_callback_t cb = boost::bind(&LLLandmarkActions::onRegionResponse,
+													signal,
+													global_pos,
+													_1, _2, _3, _4);
+
+		LLWorldMap::getInstance()->sendHandleRegionRequest(new_region_handle, cb, std::string("unused"), false);
+	}
+}
+
+void LLLandmarkActions::onRegionResponse(slurl_signal_t signal,
+										 const LLVector3d& global_pos,
+										 U64 region_handle,
+										 const std::string& url,
+										 const LLUUID& snapshot_id,
+										 bool teleport)
+{
+	std::string sim_name;
+	std::string slurl;
+	bool gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal(global_pos, sim_name);
+	if (gotSimName)
+	{
+		slurl = LLSLURL::buildSLURLfromPosGlobal(sim_name, global_pos);
+	}
+	else
+	{
+		slurl = "";
+	}
+
+	signal(global_pos, slurl);
+}
+
+bool LLLandmarkActions::getLandmarkGlobalPos(const LLUUID& landmarkInventoryItemID, LLVector3d& posGlobal)
+{
+	LLViewerInventoryItem* item = gInventory.getItem(landmarkInventoryItemID);
+	if (NULL == item)
+		return false;
+
+	const LLUUID& asset_id = item->getAssetUUID();
+	LLLandmark* landmark = gLandmarkList.getAsset(asset_id, NULL);
+
+	if (NULL == landmark)
+		return false;
+
+	return landmark->getGlobalPos(posGlobal);
+}
+
+void LLLandmarkActions::collectParcelLandmark(LLInventoryModel::item_array_t& items){
+	LLInventoryModel::cat_array_t cats;
+	LLIsAgentParcelLandmark is_current_parcel_landmark;
+	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
+		cats,
+		items,
+		LLInventoryModel::EXCLUDE_TRASH,
+		is_current_parcel_landmark);
+}
diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h
index e1e94edb75..e04d1bf543 100644
--- a/indra/newview/lllandmarkactions.h
+++ b/indra/newview/lllandmarkactions.h
@@ -1,68 +1,107 @@
 /** 
-* @file lllandmarkactions.h
-* @brief LLLandmark class declaration
-*
-* $LicenseInfo:firstyear=2000&license=viewergpl$
-* 
-* Copyright (c) 2000-2009, Linden Research, Inc.
-* 
-* Second Life Viewer Source Code
-* The source code in this file ("Source Code") is provided by Linden Lab
-* to you under the terms of the GNU General Public License, version 2.0
-* ("GPL"), unless you have obtained a separate licensing agreement
-* ("Other License"), formally executed by you and Linden Lab.  Terms of
-* the GPL can be found in doc/GPL-license.txt in this distribution, or
-* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
-* 
-* There are special exceptions to the terms and conditions of the GPL as
-* it is applied to this Source Code. View the full text of the exception
-* in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at
-* http://secondlifegrid.net/programs/open_source/licensing/flossexception
-* 
-* By copying, modifying or distributing this software, you acknowledge
-* that you have read and understood your obligations described above,
-* and agree to abide by those obligations.
-* 
-* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-* COMPLETENESS OR PERFORMANCE.
-* $/LicenseInfo$
-*/
+ * @file lllandmarkactions.h
+ * @brief LLLandmark class declaration
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
 
 #ifndef LL_LLLANDMARKACTIONS_H
 #define LL_LLLANDMARKACTIONS_H
 
+#include "llinventorymodel.h"
+
 /**
-* @brief Provides helper functions to manage landmarks
-*/
+ * @brief Provides helper functions to manage landmarks
+ */
 class LLLandmarkActions
 {
 public:
+	typedef boost::function<void(const LLVector3d& global_pos, std::string& slurl)> slurl_signal_t;
 
 	/**
-	* @brief Checks whether landmark exists for current parcel.
-	*/
+	 * @brief Fetches landmark LLViewerInventoryItems for the given landmark name. 
+	 */
+	static LLInventoryModel::item_array_t fetchLandmarksByName(std::string& name);
+	/**
+	 * @brief Checks whether landmark exists for current parcel.
+	 */
 	static bool landmarkAlreadyExists();
 
 	/**
-	* @brief Checks whether agent has rights to create landmark for current parcel.
-	*/
+	 * @brief Checks whether agent has rights to create landmark for current parcel.
+	 */
 	static bool canCreateLandmarkHere();
 
 	/**
-	* @brief Creates landmark for current parcel.
-	*/
+	 * @brief Creates landmark for current parcel.
+	 */
 	static void createLandmarkHere();
 
 	/**
-	* @brief Creates landmark for current parcel.
-	*/
+	 * @brief Creates landmark for current parcel.
+	 */
 	static void createLandmarkHere(
 		const std::string& name, 
 		const std::string& desc, 
 		const LLUUID& folder_id);
 
+	/**
+	 * @brief Trying to find in inventory a landmark of the  current parcel.
+	 * Normally items should contain only one item, 
+	 * because we can create the only landmark per parcel according to Navigation spec.
+	 */	
+	static void collectParcelLandmark(LLInventoryModel::item_array_t& items);
+	
+	/**
+	 * @brief Creates SLURL for given global position.
+	 */
+	static void getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_signal_t signal);
+
+    /**
+     * @brief Gets landmark global position specified by inventory LLUUID.
+     * Found position is placed into "posGlobal" variable.
+     *.
+     * @return - true if specified item exists in Inventory and an appropriate landmark found.
+     * and its position is known, false otherwise.
+     */
+    // *TODO: mantipov: profide callback for cases, when Landmark is not loaded yet.
+    static bool getLandmarkGlobalPos(const LLUUID& landmarkInventoryItemID, LLVector3d& posGlobal);
+
+private:
+    LLLandmarkActions();
+    LLLandmarkActions(const LLLandmarkActions&);
+
+	static void onRegionResponse(slurl_signal_t signal,
+								 const LLVector3d& global_pos,
+								 U64 region_handle,
+								 const std::string& url,
+								 const LLUUID& snapshot_id,
+								 bool teleport);
 };
 
 #endif //LL_LLLANDMARKACTIONS_H
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index e2dc7d69a1..a6662ef379 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -37,24 +37,23 @@
 
 // common includes
 #include "llbutton.h"
-#include "llfloaterreg.h"
 #include "llfocusmgr.h"
-#include "llkeyboard.h"
+#include "llmenugl.h"
 #include "llstring.h"
 #include "lluictrlfactory.h"
-#include "v2math.h"
 
 // newview includes
 #include "llagent.h"
-#include "llfloaterland.h"
 #include "llinventorymodel.h"
 #include "lllandmarkactions.h"
 #include "lllandmarklist.h"
 #include "lllocationhistory.h"
 #include "llsidetray.h"
+#include "lltrans.h"
 #include "llviewerinventory.h"
 #include "llviewerparcelmgr.h"
 #include "llviewercontrol.h"
+#include "llviewermenu.h"
 #include "llurllineeditorctrl.h"
 //============================================================================
 /*
@@ -161,6 +160,7 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 :	LLComboBox(p),
 	mAddLandmarkHPad(p.add_landmark_hpad),
 	mInfoBtn(NULL),
+	mLocationContextMenu(NULL),
 	mAddLandmarkBtn(NULL)
 {
 	// Lets replace default LLLineEditor with LLLocationLineEditor
@@ -212,9 +212,21 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	enableAddLandmarkButton(true);
 	addChild(mAddLandmarkBtn);
 	
+	// Register callbacks and load the location field context menu (NB: the order matters).
+	LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Navbar.Action", boost::bind(&LLLocationInputCtrl::onLocationContextMenuItemClicked, this, _2));
+	LLUICtrl::EnableCallbackRegistry::currentRegistrar().add("Navbar.EnableMenuItem", boost::bind(&LLLocationInputCtrl::onLocationContextMenuItemEnabled, this, _2));
+		
 	setPrearrangeCallback(boost::bind(&LLLocationInputCtrl::onLocationPrearrange, this, _2));
-	getTextEntry()->setMouseUpCallback(boost::bind(&LLLocationInputCtrl::onTextEditorMouseUp, this, _2,_3,_4));
+	getTextEntry()->setMouseUpCallback(boost::bind(&LLLocationInputCtrl::changeLocationPresentation, this));
 
+	// Load the location field context menu
+	mLocationContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_navbar.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+	if (!mLocationContextMenu)
+	{
+		llwarns << "Error loading navigation bar context menu" << llendl;
+		
+	}
+	getTextEntry()->setRightClickedCallback(boost::bind(&LLLocationInputCtrl::onTextEditorRightClicked,this,_2,_3,_4));
 	updateWidgetlayout();
 
 	// - Make the "Add landmark" button updated when either current parcel gets changed
@@ -401,11 +413,18 @@ void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data)
 	rebuildLocationHistory(filter);
 	mList->mouseOverHighlightNthItem(-1); // Clear highlight on the last selected item.
 }
-void LLLocationInputCtrl::onTextEditorMouseUp(S32 x, S32 y, MASK mask)
+
+void LLLocationInputCtrl::onTextEditorRightClicked(S32 x, S32 y, MASK mask)
 {
-	if (!mTextEntry->hasSelection()) {
-			setText(gAgent.getUnescapedSLURL());
-			mTextEntry->selectAll();
+	if (mLocationContextMenu)
+	{
+		updateContextMenu();
+		mLocationContextMenu->buildDrawLabels();
+		mLocationContextMenu->updateParent(LLMenuGL::sMenuContainer);
+		hideList();
+		setFocus(true);
+		changeLocationPresentation();
+		LLMenuGL::showPopup(this, mLocationContextMenu, x, y);
 	}
 }
 
@@ -429,7 +448,7 @@ void LLLocationInputCtrl::refreshLocation()
 	// Update location field.
 	std::string location_name;
 	LLAgent::ELocationFormat format =  (gSavedSettings.getBOOL("ShowCoordinatesOption") ? 
-			LLAgent::LOCATION_FORMAT_FULL: LLAgent::LOCATION_FORMAT_NORMAL);
+			LLAgent::LOCATION_FORMAT_WITHOUT_SIM: LLAgent::LOCATION_FORMAT_NORMAL);
 
 	if (!gAgent.buildLocationString(location_name,format))
 		location_name = "Unknown";
@@ -482,6 +501,21 @@ void LLLocationInputCtrl::updateAddLandmarkButton()
 	enableAddLandmarkButton(!LLLandmarkActions::landmarkAlreadyExists());
 }
 
+void LLLocationInputCtrl::updateContextMenu(){
+
+	if (mLocationContextMenu)
+	{
+		LLMenuItemGL* landmarkItem = mLocationContextMenu->getChild<LLMenuItemGL>("Landmark");
+		if (!LLLandmarkActions::landmarkAlreadyExists())
+		{
+			landmarkItem->setLabel(LLTrans::getString("AddLandmarkNavBarMenu"));
+		}
+		else
+		{
+			landmarkItem->setLabel(LLTrans::getString("EditLandmarkNavBarMenu"));
+		}
+	}
+}
 void LLLocationInputCtrl::updateWidgetlayout()
 {
 	const LLRect&	rect			= getLocalRect();
@@ -503,3 +537,88 @@ void LLLocationInputCtrl::updateWidgetlayout()
 		mAddLandmarkBtn->setRect(al_btn_rect);
 	}
 }
+
+void LLLocationInputCtrl::changeLocationPresentation()
+{
+	// change location presentation only if user select anything. 
+	if(mTextEntry && !mTextEntry->hasSelection() )
+	{
+		mTextEntry->setText(gAgent.getUnescapedSLURL());
+		mTextEntry->selectAll();
+	}	
+}
+
+void LLLocationInputCtrl::onLocationContextMenuItemClicked(const LLSD& userdata)
+{
+	std::string item = userdata.asString();
+
+	if (item == std::string("show_coordinates"))
+	{
+		gSavedSettings.setBOOL("ShowCoordinatesOption",!gSavedSettings.getBOOL("ShowCoordinatesOption"));
+	}
+	else if (item == std::string("landmark"))
+	{
+		LLInventoryModel::item_array_t items;
+		LLLandmarkActions::collectParcelLandmark(items);
+		
+		if(items.empty())
+		{
+			LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
+		}else{
+			LLSideTray::getInstance()->showPanel("panel_places", 
+					LLSD().insert("type", "landmark").insert("id",items.get(0)->getUUID()));
+		}
+	}
+	else if (item == std::string("cut"))
+	{
+		mTextEntry->cut();
+	}
+	else if (item == std::string("copy"))
+	{
+		mTextEntry->copy();
+	}
+	else if (item == std::string("paste"))
+	{
+		mTextEntry->paste();
+	}
+	else if (item == std::string("delete"))
+	{
+		mTextEntry->deleteSelection();
+	}
+	else if (item == std::string("select_all"))
+	{
+		mTextEntry->selectAll();
+	}
+}
+
+bool LLLocationInputCtrl::onLocationContextMenuItemEnabled(const LLSD& userdata)
+{
+	std::string item = userdata.asString();
+	
+	if (item == std::string("can_cut"))
+	{
+		return mTextEntry->canCut();
+	}
+	else if (item == std::string("can_copy"))
+	{
+		return mTextEntry->canCopy();
+	}
+	else if (item == std::string("can_paste"))
+	{
+		return mTextEntry->canPaste();
+	}
+	else if (item == std::string("can_delete"))
+	{
+		return mTextEntry->canDeselect();
+	}
+	else if (item == std::string("can_select_all"))
+	{
+		return mTextEntry->canSelectAll();
+	}
+	else if(item == std::string("show_coordinates")){
+	
+		return gSavedSettings.getBOOL("ShowCoordinatesOption");
+	}
+
+	return false;
+}
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index 0196aae4e7..1b26a07d83 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -40,6 +40,7 @@ class LLLandmark;
 // internals
 class LLAddLandmarkObserver;
 class LLRemoveLandmarkObserver;
+class LLMenuGL;
 
 /**
  * Location input control.
@@ -98,16 +99,22 @@ private:
 	void					rebuildLocationHistory(std::string filter = "");
 	void					setText(const LLStringExplicit& text);
 	void					updateAddLandmarkButton();
+	void 					updateContextMenu();
 	void					updateWidgetlayout();
+	void					changeLocationPresentation();
 
 	void					onInfoButtonClicked();
 	void					onLocationHistoryLoaded();
 	void					onLocationPrearrange(const LLSD& data);
-	void 					onTextEditorMouseUp(S32 x, S32 y, MASK mask);
+	void 					onTextEditorRightClicked(S32 x, S32 y, MASK mask);
 	void					onLandmarkLoaded(LLLandmark* lm);
 	void					onAddLandmarkButtonClicked();
 	void					onAgentParcelChange();
+	// callbacks
+	bool					onLocationContextMenuItemEnabled(const LLSD& userdata);
+	void 					onLocationContextMenuItemClicked(const LLSD& userdata);
 
+	LLMenuGL*				mLocationContextMenu;
 	LLButton*				mAddLandmarkBtn;
 	LLButton*				mInfoBtn;
 	S32						mAddLandmarkHPad;
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index fc425d1b33..92b1ecfd16 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -549,6 +549,7 @@ void LLPanelStandStopFlying::onStandButtonClick()
 	LLSelectMgr::getInstance()->deselectAllForStandingUp();
 	gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
 
+	setFocus(FALSE); // EXT-482
 	setVisible(FALSE);
 }
 
@@ -556,6 +557,7 @@ void LLPanelStandStopFlying::onStopFlyingButtonClick()
 {
 	gAgent.setFlying(FALSE);
 
+	setFocus(FALSE); // EXT-482
 	setVisible(FALSE);
 }
 
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 0f719f29e9..e3c4cd4895 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -38,11 +38,8 @@
 #include <llfocusmgr.h>
 #include <lliconctrl.h>
 #include <llmenugl.h>
-#include <llwindow.h>
 
 #include "llagent.h"
-#include "llfloaterhtmlhelp.h"
-#include "lllandmarkactions.h"
 #include "lllocationhistory.h"
 #include "lllocationinputctrl.h"
 #include "llteleporthistory.h"
@@ -51,11 +48,14 @@
 #include "llslurl.h"
 #include "llurlsimstring.h"
 #include "llviewerinventory.h"
-#include "llviewermenu.h"
 #include "llviewerparcelmgr.h"
 #include "llworldmap.h"
 #include "llappviewer.h"
 #include "llviewercontrol.h"
+
+#include "llinventorymodel.h"
+#include "lllandmarkactions.h"
+
 #include "llfavoritesbar.h"
 
 //-- LLTeleportHistoryMenuItem -----------------------------------------------
@@ -176,7 +176,6 @@ LLNavigationBar* LLNavigationBar::getInstance()
 
 LLNavigationBar::LLNavigationBar()
 :	mTeleportHistoryMenu(NULL),
-	mLocationContextMenu(NULL),
 	mBtnBack(NULL),
 	mBtnForward(NULL),
 	mBtnHome(NULL),
@@ -190,10 +189,6 @@ LLNavigationBar::LLNavigationBar()
 	mParcelMgrConnection = LLViewerParcelMgr::getInstance()->setAgentParcelChangedCallback(
 			boost::bind(&LLNavigationBar::onTeleportFinished, this));
 
-	// Register callbacks and load the location field context menu (NB: the order matters).
-	mCommitCallbackRegistrar.add("Navbar.Action", boost::bind(&LLNavigationBar::onLocationContextMenuItemClicked, this, _2));
-	mEnableCallbackRegistrar.add("Navbar.EnableMenuItem", boost::bind(&LLNavigationBar::onLocationContextMenuItemEnabled, this, _2));
-	
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_navigation_bar.xml");
 
 	// navigation bar can never get a tab
@@ -242,14 +237,6 @@ BOOL LLNavigationBar::postBuild()
 	
 	mLeSearch->setCommitCallback(boost::bind(&LLNavigationBar::onSearchCommit, this));
 
-	// Load the location field context menu
-	mLocationContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_navbar.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
-	if (!mLocationContextMenu)
-	{
-		llwarns << "Error loading navigation bar context menu" << llendl;
-		return FALSE;
-	}
-
 	mDefaultNbRect = getRect();
 	mDefaultFpRect = getChild<LLFavoritesBarCtrl>("favorite")->getRect();
 
@@ -271,32 +258,6 @@ void LLNavigationBar::draw()
 	LLPanel::draw();
 }
 
-BOOL LLNavigationBar::handleRightMouseUp(S32 x, S32 y, MASK mask)
-{
-	// *HACK. We should use mCmbLocation's right click callback instead.
-
-	// If the location field is clicked then show its context menu.
-	if (mCmbLocation->getRect().pointInRect(x, y))
-	{
-		// Pass the focus to the line editor when it is right-clicked
-		mCmbLocation->setFocus(TRUE);
-
-		if (mLocationContextMenu)
-		{
-			mLocationContextMenu->buildDrawLabels();
-			mLocationContextMenu->updateParent(LLMenuGL::sMenuContainer);
-			LLLineEditor* textEntry =mCmbLocation->getTextEntry();  
-			if(textEntry && !textEntry->hasSelection() ){
-				textEntry->setText(gAgent.getUnescapedSLURL());
-				textEntry->selectAll();
-			}
-			LLMenuGL::showPopup(this, mLocationContextMenu, x, y);
-		}
-		return TRUE;
-	}
-	return LLPanel:: handleRightMouseUp(x, y, mask);
-}
-
 void LLNavigationBar::onBackButtonClicked()
 {
 	LLTeleportHistory::getInstance()->goBack();
@@ -358,6 +319,22 @@ void LLNavigationBar::onLocationSelection()
 
 		if (region_name != typed_location) {
 			local_coords.set(x, y, z);
+		} 
+		else
+		{
+			LLInventoryModel::item_array_t landmark_items = LLLandmarkActions::fetchLandmarksByName(typed_location);
+			LLViewerInventoryItem* item = NULL;
+			if ( !landmark_items.empty() )
+			{
+				item = landmark_items[0];
+			}
+
+			if (item)
+			{
+				mUpdateTypedLocationHistory = true;
+				gAgent.teleportViaLandmark(item->getAssetUUID());
+				return;
+			}
 		}
 		// Treat it as region name.
 		// region_name = typed_location;
@@ -371,7 +348,8 @@ void LLNavigationBar::onLocationSelection()
 	LLWorldMap::getInstance()->sendNamedRegionRequest(region_name, cb, std::string("unused"), false);
 }
 
-void LLNavigationBar::onTeleportFinished() {
+void LLNavigationBar::onTeleportFinished()
+{
 
 	if (mUpdateTypedLocationHistory) {
 		LLLocationHistory* lh = LLLocationHistory::getInstance();
@@ -496,77 +474,6 @@ void	LLNavigationBar::showTeleportHistoryMenu()
 	gFocusMgr.setMouseCapture( NULL );
 }
 
-void LLNavigationBar::onLocationContextMenuItemClicked(const LLSD& userdata)
-{
-	std::string item = userdata.asString();
-	LLLineEditor* location_entry = mCmbLocation->getTextEntry();
-
-	if (item == std::string("show_coordinates"))
-	{
-		gSavedSettings.setBOOL("ShowCoordinatesOption",!gSavedSettings.getBOOL("ShowCoordinatesOption"));
-	}
-	else if (item == std::string("landmark"))
-	{
-		LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
-	}
-	else if (item == std::string("cut"))
-	{
-		location_entry->cut();
-	}
-	else if (item == std::string("copy"))
-	{
-		location_entry->copy();
-	}
-	else if (item == std::string("paste"))
-	{
-		location_entry->paste();
-	}
-	else if (item == std::string("delete"))
-	{
-		location_entry->deleteSelection();
-	}
-	else if (item == std::string("select_all"))
-	{
-		location_entry->selectAll();
-	}
-}
-
-bool LLNavigationBar::onLocationContextMenuItemEnabled(const LLSD& userdata)
-{
-	std::string item = userdata.asString();
-	const LLLineEditor* location_entry = mCmbLocation->getTextEntry();
-
-	if (item == std::string("can_cut"))
-	{
-		return location_entry->canCut();
-	}
-	else if (item == std::string("can_copy"))
-	{
-		return location_entry->canCopy();
-	}
-	else if (item == std::string("can_paste"))
-	{
-		return location_entry->canPaste();
-	}
-	else if (item == std::string("can_delete"))
-	{
-		return location_entry->canDeselect();
-	}
-	else if (item == std::string("can_select_all"))
-	{
-		return location_entry->canSelectAll();
-	}
-	else if(item == std::string("can_landmark"))
-	{
-		return !LLLandmarkActions::landmarkAlreadyExists();
-	}else if(item == std::string("show_coordinates")){
-	
-		return gSavedSettings.getBOOL("ShowCoordinatesOption");
-	}
-
-	return false;
-}
-
 void LLNavigationBar::handleLoginComplete()
 {
 	mCmbLocation->handleLoginComplete();
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index c533953a02..eeaec4e668 100644
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -56,7 +56,6 @@ public:
 	
 	/*virtual*/ void	draw();
 	/*virtual*/ BOOL	postBuild();
-	/*virtual*/ BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);
 
 	void handleLoginComplete();
 	void clearHistoryCache();
@@ -75,8 +74,6 @@ private:
 	static std::string extractLocalCoordsFromRegName(const std::string & reg_name, S32* x, S32* y, S32* z);
 
 	// callbacks
-	bool onLocationContextMenuItemEnabled(const LLSD& userdata);
-	void onLocationContextMenuItemClicked(const LLSD& userdata);
 	void onTeleportHistoryMenuItemClicked(const LLSD& userdata);
 	void onTeleportHistoryChanged();
 	void onBackButtonClicked();
@@ -97,7 +94,6 @@ private:
 
 	static LLNavigationBar *sInstance;
 	
-	LLMenuGL*					mLocationContextMenu;
 	LLMenuGL*					mTeleportHistoryMenu;
 	LLButton*					mBtnBack;
 	LLButton*					mBtnForward;
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index c89715e815..2683109829 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -54,6 +54,8 @@
 #include "llviewertexteditor.h"
 #include "llstylemap.h"
 
+#include "lldraghandle.h"
+
 
 static const S32 RESIZE_BAR_THICKNESS = 3;
 
@@ -88,6 +90,8 @@ BOOL LLNearbyChat::postBuild()
 	mResizeHandle[2]->setVisible(false);
 	mResizeHandle[3]->setVisible(false);
 
+	getDragHandle()->setVisible(false);
+
 	//menu
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
 	LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
@@ -415,6 +419,8 @@ void	LLNearbyChat::pinn_panel()
 	mResizeBar[LLResizeBar::LEFT]->setVisible(false);
 	mResizeBar[LLResizeBar::RIGHT]->setVisible(false);
 
+	getDragHandle()->setVisible(false);
+
 }
 
 void	LLNearbyChat::float_panel()
@@ -427,6 +433,8 @@ void	LLNearbyChat::float_panel()
 	mResizeBar[LLResizeBar::LEFT]->setVisible(true);
 	mResizeBar[LLResizeBar::RIGHT]->setVisible(true);
 
+	getDragHandle()->setVisible(true);
+
 	translate(4,4);
 }
 
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 086b06c1a3..615a41b143 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -180,21 +180,32 @@ void LLPanelGroup::reshape(S32 width, S32 height, BOOL called_from_parent )
 {
 	LLPanel::reshape(width, height, called_from_parent );
 
-	LLButton* button = getChild<LLButton>("btn_apply");
-	LLRect btn_rect = button->getRect();
-	btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
-	button->setRect(btn_rect);
+	LLRect btn_rect;
 
-	button = getChild<LLButton>("btn_create");
-	btn_rect = button->getRect();
-	btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
-	button->setRect(btn_rect);
+	LLButton* button = findChild<LLButton>("btn_apply");
+	if(button)
+	{
+		btn_rect = button->getRect();
+		btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
+		button->setRect(btn_rect);
+	}
+
+	button = findChild<LLButton>("btn_create");
+	if(button)
+	{
+		btn_rect = button->getRect();
+		btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
+		button->setRect(btn_rect);
+	}
 
 
-	button = getChild<LLButton>("btn_refresh");
-	btn_rect = button->getRect();
-	btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
-	button->setRect(btn_rect);
+	button = findChild<LLButton>("btn_refresh");
+	if(button)
+	{
+		btn_rect = button->getRect();
+		btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
+		button->setRect(btn_rect);
+	}
 }
 
 void LLPanelGroup::onBackBtnClick()
@@ -259,22 +270,27 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
 	for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
 		(*it)->setGroupID(group_id);
 
-	LLButton* button_apply = getChild<LLButton>("btn_apply");
-	LLButton* button_refresh = getChild<LLButton>("btn_refresh");
-	LLButton* button_create = getChild<LLButton>("btn_create");
+	LLButton* button_apply = findChild<LLButton>("btn_apply");
+	LLButton* button_refresh = findChild<LLButton>("btn_refresh");
+	LLButton* button_create = findChild<LLButton>("btn_create");
 
 
 	bool is_null_group_id = group_id == LLUUID::null;
-	
-	button_apply->setVisible(!is_null_group_id);
-	button_refresh->setVisible(!is_null_group_id);
-	button_create->setVisible(is_null_group_id);
+	if(button_apply)
+		button_apply->setVisible(!is_null_group_id);
+	if(button_refresh)
+		button_refresh->setVisible(!is_null_group_id);
+	if(button_create)
+		button_create->setVisible(is_null_group_id);
 
 	LLAccordionCtrlTab* tab_general = findChild<LLAccordionCtrlTab>("group_general_tab");
 	LLAccordionCtrlTab* tab_roles = findChild<LLAccordionCtrlTab>("group_roles_tab");
 	LLAccordionCtrlTab* tab_notices = findChild<LLAccordionCtrlTab>("group_notices_tab");
 	LLAccordionCtrlTab* tab_land = findChild<LLAccordionCtrlTab>("group_land_tab");
 
+	if(!tab_general || !tab_roles || !tab_notices || !tab_land)
+		return;
+
 	if(is_null_group_id)//creating new group
 	{
 		if(!tab_general->getDisplayChildren())
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 630970fcf5..19a5f3a5f1 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -92,7 +92,10 @@ public:
 	 * 
 	 * This may start repeated updates until all names are complete.
 	 */
-	virtual void forceUpdate() {}
+	virtual void forceUpdate()
+	{
+		updateList();
+	}
 
 	/**
 	 * Activate/deactivate updater.
@@ -209,11 +212,6 @@ public:
 		}
 	}
 
-	/*virtual*/ void forceUpdate()
-	{
-		updateList();
-	}
-
 	/*virtual*/ BOOL tick()
 	{
 		updateList();
@@ -283,11 +281,6 @@ public:
 		gAgent.removeListener(this);
 	}
 
-	/*virtual*/ void forceUpdate()
-	{
-		updateList();
-	}
-
 	/*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
 		// Why is "new group" sufficient?
@@ -308,7 +301,8 @@ LLPanelPeople::LLPanelPeople()
 		mFilterSubString(LLStringUtil::null),
 		mFilterEditor(NULL),
 		mTabContainer(NULL),
-		mFriendList(NULL),
+		mOnlineFriendList(NULL),
+		mOfflineFriendList(NULL),
 		mNearbyList(NULL),
 		mRecentList(NULL)
 {
@@ -337,9 +331,10 @@ BOOL LLPanelPeople::postBuild()
 
 	mTabContainer = getChild<LLTabContainer>("tabs");
 	mTabContainer->setCommitCallback(boost::bind(&LLPanelPeople::onTabSelected, this, _2));
-	mTabContainer->selectTabByName(FRIENDS_TAB_NAME); // must go after setting commit callback
 
-	mFriendList = getChild<LLPanel>(FRIENDS_TAB_NAME)->getChild<LLAvatarList>("avatar_list");
+	mOnlineFriendList = getChild<LLPanel>(FRIENDS_TAB_NAME)->getChild<LLAvatarList>("avatars_online");
+	mOfflineFriendList = getChild<LLPanel>(FRIENDS_TAB_NAME)->getChild<LLAvatarList>("avatars_offline");
+
 	mNearbyList = getChild<LLPanel>(NEARBY_TAB_NAME)->getChild<LLAvatarList>("avatar_list");
 	mRecentList = getChild<LLPanel>(RECENT_TAB_NAME)->getChild<LLAvatarList>("avatar_list");
 	mGroupList = getChild<LLGroupList>("group_list");
@@ -353,10 +348,12 @@ BOOL LLPanelPeople::postBuild()
 	friends_panel->childSetAction("add_btn",	boost::bind(&LLPanelPeople::onAddFriendWizButtonClicked,	this));
 	friends_panel->childSetAction("del_btn",	boost::bind(&LLPanelPeople::onDeleteFriendButtonClicked,	this));
 
-	mFriendList->setDoubleClickCallback(boost::bind(&LLPanelPeople::onAvatarListDoubleClicked, this, mFriendList));
+	mOnlineFriendList->setDoubleClickCallback(boost::bind(&LLPanelPeople::onAvatarListDoubleClicked, this, mOnlineFriendList));
+	mOfflineFriendList->setDoubleClickCallback(boost::bind(&LLPanelPeople::onAvatarListDoubleClicked, this, mOfflineFriendList));
 	mNearbyList->setDoubleClickCallback(boost::bind(&LLPanelPeople::onAvatarListDoubleClicked, this, mNearbyList));
 	mRecentList->setDoubleClickCallback(boost::bind(&LLPanelPeople::onAvatarListDoubleClicked, this, mRecentList));
-	mFriendList->setCommitCallback(boost::bind(&LLPanelPeople::onAvatarListCommitted, this, mFriendList));
+	mOnlineFriendList->setCommitCallback(boost::bind(&LLPanelPeople::onAvatarListCommitted, this, mOnlineFriendList));
+	mOfflineFriendList->setCommitCallback(boost::bind(&LLPanelPeople::onAvatarListCommitted, this, mOfflineFriendList));
 	mNearbyList->setCommitCallback(boost::bind(&LLPanelPeople::onAvatarListCommitted, this, mNearbyList));
 	mRecentList->setCommitCallback(boost::bind(&LLPanelPeople::onAvatarListCommitted, this, mRecentList));
 
@@ -373,6 +370,9 @@ BOOL LLPanelPeople::postBuild()
 	buttonSetAction("share_btn",		boost::bind(&LLPanelPeople::onShareButtonClicked,		this));
 	buttonSetAction("more_btn",			boost::bind(&LLPanelPeople::onMoreButtonClicked,		this));
 
+	// Must go after setting commit callback and initializing all pointers to children.
+	mTabContainer->selectTabByName(FRIENDS_TAB_NAME);
+
 	// Create menus.
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
 	registrar.add("People.Group.Plus.Action",  boost::bind(&LLPanelPeople::onGroupPlusMenuItemClicked,  this, _2));
@@ -381,8 +381,9 @@ BOOL LLPanelPeople::postBuild()
 
 	// Perform initial update.
 	mFriendListUpdater->forceUpdate();
-	updateGroupList();
-	updateRecentList();
+	mRecentListUpdater->forceUpdate();
+	mGroupListUpdater->forceUpdate();
+	mRecentListUpdater->forceUpdate();
 
 	return TRUE;
 }
@@ -393,16 +394,24 @@ bool LLPanelPeople::updateFriendList(U32 changed_mask)
 	if (changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE))
 	{
 		// get all buddies we know about
+		const LLAvatarTracker& av_tracker = LLAvatarTracker::instance();
 		LLAvatarTracker::buddy_map_t all_buddies;
-		LLAvatarTracker::instance().copyBuddyList(all_buddies);
+		av_tracker.copyBuddyList(all_buddies);
 
-		// *TODO: it's suboptimal to rebuild the whole list on online status change.
+		// *TODO: it's suboptimal to rebuild the whole lists on online status change.
 
-		// convert the buddy map to vector
-		mFriendVec.clear();
+		// save them to the online and offline friends vectors
+		mOnlineFriendVec.clear();
+		mOfflineFriendVec.clear();
 		LLAvatarTracker::buddy_map_t::const_iterator buddy_it = all_buddies.begin();
 		for (; buddy_it != all_buddies.end(); ++buddy_it)
-			mFriendVec.push_back(buddy_it->first);
+		{
+			LLUUID buddy_id = buddy_it->first;
+			if (av_tracker.isBuddyOnline(buddy_id))
+				mOnlineFriendVec.push_back(buddy_id);
+			else
+				mOfflineFriendVec.push_back(buddy_id);
+		}
 
 		return filterFriendList();
 	}
@@ -428,6 +437,9 @@ bool LLPanelPeople::updateRecentList()
 
 bool LLPanelPeople::updateGroupList()
 {
+	if (!mGroupList)
+		return true; // there's no point in further updates
+
 	bool have_names = mGroupList->update(mFilterSubString);
 
 	if (mGroupList->isEmpty())
@@ -438,11 +450,19 @@ bool LLPanelPeople::updateGroupList()
 
 bool LLPanelPeople::filterFriendList()
 {
+	if (!mOnlineFriendList || !mOfflineFriendList)
+		return true; // there's no point in further updates
+
 	// We must always update Friends list to clear the latest removed friend.
-	bool have_names = mFriendList->update(mFriendVec, mFilterSubString);
+	bool have_names =
+			mOnlineFriendList->update(mOnlineFriendVec, mFilterSubString) &
+			mOfflineFriendList->update(mOfflineFriendVec, mFilterSubString);
 
-	if (mFriendVec.size() == 0)
-		mFriendList->setCommentText(getString("no_friends"));
+	if (mOnlineFriendVec.size() == 0)
+		mOnlineFriendList->setCommentText(getString("no_friends_online"));
+
+	if (mOfflineFriendVec.size() == 0)
+		mOfflineFriendList->setCommentText(getString("no_friends_offline"));
 
 	return have_names;
 }
@@ -459,6 +479,9 @@ bool LLPanelPeople::filterNearbyList()
 
 bool LLPanelPeople::filterRecentList()
 {
+	if (!mRecentList)
+		return true;
+
 	if (mRecentVec.size() > 0)
 		return mRecentList->update(mRecentVec, mFilterSubString);
 
@@ -495,7 +518,7 @@ void LLPanelPeople::buttonSetAction(const std::string& btn_name, const commit_si
 
 void LLPanelPeople::updateButtons()
 {
-	std::string cur_tab		= mTabContainer->getCurrentPanel()->getName();
+	std::string cur_tab		= getActiveTabName();
 	bool nearby_tab_active	= (cur_tab == NEARBY_TAB_NAME);
 	bool friends_tab_active = (cur_tab == FRIENDS_TAB_NAME);
 	bool group_tab_active	= (cur_tab == GROUP_TAB_NAME);
@@ -507,7 +530,7 @@ void LLPanelPeople::updateButtons()
 	buttonSetVisible("add_friend_btn",		nearby_tab_active || recent_tab_active);
 	buttonSetVisible("view_profile_btn",	!group_tab_active);
 	buttonSetVisible("im_btn",				!group_tab_active);
-	buttonSetVisible("teleport_btn",		friends_tab_active || group_tab_active);
+	buttonSetVisible("teleport_btn",		friends_tab_active);
 	buttonSetVisible("share_btn",			!recent_tab_active && false); // not implemented yet
 
 	if (group_tab_active)
@@ -529,10 +552,9 @@ void LLPanelPeople::updateButtons()
 	else
 	{
 		bool is_friend = true;
-		LLAvatarList* list;
 
 		// Check whether selected avatar is our friend.
-		if ((list = getActiveAvatarList()) && (selected_id = list->getCurrentID()).notNull())
+		if ((selected_id = getCurrentItemID()).notNull())
 		{
 			is_friend = LLAvatarTracker::instance().getBuddyInfo(selected_id) != NULL;
 		}
@@ -541,7 +563,7 @@ void LLPanelPeople::updateButtons()
 	}
 
 	bool item_selected = selected_id.notNull();
-	buttonSetEnabled("teleport_btn",		(friends_tab_active || group_tab_active) && item_selected);
+	buttonSetEnabled("teleport_btn",		friends_tab_active && item_selected);
 	buttonSetEnabled("view_profile_btn",	item_selected);
 	buttonSetEnabled("im_btn",				item_selected);
 	buttonSetEnabled("call_btn",			item_selected && false); // not implemented yet
@@ -550,26 +572,36 @@ void LLPanelPeople::updateButtons()
 	buttonSetEnabled("chat_btn",			item_selected);
 }
 
-LLAvatarList* LLPanelPeople::getActiveAvatarList() const
+const std::string& LLPanelPeople::getActiveTabName() const
 {
-	std::string cur_tab = mTabContainer->getCurrentPanel()->getName();
+	return mTabContainer->getCurrentPanel()->getName();
+}
+
+LLUUID LLPanelPeople::getCurrentItemID() const
+{
+	std::string cur_tab = getActiveTabName();
+
+	if (cur_tab == FRIENDS_TAB_NAME) // this tab has two lists
+	{
+		LLUUID cur_online_friend;
+
+		if ((cur_online_friend = mOnlineFriendList->getCurrentID()).notNull())
+			return cur_online_friend;
+
+		return mOfflineFriendList->getCurrentID();
+	}
 
-	if (cur_tab == FRIENDS_TAB_NAME)
-		return mFriendList;
 	if (cur_tab == NEARBY_TAB_NAME)
-		return mNearbyList;
+		return mNearbyList->getCurrentID();
+
 	if (cur_tab == RECENT_TAB_NAME)
-		return mRecentList;
+		return mRecentList->getCurrentID();
 
-	return NULL;
-}
+	if (cur_tab == GROUP_TAB_NAME)
+		return mGroupList->getCurrentID();
 
-LLUUID LLPanelPeople::getCurrentItemID() const
-{
-	LLAvatarList* alist = getActiveAvatarList();
-	if (alist)
-		return alist->getCurrentID();
-	return mGroupList->getCurrentID();
+	llassert(0 && "unknown tab selected");
+	return LLUUID::null;
 }
 
 void LLPanelPeople::showGroupMenu(LLMenuGL* menu)
@@ -653,9 +685,7 @@ void LLPanelPeople::onAvatarListDoubleClicked(LLAvatarList* list)
 		return;
 	
 #if 0 // SJB: Useful for testing, but not currently functional or to spec
-	// Open mini-inspector for the avatar being clicked
-	LLFloaterReg::showInstance("mini_inspector", clicked_id);
-	// inspector will delete itself on close
+	LLAvatarActions::showProfile(clicked_id);
 #else // spec says open IM window
 	LLAvatarActions::startIM(clicked_id);
 #endif
@@ -663,7 +693,17 @@ void LLPanelPeople::onAvatarListDoubleClicked(LLAvatarList* list)
 
 void LLPanelPeople::onAvatarListCommitted(LLAvatarList* list)
 {
-	(void) list;
+	// Make sure only one of the friends lists (online/offline) has selection.
+	if (getActiveTabName() == FRIENDS_TAB_NAME)
+	{
+		if (list == mOnlineFriendList)
+			mOfflineFriendList->deselectAllItems(TRUE);
+		else if (list == mOfflineFriendList)
+			mOnlineFriendList->deselectAllItems(TRUE);
+		else
+			llassert(0 && "commit on unknown friends list");
+	}
+
 	updateButtons();
 }
 
@@ -778,16 +818,7 @@ void LLPanelPeople::onCallButtonClicked()
 
 void LLPanelPeople::onTeleportButtonClicked()
 {
-	std::string cur_tab = mTabContainer->getCurrentPanel()->getName();
-
-	if (cur_tab == FRIENDS_TAB_NAME)
-	{
-		LLAvatarActions::offerTeleport(getCurrentItemID());
-	}
-	else if (cur_tab == GROUP_TAB_NAME)
-	{
-		LLGroupActions::offerTeleport(getCurrentItemID());
-	}
+	LLAvatarActions::offerTeleport(getCurrentItemID());
 }
 
 void LLPanelPeople::onShareButtonClicked()
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 58ed77f0f2..2b821a432b 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -57,15 +57,17 @@ public:
 	class Updater;
 
 private:
+	// methods indirectly called by the updaters
 	bool					updateFriendList(U32 changed_mask);
 	bool					updateNearbyList();
 	bool					updateRecentList();
 	bool					updateGroupList();
+
 	bool					filterFriendList();
 	bool					filterNearbyList();
 	bool					filterRecentList();
 	void					updateButtons();
-	LLAvatarList*			getActiveAvatarList() const;
+	const std::string&		getActiveTabName() const;
 	LLUUID					getCurrentItemID() const;
 	void					buttonSetVisible(std::string btn_name, BOOL visible);
 	void					buttonSetEnabled(const std::string& btn_name, bool enabled);
@@ -106,7 +108,8 @@ private:
 
 	LLFilterEditor*			mFilterEditor;
 	LLTabContainer*			mTabContainer;
-	LLAvatarList*			mFriendList;
+	LLAvatarList*			mOnlineFriendList;
+	LLAvatarList*			mOfflineFriendList;
 	LLAvatarList*			mNearbyList;
 	LLAvatarList*			mRecentList;
 	LLGroupList*			mGroupList;
@@ -128,7 +131,8 @@ private:
 	// since re-fetching the groups list is always fast.
 	typedef std::vector<LLUUID> uuid_vector_t;
 	uuid_vector_t			mNearbyVec;
-	uuid_vector_t			mFriendVec;
+	uuid_vector_t			mOnlineFriendVec;
+	uuid_vector_t			mOfflineFriendVec;
 	uuid_vector_t			mRecentVec;
 };
 
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 51cd05376a..8b378c33e3 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -200,7 +200,7 @@ void LLTeleportHistoryPanel::showTeleportHistory()
 		index_column["type"] = "text";
 		index_column["value"] = index;
 
-		mHistoryItems->addElement(row);
+		mHistoryItems->addElement(row, ADD_TOP);
 
 		if (cur_item == index)
 		{
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 10561f5701..ab8d61f305 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -136,8 +136,7 @@ void LLScreenChannel::onToastFade(LLToast* toast)
 {	
 	std::vector<ToastElem>::iterator it = find(mToastList.begin(), mToastList.end(), static_cast<LLPanel*>(toast));
 		
-	// *TODO: toast->isViewed() - seems unnecessary
-	bool destroy_toast = toast->isViewed() || !mCanStoreToasts || !toast->getCanBeStored();
+	bool destroy_toast = !mCanStoreToasts || !toast->getCanBeStored();
 	if(destroy_toast)
 	{
 		mToastList.erase(it);
@@ -369,7 +368,8 @@ void LLScreenChannel::showToastsTop()
 void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
 {
 	LLRect toast_rect;
-	LLToast::Params p; // *TODO: fill structure
+	LLToast::Params p;
+	p.timer_period = timer;
 	mOverflowToastPanel = new LLToast(p);
 
 	if(!mOverflowToastPanel)
@@ -393,7 +393,6 @@ void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
 	mOverflowToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
 	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastMargin"), getRect().getWidth(), toast_rect.getHeight());	
 	mOverflowToastPanel->setRect(toast_rect);
-	mOverflowToastPanel->setAndStartTimer(timer);
 	getRootView()->addChild(mOverflowToastPanel);
 
 	text_box->setValue(text);
@@ -424,7 +423,8 @@ void LLScreenChannel::closeOverflowToastPanel()
 void LLScreenChannel::createStartUpToast(S32 notif_num, S32 bottom, F32 timer)
 {
 	LLRect toast_rect;
-	LLToast::Params p; // *TODO: fill structure
+	LLToast::Params p;
+	p.timer_period = timer;
 	mStartUpToastPanel = new LLToast(p);
 
 	if(!mStartUpToastPanel)
@@ -453,7 +453,6 @@ void LLScreenChannel::createStartUpToast(S32 notif_num, S32 bottom, F32 timer)
 	mStartUpToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
 	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastMargin"), getRect().getWidth(), toast_rect.getHeight());	
 	mStartUpToastPanel->setRect(toast_rect);
-	mStartUpToastPanel->setAndStartTimer(timer);
 	getRootView()->addChild(mStartUpToastPanel);
 
 	text_box->setValue(text);
@@ -515,9 +514,12 @@ void LLScreenChannel::removeAndStoreAllVisibleToasts()
 	hideToastsFromScreen();
 	for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end(); it++)
 	{
-		mStoredToastList.push_back(*it);
-		mOnStoreToast((*it).toast->getPanel(), (*it).id);
-		(*it).toast->stopTimer();
+		if((*it).toast->getCanBeStored())
+		{
+			mStoredToastList.push_back(*it);
+			mOnStoreToast((*it).toast->getPanel(), (*it).id);
+			(*it).toast->stopTimer();
+		}
 		(*it).toast->setVisible(FALSE);
 	}
 
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index ffadeeddf2..f6c4710d60 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -112,6 +112,19 @@ std::string LLSLURL::buildUnescapedSLURL(const std::string& regionname, S32 x, S
 	return unescapedslurl;
 }
 
+// static
+std::string LLSLURL::buildSLURLfromPosGlobal(const std::string& regionname,
+											 const LLVector3d& global_pos)
+{
+	F32 region_x = (F32)fmod(global_pos.mdV[VX], (F64)REGION_WIDTH_METERS);
+	F32 region_y = (F32)fmod(global_pos.mdV[VY], (F64)REGION_WIDTH_METERS);
+
+	return buildSLURL(regionname,
+					  llround(region_x),
+					  llround(region_y),
+					  llround((F32)global_pos.mdV[VZ]));
+}
+
 // static
 bool LLSLURL::matchPrefix(const std::string& url, const std::string& prefix)
 {
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h
index 5c9fea3e96..cb1b8cca9e 100644
--- a/indra/newview/llslurl.h
+++ b/indra/newview/llslurl.h
@@ -78,6 +78,11 @@ public:
 	 */
 	static std::string buildUnescapedSLURL(const std::string& regionname, S32 x, S32 y, S32 z);
 
+	/**
+	 * builds SLURL from global position escaping result url.
+	 */
+	static std::string buildSLURLfromPosGlobal(const std::string& regionname,
+											   const LLVector3d& global_pos);
 	/**
 	 * Strip protocol part from the URL.
 	 */
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 993a092eba..1fc2245a8f 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -314,6 +314,59 @@ void update_texture_fetch()
 static std::vector<std::string> sAuthUris;
 static S32 sAuthUriNum = -1;
 
+//Copies landmarks from the "Library" to "My Favorites"
+void populate_favorites_bar()
+{
+	//*TODO consider extending LLInventoryModel::findCategoryUUIDForType(...) to support both root's
+	LLInventoryModel::cat_array_t* lib_cats = NULL;
+	LLInventoryModel::item_array_t* lib_items = NULL;
+	gInventory.getDirectDescendentsOf(gInventory.getLibraryRootFolderID(), lib_cats, lib_items);
+	if (!lib_cats) return;
+
+	LLUUID lib_landmarks(LLUUID::null);
+	S32 count = lib_cats->count();
+	for(S32 i = 0; i < count; ++i)
+	{
+		if(lib_cats->get(i)->getPreferredType() == LLAssetType::AT_LANDMARK)
+		{
+			lib_landmarks = lib_cats->get(i)->getUUID();
+			break;
+		}
+	}
+	if (lib_landmarks.isNull())
+	{
+		llerror("Library inventory is missing Landmarks", 0);
+		return;
+	}
+
+	LLInventoryModel::cat_array_t* lm_cats = NULL;
+	LLInventoryModel::item_array_t* lm_items = NULL;
+	gInventory.getDirectDescendentsOf(lib_landmarks, lm_cats, lm_items);
+	if (!lm_items) return;
+
+	LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_FAVORITE);
+	if (favorites_id.isNull())
+	{
+		llerror("My Inventory is missing My Favorites", 0);
+		return;
+	}
+
+	S32 lm_count = lm_items->count();
+	for (S32 i = 0; i < lm_count; ++i)
+	{
+		LLInventoryItem* item = lm_items->get(i);
+		if (item->getUUID().isNull()) continue;
+
+		copy_inventory_item(gAgent.getID(),
+			item->getPermissions().getOwner(),
+			item->getUUID(),
+			favorites_id,
+			std::string(),
+			LLPointer<LLInventoryCallback>(NULL));
+	}
+}
+
+
 // Returns false to skip other idle processing. Should only return
 // true when all initialization done.
 bool idle_startup()
@@ -2085,7 +2138,7 @@ bool idle_startup()
 		}
 
 
-		//all categories loaded. lets create "My Favourites" category
+		//all categories loaded. lets create "My Favorites" category
 		gInventory.findCategoryUUIDForType(LLAssetType::AT_FAVORITE,true);
 
 		gInventory.buildParentChildMap();
@@ -2120,6 +2173,12 @@ bool idle_startup()
 		llinfos << "Creating Inventory Views" << llendl;
 		LLFloaterReg::getInstance("inventory");
 
+		//default initial content for Favorites Bar 
+		if (gAgent.isFirstLogin())
+		{
+			populate_favorites_bar();
+		}
+
 		LLStartUp::setStartupState( STATE_MISC );
 		return FALSE;
 	}
diff --git a/indra/newview/llsyswellitem.cpp b/indra/newview/llsyswellitem.cpp
index 5ed8a8b604..7d9ebc7208 100644
--- a/indra/newview/llsyswellitem.cpp
+++ b/indra/newview/llsyswellitem.cpp
@@ -37,6 +37,7 @@
 
 #include "llwindow.h"
 #include "v4color.h"
+#include "lluicolortable.h"
 
 //---------------------------------------------------------------------------------
 LLSysWellItem::LLSysWellItem(const Params& p) : LLScrollingPanel(p),
@@ -76,7 +77,10 @@ void LLSysWellItem::onClickCloseBtn()
 //---------------------------------------------------------------------------------
 void LLSysWellItem::updatePanel(BOOL allow_modify)
 {
-	//nothing to do here
+	S32 parent_width = getParent()->getRect().getWidth();
+	S32 panel_height = getRect().getHeight();
+
+	reshape(parent_width, panel_height, TRUE);
 }
 
 //---------------------------------------------------------------------------------
@@ -91,13 +95,13 @@ BOOL LLSysWellItem::handleMouseDown(S32 x, S32 y, MASK mask)
 //---------------------------------------------------------------------------------
 void LLSysWellItem::onMouseEnter(S32 x, S32 y, MASK mask)
 {
-	setTransparentColor(LLColor4(0.3f, 0.3f, 0.3f, 1.0f));
+	setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemSelected" ));
 }
 
 //---------------------------------------------------------------------------------
 void LLSysWellItem::onMouseLeave(S32 x, S32 y, MASK mask)
 {
-	setTransparentColor(LLColor4(0.0f, 0.0f, 0.0f, 0.0f));
+	setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemUnselected" ));
 }
 
 //---------------------------------------------------------------------------------
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index c8eea5e7b4..bf1cd7002e 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -36,7 +36,7 @@
 
 #include "llbottomtray.h"
 #include "llviewercontrol.h"
-
+#include "llviewerwindow.h"
 
 //---------------------------------------------------------------------------------
 LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLFloater(LLSD()),
@@ -44,19 +44,18 @@ LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLFloater(LLSD()),
 													mScrollContainer(NULL),
 													mNotificationList(NULL)
 {
-	// Ho to use:
-	// LLFloaterReg::showInstance("syswell_window");
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_sys_well.xml", NULL);
 }
 
 //---------------------------------------------------------------------------------
 BOOL LLSysWellWindow::postBuild()
 {
-	mCloseBtn = getChild<LLButton>("close_btn");
 	mScrollContainer = getChild<LLScrollContainer>("notification_list_container");
 	mNotificationList = getChild<LLScrollingPanelList>("notification_list");
 
-	mCloseBtn->setClickedCallback(boost::bind(&LLSysWellWindow::onClickCloseBtn,this));
+	//gViewerWindow->setOnBottomTrayWidthChanged(boost::bind(&LLSysWellWindow::adjustWindowPosition, this)); // *TODO: won't be necessary after docking is realized
+	mScrollContainer->setBorderVisible(FALSE);
+
+	mDockTongue = LLUI::getUIImage("windows/Flyout_Pointer.png");
 
 	return TRUE;
 }
@@ -76,7 +75,7 @@ void LLSysWellWindow::addItem(LLSysWellItem::Params p)
 	LLSysWellItem* new_item = new LLSysWellItem(p);
 	mNotificationList->addPanel(dynamic_cast<LLScrollingPanel*>(new_item));
 	reshapeWindow();
-	adjustWindowPosition();
+	//adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
 
 	new_item->setOnItemCloseCallback(boost::bind(&LLSysWellWindow::onItemClose, this, _1));
 	new_item->setOnItemClickCallback(boost::bind(&LLSysWellWindow::onItemClick, this, _1));
@@ -95,14 +94,12 @@ S32 LLSysWellWindow::findItemByID(const LLUUID& id)
 	if(list.size() == 0)
 		return -1;
 
-	LLScrollingPanelList::panel_list_t::const_iterator it = list.begin(); 
+	LLScrollingPanelList::panel_list_t::const_iterator it; 
 	S32 index = 0;
-	while(it != list.end())
+	for(it = list.begin(); it != list.end(); ++it, ++index)
 	{
 		if( dynamic_cast<LLSysWellItem*>(*it)->getID() == id )
 			break;
-		++it;
-		++index;
 	}
 
 	if(it == list.end())
@@ -123,7 +120,7 @@ void LLSysWellWindow::removeItemByID(const LLUUID& id)
 		return;
 
 	reshapeWindow();
-	adjustWindowPosition();
+	//adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
 	// hide chiclet window if there are no items left
 	S32 items_left = mNotificationList->getPanelList().size();
 	if(items_left == 0)
@@ -146,9 +143,9 @@ void LLSysWellWindow::onItemClose(LLSysWellItem* item)
 }
 
 //---------------------------------------------------------------------------------
-void LLSysWellWindow::onClickCloseBtn()
+void LLSysWellWindow::toggleWindow()
 {
-	setVisible(false);
+	setVisible(!getVisible());
 }
 
 //---------------------------------------------------------------------------------
@@ -158,14 +155,14 @@ void LLSysWellWindow::setVisible(BOOL visible)
 	if(visible)
 	{
 		mChannel->removeAndStoreAllVisibleToasts();
-		adjustWindowPosition();
+		//adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
 	}
 
 	LLFloater::setVisible(visible);
 }
 
 //---------------------------------------------------------------------------------
-void LLSysWellWindow::adjustWindowPosition()
+void LLSysWellWindow::adjustWindowPosition()	// *TODO: won't be necessary after docking is realized
 {
 	const S32 WINDOW_MARGIN	= 5;
 
@@ -176,32 +173,31 @@ void LLSysWellWindow::adjustWindowPosition()
 //---------------------------------------------------------------------------------
 void LLSysWellWindow::reshapeWindow()
 {
-	// Get scrollbar size
+	// Get size for scrollbar and floater's header
 	const LLUICachedControl<S32> SCROLLBAR_SIZE("UIScrollbarSize", 0);
+	const LLUICachedControl<S32> HEADER_SIZE("UIFloaterHeaderSize", 0);
 
 	// Get item list	
 	const LLScrollingPanelList::panel_list_t list = mNotificationList->getPanelList();
 
-	// window's size constants
-	const S32 WINDOW_HEADER_HEIGHT	= 30;
-	const S32 MAX_WINDOW_HEIGHT		= 200;
-	const S32 MIN_WINDOW_WIDTH		= 320;
-
-	// Get height and border's width for a scrolling panel list
-	S32 list_height			= mNotificationList->getRect().getHeight();
-	S32 list_border_width	= mScrollContainer->getBorderWidth() * 2;
+	// Get height for a scrolling panel list
+	S32 list_height	= mNotificationList->getRect().getHeight();
 
 	// Check that the floater doesn't exceed its parent view limits after reshape
-	S32 new_height = list_height + WINDOW_HEADER_HEIGHT + list_border_width;
+	S32 new_height = list_height + LLScrollingPanelList::GAP_BETWEEN_PANELS + HEADER_SIZE;
 
 	if(new_height > MAX_WINDOW_HEIGHT)
 	{
-		reshape(MIN_WINDOW_WIDTH + SCROLLBAR_SIZE, MAX_WINDOW_HEIGHT, FALSE);
+		reshape(MIN_WINDOW_WIDTH, MAX_WINDOW_HEIGHT, FALSE);
+		mNotificationList->reshape(MIN_PANELLIST_WIDTH - SCROLLBAR_SIZE, list_height, TRUE);
 	}
 	else
 	{
 		reshape(MIN_WINDOW_WIDTH, new_height, FALSE);
+		mNotificationList->reshape(MIN_PANELLIST_WIDTH, list_height, TRUE);
 	}
+	
+	mNotificationList->updatePanels(TRUE);
 }
 
 //---------------------------------------------------------------------------------
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
index 9554f3cb82..7a107af0d1 100644
--- a/indra/newview/llsyswellwindow.h
+++ b/indra/newview/llsyswellwindow.h
@@ -46,8 +46,6 @@
 
 class LLSysWellWindow : public LLFloater
 {
-	friend class LLFloaterReg;
-
 public:
     LLSysWellWindow(const LLSD& key);
     ~LLSysWellWindow();
@@ -65,20 +63,25 @@ public:
 	// Operating with outfit
 	virtual void setVisible(BOOL visible);
 	void adjustWindowPosition();
+	void toggleWindow();
 
 	// Handlers
 	void onItemClick(LLSysWellItem* item);
 	void onItemClose(LLSysWellItem* item);
 
+	// size constants for the window and for its elements
+	static const S32 MAX_WINDOW_HEIGHT		= 200;
+	static const S32 MIN_WINDOW_WIDTH		= 320;
+	static const S32 MIN_PANELLIST_WIDTH	= 318;
+
 private:
 
-	void onClickCloseBtn();
 	void reshapeWindow();
 
 	// pointer to a corresponding channel's instance
 	LLNotificationsUI::LLScreenChannel*	mChannel;
 
-	LLButton*				mCloseBtn;
+	LLUIImagePtr			mDockTongue;
 	LLScrollContainer*		mScrollContainer;
 	LLScrollingPanelList*	mNotificationList;
 };
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index a67ef85f87..07f802cf54 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -49,10 +49,8 @@ LLToast::LLToast(LLToast::Params p) :	LLFloater(LLSD()),
 										mCanBeStored(p.can_be_stored),
 										mHideBtnEnabled(p.enable_hide_btn),
 										mIsModal(p.is_modal),
-										mIsTipNotification(p.is_tip),
 										mHideBtn(NULL),
 										mNotification(p.notification),
-										mIsViewed(false), 
 										mHideBtnPressed(false)
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "panel_toast.xml", NULL);
@@ -147,7 +145,6 @@ bool LLToast::timerHasExpired()
 void LLToast::hide()
 {
 	setVisible(FALSE);
-	mIsViewed = false;
 	mTimer.stop();
 	mOnFade(this);
 }
@@ -230,7 +227,7 @@ void LLToast::onMouseEnter(S32 x, S32 y, MASK mask)
 
 	setVisibleAndFrontmost();
 	setBackgroundOpaque(TRUE);
-	if(mCanFade && !mIsViewed)
+	if(mCanFade)
 	{
 		mTimer.stop();
 	}
@@ -246,7 +243,7 @@ void LLToast::onMouseLeave(S32 x, S32 y, MASK mask)
 {	
 	mOnToastHover(this, MOUSE_LEAVE);
 
-	if(mCanFade && !mIsViewed)
+	if(mCanFade)
 	{
 		mTimer.start();
 	}
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index a4dee1e386..f1a9f2ec46 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -121,8 +121,6 @@ public:
 	// get information whether the notification corresponding to the toast is responded or not
 	bool getIsNotificationUnResponded();
 	//
-	bool isViewed() { return mIsViewed; }
-	//
 	void setCanFade(bool can_fade);
 	//
 	void setCanBeStored(bool can_be_stored) { mCanBeStored = can_be_stored; }
@@ -163,8 +161,6 @@ private:
 	LLButton*	mHideBtn;
 
 	LLColor4	mBgColor;
-	bool		mIsViewed;
-	bool		mIsTipNotification;
 	bool		mCanFade;
 	bool		mIsModal;
 	bool		mCanBeStored;
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp
index c39bac97a8..28052a33be 100644
--- a/indra/newview/lltoastpanel.cpp
+++ b/indra/newview/lltoastpanel.cpp
@@ -45,16 +45,8 @@ LLToastPanel::~LLToastPanel()
 
 std::string LLToastPanel::getTitle()
 {
-// *TODO: localize header of Title
-/*	std::string title;
-	std::string notification_type = mNotification->getType();
-
-	if( notification_type == "groupnotify" )
-	{
-		title = LLTrans::getString("TitleGroup");
-	}
-*/
-	return (mNotification->getName() + "\n" + mNotification->getMessage());
+	// *TODO: create Title and localize it. If it will be required.
+	return mNotification->getMessage();
 }
 
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index db65203950..499632def3 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3458,7 +3458,10 @@ class LLSelfFriends : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		// Open "Friends" tab of the "People" panel in side tray.
-		LLSideTray::getInstance()->showPanel("panel_people", "friends_panel");
+		LLSD param;
+		param["people_panel_tab_name"] = "friends_panel";
+
+		LLSideTray::getInstance()->showPanel("panel_people", param);
 		return true;
 	}
 };
@@ -3468,7 +3471,9 @@ class LLSelfGroups : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		// Open "Groups" tab of the "People" panel in side tray.
-		LLSideTray::getInstance()->showPanel("panel_people", "groups_panel");
+		LLSD param;
+		param["people_panel_tab_name"] = "groups_panel";
+		LLSideTray::getInstance()->showPanel("panel_people", param);
 		return true;
 	}
 };
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 2747763cd9..e757090da8 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2422,6 +2422,7 @@ void LLViewerWindow::updateBottomTrayRect()
 			rc.mRight = right;
 			bottom_tray->reshape(rc.getWidth(), rc.getHeight(), FALSE);
 			bottom_tray->setRect(rc);
+			mOnBottomTrayWidthChanged();
 		}
 	}
 }
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index a823e5bd99..7afb77bed8 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -186,6 +186,12 @@ public:
 	/*virtual*/ std::string translateString(const char* tag);
 	/*virtual*/ std::string translateString(const char* tag,
 					const std::map<std::string, std::string>& args);
+	
+	// signal on bottom tray width changed
+	typedef boost::function<void (void)> bottom_tray_callback_t;
+	typedef boost::signals2::signal<void (void)> bottom_tray_signal_t;
+	bottom_tray_signal_t mOnBottomTrayWidthChanged;
+	boost::signals2::connection setOnBottomTrayWidthChanged(bottom_tray_callback_t cb) { return mOnBottomTrayWidthChanged.connect(cb); }
 
 	//
 	// ACCESSORS
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 73f0d32d12..c739d4d455 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -664,4 +664,11 @@
     <color
      name="OutputMonitorMutedColor"
      reference="DkGray2" />
+    <color
+     name="SysWellItemUnselected"
+     value="0 0 0 0" />
+    <color
+     name="SysWellItemSelected"
+     value="0.3 0.3 0.3 1.0" />
+  
 </colors>
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index 4525df31b6..02784bb74b 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -5,7 +5,7 @@ untill LLFontGL::render() is fixed to avoid this requirement-->
 <!-- All buttons in the Favorites bar will be created from this one -->
 <button
  follows="left|bottom"
- halign="left"
+ halign="center"
  height="23"
  image_disabled="transparent.j2c"
  image_disabled_selected="PushButton_Selected"
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
new file mode 100644
index 0000000000..38c6d44fdf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_activeim.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	name="floater_activeim"
+	title="ACTIVE IM"
+	top="26"
+	left="0"
+	height="22"
+	width="350"
+	follows="right|bottom"
+	background_visible="true"
+	can_close="true"
+	can_dock="true"
+	can_minimize="false"
+	visible="true"
+	bg_alpha_color="0 0 0 0">
+	<scroll_container
+		follows="top|bottom"
+		layout="topleft"
+		top="20"
+		left="1"
+		width="349"
+		height="2"
+		name="panel_list_container">
+		<scrolling_panel_list
+			follows="left|right"
+			layout="topleft"
+			name="chiclet_row_panel_list"
+			width="335"/>
+	</scroll_container>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 2d67e3d5a9..674bfa42da 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -9,6 +9,7 @@
  name="nearby_chat"
  save_rect="true"
  title="Nearby Chat"
+ single_instance="true"
  width="320">
 	<panel top="20" width="320" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="chat_caption">
     	<text
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index 468d41e2f0..46c8960fbd 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -4,96 +4,37 @@
  background_visible="true" 
  bevel_style="in"
  bg_alpha_color="0.0 0.0 0.0 0.0"
- height="60"
+ height="30"
  left="0"
  top="0" 
  follows="right|bottom"
  layout="topleft"
  name="notification_chiclet"
  save_rect="true"
- title=""
+ title="NOTIFICATIONS"
  width="320"
+ min_width="320"
  can_minimize="false"
  can_tear_off="false"
  can_resize="false"
  can_drag_on_left="false"
  can_close="false"
- can_dock="false"
+ can_dock="true"
 >
   <scroll_container
    follows="top|bottom"
    layout="topleft"
    name="notification_list_container"
-   left="1"
-   top="30"
-   width="336"
-   height="30">
+   left="0"
+   top="18"
+   width="320"
+   height="12">
     <scrolling_panel_list
-     follows="left|right"
      layout="topleft"
      name="notification_list"
-     left="0"
+     left="1"
      top="0"
-     height="20"
-     width="320" />
+     height="10"
+     width="318" />
   </scroll_container>
-
-  <panel 
-    top="0" 
-    width="320" 
-    height="30"
-    layout="topleft"
-    follows="top|left|right"
-    background_visible="true" 
-    background_opaque="false" 
-    bg_alpha_color="0.0 0.0 0.0 1.0" 
-    name="notification_caption"
-  >
-    <text
-      width="255" 
-      left="25" 
-      height="20" 
-      layout="topleft"
-      follows="left|right|top"
-      font="SansSerifBoldBig" 
-      text_color="white" 
-      word_wrap="true"
-      mouse_opaque="true" 
-      name="sender_name"
-    >
-      NOTIFICATIONS  
-    </text>
-    <button
-      top="5"
-      left="270"
-      width="15"
-      height="15"
-      layout="topleft"
-      follows="right"
-      label=""
-      toggle="true" 
-      image_unselected="arrow_up.tga"
-      image_disabled="arrow_up.tga"
-      image_selected="arrow_down.tga"
-      image_hover_selected="arrow_down.tga"
-      image_disabled_selected="arrow_down.tga"
-      name="tear_btn"
-    />    
-    <button 
-      top="5" 
-      left="300"
-      width="15" 
-      height="15"
-      layout="topleft"
-      follows="right"
-      label="" 
-      image_unselected="closebox.tga" 
-      image_disabled="closebox.tga"
-      image_selected="closebox.tga" 
-      image_hover_selected="closebox.tga"
-      image_disabled_selected="closebox.tga"
-      name="close_btn"
-    />
-  </panel>
-
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml
index 7e4bbe3c9d..76c132aeb7 100644
--- a/indra/newview/skins/default/xui/en/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/en/menu_favorites.xml
@@ -7,27 +7,59 @@
     <menu_item_call
      label="Teleport"
      layout="topleft"
-     name="Landmark Open">
+     name="Teleport To Landmark">
         <menu_item_call.on_click
          function="Favorites.DoToSelected"
          parameter="open" />
     </menu_item_call>
     <menu_item_call
-     label="About Landmark"
+     label="View/Edit Landmark"
      layout="topleft"
-     name="Teleport To Landmark">
+     name="Landmark Open">
         <menu_item_call.on_click
          function="Favorites.DoToSelected"
          parameter="about" />
     </menu_item_call>
-<!--     <menu_item_call -->
-<!--      label="Rename" -->
-<!--      layout="topleft" -->
-<!--      name="Rename"> -->
-<!--         <menu_item_call.on_click -->
-<!--          function="Favorites.DoToSelected" -->
-<!--          parameter="rename" /> -->
-<!--     </menu_item_call> -->
+    <menu_item_call
+     label="Copy SLURL"
+     layout="topleft"
+     name="Copy slurl">
+        <menu_item_call.on_click
+         function="Favorites.DoToSelected"
+         parameter="copy_slurl" />
+    </menu_item_call>
+    <menu_item_call
+     label="Show On Map"
+     layout="topleft"
+     name="Show On Map">
+        <menu_item_call.on_click
+         function="Favorites.DoToSelected"
+         parameter="show_on_map" />
+    </menu_item_call>
+
+    <menu_item_separator
+     layout="topleft" />
+
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="Landmark Copy">
+        <menu_item_call.on_click
+         function="Favorites.DoToSelected"
+         parameter="copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="Landmark Paste">
+        <menu_item_call.on_click
+         function="Favorites.DoToSelected"
+         parameter="paste" />
+    </menu_item_call>
+
+    <menu_item_separator
+     layout="topleft" />
+
     <menu_item_call
      label="Delete"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
new file mode 100644
index 0000000000..1ad10abbeb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="201"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="hide_navbar_menu"
+ top="624"
+ visible="false"
+ width="128">
+    <menu_item_check
+         label="Show Navigation Bar"
+         layout="topleft"
+         name="Show Navigation Bar">
+           <menu_item_check.on_click
+             function="HideNavbarMenu.Action"
+             parameter="show_navbar_navigation_panel" />
+             <menu_item_check.on_check
+             function="HideNavbarMenu.EnableMenuItem"
+             parameter="show_navbar_navigation_panel" />
+    </menu_item_check>
+    <menu_item_check
+         label="Show Favorites Bar"
+         layout="topleft"
+         name="Show Favorites Bar">
+           <menu_item_check.on_click
+             function="HideNavbarMenu.Action"
+             parameter="show_navbar_favorites_panel" />
+             <menu_item_check.on_check
+             function="HideNavbarMenu.EnableMenuItem"
+             parameter="show_navbar_favorites_panel" />
+    </menu_item_check>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
index 435d928f00..89469fb013 100644
--- a/indra/newview/skins/default/xui/en/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_navbar.xml
@@ -19,16 +19,15 @@
              function="Navbar.EnableMenuItem"
              parameter="show_coordinates" />
     </menu_item_check>
+    <!-- Label of 'Landmark' item is changing in runtime, 
+    see  AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml -->
     <menu_item_call
-     label="Add Landmark..."
+     label="Landmark"
      layout="topleft"
-     name="Add Landmark">
+     name="Landmark">
         <menu_item_call.on_click
          function="Navbar.Action"
          parameter="landmark" />
-        <menu_item_call.on_enable
-         function="Navbar.EnableMenuItem"
-         parameter="can_landmark" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
new file mode 100644
index 0000000000..8977f30a51
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	follows="bottom|right"
+	name="panel_activeim_row"
+	layout="topleft"
+	top="0"
+	left="0"
+	height="40"
+	width="332"
+	background_visible="true"
+	bevel_style="in"
+	bg_alpha_color="0 0 0 0">
+	<chiclet_im
+		name="chiclet"
+		layout="topleft"
+		top="4"
+		left="10"
+		height="26"
+		width="45">
+	</chiclet_im>
+	<text
+		type="string"
+		name="contact_name"
+		layout="topleft"
+		top="8"
+		left="70"
+		height="20"
+		width="230"
+		length="1"
+		follows="left|top|right|bottom"
+		font="SansSerifBigBold"
+		text_color="White">Contact Name</text>
+	<button
+		name="hide_btn"
+		layout="topleft"
+		top="10"
+		left="310"
+		height="20"
+		width="20"
+		label=""
+		image_unselected="toast_hide_btn.tga"
+		image_disabled="toast_hide_btn.tga"
+		image_selected="toast_hide_btn.tga"
+		image_hover_selected="toast_hide_btn.tga"
+		image_disabled_selected="toast_hide_btn.tga">
+	</button>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 5e2e2267f6..9910f99c17 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -245,9 +245,11 @@
                height="20"
                left="18"
                top="23"/>
+<!-- 
 			  <chiclet_notification.commit_callback
 				 function="Notification.Show"
 				 parameter="ClickUnimplemented" />
+ -->               				 
 			</chiclet_notification>
         </layout_panel>
         <icon
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 4f179d7a16..93fc938622 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -53,7 +53,7 @@
 	 top="632"
 	 left="75"	 
 	 height="20"
-     ont="SansSerifSmall"
+     font="SansSerifSmall"
      label="Refresh"
      label_selected="Refresh"
      name="btn_refresh"
@@ -69,7 +69,7 @@
      left="5"
      visible="false"
      width="65" />
-      <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="panel_me_profile">
+      <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="group_general_tab">
 		<accordion_tab min_height="515" title="Group General" name="group_general_tab">
         	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>
 		</accordion_tab>
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 8d90c6ebf0..f821dcd839 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -132,6 +132,7 @@
      layout="topleft"
      left="5"
      name="favorite"
+     chevron_button_tool_tip="Show more of My Favorites"
      top="32"
      width="590" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index b934312971..1efe287cbe 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -16,11 +16,20 @@
      name="no_one_near"
      value="No-one near" />
     <string
-     name="no_friends"
-     value="No friends" />
+     name="no_friends_online"
+     value="No friends online" />
+    <string
+     name="no_friends_offline"
+     value="No friends offline" />
     <string
      name="no_groups"
      value="No groups" />
+    <string
+     name="people_filter_label"
+     value="Filter People" />
+    <string
+     name="groups_filter_label"
+     value="Filter Groups" />
     <filter_editor
      background_image="TextField_Search_Off"
      follows="left|top|right"
@@ -85,7 +94,7 @@
              width="285">
                 <button
                  enabled="false"
-                 follows="bottom|right"
+                 follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="OptionsMenu_Press"
@@ -107,14 +116,65 @@
          layout="topleft"
          name="friends_panel"
          width="285">
-            <avatar_list
+            <accordion
              follows="left|top|right|bottom"
              height="357"
              layout="topleft"
              left="0"
-             name="avatar_list"
+             name="friends_accordion"
              top="2"
-             width="285" />
+             width="285">
+                <accordion_tab
+                 can_resize="false"
+                 layout="topleft"
+                 min_height="100"
+                 name="tab_online"
+                 title="Online">
+                    <panel
+                     follows="all"
+                     height="150"
+                     layout="topleft"
+                     left="0"
+                     name="tab_online_panel"
+                     top="100"
+                     width="285">
+                        <avatar_list
+                         draw_heading="false"
+                         follows="all"
+                         height="145"
+                         layout="topleft"
+                         left="0"
+                         name="avatars_online"
+                         top="0"
+                         width="285" />
+                    </panel>
+                </accordion_tab>
+                <accordion_tab
+                 can_resize="false"
+                 layout="topleft"
+                 min_height="100"
+                 name="tab_offline"
+                 title="Offline">
+                    <panel
+                     follows="all"
+                     height="260"
+                     layout="topleft"
+                     left="0"
+                     name="tab_offline_panel"
+                     top="100"
+                     width="285">
+                        <avatar_list
+                         draw_heading="false"
+                         follows="all"
+                         height="255"
+                         layout="topleft"
+                         left="0"
+                         name="avatars_offline"
+                         top="0"
+                         width="285" />
+                    </panel>
+                </accordion_tab>
+            </accordion>
             <panel
              background_visible="true"
              bevel_style="none"
@@ -128,7 +188,7 @@
              width="285">
                 <button
                  enabled="false"
-                 follows="bottom|right"
+                 follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="OptionsMenu_Press"
@@ -195,7 +255,7 @@
              width="285">
                 <button
                  enabled="false"
-                 follows="bottom|right"
+                 follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="OptionsMenu_Press"
@@ -275,7 +335,7 @@
              width="285">
                 <button
                  enabled="false"
-                 follows="bottom|right"
+                 follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="OptionsMenu_Press"
@@ -298,7 +358,6 @@
      left="10"
      name="button_bar"
      orientation="horizontal"
-     top_pad="0"
      width="295">
         <layout_panel
          default_tab_group="1"
@@ -318,17 +377,17 @@
              name="view_profile_btn"
              width="65" />
         </layout_panel>
-<!--        <layout_panel
+        <layout_panel
          default_tab_group="1"
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
+         left_delta="0"
          min_width="85"
          name="add_friend_btn_panel"
          top_delta="0"
          width="85">
-           <button
+            <button
              follows="top|left|right"
              font="SansSerifSmallBold"
              height="25"
@@ -336,13 +395,12 @@
              layout="topleft"
              name="add_friend_btn"
              width="85" />
-        </layout_panel>-->
+        </layout_panel>
         <layout_panel
          default_tab_group="1"
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="80"
          name="group_info_btn_panel"
          width="80">
@@ -360,7 +418,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="45"
          name="chat_btn_panel"
          top_delta="0"
@@ -379,7 +436,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="35"
          name="im_btn_panel"
          top_delta="0"
@@ -398,7 +454,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="40"
          name="call_btn_panel"
          top_delta="0"
@@ -419,7 +474,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="65"
          name="teleport_btn_panel"
          top_delta="0"
@@ -439,7 +493,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="50"
          name="share_btn_panel"
          top_delta="0"
@@ -455,31 +508,5 @@
              name="share_btn"
              width="50" />
         </layout_panel>
-<!--        <layout_panel
-         default_tab_group="1"
-         follows="left|top|right"
-         height="25"
-         layout="topleft"
-         left_pad="0"
-         min_width="40"
-         name="more_btn_panel"
-         top_delta="0"
-         width="40">
-            <button
-             enabled="false"
-             follows="top|right"
-             font="SansSerifSmallBold"
-             height="25"
-             label="&gt;&gt;"
-             layout="topleft"
-             name="more_btn"
-             width="40" />
-        </layout_panel>-->
     </layout_stack>
-  <string name="people_filter_label">
-    Filter People
-  </string>
-  <string name="groups_filter_label">
-    Filter Groups
-  </string>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 73cd988103..edaa8f7fa7 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -40,78 +40,91 @@
      scale_image="false"
      top="8"
      width="13" />
+
     <tab_container
-     follows="left|top|right|bottom"
+     follows="all"
      height="326"
      layout="topleft"
      left="9"
      name="Places Tabs"
      tab_position="top"
-     top_pad="15"
+     top="30"
      width="285" />
-    <button
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     image_disabled="widgets/SegmentedBtn_Left_Disabled.png"
-     image_selected="widgets/SegmentedBtn_Left_Selected.png"
-     image_unselected="widgets/SegmentedBtn_Left_Off.png"
-     label="Create"
-     layout="topleft"
-     left="10"
-     name="create_landmark_btn"
-     top_pad="5"
-     visible="false"
-     width="60" />
-    <button
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     image_disabled="widgets/ComboButton_Disabled.png"
-     image_selected="widgets/ComboButton_Selected.png"
-     image_unselected="widgets/ComboButton_Off.png"
-     label="â–¼"
-     layout="topleft"
-     top_pad="0"
-     name="folder_menu_btn"
-     visible="false"
-     left_pad="5"
-     width="20" />
-    <button
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     label="Teleport"
-     layout="topleft"
-     left="10"
-     top_pad="0"
-     name="teleport_btn"
-     width="80" />
-    <button
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     label="Map"
-     layout="topleft"
-     name="map_btn"
-     left_pad="5"
-     width="80" />
-    <button
-     enabled="false"
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     left_pad="5"
-     label="Share"
-     layout="topleft"
-     name="share_btn"
-     width="60" />
     <panel
      class="panel_place_info"
      filename="panel_place_info.xml"
      follows="all"
      layout="topleft"
+     top="30"
+     height="326"
      left="0"
      name="panel_place_info"
      visible="false" />
+    
+    <panel
+     name="button_panel"
+     layout="topleft"
+     height="25"
+     left="0"
+     top_pad="10"
+     width="305">
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Teleport"
+         layout="topleft"
+         left="5"
+         top="0"
+         name="teleport_btn"
+         width="80" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Map"
+         layout="topleft"
+         name="map_btn"
+         left_pad="5"
+         top="0"
+         width="80" />
+        <button
+         enabled="false"
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         left_pad="5"
+         top="0"
+         label="Share"
+         layout="topleft"
+         name="share_btn"
+         width="60" />
+
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         image_disabled="widgets/SegmentedBtn_Left_Disabled.png"
+         image_selected="widgets/SegmentedBtn_Left_Selected.png"
+         image_unselected="widgets/SegmentedBtn_Left_Off.png"
+         label="Create"
+         layout="topleft"
+         left="5"
+         top="0"
+         name="create_landmark_btn"
+         width="60" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         image_disabled="widgets/ComboButton_Disabled.png"
+         image_selected="widgets/ComboButton_Selected.png"
+         image_unselected="widgets/ComboButton_Off.png"
+         label="â–¼"
+         layout="topleft"
+         name="folder_menu_btn"
+         left_pad="0"
+         top="0"
+         width="20" />
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
index eccb919b04..3c49ce311a 100644
--- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -10,7 +10,7 @@
 	width="318"
 	height="35"
   layout="topleft"
-  follows="top"
+  follows="left|right"
   background_opaque="false"
   background_visible="true"
   bg_alpha_color="0.0 0.0 0.0 0.0" >
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 05ebcbb50b..82d6945e0f 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Teleport History" bottom="0" height="326" left="0" width="380"
      border="true" follows="left|top|right|bottom">
-	<scroll_list bottom="0" column_padding="0" draw_heading="true"
+	<scroll_list bottom="0" column_padding="0" draw_heading="false"
 	     draw_stripes="false" follows="left|top|bottom|right" left="0"
 	     multi_select="false" name="history_items" search_column="1"
 	     sort_column="1" height="326" width="380" >
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0ed473a01a..fb1aa25b25 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -610,6 +610,8 @@ you managed for [OWNER]
 		Unknown file extension .%s
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>		
+	<string name="AddLandmarkNavBarMenu">Add Landmark...</string>	 
+	<string name="EditLandmarkNavBarMenu">Edit Landmark...</string>
 	
 	<!-- Previews -->
 	<string name="FileSaved">File Saved</string>	
-- 
cgit v1.3


From 36e932b4d8590171d8fb3552db89c915684629c9 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 17 Aug 2009 17:02:48 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1351
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1365 ->
 viewer-2.0.0-3 EXT 451 EXT-303 EXT-367 EXT-367 EXT-371 EXT-394 EXT-494
 EXT-502 EXT-503 EXT-516 EXT-538 EXT-540

---
 indra/llui/lllineeditor.cpp                        |  2 +-
 indra/newview/app_settings/settings.xml            | 11 +++++++++
 indra/newview/llchannelmanager.cpp                 | 11 ++++++++-
 indra/newview/llchannelmanager.h                   |  2 ++
 indra/newview/lllandmarkactions.cpp                | 24 ++++++++++++++-----
 indra/newview/lllandmarkactions.h                  |  2 +-
 indra/newview/lllocationinputctrl.cpp              | 15 ++++++++++--
 indra/newview/llnavigationbar.cpp                  | 28 ++++++++--------------
 indra/newview/llnearbychat.cpp                     |  2 +-
 indra/newview/llnearbychathandler.cpp              |  3 +--
 indra/newview/llnearbychathandler.h                |  2 --
 indra/newview/llnotificationalerthandler.cpp       |  1 +
 indra/newview/llpanelimcontrolpanel.cpp            |  3 ++-
 indra/newview/llpanelpicks.cpp                     | 25 ++++++++++---------
 indra/newview/llscreenchannel.cpp                  |  4 ++--
 indra/newview/llscreenchannel.h                    |  7 +++++-
 indra/newview/llsyswellwindow.cpp                  |  8 +++----
 .../default/xui/en/panel_group_land_money.xml      |  8 +++----
 .../newview/skins/default/xui/en/panel_profile.xml |  4 ++--
 .../default/xui/en/panel_side_tray_tab_caption.xml |  2 +-
 20 files changed, 102 insertions(+), 62 deletions(-)

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 20957499bc..42a1b9ad9c 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -624,7 +624,7 @@ BOOL LLLineEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 	// delay cursor flashing
 	mKeystrokeTimer.reset();
 	
-	LLUICtrl::handleMouseDown(x,y,mask);
+	mMouseDownSignal(this,x,y,mask);
 
 	return TRUE;
 }
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 06873c599c..4e7b3e2f68 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8153,6 +8153,17 @@
       <key>Value</key>
       <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
     </map>
+    <key>NearByChatChannelUUID</key>
+    <map>
+      <key>Comment</key>
+      <string />
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>E1158BD6-661C-4981-9DAD-4DCBFF062502</string>
+    </map>  
     <key>UIImgWhiteUUID</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp
index 91945038aa..57ea6064a4 100644
--- a/indra/newview/llchannelmanager.cpp
+++ b/indra/newview/llchannelmanager.cpp
@@ -62,7 +62,10 @@ void LLChannelManager::onLoginCompleted()
 
 	for(std::vector<ChannelElem>::iterator it = mChannelList.begin(); it !=  mChannelList.end(); ++it)
 	{
-		away_notifications +=(*it).channel->getNumberOfHiddenToasts();
+		if(!(*it).channel->getDisplayToastsAlways())
+		{
+			away_notifications +=(*it).channel->getNumberOfHiddenToasts();
+		}
 	}
 
 	if(!away_notifications)
@@ -95,6 +98,11 @@ void LLChannelManager::removeStartUpChannel()
 	getRootView()->removeChild(mStartUpChannel);
 	delete mStartUpChannel;
 	mStartUpChannel = NULL;
+
+	//force NEARBY CHAT CHANNEL to repost all toasts if present
+	LLScreenChannel* nearby_channel = getChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID")));
+	nearby_channel->loadStoredToastsToChannel();
+	nearby_channel->setCanStoreToasts(false);
 }
 
 //--------------------------------------------------------------------------
@@ -118,6 +126,7 @@ LLScreenChannel* LLChannelManager::createChannel(LLChannelManager::Params& p)
 	getRootView()->addChild(new_channel);
 	new_channel->init(p.channel_right_bound - p.channel_width, p.channel_right_bound);
 	new_channel->setToastAlignment(p.align);
+	new_channel->setDisplayToastsAlways(p.display_toasts_always);
 
 	ChannelElem new_elem;
 	new_elem.id = p.id;
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index 6adc79713a..dbd2e0b422 100644
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@@ -60,12 +60,14 @@ public:
 		Optional<LLChiclet*>		chiclet;
 		Optional<S32>				channel_right_bound;
 		Optional<S32>				channel_width;
+		Optional<bool>				display_toasts_always;
 		Optional<EToastAlignment>	align;
 
 		Params():	id("id", LLUUID("")),
 					chiclet("chiclet", NULL), 
 					channel_right_bound("channel_right_bound", 0), 
 					channel_width("channel_width", 0), 
+					display_toasts_always("display_toasts_always", false),
 					align("align", NA_BOTTOM)
 		{}
 	};
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp
index a341d81b94..aa5432740c 100644
--- a/indra/newview/lllandmarkactions.cpp
+++ b/indra/newview/lllandmarkactions.cpp
@@ -77,11 +77,14 @@ class LLFetchLandmarksByName : public LLInventoryCollectFunctor
 {
 private:
 	std::string name;
+	BOOL use_substring;
 
 public:
-LLFetchLandmarksByName(std::string &landmark_name)
-:name(landmark_name)
+LLFetchLandmarksByName(std::string &landmark_name, BOOL if_use_substring)
+:name(landmark_name),
+use_substring(if_use_substring)
 	{
+	LLStringUtil::toLower(name);
 	}
 
 public:
@@ -94,20 +97,28 @@ public:
 		if (!landmark) // the landmark not been loaded yet
 			return false;
 
-		if (item->getName() == name)
+		std::string landmark_name = item->getName();
+		LLStringUtil::toLower(landmark_name);
+		if(use_substring)
 		{
-			return true;
+			if ( landmark_name.find( name ) != std::string::npos)
+				return true;
+		}
+		else
+		{
+			if ( landmark_name == name )
+				return true;
 		}
 
 		return false;
 	}
 };
 
-LLInventoryModel::item_array_t LLLandmarkActions::fetchLandmarksByName(std::string& name)
+LLInventoryModel::item_array_t LLLandmarkActions::fetchLandmarksByName(std::string& name, BOOL if_starts_with)
 {
 	LLInventoryModel::cat_array_t cats;
 	LLInventoryModel::item_array_t items;
-	LLFetchLandmarksByName fetchLandmarks(name);
+	LLFetchLandmarksByName fetchLandmarks(name, if_starts_with);
 	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
 			cats,
 			items,
@@ -115,6 +126,7 @@ LLInventoryModel::item_array_t LLLandmarkActions::fetchLandmarksByName(std::stri
 			fetchLandmarks);
 	return items;
 }
+
 bool LLLandmarkActions::landmarkAlreadyExists()
 {
 	// Determine whether there are landmarks pointing to the current parcel.
diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h
index 12c7398f6a..3c2a0a5522 100644
--- a/indra/newview/lllandmarkactions.h
+++ b/indra/newview/lllandmarkactions.h
@@ -46,7 +46,7 @@ public:
 	/**
 	 * @brief Fetches landmark LLViewerInventoryItems for the given landmark name. 
 	 */
-	static LLInventoryModel::item_array_t fetchLandmarksByName(std::string& name);
+	static LLInventoryModel::item_array_t fetchLandmarksByName(std::string& name, BOOL if_use_substring);
 	/**
 	 * @brief Checks whether landmark exists for current parcel.
 	 */
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index a6662ef379..cdfb15fd71 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -49,6 +49,7 @@
 #include "lllandmarklist.h"
 #include "lllocationhistory.h"
 #include "llsidetray.h"
+#include "llslurl.h"
 #include "lltrans.h"
 #include "llviewerinventory.h"
 #include "llviewerparcelmgr.h"
@@ -411,6 +412,14 @@ void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data)
 {
 	std::string filter = data.asString();
 	rebuildLocationHistory(filter);
+
+	//Let's add landmarks to the top of the list if any
+	LLInventoryModel::item_array_t landmark_items = LLLandmarkActions::fetchLandmarksByName(filter, TRUE);
+
+	for(U32 i=0; i < landmark_items.size(); i++)
+	{
+		mList->addSimpleElement(landmark_items[i]->getName(), ADD_TOP);
+	}
 	mList->mouseOverHighlightNthItem(-1); // Clear highlight on the last selected item.
 }
 
@@ -540,8 +549,10 @@ void LLLocationInputCtrl::updateWidgetlayout()
 
 void LLLocationInputCtrl::changeLocationPresentation()
 {
-	// change location presentation only if user select anything. 
-	if(mTextEntry && !mTextEntry->hasSelection() )
+	//change location presentation only if user does not  select anything and 
+	//human-readable region name  is being displayed
+	if(mTextEntry && !mTextEntry->hasSelection() && 
+		!LLSLURL::isSLURL(mTextEntry->getText()))
 	{
 		mTextEntry->setText(gAgent.getUnescapedSLURL());
 		mTextEntry->selectAll();
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index e3c4cd4895..9a66507eae 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -315,26 +315,18 @@ void LLNavigationBar::onLocationSelection()
 	}
 	else
 	{
-		region_name = extractLocalCoordsFromRegName(typed_location, &x, &y, &z);
-
-		if (region_name != typed_location) {
-			local_coords.set(x, y, z);
-		} 
+		LLInventoryModel::item_array_t landmark_items = LLLandmarkActions::fetchLandmarksByName(typed_location, FALSE);
+		if ( !landmark_items.empty() )
+		{
+			mUpdateTypedLocationHistory = true;
+			gAgent.teleportViaLandmark(landmark_items[0]->getAssetUUID());
+			return;
+		}
 		else
 		{
-			LLInventoryModel::item_array_t landmark_items = LLLandmarkActions::fetchLandmarksByName(typed_location);
-			LLViewerInventoryItem* item = NULL;
-			if ( !landmark_items.empty() )
-			{
-				item = landmark_items[0];
-			}
-
-			if (item)
-			{
-				mUpdateTypedLocationHistory = true;
-				gAgent.teleportViaLandmark(item->getAssetUUID());
-				return;
-			}
+			region_name = extractLocalCoordsFromRegName(typed_location, &x, &y, &z);
+			if (region_name != typed_location)
+				local_coords.set(x, y, z);
 		}
 		// Treat it as region name.
 		// region_name = typed_location;
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 2683109829..32d7bc94ff 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -468,7 +468,7 @@ BOOL LLNearbyChat::handleRightMouseDown(S32 x, S32 y, MASK mask)
 
 void	LLNearbyChat::onOpen(const LLSD& key )
 {
-	LLNotificationsUI::LLScreenChannel* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->getChannelByID(LLUUID(NEARBY_CHAT_ID));
+	LLNotificationsUI::LLScreenChannel* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->getChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID")));
 	if(chat_channel)
 	{
 		chat_channel->removeToastsFromChannel();
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 837f924c44..a56688d862 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -52,7 +52,7 @@ LLNearbyChatHandler::LLNearbyChatHandler(e_notification_type type, const LLSD& i
 	LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
 	/////////////////////////////////////////////////////
 	LLChannelManager::Params p;														  //TODO: check and correct
-	p.id = LLUUID(NEARBY_CHAT_ID);
+	p.id = LLUUID(gSavedSettings.getString("NearByChatChannelUUID"));
 	p.channel_right_bound = nearby_chat->getRect().mRight;
 	p.channel_width = nearby_chat->getRect().mRight - 16;   //HACK: 16 - ?
 	/////////////////////////////////////////////////////
@@ -62,7 +62,6 @@ LLNearbyChatHandler::LLNearbyChatHandler(e_notification_type type, const LLSD& i
 	mChannel = LLChannelManager::getInstance()->createChannel(p);
 	mChannel->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_TOP); 
 	mChannel->setOverflowFormatString("You have %d unread nearby chat messages");
-	mChannel->setCanStoreToasts(false);
 }
 LLNearbyChatHandler::~LLNearbyChatHandler()
 {
diff --git a/indra/newview/llnearbychathandler.h b/indra/newview/llnearbychathandler.h
index 89ac08b9f0..53436a92b0 100644
--- a/indra/newview/llnearbychathandler.h
+++ b/indra/newview/llnearbychathandler.h
@@ -35,8 +35,6 @@
 
 #include "llnotificationhandler.h"
 
-#define NEARBY_CHAT_ID "E1158BD6-661C-4981-9DAD-4DCBFF062502"
-
 //add LLNearbyChatHandler to LLNotificationsUI namespace
 namespace LLNotificationsUI{
 
diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
index 7003879dbf..f485152d3a 100644
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/indra/newview/llnotificationalerthandler.cpp
@@ -52,6 +52,7 @@ LLAlertHandler::LLAlertHandler(e_notification_type type, const LLSD& id) : mIsMo
 	p.id = LLUUID(ALERT_CHANNEL_ID);
 	p.channel_right_bound = tray->getRect().getWidth() / 2;
 	p.channel_width = 0;
+	p.display_toasts_always = true;
 	p.align = NA_CENTRE;
 
 	// Getting a Channel for our notifications
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index f9de409596..1d50bb26f6 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -37,6 +37,7 @@
 #include "llavataractions.h"
 #include "llavatariconctrl.h"
 #include "llbutton.h"
+#include "llgroupactions.h"
 
 LLPanelIMControlPanel::LLPanelIMControlPanel()
 {
@@ -95,7 +96,7 @@ BOOL LLPanelGroupControlPanel::postBuild()
 
 void LLPanelGroupControlPanel::onGroupInfoButtonClicked()
 {
-	//LLFloaterGroupInfo::showFromUUID(mGroupID);
+	LLGroupActions::show(mGroupID);
 }
 
 
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 051bf08c2f..45a00b7fd2 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -191,25 +191,24 @@ void LLPanelPicks::reshapePicksList()
 	if (!mPickItemList.size()) return;
 	LLView* pickList = getPicksList();
 
+	//We don't need to update size of the 'pick list' before reshaping pick items. Don't need to reshape the pick list
+	S32 height = mPickItemList.size() * (mPickItemList.front()->getRect().getHeight() + PICK_ITEMS_BETWEEN);
+	LLRect rc = pickList->getRect();
+	rc.setLeftTopAndSize(rc.mLeft, rc.mTop, rc.getWidth(), height);
+	pickList->setRect(rc);
+
 	S32 last_bottom = pickList->getRect().getHeight();
-	child_list_const_iter_t child_it, child_first_it = pickList->getChildList()->begin();
-	for ( child_it = child_first_it; child_it != pickList->getChildList()->end(); ++child_it)
+	std::list<LLPickItem*>::const_iterator pick_it, pick_first_it = mPickItemList.begin();
+	for ( pick_it = pick_first_it; pick_it != mPickItemList.end(); ++pick_it)
 	{
-		LLView* const childp = *child_it;
-		if(child_it != child_first_it)
+		LLView* const pick = *pick_it;
+		if(pick_it != pick_first_it)
 		{
-			last_bottom -= childp->getRect().getHeight();
+			last_bottom -= pick->getRect().getHeight();
 			last_bottom -= PICK_ITEMS_BETWEEN;
 		}
-		reshapePickItem(childp, last_bottom,pickList->getRect().getWidth());
+		reshapePickItem(pick, last_bottom,pickList->getRect().getWidth());
 	}
-
-	//*TODO move back panel reshaping before reshaping pick items, so it will be more durable to xui xml changes
-	S32 height = pickList->getChildCount() * ((*child_first_it)->getRect().getHeight() + PICK_ITEMS_BETWEEN);
-	LLRect rc = pickList->getRect();
-	rc.setLeftTopAndSize(rc.mLeft, rc.mTop, rc.getWidth(), height);
-	pickList->reshape(rc.getWidth(), rc.getHeight());
-	pickList->setRect(rc);
 }
 
 void LLPanelPicks::reshapePickItem(LLView* const pick_item, const S32 last_bottom, const S32 newWidth)
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index ab8d61f305..50110da70c 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -93,8 +93,8 @@ void LLScreenChannel::addToast(LLToast::Params p)
 	// we show toast in the following cases:
 	//	- the StartUp Toast is already hidden and the SysWell's window is hidden
 	//  - the SysWell's window is shown, but notification is a tip. We can't store it, so we show it
-	//	- the channel has a CENTRE allignment, so it is intended for alerts. We always show alerts
-	bool show_toast = (mWasStartUpToastShown && !isSysWellWndShown) || (isSysWellWndShown && p.is_tip) || mToastAlignment == NA_CENTRE;
+	//	- the channel is intended for displaying of toasts always, e.g. alerts
+	bool show_toast = (mWasStartUpToastShown && !isSysWellWndShown) || (isSysWellWndShown && p.is_tip) || mDisplayToastsAlways;
 	bool store_toast = !show_toast && !p.is_tip && mCanStoreToasts;
 
 	// if we can't show or store a toast, then do nothing, just send ignore to a notification 
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index 1ca70c72d0..0845c32ee5 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -103,8 +103,12 @@ public:
 	void		setCanStoreToasts(bool store) { mCanStoreToasts = store; }
 	// tell all channels that the StartUp toast was shown and allow them showing of toasts
 	static void	setStartUpToastShown() { mWasStartUpToastShown = true; }
-	//
+	// get StartUp Toast's state
 	static bool	getStartUpToastShown() { return mWasStartUpToastShown; }
+	// set mode for dislaying of toasts
+	void setDisplayToastsAlways(bool display_toasts) { mDisplayToastsAlways = display_toasts; }
+	// get mode for dislaying of toasts
+	bool getDisplayToastsAlways() { return mDisplayToastsAlways; }
 
 	// Channel's other interface functions functions
 	// get number of hidden notifications from a channel
@@ -173,6 +177,7 @@ private:
 	bool		mControlHovering;
 	bool		mIsHovering;
 	bool		mCanStoreToasts;
+	bool		mDisplayToastsAlways;
 	bool		mOverflowToastHidden;
 	// 
 	e_notification_toast_alignment	mToastAlignment;
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index bf1cd7002e..a26b1c14af 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -52,7 +52,7 @@ BOOL LLSysWellWindow::postBuild()
 	mScrollContainer = getChild<LLScrollContainer>("notification_list_container");
 	mNotificationList = getChild<LLScrollingPanelList>("notification_list");
 
-	//gViewerWindow->setOnBottomTrayWidthChanged(boost::bind(&LLSysWellWindow::adjustWindowPosition, this)); // *TODO: won't be necessary after docking is realized
+	gViewerWindow->setOnBottomTrayWidthChanged(boost::bind(&LLSysWellWindow::adjustWindowPosition, this)); // *TODO: won't be necessary after docking is realized
 	mScrollContainer->setBorderVisible(FALSE);
 
 	mDockTongue = LLUI::getUIImage("windows/Flyout_Pointer.png");
@@ -75,7 +75,7 @@ void LLSysWellWindow::addItem(LLSysWellItem::Params p)
 	LLSysWellItem* new_item = new LLSysWellItem(p);
 	mNotificationList->addPanel(dynamic_cast<LLScrollingPanel*>(new_item));
 	reshapeWindow();
-	//adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
+	adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
 
 	new_item->setOnItemCloseCallback(boost::bind(&LLSysWellWindow::onItemClose, this, _1));
 	new_item->setOnItemClickCallback(boost::bind(&LLSysWellWindow::onItemClick, this, _1));
@@ -120,7 +120,7 @@ void LLSysWellWindow::removeItemByID(const LLUUID& id)
 		return;
 
 	reshapeWindow();
-	//adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
+	adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
 	// hide chiclet window if there are no items left
 	S32 items_left = mNotificationList->getPanelList().size();
 	if(items_left == 0)
@@ -155,7 +155,7 @@ void LLSysWellWindow::setVisible(BOOL visible)
 	if(visible)
 	{
 		mChannel->removeAndStoreAllVisibleToasts();
-		//adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
+		adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
 	}
 
 	LLFloater::setVisible(visible);
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 57ca8747e5..b85f1ed617 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -281,13 +281,13 @@
              bg_readonly_color="0.784314 0.819608 0.8 1"
              follows="all"
              font="Monospace"
-             height="180"
+             height="172"
              layout="topleft"
              left="8"
              max_length="4096"
              name="group_money_planning_text"
              top="5"
-             width="260">
+             width="250">
                 Computing...
             </text_editor>
         </panel>
@@ -313,7 +313,7 @@
              max_length="4096"
              name="group_money_details_text"
              top="7"
-             width="260">
+             width="250">
                 Computing...
             </text_editor> 
           <button
@@ -359,7 +359,7 @@
              max_length="4096"
              name="group_money_sales_text"
              top="7"
-             width="260">
+             width="250">
                 Computing...
             </text_editor>
             <button
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 23c8223e7b..d00ff7a6a1 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -222,7 +222,7 @@
          width="100" />
         <panel
          follows="left|top|right"
-         height="15"
+         height="50"
          layout="topleft"
          left_pad="10"
          name="partner_data_panel"
@@ -230,7 +230,7 @@
          width="125">
             <text
              follows="left|top|right"
-             height="15"
+             height="30"
              layout="topleft"
              left="0"
              name="partner_text"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index fa455dffb0..a5c3be3349 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  bottom="0"
  follows="left|top|right"
- height="20"
+ height="30"
  layout="topleft"
  left="0"
  name="sidetray_tab_panel">
-- 
cgit v1.3


From 138bf1132262c479dbbd5c95195db46b1efd065f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 24 Aug 2009 20:04:52 +0000
Subject: merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3

DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
---
 indra/llcharacter/llcharacter.cpp                  |    4 +-
 indra/llcommon/llfasttimer.h                       |  124 +-
 indra/llcommon/llmetrics.cpp                       |    2 +-
 indra/llcommon/llrefcount.h                        |    7 +-
 indra/llcommon/llsd.cpp                            |   10 +-
 indra/llcommon/llstring.cpp                        |    3 +
 indra/llcommon/llstring.h                          |    9 +
 indra/llmath/llrect.h                              |   28 +-
 indra/llmessage/llpumpio.cpp                       |    4 +-
 indra/llmessage/lltemplatemessagereader.cpp        |    4 +-
 indra/llrender/llfontfreetype.cpp                  |   14 +
 indra/llrender/llfontgl.cpp                        |  474 +---
 indra/llrender/llfontgl.h                          |   27 +-
 indra/llrender/llfontregistry.cpp                  |    1 -
 indra/llrender/llimagegl.cpp                       |   11 +-
 indra/llui/llbutton.cpp                            |   25 +-
 indra/llui/llcombobox.cpp                          |   15 +-
 indra/llui/llcontainerview.cpp                     |   22 +-
 indra/llui/llfloater.cpp                           |   18 +-
 indra/llui/llkeywords.cpp                          |   31 +-
 indra/llui/llkeywords.h                            |    7 +-
 indra/llui/lllayoutstack.cpp                       |    2 +-
 indra/llui/lllineeditor.cpp                        |   14 +-
 indra/llui/llmenugl.cpp                            |  125 +-
 indra/llui/llmenugl.h                              |   23 +-
 indra/llui/llmodaldialog.cpp                       |    5 +-
 indra/llui/llmultifloater.cpp                      |   10 +-
 indra/llui/llpanel.cpp                             |  109 +-
 indra/llui/llpanel.h                               |   22 -
 indra/llui/llradiogroup.cpp                        |   12 -
 indra/llui/llradiogroup.h                          |    2 -
 indra/llui/llresizehandle.h                        |    4 +-
 indra/llui/llscrollbar.cpp                         |    2 +-
 indra/llui/llscrollbar.h                           |    5 -
 indra/llui/llscrollcontainer.cpp                   |  247 +-
 indra/llui/llscrollcontainer.h                     |   25 +-
 indra/llui/llscrolllistcell.cpp                    |   21 +-
 indra/llui/llscrolllistctrl.cpp                    |   47 +-
 indra/llui/llscrolllistctrl.h                      |   11 +-
 indra/llui/llstyle.cpp                             |  133 +-
 indra/llui/llstyle.h                               |   67 +-
 indra/llui/lltabcontainer.cpp                      |   36 +-
 indra/llui/lltabcontainer.h                        |    3 +-
 indra/llui/lltextbox.cpp                           |    4 +-
 indra/llui/lltexteditor.cpp                        | 2932 +++++++++++---------
 indra/llui/lltexteditor.h                          |  428 +--
 indra/llui/llui.cpp                                |    9 +-
 indra/llui/llui.h                                  |    3 -
 indra/llui/lluictrl.cpp                            |   30 +-
 indra/llui/lluictrl.h                              |    8 +-
 indra/llui/lluictrlfactory.cpp                     |   36 +-
 indra/llui/llview.cpp                              |   43 +-
 indra/llui/llview.h                                |   52 +-
 indra/llui/llviewborder.cpp                        |    4 +-
 indra/llvfs/llvfile.cpp                            |    6 +-
 indra/llwindow/llwindowwin32.cpp                   |   17 +-
 indra/llxml/llcontrol.h                            |    2 +-
 indra/llxuixml/llinitparam.h                       |    1 +
 indra/llxuixml/lltrans.cpp                         |   25 +
 indra/llxuixml/lltrans.h                           |   10 +-
 indra/llxuixml/llxuiparser.cpp                     |    4 +-
 indra/lscript/lscript_execute/lscript_execute.cpp  |    2 -
 indra/newview/llappviewer.cpp                      |   62 +-
 indra/newview/llavatarlist.cpp                     |    2 +-
 indra/newview/llbottomtray.cpp                     |    2 +-
 indra/newview/llchatbar.cpp                        |    6 +-
 indra/newview/llchatitemscontainerctrl.cpp         |    2 -
 indra/newview/llchatmsgbox.cpp                     |    2 +-
 indra/newview/lldrawable.cpp                       |    7 +-
 indra/newview/lldrawable.h                         |    1 -
 indra/newview/lldrawpoolalpha.cpp                  |   10 +-
 indra/newview/lldrawpoolavatar.cpp                 |   19 +-
 indra/newview/lldrawpoolbump.cpp                   |   33 +-
 indra/newview/lldrawpoolsimple.cpp                 |   28 +-
 indra/newview/lldrawpoolterrain.cpp                |   20 +-
 indra/newview/lldrawpooltree.cpp                   |   15 +-
 indra/newview/lldrawpoolwater.cpp                  |    2 +-
 indra/newview/lldrawpoolwlsky.cpp                  |    2 +-
 indra/newview/llfasttimerview.cpp                  |   17 +-
 indra/newview/llfasttimerview.h                    |    2 +-
 indra/newview/llfavoritesbar.cpp                   |   13 +-
 indra/newview/llflexibleobject.cpp                 |    3 +-
 indra/newview/llfloaterabout.cpp                   |   28 +-
 indra/newview/llfloaterbuyland.cpp                 |   39 +-
 indra/newview/llfloaterbuyland.h                   |    1 -
 indra/newview/llfloaterchat.cpp                    |    3 +-
 indra/newview/llfloaterchat.h                      |    6 -
 indra/newview/llfloaterfriends.cpp                 |    2 +-
 indra/newview/llfloaterinventory.cpp               |    6 +-
 indra/newview/llfloaterland.cpp                    |    6 +-
 indra/newview/llfloaterland.h                      |    1 -
 indra/newview/llfloaternotificationsconsole.cpp    |    3 +-
 indra/newview/llfloaterpostcard.cpp                |   12 +-
 indra/newview/llfloaterpreference.cpp              |   38 +-
 indra/newview/llfloaterproperties.cpp              |   20 +-
 indra/newview/llfloaterregioninfo.cpp              |    1 -
 indra/newview/llfloaterreporter.cpp                |    2 +-
 indra/newview/llfloaterscriptdebug.cpp             |    3 -
 indra/newview/llfloatersettingsdebug.cpp           |    1 +
 indra/newview/llfloatersettingsdebug.h             |    3 +-
 indra/newview/llfloatersnapshot.cpp                |    1 -
 indra/newview/llfloatertos.cpp                     |   13 +-
 indra/newview/llfloateruipreview.cpp               |    6 +-
 indra/newview/llfolderview.cpp                     |  169 +-
 indra/newview/llfolderview.h                       |    6 +-
 indra/newview/llfolderviewitem.cpp                 |    2 +-
 indra/newview/llhudmanager.cpp                     |    3 +-
 indra/newview/llhudobject.cpp                      |    4 +-
 indra/newview/llhudtext.cpp                        |    2 +-
 indra/newview/llimpanel.cpp                        |   95 +-
 indra/newview/llimview.cpp                         |   14 +-
 indra/newview/llinventorybridge.cpp                |    4 +-
 indra/newview/lllocationinputctrl.cpp              |    2 +-
 indra/newview/llnavigationbar.cpp                  |    3 +-
 indra/newview/llnearbychat.cpp                     |    4 +-
 indra/newview/llnearbychatbar.cpp                  |   56 +-
 indra/newview/llnearbychatbar.h                    |    3 +-
 indra/newview/llnearbychathandler.cpp              |    2 +
 indra/newview/llpanelclassified.cpp                |    5 +-
 indra/newview/llpanelgrouplandmoney.cpp            |    1 +
 indra/newview/llpanelgrouplandmoney.h              |    4 -
 indra/newview/llpanelgroupnotices.cpp              |    2 +-
 indra/newview/llpanelplace.cpp                     |    2 +-
 indra/newview/llpanelplaces.cpp                    |   10 +-
 indra/newview/llpreviewnotecard.cpp                |    8 -
 indra/newview/llpreviewscript.cpp                  |   12 +-
 indra/newview/llsidetray.cpp                       |    6 +-
 indra/newview/llspatialpartition.cpp               |   20 +-
 indra/newview/llstartup.cpp                        |    3 -
 indra/newview/llstatusbar.cpp                      |    2 +-
 indra/newview/llstylemap.cpp                       |   74 +-
 indra/newview/llstylemap.h                         |   16 +-
 indra/newview/lltoastgroupnotifypanel.cpp          |   25 +-
 indra/newview/lltoastnotifypanel.cpp               |    3 -
 indra/newview/llviewerdisplay.cpp                  |   25 +-
 indra/newview/llviewermenu.cpp                     |   12 +-
 indra/newview/llviewermessage.cpp                  |    3 +-
 indra/newview/llviewerobject.cpp                   |    4 +-
 indra/newview/llviewerobjectlist.cpp               |    7 +-
 indra/newview/llviewerpartsim.cpp                  |    4 +-
 indra/newview/llviewerstats.cpp                    |   12 +-
 indra/newview/llviewertexteditor.cpp               |  589 ++--
 indra/newview/llviewertexteditor.h                 |    9 +-
 indra/newview/llviewertexturelist.cpp              |   13 +-
 indra/newview/llviewerwindow.cpp                   |   14 +-
 indra/newview/llvoavatar.cpp                       |   18 +-
 indra/newview/llvoclouds.cpp                       |    4 +-
 indra/newview/llvograss.cpp                        |    4 +-
 indra/newview/llvopartgroup.cpp                    |   10 +-
 indra/newview/llvosky.cpp                          |    7 +-
 indra/newview/llvosurfacepatch.cpp                 |    6 +-
 indra/newview/llvotree.cpp                         |    4 +-
 indra/newview/llvovolume.cpp                       |   31 +-
 indra/newview/llvowater.cpp                        |    4 +-
 indra/newview/llvowlsky.cpp                        |    4 +-
 indra/newview/llwaterparammanager.cpp              |    4 +-
 indra/newview/llwlparammanager.cpp                 |    5 +-
 indra/newview/pipeline.cpp                         |   92 +-
 indra/newview/pipeline.h                           |   21 +
 .../textures/navbar/Favorite_Star_Active.png       |  Bin 641 -> 704 bytes
 .../default/textures/navbar/Favorite_Star_Off.png  |  Bin 573 -> 444 bytes
 .../default/textures/navbar/Favorite_Star_Over.png |  Bin 579 -> 445 bytes
 .../textures/navbar/Favorite_Star_Press.png        |  Bin 551 -> 616 bytes
 .../textures/windows/Icon_Close_Foreground.png     |  Bin 226 -> 263 bytes
 .../default/textures/windows/Icon_Close_Press.png  |  Bin 217 -> 263 bytes
 .../textures/windows/Icon_Dock_Foreground.png      |  Bin 240 -> 263 bytes
 .../default/textures/windows/Icon_Dock_Press.png   |  Bin 241 -> 263 bytes
 .../textures/windows/Icon_Undock_Foreground.png    |  Bin 238 -> 268 bytes
 .../default/textures/windows/Icon_Undock_Press.png |  Bin 260 -> 267 bytes
 .../newview/skins/default/xui/da/notifications.xml | 2601 +++++++----------
 .../newview/skins/default/xui/de/notifications.xml |    3 +
 indra/newview/skins/default/xui/en/floater_aaa.xml |    8 +-
 .../newview/skins/default/xui/en/floater_about.xml |    2 +-
 .../skins/default/xui/en/floater_about_land.xml    |    3 +-
 .../skins/default/xui/en/floater_buy_land.xml      |    1 +
 .../skins/default/xui/en/floater_incoming_call.xml |    4 +
 .../skins/default/xui/en/floater_land_holdings.xml |    4 +-
 .../skins/default/xui/en/floater_postcard.xml      |    3 +-
 .../skins/default/xui/en/floater_preferences.xml   |    1 +
 .../default/xui/en/floater_preview_gesture.xml     |  248 +-
 .../default/xui/en/floater_preview_notecard.xml    |    1 +
 indra/newview/skins/default/xui/en/floater_tos.xml |    3 +-
 .../skins/default/xui/en/floater_world_map.xml     |    2 -
 indra/newview/skins/default/xui/en/menu_login.xml  |    4 +-
 indra/newview/skins/default/xui/en/menu_picks.xml  |    2 +-
 indra/newview/skins/default/xui/en/menu_slurl.xml  |    2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |    6 +-
 .../newview/skins/default/xui/en/notifications.xml |  205 +-
 .../skins/default/xui/en/panel_bottomtray.xml      |    3 +
 .../skins/default/xui/en/panel_classified.xml      |    2 +-
 .../skins/default/xui/en/panel_edit_profile.xml    |    4 +-
 .../skins/default/xui/en/panel_group_general.xml   |   35 -
 .../default/xui/en/panel_group_info_sidetray.xml   |   41 +-
 .../default/xui/en/panel_group_land_money.xml      |    4 +-
 .../skins/default/xui/en/panel_pick_info.xml       |    2 +-
 .../default/xui/en/panel_preferences_advanced.xml  |   10 +-
 .../default/xui/en/panel_preferences_graphics1.xml |  119 +-
 .../newview/skins/default/xui/en/panel_profile.xml |   67 +-
 .../skins/default/xui/en/panel_region_covenant.xml |    1 +
 .../skins/default/xui/en/panel_region_estate.xml   | 1008 +++----
 .../skins/default/xui/en/panel_region_texture.xml  |  635 ++---
 .../skins/default/xui/en/panel_script_ed.xml       |    2 +
 .../skins/default/xui/en/panel_status_bar.xml      |    4 +-
 indra/newview/skins/default/xui/en/strings.xml     |   36 +-
 .../skins/default/xui/en/teleport_strings.xml      |   33 +-
 .../default/xui/en/widgets/gesture_combo_box.xml   |    2 +-
 .../default/xui/en/widgets/location_input.xml      |    3 +
 .../skins/default/xui/en/widgets/scroll_bar.xml    |    8 +-
 .../default/xui/en/widgets/scroll_container.xml    |    4 +-
 .../default/xui/en/widgets/simple_text_editor.xml  |    4 +-
 .../skins/default/xui/es/floater_joystick.xml      |   33 +-
 .../skins/default/xui/es/menu_inventory.xml        |    4 +-
 .../newview/skins/default/xui/es/notifications.xml |   55 +-
 .../newview/skins/default/xui/es/role_actions.xml  |  195 +-
 indra/newview/skins/default/xui/es/strings.xml     |    3 +
 .../newview/skins/default/xui/fr/notifications.xml |    5 +-
 .../newview/skins/default/xui/it/floater_tools.xml |  104 +-
 .../newview/skins/default/xui/it/notifications.xml |    5 +-
 .../newview/skins/default/xui/ja/notifications.xml |    5 +-
 .../skins/default/xui/nl/menu_inventory.xml        |    4 +-
 .../newview/skins/default/xui/nl/notifications.xml |    5 +-
 indra/newview/skins/default/xui/nl/strings.xml     |    3 +
 .../skins/default/xui/pl/floater_god_tools.xml     |    6 +-
 .../newview/skins/default/xui/pl/notifications.xml |    9 +-
 indra/newview/skins/default/xui/pl/strings.xml     |    3 +
 .../newview/skins/default/xui/pt/notifications.xml |    7 +-
 .../default/xui/pt/panel_preferences_graphics1.xml |    4 +-
 227 files changed, 6201 insertions(+), 6671 deletions(-)

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index 6633c65317..20ff7bab34 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -180,9 +180,11 @@ void LLCharacter::requestStopMotion( LLMotion* motion)
 //-----------------------------------------------------------------------------
 // updateMotions()
 //-----------------------------------------------------------------------------
+static LLFastTimer::DeclareTimer FTM_UPDATE_ANIMATION("Update Animation");
+
 void LLCharacter::updateMotions(e_update_t update_type)
 {
-	LLFastTimer t(LLFastTimer::FTM_UPDATE_ANIMATION);
+	LLFastTimer t(FTM_UPDATE_ANIMATION);
 	if (update_type == HIDDEN_UPDATE)
 	{
 		mMotionController.updateMotionsMinimal();
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 612068b202..0d89353dee 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -69,13 +69,13 @@ public:
 		std::vector<NamedTimer*>& getChildren();
 
 		void setCollapsed(bool collapsed) { mCollapsed = collapsed; }
-		bool getCollapsed() { return mCollapsed; }
+		bool getCollapsed() const { return mCollapsed; }
 
-		U64 getCountAverage() { return mCountAverage; }
-		U64 getCallAverage() { return mCallAverage; }
+		U64 getCountAverage() const { return mCountAverage; }
+		U64 getCallAverage() const { return mCallAverage; }
 
-		U64 getHistoricalCount(S32 history_index = 0);
-		U64 getHistoricalCalls(S32 history_index = 0);
+		U64 getHistoricalCount(S32 history_index = 0) const;
+		U64 getHistoricalCalls(S32 history_index = 0) const;
 
 		static NamedTimer& getRootNamedTimer();
 
@@ -162,117 +162,6 @@ public:
 		NamedTimer& mNamedTimer;
 	};
 
-	static DeclareTimer FTM_ARRANGE;
-	static DeclareTimer FTM_ATTACHMENT_UPDATE;
-	static DeclareTimer FTM_AUDIO_UPDATE;
-	static DeclareTimer FTM_AUTO_SELECT;
-	static DeclareTimer FTM_AVATAR_UPDATE;
-	static DeclareTimer FTM_CLEANUP;
-	static DeclareTimer FTM_CLIENT_COPY;
-	static DeclareTimer FTM_CREATE_OBJECT;
-	static DeclareTimer FTM_CULL;
-	static DeclareTimer FTM_CULL_REBOUND;
-	static DeclareTimer FTM_FILTER;
-	static DeclareTimer FTM_FLEXIBLE_UPDATE;
-	static DeclareTimer FTM_FRAME;
-	static DeclareTimer FTM_FRUSTUM_CULL;
-	static DeclareTimer FTM_GEN_FLEX;
-	static DeclareTimer FTM_GEN_TRIANGLES;
-	static DeclareTimer FTM_GEN_VOLUME;
-	static DeclareTimer FTM_GEO_SKY;
-	static DeclareTimer FTM_GEO_UPDATE;
-	static DeclareTimer FTM_HUD_EFFECTS;
-	static DeclareTimer FTM_HUD_UPDATE;
-	static DeclareTimer FTM_IDLE;
-	static DeclareTimer FTM_IDLE_CB;
-	static DeclareTimer FTM_IDLE_NETWORK;
-	static DeclareTimer FTM_IMAGE_CREATE;
-	static DeclareTimer FTM_IMAGE_MARK_DIRTY;
-	static DeclareTimer FTM_IMAGE_UPDATE;
-	static DeclareTimer FTM_INVENTORY;
-	static DeclareTimer FTM_JOINT_UPDATE;
-	static DeclareTimer FTM_KEYHANDLER;
-	static DeclareTimer FTM_LOAD_AVATAR;
-	static DeclareTimer FTM_LOD_UPDATE;
-	static DeclareTimer FTM_MESSAGES;
-	static DeclareTimer FTM_MOUSEHANDLER;
-	static DeclareTimer FTM_NETWORK;
-	static DeclareTimer FTM_OBJECTLIST_UPDATE;
-	static DeclareTimer FTM_OCCLUSION_READBACK;
-	static DeclareTimer FTM_OCTREE_BALANCE;
-	static DeclareTimer FTM_PICK;
-	static DeclareTimer FTM_PIPELINE;
-	static DeclareTimer FTM_POOLRENDER;
-	static DeclareTimer FTM_POOLS;
-	static DeclareTimer FTM_PROCESS_IMAGES;
-	static DeclareTimer FTM_PROCESS_MESSAGES;
-	static DeclareTimer FTM_PROCESS_OBJECTS;
-	static DeclareTimer FTM_PUMP;
-	static DeclareTimer FTM_REBUILD_GRASS_VB;
-	static DeclareTimer FTM_REBUILD_PARTICLE_VB;
-	static DeclareTimer FTM_REBUILD_TERRAIN_VB;
-	static DeclareTimer FTM_REBUILD_VBO;
-	static DeclareTimer FTM_REBUILD_VOLUME_VB;
-	static DeclareTimer FTM_REFRESH;
-	static DeclareTimer FTM_REGION_UPDATE;
-	static DeclareTimer FTM_RENDER;
-	static DeclareTimer FTM_RENDER_ALPHA;
-	static DeclareTimer FTM_RENDER_BLOOM;
-	static DeclareTimer FTM_RENDER_BLOOM_FBO;
-	static DeclareTimer FTM_RENDER_BUMP;
-	static DeclareTimer FTM_RENDER_CHARACTERS;
-	static DeclareTimer FTM_RENDER_FAKE_VBO_UPDATE;
-	static DeclareTimer FTM_RENDER_FONTS;
-	static DeclareTimer FTM_RENDER_FULLBRIGHT;
-	static DeclareTimer FTM_RENDER_GEOMETRY;
-	static DeclareTimer FTM_RENDER_GLOW;
-	static DeclareTimer FTM_RENDER_GRASS;
-	static DeclareTimer FTM_RENDER_INVISIBLE;
-	static DeclareTimer FTM_RENDER_OCCLUSION;
-	static DeclareTimer FTM_RENDER_SHINY;
-	static DeclareTimer FTM_RENDER_SIMPLE;
-	static DeclareTimer FTM_RENDER_TERRAIN;
-	static DeclareTimer FTM_RENDER_TREES;
-	static DeclareTimer FTM_RENDER_UI;
-	static DeclareTimer FTM_RENDER_WATER;
-	static DeclareTimer FTM_RENDER_WL_SKY;
-	static DeclareTimer FTM_RESET_DRAWORDER;
-	static DeclareTimer FTM_SHADOW_ALPHA;
-	static DeclareTimer FTM_SHADOW_AVATAR;
-	static DeclareTimer FTM_SHADOW_RENDER;
-	static DeclareTimer FTM_SHADOW_SIMPLE;
-	static DeclareTimer FTM_SHADOW_TERRAIN;
-	static DeclareTimer FTM_SHADOW_TREE;
-	static DeclareTimer FTM_SIMULATE_PARTICLES;
-	static DeclareTimer FTM_SLEEP;
-	static DeclareTimer FTM_SORT;
-	static DeclareTimer FTM_STATESORT;
-	static DeclareTimer FTM_STATESORT_DRAWABLE;
-	static DeclareTimer FTM_STATESORT_POSTSORT;
-	static DeclareTimer FTM_SWAP;
-	static DeclareTimer FTM_TEMP1;
-	static DeclareTimer FTM_TEMP2;
-	static DeclareTimer FTM_TEMP3;
-	static DeclareTimer FTM_TEMP4;
-	static DeclareTimer FTM_TEMP5;
-	static DeclareTimer FTM_TEMP6;
-	static DeclareTimer FTM_TEMP7;
-	static DeclareTimer FTM_TEMP8;
-	static DeclareTimer FTM_UPDATE_ANIMATION;
-	static DeclareTimer FTM_UPDATE_AVATAR;
-	static DeclareTimer FTM_UPDATE_CLOUDS;
-	static DeclareTimer FTM_UPDATE_GRASS;
-	static DeclareTimer FTM_UPDATE_MOVE;
-	static DeclareTimer FTM_UPDATE_PARTICLES;
-	static DeclareTimer FTM_UPDATE_PRIMITIVES;
-	static DeclareTimer FTM_UPDATE_SKY;
-	static DeclareTimer FTM_UPDATE_TERRAIN;
-	static DeclareTimer FTM_UPDATE_TEXTURES;
-	static DeclareTimer FTM_UPDATE_TREE;
-	static DeclareTimer FTM_UPDATE_WATER;
-	static DeclareTimer FTM_UPDATE_WLPARAM;
-	static DeclareTimer FTM_VFILE_WAIT;
-	static DeclareTimer FTM_WORLD_UPDATE;
 
 public:
 	enum RootTimerMarker { ROOT };
@@ -287,6 +176,7 @@ public:
 	LLFastTimer(NamedTimer::FrameState& timer)
 	:	mFrameState(&timer)
 	{
+#if FAST_TIMER_ON
 		NamedTimer::FrameState* frame_state = mFrameState;
 		frame_state->mLastStartTime = get_cpu_clock_count();
 		mStartSelfTime = frame_state->mLastStartTime;
@@ -298,6 +188,7 @@ public:
 	
 		mLastTimer = sCurTimer;
 		sCurTimer = this;
+#endif
 	}
 
 	~LLFastTimer()
@@ -332,6 +223,7 @@ public:
 	static S32 getCurFrameIndex() { return sCurFrameIndex; }
 
 	static void writeLog(std::ostream& os);
+	static const NamedTimer* getTimerByName(const std::string& name);
 
 public:
 	static bool 		sPauseHistory;
diff --git a/indra/llcommon/llmetrics.cpp b/indra/llcommon/llmetrics.cpp
index 8db3284c42..30e5d435ae 100644
--- a/indra/llcommon/llmetrics.cpp
+++ b/indra/llcommon/llmetrics.cpp
@@ -71,7 +71,7 @@ void LLMetricsImpl::recordEventDetails(const std::string& location,
 	metrics["location"] = location;
 	metrics["stats"]  = stats;
 	
-	llinfos << "LLMETRICS: " << LLSDNotationStreamer(metrics) << llendl; 
+	llinfos << "LLMETRICS: " << (LLSDNotationStreamer(metrics)) << llendl; 
 }
 
 // Store this:
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index 540a18b8a0..d3597b454c 100644
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -32,6 +32,8 @@
 #ifndef LLREFCOUNT_H
 #define LLREFCOUNT_H
 
+#include <boost/noncopyable.hpp>
+
 //----------------------------------------------------------------------------
 // RefCount objects should generally only be accessed by way of LLPointer<>'s
 // see llthread.h for LLThreadSafeRefCount
@@ -40,10 +42,9 @@
 class LLRefCount
 {
 protected:
-	LLRefCount(const LLRefCount&); // not implemented
+	LLRefCount(const LLRefCount& other); // no implementation
 private:
-	LLRefCount&operator=(const LLRefCount&); // not implemented
-
+	LLRefCount& operator=(const LLRefCount&); // no implementation
 protected:
 	virtual ~LLRefCount(); // use unref()
 	
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp
index ba0f798dbb..9140ebb3f3 100644
--- a/indra/llcommon/llsd.cpp
+++ b/indra/llcommon/llsd.cpp
@@ -819,9 +819,15 @@ static const char *llsd_dump(const LLSD &llsd, bool useXMLFormat)
 	{
 		std::ostringstream out;
 		if (useXMLFormat)
-			out << LLSDXMLStreamer(llsd);
+		{
+			LLSDXMLStreamer xml_streamer(llsd);
+			out << xml_streamer;
+		}
 		else
-			out << LLSDNotationStreamer(llsd);
+		{
+			LLSDNotationStreamer notation_streamer(llsd);
+			out << notation_streamer;
+		}
 		out_string = out.str();
 	}
 	int len = out_string.length();
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index ec1718a8cb..d7da40d645 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -42,6 +42,9 @@
 #include <winnls.h> // for WideCharToMultiByte
 #endif
 
+LLFastTimer::DeclareTimer STRING_LOCALIZATION("String Localization");
+
+
 std::string ll_safe_string(const char* in)
 {
 	if(in) return std::string(in);
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index f6bb0e0fe2..a15d6a9a14 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -38,6 +38,7 @@
 #include <iomanip>
 #include <boost/regex.hpp>
 #include "llsd.h"
+#include "llfasttimer.h"
 
 #if LL_LINUX || LL_SOLARIS
 #include <wctype.h>
@@ -337,6 +338,9 @@ public:
 	// Copies src into dst at a given offset.  
 	static void		copyInto(std::basic_string<T>& dst, const std::basic_string<T>& src, size_type offset);
 	
+	static bool		isPartOfWord(T c) { return (c == (T)'_') || LLStringOps::isAlnum(c); }
+
+
 #ifdef _DEBUG	
 	static void		testHarness();
 #endif
@@ -617,10 +621,13 @@ void LLStringUtilBase<T>::getTokens (std::basic_string<T> input, std::vector<std
 	}
 }
 
+extern LLFastTimer::DeclareTimer STRING_LOCALIZATION;
+
 // static
 template<class T> 
 S32 LLStringUtilBase<T>::format(std::basic_string<T>& s, const format_map_t& substitutions)
 {
+	LLFastTimer ft(STRING_LOCALIZATION);
 	S32 res = 0;
 
 	std::basic_ostringstream<T> output;
@@ -695,6 +702,8 @@ S32 LLStringUtilBase<T>::format(std::basic_string<T>& s, const format_map_t& sub
 template<class T>
 S32 LLStringUtilBase<T>::format(std::basic_string<T>& s, const LLSD& substitutions)
 {
+	LLFastTimer ft(STRING_LOCALIZATION);
+
 	S32 res = 0;
 
 	if (!substitutions.isMap()) 
diff --git a/indra/llmath/llrect.h b/indra/llmath/llrect.h
index 894f0a7ed0..c03a331aff 100644
--- a/indra/llmath/llrect.h
+++ b/indra/llmath/llrect.h
@@ -141,10 +141,20 @@ public:
 
 	// Note: Does NOT follow GL_QUAD conventions: the top and right edges ARE considered part of the rect
 	// returns TRUE if any part of rect is is inside this LLRect
-	BOOL		rectInRect(const LLRectBase* rect) const
+	BOOL		overlaps(const LLRectBase& rect) const
 	{
-		return mLeft <= rect->mRight && rect->mLeft <= mRight && 
-			   mBottom <= rect->mTop && rect->mBottom <= mTop ;
+		return !(mLeft > rect.mRight 
+			|| mRight < rect.mLeft
+			|| mBottom > rect.mTop 
+			|| mTop < rect.mBottom);
+	}
+
+	BOOL		contains(const LLRectBase& rect) const
+	{
+		return mLeft <= rect.mLeft
+			&& mRight >= rect.mRight
+			&& mBottom <= rect.mBottom
+			&& mTop >= rect.mTop;
 	}
 
 	LLRectBase& set(Type left, Type top, Type right, Type bottom)
@@ -223,26 +233,25 @@ public:
 		return mLeft <= mRight && mBottom <= mTop;
 	}
 
-	bool isNull() const
+	bool isEmpty() const
 	{
 		return mLeft == mRight || mBottom == mTop;
 	}
 
-	bool notNull() const
+	bool notEmpty() const
 	{
-		return !isNull();
+		return !isEmpty();
 	}
 
-	LLRectBase& unionWith(const LLRectBase &other)
+	void unionWith(const LLRectBase &other)
 	{
 		mLeft = llmin(mLeft, other.mLeft);
 		mRight = llmax(mRight, other.mRight);
 		mBottom = llmin(mBottom, other.mBottom);
 		mTop = llmax(mTop, other.mTop);
-		return *this;
 	}
 
-	LLRectBase& intersectWith(const LLRectBase &other)
+	void intersectWith(const LLRectBase &other)
 	{
 		mLeft = llmax(mLeft, other.mLeft);
 		mRight = llmin(mRight, other.mRight);
@@ -256,7 +265,6 @@ public:
 		{
 			mBottom = mTop;
 		}
-		return *this;
 	}
 
 	friend std::ostream &operator<<(std::ostream &s, const LLRectBase &rect)
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp
index 3e3f0b37a7..5e9dfd81fa 100644
--- a/indra/llmessage/llpumpio.cpp
+++ b/indra/llmessage/llpumpio.cpp
@@ -444,11 +444,13 @@ void LLPumpIO::pump()
 	pump(DEFAULT_POLL_TIMEOUT);
 }
 
+static LLFastTimer::DeclareTimer FTM_PUMP("Pump");
+
 //timeout is in microseconds
 void LLPumpIO::pump(const S32& poll_timeout)
 {
 	LLMemType m1(LLMemType::MTYPE_IO_PUMP);
-	LLFastTimer t1(LLFastTimer::FTM_PUMP);
+	LLFastTimer t1(FTM_PUMP);
 	//llinfos << "LLPumpIO::pump()" << llendl;
 
 	// Run any pending runners.
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index 80ea6ce96b..8c9eb7ed42 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -531,6 +531,8 @@ void LLTemplateMessageReader::logRanOffEndOfPacket( const LLHost& host, const S3
 	gMessageSystem->callExceptionFunc(MX_RAN_OFF_END_OF_PACKET);
 }
 
+static LLFastTimer::DeclareTimer FTM_PROCESS_MESSAGES("Process Messages");
+
 // decode a given message
 BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender )
 {
@@ -714,7 +716,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
 		}
 
 		{
-			LLFastTimer t(LLFastTimer::FTM_PROCESS_MESSAGES);
+			LLFastTimer t(FTM_PROCESS_MESSAGES);
 			if( !mCurrentRMessageTemplate->callHandlerFunc(gMessageSystem) )
 			{
 				llwarns << "Message from " << sender << " with no handler function received: " << mCurrentRMessageTemplate->mName << llendl;
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 62534969b7..0be6bedbee 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -33,6 +33,7 @@
 #include "linden_common.h"
 
 #include "llfontfreetype.h"
+#include "llfontgl.h"
 
 // Freetype stuff
 #include <ft2build.h>
@@ -204,6 +205,19 @@ BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
 	mName = filename;
 	mPointSize = point_size;
 
+	mStyle = LLFontGL::NORMAL;
+	if(mFTFace->style_flags & FT_STYLE_FLAG_BOLD)
+	{
+		mStyle |= LLFontGL::BOLD;
+		mStyle &= ~LLFontGL::NORMAL;
+	}
+
+	if(mFTFace->style_flags & FT_STYLE_FLAG_ITALIC)
+	{
+		mStyle |= LLFontGL::ITALIC;
+		mStyle &= ~LLFontGL::NORMAL;
+	}
+
 	return TRUE;
 }
 
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 177e13e27c..d76b23248d 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -89,12 +89,10 @@ static F32 llfont_round_y(F32 y)
 
 LLFontGL::LLFontGL()
 {
-	clearEmbeddedChars();
 }
 
 LLFontGL::~LLFontGL()
 {
-	clearEmbeddedChars();
 }
 
 void LLFontGL::reset()
@@ -117,8 +115,10 @@ BOOL LLFontGL::loadFace(const std::string& filename, F32 point_size, F32 vert_dp
 	return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, components, is_fallback);
 }
 
+static LLFastTimer::DeclareTimer FTM_RENDER_FONTS("Fonts");
+
 S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style, 
-					 ShadowType shadow, S32 max_chars, S32 max_pixels, F32* right_x, BOOL use_embedded, BOOL use_ellipses) const
+					 ShadowType shadow, S32 max_chars, S32 max_pixels, F32* right_x, BOOL use_ellipses) const
 {
 	if(!sDisplayFont) //do not display texts
 	{
@@ -159,7 +159,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 	F32 pixel_offset_y = llround((F32)sCurOrigin.mY) - (sCurOrigin.mY);
 	gGL.translatef(-pixel_offset_x, -pixel_offset_y, 0.f);
 
-	LLFastTimer t(LLFastTimer::FTM_RENDER_FONTS);
+	LLFastTimer t(FTM_RENDER_FONTS);
 
 	gGL.color4fv( color.mV );
 
@@ -251,135 +251,69 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 	{
 		llwchar wch = wstr[i];
 
-		// Handle embedded characters first, if they're enabled.
-		// Embedded characters are a hack for notecards
-		const embedded_data_t* ext_data = use_embedded ? getEmbeddedCharData(wch) : NULL;
-		if (ext_data)
+		if (!mFontFreetype->hasGlyph(wch))
 		{
-			LLImageGL* ext_image = ext_data->mImage;
-			const LLWString& label = ext_data->mLabel;
-
-			F32 ext_height = (F32)ext_image->getHeight() * sScaleY;
-
-			F32 ext_width = (F32)ext_image->getWidth() * sScaleX;
-			F32 ext_advance = (EXT_X_BEARING * sScaleX) + ext_width;
-
-			if (!label.empty())
-			{
-				ext_advance += (EXT_X_BEARING + getFontExtChar()->getWidthF32( label.c_str() )) * sScaleX;
-			}
-
-			if (start_x + scaled_max_pixels < cur_x + ext_advance)
-			{
-				// Not enough room for this character.
-				break;
-			}
-
-			if (last_bound_texture != ext_image)
-			{
-				gGL.getTexUnit(0)->bind(ext_image);
-				last_bound_texture = ext_image;
-			}
-
-			// snap origin to whole screen pixel
-			const F32 ext_x = (F32)llround(cur_render_x + (EXT_X_BEARING * sScaleX));
-			const F32 ext_y = (F32)llround(cur_render_y + (EXT_Y_BEARING * sScaleY + mFontFreetype->getAscenderHeight() - mFontFreetype->getLineHeight()));
-
-			LLRectf uv_rect(0.f, 1.f, 1.f, 0.f);
-			LLRectf screen_rect(ext_x, ext_y + ext_height, ext_x + ext_width, ext_y);
-			drawGlyph(screen_rect, uv_rect, LLColor4::white, style_to_add, shadow, drop_shadow_strength);
-
-			if (!label.empty())
-			{
-				gGL.pushMatrix();
-				//glLoadIdentity();
-				//gGL.translatef(sCurOrigin.mX, sCurOrigin.mY, 0.0f);
-				//glScalef(sScaleX, sScaleY, 1.f);
-				getFontExtChar()->render(label, 0,
-									 /*llfloor*/((ext_x + (F32)ext_image->getWidth() + EXT_X_BEARING) / sScaleX), 
-									 /*llfloor*/(cur_y / sScaleY),
-									 color,
-									 halign, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL,
-									 TRUE );
-				gGL.popMatrix();
-			}
-
-			gGL.color4fv(color.mV);
+			addChar(wch);
+		}
 
-			chars_drawn++;
-			cur_x += ext_advance;
-			if (((i + 1) < length) && wstr[i+1])
-			{
-				cur_x += EXT_KERNING * sScaleX;
-			}
-			cur_render_x = cur_x;
+		const LLFontGlyphInfo* fgi= mFontFreetype->getGlyphInfo(wch);
+		if (!fgi)
+		{
+			llerrs << "Missing Glyph Info" << llendl;
+			break;
 		}
-		else
+		// Per-glyph bitmap texture.
+		LLImageGL *image_gl = mFontFreetype->getFontBitmapCache()->getImageGL(fgi->mBitmapNum);
+		if (last_bound_texture != image_gl)
 		{
-			if (!mFontFreetype->hasGlyph(wch))
-			{
-				addChar(wch);
-			}
-
-			const LLFontGlyphInfo* fgi= mFontFreetype->getGlyphInfo(wch);
-			if (!fgi)
-			{
-				llerrs << "Missing Glyph Info" << llendl;
-				break;
-			}
-			// Per-glyph bitmap texture.
-			LLImageGL *image_gl = mFontFreetype->getFontBitmapCache()->getImageGL(fgi->mBitmapNum);
-			if (last_bound_texture != image_gl)
-			{
-				gGL.getTexUnit(0)->bind(image_gl);
-				last_bound_texture = image_gl;
-			}
+			gGL.getTexUnit(0)->bind(image_gl);
+			last_bound_texture = image_gl;
+		}
 
-			if ((start_x + scaled_max_pixels) < (cur_x + fgi->mXBearing + fgi->mWidth))
-			{
-				// Not enough room for this character.
-				break;
-			}
+		if ((start_x + scaled_max_pixels) < (cur_x + fgi->mXBearing + fgi->mWidth))
+		{
+			// Not enough room for this character.
+			break;
+		}
 
-			// Draw the text at the appropriate location
-			//Specify vertices and texture coordinates
-			LLRectf uv_rect((fgi->mXBitmapOffset) * inv_width,
-					(fgi->mYBitmapOffset + fgi->mHeight + PAD_UVY) * inv_height,
-					(fgi->mXBitmapOffset + fgi->mWidth) * inv_width,
-					(fgi->mYBitmapOffset - PAD_UVY) * inv_height);
-			// snap glyph origin to whole screen pixel
-			LLRectf screen_rect(llround(cur_render_x + (F32)fgi->mXBearing),
-					    llround(cur_render_y + (F32)fgi->mYBearing),
-					    llround(cur_render_x + (F32)fgi->mXBearing) + (F32)fgi->mWidth,
-					    llround(cur_render_y + (F32)fgi->mYBearing) - (F32)fgi->mHeight);
-			
-			drawGlyph(screen_rect, uv_rect, color, style_to_add, shadow, drop_shadow_strength);
+		// Draw the text at the appropriate location
+		//Specify vertices and texture coordinates
+		LLRectf uv_rect((fgi->mXBitmapOffset) * inv_width,
+				(fgi->mYBitmapOffset + fgi->mHeight + PAD_UVY) * inv_height,
+				(fgi->mXBitmapOffset + fgi->mWidth) * inv_width,
+				(fgi->mYBitmapOffset - PAD_UVY) * inv_height);
+		// snap glyph origin to whole screen pixel
+		LLRectf screen_rect(llround(cur_render_x + (F32)fgi->mXBearing),
+				    llround(cur_render_y + (F32)fgi->mYBearing),
+				    llround(cur_render_x + (F32)fgi->mXBearing) + (F32)fgi->mWidth,
+				    llround(cur_render_y + (F32)fgi->mYBearing) - (F32)fgi->mHeight);
+		
+		drawGlyph(screen_rect, uv_rect, color, style_to_add, shadow, drop_shadow_strength);
 
-			chars_drawn++;
-			cur_x += fgi->mXAdvance;
-			cur_y += fgi->mYAdvance;
+		chars_drawn++;
+		cur_x += fgi->mXAdvance;
+		cur_y += fgi->mYAdvance;
 
-			llwchar next_char = wstr[i+1];
-			if (next_char && (next_char < LAST_CHARACTER))
+		llwchar next_char = wstr[i+1];
+		if (next_char && (next_char < LAST_CHARACTER))
+		{
+			// Kern this puppy.
+			if (!mFontFreetype->hasGlyph(next_char))
 			{
-				// Kern this puppy.
-				if (!mFontFreetype->hasGlyph(next_char))
-				{
-					addChar(next_char);
-				}
-				cur_x += mFontFreetype->getXKerning(wch, next_char);
+				addChar(next_char);
 			}
+			cur_x += mFontFreetype->getXKerning(wch, next_char);
+		}
 
-			// Round after kerning.
-			// Must do this to cur_x, not just to cur_render_x, otherwise you
-			// will squish sub-pixel kerned characters too close together.
-			// For example, "CCCCC" looks bad.
-			cur_x = (F32)llfloor(cur_x + 0.5f);
-			//cur_y = (F32)llfloor(cur_y + 0.5f);
+		// Round after kerning.
+		// Must do this to cur_x, not just to cur_render_x, otherwise you
+		// will squish sub-pixel kerned characters too close together.
+		// For example, "CCCCC" looks bad.
+		cur_x = (F32)llfloor(cur_x + 0.5f);
+		//cur_y = (F32)llfloor(cur_y + 0.5f);
 
-			cur_render_x = cur_x;
-			cur_render_y = cur_y;
-		}
+		cur_render_x = cur_x;
+		cur_render_y = cur_y;
 	}
 
 	if (right_x)
@@ -427,12 +361,12 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 
 S32 LLFontGL::render(const LLWString &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color) const
 {
-	return render(text, begin_offset, x, y, color, LEFT, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE, FALSE);
+	return render(text, begin_offset, x, y, color, LEFT, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
 }
 
 S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign,  VAlign valign, U8 style, ShadowType shadow, S32 max_chars, S32 max_pixels,  F32* right_x, BOOL use_ellipses) const
 {
-	return render(utf8str_to_wstring(text), begin_offset, x, y, color, halign, valign, style, shadow, max_chars, max_pixels, right_x, FALSE, use_ellipses);
+	return render(utf8str_to_wstring(text), begin_offset, x, y, color, halign, valign, style, shadow, max_chars, max_pixels, right_x, use_ellipses);
 }
 
 S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color) const
@@ -478,9 +412,9 @@ S32 LLFontGL::getWidth(const std::string& utf8text, S32 begin_offset, S32 max_ch
 	return getWidth(wtext.c_str(), begin_offset, max_chars);
 }
 
-S32 LLFontGL::getWidth(const llwchar* wchars, S32 begin_offset, S32 max_chars, BOOL use_embedded) const
+S32 LLFontGL::getWidth(const llwchar* wchars, S32 begin_offset, S32 max_chars) const
 {
-	F32 width = getWidthF32(wchars, begin_offset, max_chars, use_embedded);
+	F32 width = getWidthF32(wchars, begin_offset, max_chars);
 	return llround(width);
 }
 
@@ -501,7 +435,7 @@ F32 LLFontGL::getWidthF32(const std::string& utf8text, S32 begin_offset, S32 max
 	return getWidthF32(wtext.c_str(), begin_offset, max_chars);
 }
 
-F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars, BOOL use_embedded) const
+F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars) const
 {
 	const S32 LAST_CHARACTER = LLFontFreetype::LAST_CHAR_FULL;
 
@@ -509,34 +443,21 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars
 	const S32 max_index = begin_offset + max_chars;
 	for (S32 i = begin_offset; i < max_index; i++)
 	{
-		const llwchar wch = wchars[i];
+		llwchar wch = wchars[i];
 		if (wch == 0)
 		{
 			break; // done
 		}
-		const embedded_data_t* ext_data = use_embedded ? getEmbeddedCharData(wch) : NULL;
-		if (ext_data)
-		{
-			// Handle crappy embedded hack
-			cur_x += getEmbeddedCharAdvance(ext_data);
 
-			if( ((i+1) < max_chars) && (i+1 < max_index))
-			{
-				cur_x += EXT_KERNING * sScaleX;
-			}
-		}
-		else
-		{
-			cur_x += mFontFreetype->getXAdvance(wch);
-			llwchar next_char = wchars[i+1];
+		cur_x += mFontFreetype->getXAdvance(wch);
+		llwchar next_char = wchars[i+1];
 
-			if (((i + 1) < max_chars) 
-				&& next_char 
-				&& (next_char < LAST_CHARACTER))
-			{
-				// Kern this puppy.
-				cur_x += mFontFreetype->getXKerning(wch, next_char);
-			}
+		if (((i + 1) < begin_offset + max_chars) 
+			&& next_char 
+			&& (next_char < LAST_CHARACTER))
+		{
+			// Kern this puppy.
+			cur_x += mFontFreetype->getXKerning(wch, next_char);
 		}
 		// Round after kerning.
 		cur_x = (F32)llfloor(cur_x + 0.5f);
@@ -546,7 +467,7 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars
 }
 
 // Returns the max number of complete characters from text (up to max_chars) that can be drawn in max_pixels
-S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_chars, BOOL end_on_word_boundary, BOOL use_embedded, F32* drawn_pixels) const
+S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_chars, BOOL end_on_word_boundary) const
 {
 	if (!wchars || !wchars[0] || max_chars == 0)
 	{
@@ -576,83 +497,51 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
 			break;
 		}
 			
-		const embedded_data_t* ext_data = use_embedded ? getEmbeddedCharData(wch) : NULL;
-		if (ext_data)
+		if (in_word)
 		{
-			if (in_word)
-			{
-				in_word = FALSE;
-			}
-			else
-			{
-				start_of_last_word = i;
-			}
-			cur_x += getEmbeddedCharAdvance(ext_data);
-			
-			if (scaled_max_pixels < cur_x)
-			{
-				clip = TRUE;
-				break;
-			}
-			
-			if (((i+1) < max_chars) && wchars[i+1])
+			if (iswspace(wch))
 			{
-				cur_x += EXT_KERNING * sScaleX;
-			}
-
-			if( scaled_max_pixels < cur_x )
-			{
-				clip = TRUE;
-				break;
+				if(wch !=(0x00A0))
+				{
+					in_word = FALSE;
+				}
 			}
-		}
-		else
-		{
-			if (in_word)
+			if (iswindividual(wch))
 			{
-				if (iswspace(wch))
+				if (iswpunct(wchars[i+1]))
 				{
-					if(wch !=(0x00A0))
-					{
-						in_word = FALSE;
-					}
+					in_word=TRUE;
 				}
-				if (iswindividual(wch))
+				else
 				{
-					if (iswpunct(wchars[i+1]))
-					{
-						in_word=TRUE;
-					}
-					else
-					{
-						in_word=FALSE;
-						start_of_last_word = i;
-					}
+					in_word=FALSE;
+					start_of_last_word = i;
 				}
 			}
-			else
+		}
+		else
+		{
+			start_of_last_word = i;
+			if (!iswspace(wch)||!iswindividual(wch))
 			{
-				start_of_last_word = i;
-				if (!iswspace(wch)||!iswindividual(wch))
-				{
-					in_word = TRUE;
-				}
+				in_word = TRUE;
 			}
+		}
 
-			cur_x += mFontFreetype->getXAdvance(wch);
-			
-			if (scaled_max_pixels < cur_x)
-			{
-				clip = TRUE;
-				break;
-			}
+		cur_x += mFontFreetype->getXAdvance(wch);
+		
+		if (scaled_max_pixels < cur_x)
+		{
+			clip = TRUE;
+			break;
+		}
 
-			if (((i+1) < max_chars) && wchars[i+1])
-			{
-				// Kern this puppy.
-				cur_x += mFontFreetype->getXKerning(wch, wchars[i+1]);
-			}
+		if (((i+1) < max_chars) && wchars[i+1])
+		{
+			// Kern this puppy.
+			cur_x += mFontFreetype->getXKerning(wch, wchars[i+1]);
 		}
+
 		// Round after kerning.
 		cur_x = (F32)llfloor(cur_x + 0.5f);
 		drawn_x = cur_x;
@@ -662,10 +551,6 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
 	{
 		i = start_of_last_word;
 	}
-	if (drawn_pixels)
-	{
-		*drawn_pixels = drawn_x;
-	}
 	return i;
 }
 
@@ -686,8 +571,7 @@ S32	LLFontGL::firstDrawableChar(const llwchar* wchars, F32 max_pixels, S32 text_
 	{
 		llwchar wch = wchars[i];
 
-		const embedded_data_t* ext_data = getEmbeddedCharData(wch);
-		F32 char_width = ext_data ? getEmbeddedCharAdvance(ext_data) : mFontFreetype->getXAdvance(wch);
+		F32 char_width = mFontFreetype->getXAdvance(wch);
 
 		if( scaled_max_pixels < (total_width + char_width) )
 		{
@@ -705,7 +589,7 @@ S32	LLFontGL::firstDrawableChar(const llwchar* wchars, F32 max_pixels, S32 text_
 		if ( i > 0 )
 		{
 			// kerning
-			total_width += ext_data ? (EXT_KERNING * sScaleX) : mFontFreetype->getXKerning(wchars[i-1], wch);
+			total_width += mFontFreetype->getXKerning(wchars[i-1], wch);
 		}
 
 		// Round after kerning.
@@ -715,7 +599,7 @@ S32	LLFontGL::firstDrawableChar(const llwchar* wchars, F32 max_pixels, S32 text_
 	return start_pos - drawable_chars;
 }
 
-S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 target_x, F32 max_pixels, S32 max_chars, BOOL round, BOOL use_embedded) const
+S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 target_x, F32 max_pixels, S32 max_chars, BOOL round) const
 {
 	if (!wchars || !wchars[0] || max_chars == 0)
 	{
@@ -723,7 +607,6 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t
 	}
 	
 	F32 cur_x = 0;
-	S32 pos = 0;
 
 	target_x *= sScaleX;
 
@@ -732,113 +615,50 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t
 
 	F32 scaled_max_pixels =	max_pixels * sScaleX;
 
-	for (S32 i = begin_offset; (i < max_index); i++)
+	S32 pos;
+	for (pos = begin_offset; pos < max_index; pos++)
 	{
-		llwchar wch = wchars[i];
+		llwchar wch = wchars[pos];
 		if (!wch)
 		{
 			break; // done
 		}
-		const embedded_data_t* ext_data = use_embedded ? getEmbeddedCharData(wch) : NULL;
-		if (ext_data)
-		{
-			F32 ext_advance = getEmbeddedCharAdvance(ext_data);
-
-			if (round)
-			{
-				// Note: if the mouse is on the left half of the character, the pick is to the character's left
-				// If it's on the right half, the pick is to the right.
-				if (target_x  < cur_x + ext_advance/2)
-				{
-					break;
-				}
-			}
-			else
-			{
-				if (target_x  < cur_x + ext_advance)
-				{
-					break;
-				}
-			}
+		F32 char_width = mFontFreetype->getXAdvance(wch);
 
-			if (scaled_max_pixels < cur_x + ext_advance)
+		if (round)
+		{
+			// Note: if the mouse is on the left half of the character, the pick is to the character's left
+			// If it's on the right half, the pick is to the right.
+			if (target_x  < cur_x + char_width*0.5f)
 			{
 				break;
 			}
-
-			pos++;
-			cur_x += ext_advance;
-
-			if (((i + 1) < max_index)
-				&& (wchars[(i + 1)]))
-			{
-				cur_x += EXT_KERNING * sScaleX;
-			}
-			// Round after kerning.
-			cur_x = (F32)llfloor(cur_x + 0.5f);
 		}
-		else
+		else if (target_x  < cur_x + char_width)
 		{
-			F32 char_width = mFontFreetype->getXAdvance(wch);
-
-			if (round)
-			{
-				// Note: if the mouse is on the left half of the character, the pick is to the character's left
-				// If it's on the right half, the pick is to the right.
-				if (target_x  < cur_x + char_width*0.5f)
-				{
-					break;
-				}
-			}
-			else if (target_x  < cur_x + char_width)
-			{
-				break;
-			}
-
-			if (scaled_max_pixels < cur_x + char_width)
-			{
-				break;
-			}
-
-			pos++;
-			cur_x += char_width;
-
-			if (((i + 1) < max_index)
-				&& (wchars[(i + 1)]))
-			{
-				llwchar next_char = wchars[i + 1];
-				// Kern this puppy.
-				cur_x += mFontFreetype->getXKerning(wch, next_char);
-			}
-
-			// Round after kerning.
-			cur_x = (F32)llfloor(cur_x + 0.5f);
+			break;
 		}
-	}
 
-	return pos;
-}
+		if (scaled_max_pixels < cur_x + char_width)
+		{
+			break;
+		}
 
-void LLFontGL::addEmbeddedChar( llwchar wc, LLTexture* image, const std::string& label ) const
-{
-	LLWString wlabel = utf8str_to_wstring(label);
-	addEmbeddedChar(wc, image, wlabel);
-}
+		cur_x += char_width;
 
-void LLFontGL::addEmbeddedChar( llwchar wc, LLTexture* image, const LLWString& wlabel ) const
-{
-	embedded_data_t* ext_data = new embedded_data_t(image->getGLTexture(), wlabel);
-	mEmbeddedChars[wc] = ext_data;
-}
+		if (((pos + 1) < max_index)
+			&& (wchars[(pos + 1)]))
+		{
+			llwchar next_char = wchars[pos + 1];
+			// Kern this puppy.
+			cur_x += mFontFreetype->getXKerning(wch, next_char);
+		}
 
-void LLFontGL::removeEmbeddedChar(llwchar wc) const
-{
-	embedded_map_t::iterator iter = mEmbeddedChars.find(wc);
-	if (iter != mEmbeddedChars.end())
-	{
-		delete iter->second;
-		mEmbeddedChars.erase(wc);
+		// Round after kerning.
+		cur_x = (F32)llfloor(cur_x + 0.5f);
 	}
+
+	return llmin(max_chars, pos - begin_offset);
 }
 
 BOOL LLFontGL::addChar(llwchar wch) const
@@ -1154,38 +974,6 @@ LLFontGL &LLFontGL::operator=(const LLFontGL &source)
 	return *this;
 }
 
-const LLFontGL::embedded_data_t* LLFontGL::getEmbeddedCharData(llwchar wch) const
-{
-	// Handle crappy embedded hack
-	embedded_map_t::const_iterator iter = mEmbeddedChars.find(wch);
-	if (iter != mEmbeddedChars.end())
-	{
-		return iter->second;
-	}
-	return NULL;
-}
-
-F32 LLFontGL::getEmbeddedCharAdvance(const embedded_data_t* ext_data) const
-{
-	const LLWString& label = ext_data->mLabel;
-	LLImageGL* ext_image = ext_data->mImage;
-
-	F32 ext_width = (F32)ext_image->getWidth();
-	if( !label.empty() )
-	{
-		ext_width += (EXT_X_BEARING + getFontExtChar()->getWidthF32(label.c_str())) * sScaleX;
-	}
-
-	return (EXT_X_BEARING * sScaleX) + ext_width;
-}
-
-void LLFontGL::clearEmbeddedChars()
-{
-	for_each(mEmbeddedChars.begin(), mEmbeddedChars.end(), DeletePairedPointer());
-	mEmbeddedChars.clear();
-}
-
-
 void LLFontGL::renderQuad(const LLRectf& screen_rect, const LLRectf& uv_rect, F32 slant_amt) const
 {
 	gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 42ed7a381f..af8e0909af 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -97,7 +97,7 @@ public:
 	BOOL loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, const S32 components, BOOL is_fallback);
 
 	S32 render(const LLWString &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign = LEFT,  VAlign valign = BASELINE, U8 style = NORMAL,
-	           ShadowType shadow = NO_SHADOW, S32 max_chars = S32_MAX, S32 max_pixels = S32_MAX, F32* right_x=NULL, BOOL use_embedded = FALSE, BOOL use_ellipses = FALSE) const;
+	           ShadowType shadow = NO_SHADOW, S32 max_chars = S32_MAX, S32 max_pixels = S32_MAX, F32* right_x=NULL, BOOL use_ellipses = FALSE) const;
 	S32 render(const LLWString &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color) const;
 
 	// renderUTF8 does a conversion, so is slower!
@@ -113,28 +113,24 @@ public:
 	S32 getWidth(const std::string& utf8text) const;
 	S32 getWidth(const llwchar* wchars) const;
 	S32 getWidth(const std::string& utf8text, S32 offset, S32 max_chars ) const;
-	S32 getWidth(const llwchar* wchars, S32 offset, S32 max_chars, BOOL use_embedded = FALSE) const;
+	S32 getWidth(const llwchar* wchars, S32 offset, S32 max_chars) const;
 
 	F32 getWidthF32(const std::string& utf8text) const;
 	F32 getWidthF32(const llwchar* wchars) const;
 	F32 getWidthF32(const std::string& text, S32 offset, S32 max_chars ) const;
-	F32 getWidthF32(const llwchar* wchars, S32 offset, S32 max_chars, BOOL use_embedded = FALSE ) const;
+	F32 getWidthF32(const llwchar* wchars, S32 offset, S32 max_chars) const;
 
 	// The following are called often, frequently with large buffers, so do not use a string interface
 	
 	// Returns the max number of complete characters from text (up to max_chars) that can be drawn in max_pixels
-	S32	maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_chars = S32_MAX, BOOL end_on_word_boundary = FALSE, BOOL use_embedded = FALSE, F32* drawn_pixels = NULL) const;
+	S32	maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_chars = S32_MAX, BOOL end_on_word_boundary = FALSE) const;
 
 	// Returns the index of the first complete characters from text that can be drawn in max_pixels
 	// given that the character at start_pos should be the last character (or as close to last as possible).
 	S32	firstDrawableChar(const llwchar* wchars, F32 max_pixels, S32 text_len, S32 start_pos=S32_MAX, S32 max_chars = S32_MAX) const;
 
 	// Returns the index of the character closest to pixel position x (ignoring text to the right of max_pixels and max_chars)
-	S32 charFromPixelOffset(const llwchar* wchars, S32 char_offset, F32 x, F32 max_pixels=F32_MAX, S32 max_chars = S32_MAX, BOOL round = TRUE, BOOL use_embedded = FALSE) const;
-
-	void addEmbeddedChar( llwchar wc, LLTexture* image, const std::string& label) const;
-	void addEmbeddedChar( llwchar wc, LLTexture* image, const LLWString& label) const;
-	void removeEmbeddedChar( llwchar wc ) const;
+	S32 charFromPixelOffset(const llwchar* wchars, S32 char_offset, F32 x, F32 max_pixels=F32_MAX, S32 max_chars = S32_MAX, BOOL round = TRUE) const;
 
 	BOOL addChar(const llwchar wch) const;
 
@@ -199,19 +195,6 @@ private:
 	LLFontDescriptor mFontDescriptor;
 	LLPointer<LLFontFreetype> mFontFreetype;
 
-	struct embedded_data_t
-	{
-		embedded_data_t(LLImageGL* image, const LLWString& label) : mImage(image), mLabel(label) {}
-		LLPointer<LLImageGL> mImage;
-		LLWString			 mLabel;
-	};
-
-	typedef std::map<llwchar,embedded_data_t*> embedded_map_t;
-	mutable embedded_map_t mEmbeddedChars;
-
-	const embedded_data_t* getEmbeddedCharData(llwchar wch) const;
-	F32 getEmbeddedCharAdvance(const embedded_data_t* ext_data) const;
-	void clearEmbeddedChars();
 	void renderQuad(const LLRectf& screen_rect, const LLRectf& uv_rect, F32 slant_amt) const;
 	void drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, const LLColor4& color, U8 style, ShadowType shadow, F32 drop_shadow_fade) const;
 
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 553e7b8f9d..99f364a589 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -477,7 +477,6 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 
 	if (result)
 	{
-		result->mFontFreetype->setStyle(match_desc->getStyle());
 		result->mFontDescriptor = desc;
 	}
 	else
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index c3d1d9e894..3669b49e51 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -516,7 +516,6 @@ void LLImageGL::setImage(const LLImageRaw* imageraw)
 
 void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
 {
-// 	LLFastTimer t1(LLFastTimer::FTM_TEMP1);
 	llpushcallstacks ;
 	bool is_compressed = false;
 	if (mFormatPrimary >= GL_COMPRESSED_RGBA_S3TC_DXT1_EXT && mFormatPrimary <= GL_COMPRESSED_RGBA_S3TC_DXT5_EXT)
@@ -524,12 +523,10 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
 		is_compressed = true;
 	}
 
-// 		LLFastTimer t2(LLFastTimer::FTM_TEMP2);
 	gGL.getTexUnit(0)->bind(this);
 	
 	if (mUseMipMaps)
 	{
-// 		LLFastTimer t2(LLFastTimer::FTM_TEMP3);
 		if (data_hasmips)
 		{
 			// NOTE: data_in points to largest image; smaller images
@@ -546,14 +543,13 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
 				}
 				if (is_compressed)
 				{
-// 					LLFastTimer t2(LLFastTimer::FTM_TEMP4);
  					S32 tex_size = dataFormatBytes(mFormatPrimary, w, h);
 					glCompressedTexImage2DARB(mTarget, gl_level, mFormatPrimary, w, h, 0, tex_size, (GLvoid *)data_in);
 					stop_glerror();
 				}
 				else
 				{
-// 					LLFastTimer t2(LLFastTimer::FTM_TEMP4);
+// 					LLFastTimer t2(FTM_TEMP4);
 
 					if(mFormatSwapBytes)
 					{
@@ -586,7 +582,7 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
 				glTexParameteri(LLTexUnit::getInternalType(mBindTarget), GL_GENERATE_MIPMAP_SGIS, TRUE);
 				stop_glerror();
 				{
-// 					LLFastTimer t2(LLFastTimer::FTM_TEMP4);
+// 					LLFastTimer t2(FTM_TEMP4);
 
 					if(mFormatSwapBytes)
 					{
@@ -646,7 +642,7 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
 					}
 					llassert(w > 0 && h > 0 && cur_mip_data);
 					{
-// 						LLFastTimer t1(LLFastTimer::FTM_TEMP4);
+// 						LLFastTimer t1(FTM_TEMP4);
 						if(mFormatSwapBytes)
 						{
 							glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
@@ -988,7 +984,6 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, BOOL data_
 		LLImageGL::generateTextures(1, &mTexName);
 		stop_glerror();
 		{
-// 			LLFastTimer t1(LLFastTimer::FTM_TEMP6);
 			llverify(gGL.getTexUnit(0)->bind(this));
 			glTexParameteri(LLTexUnit::getInternalType(mBindTarget), GL_TEXTURE_BASE_LEVEL, 0);
 			glTexParameteri(LLTexUnit::getInternalType(mBindTarget), GL_TEXTURE_MAX_LEVEL,  mMaxDiscardLevel-discard_level);
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index c566282bef..b13b250c75 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -419,8 +419,16 @@ BOOL	LLButton::handleRightMouseDown(S32 x, S32 y, MASK mask)
 		{
 			setFocus(TRUE);
 		}
-	}
 
+//		if (pointInView(x, y))
+//		{
+//		}
+	}
+	// send the mouse down signal
+	LLUICtrl::handleRightMouseDown(x,y,mask);
+	// *TODO: Return result of LLUICtrl call above?  Should defer to base class
+	// but this might change the mouse handling of existing buttons in a bad way
+	// if they are not mouse opaque.
 	return TRUE;
 }
 
@@ -432,15 +440,20 @@ BOOL	LLButton::handleRightMouseUp(S32 x, S32 y, MASK mask)
 		// Always release the mouse
 		gFocusMgr.setMouseCapture( NULL );
 
-		if (pointInView(x, y))
-		{
-			mRightClickSignal(this, x,y,mask);
-		}
+//		if (pointInView(x, y))
+//		{
+//			mRightMouseUpSignal(this, x,y,mask);
+//		}
 	}
 	else 
 	{
 		childrenHandleRightMouseUp(x, y, mask);
 	}
+	// send the mouse up signal
+	LLUICtrl::handleRightMouseUp(x,y,mask);
+	// *TODO: Return result of LLUICtrl call above?  Should defer to base class
+	// but this might change the mouse handling of existing buttons in a bad way.
+	// if they are not mouse opaque.
 	return TRUE;
 }
 
@@ -788,7 +801,7 @@ void LLButton::draw()
 			LLFontGL::NORMAL,
 			mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NO_SHADOW,
 			S32_MAX, text_width,
-			NULL, FALSE, mUseEllipses);
+			NULL, mUseEllipses);
 	}
 
 	LLUICtrl::draw();
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index b3c3a2e698..ac56d15d1b 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -191,6 +191,7 @@ void LLComboBox::clear()
 	mButton->setLabelSelected(LLStringUtil::null);
 	mButton->setLabelUnselected(LLStringUtil::null);
 	mList->deselectAllItems();
+	mLastSelectedIndex = -1;
 }
 
 void LLComboBox::onCommit()
@@ -296,6 +297,7 @@ BOOL LLComboBox::setSimple(const LLStringExplicit& name)
 	if (found)
 	{
 		setLabel(name);
+		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
 
 	return found;
@@ -312,6 +314,7 @@ void LLComboBox::setValue(const LLSD& value)
 		{
 			setLabel( mList->getSelectedItemLabel() );
 		}
+		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
 }
 
@@ -359,6 +362,7 @@ void LLComboBox::setLabel(const LLStringExplicit& name)
 		if (mList->selectItemByLabel(name, FALSE))
 		{
 			mTextEntry->setTentative(FALSE);
+			mLastSelectedIndex = mList->getFirstSelectedIndex();
 		}
 		else
 		{
@@ -384,6 +388,7 @@ BOOL LLComboBox::remove(const std::string& name)
 		{
 			mList->deleteSingleItem(mList->getItemIndex(item));
 		}
+		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
 
 	return found;
@@ -436,6 +441,7 @@ BOOL LLComboBox::setCurrentByIndex( S32 index )
 	if (found)
 	{
 		setLabel(mList->getSelectedItemLabel());
+		mLastSelectedIndex = index;
 	}
 	return found;
 }
@@ -607,9 +613,6 @@ void LLComboBox::showList()
 	mList->setVisible(TRUE);
 	
 	setUseBoundingRect(TRUE);
-
-	mList->sortItems();
-	mLastSelectedIndex = mList->getFirstSelectedIndex();
 }
 
 void LLComboBox::hideList()
@@ -819,11 +822,13 @@ void LLComboBox::onTextEntry(LLLineEditor* line_editor)
 		if (mList->selectItemByLabel(line_editor->getText(), FALSE))
 		{
 			line_editor->setTentative(FALSE);
+			mLastSelectedIndex = mList->getFirstSelectedIndex();
 		}
 		else
 		{
 			line_editor->setTentative(mTextEntryTentative);
 			mList->deselectAllItems();
+			mLastSelectedIndex = -1;
 		}
 		return;
 	}
@@ -890,6 +895,7 @@ void LLComboBox::updateSelection()
 	if (mList->selectItemByLabel(full_string, FALSE))
 	{
 		mTextEntry->setTentative(FALSE);
+		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
 	else if (mList->selectItemByPrefix(left_wstring, FALSE))
 	{
@@ -900,6 +906,7 @@ void LLComboBox::updateSelection()
 		mTextEntry->endSelection();
 		mTextEntry->setTentative(FALSE);
 		mHasAutocompletedText = TRUE;
+		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
 	else // no matching items found
 	{
@@ -907,6 +914,7 @@ void LLComboBox::updateSelection()
 		mTextEntry->setText(wstring_to_utf8str(user_wstring)); // removes text added by autocompletion
 		mTextEntry->setTentative(mTextEntryTentative);
 		mHasAutocompletedText = FALSE;
+		mLastSelectedIndex = -1;
 	}
 }
 
@@ -994,6 +1002,7 @@ BOOL LLComboBox::setCurrentByID(const LLUUID& id)
 	if (found)
 	{
 		setLabel(mList->getSelectedItemLabel());
+		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
 
 	return found;
diff --git a/indra/llui/llcontainerview.cpp b/indra/llui/llcontainerview.cpp
index 7e7d6ac111..51ef80f4b9 100644
--- a/indra/llui/llcontainerview.cpp
+++ b/indra/llui/llcontainerview.cpp
@@ -132,35 +132,31 @@ void LLContainerView::draw()
 
 void LLContainerView::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-	S32 desired_width = width;
-	S32 desired_height = height;
+	LLRect scroller_rect;
+	scroller_rect.setOriginAndSize(0, 0, width, height);
 
 	if (mScrollContainer)
 	{
-		BOOL dum_bool;
-		mScrollContainer->calcVisibleSize(&desired_width, &desired_height, &dum_bool, &dum_bool);
+		scroller_rect = mScrollContainer->getContentWindowRect();
 	}
 	else
 	{
 		// if we're uncontained - make height as small as possible
-		desired_height = 0;
+		scroller_rect.mTop = 0;
 	}
 
-	arrange(desired_width, desired_height, called_from_parent);
+	arrange(scroller_rect.getWidth(), scroller_rect.getHeight(), called_from_parent);
 
 	// sometimes, after layout, our container will change size (scrollbars popping in and out)
 	// if so, attempt another layout
 	if (mScrollContainer)
 	{
-		S32 new_container_width;
-		S32 new_container_height;
-		BOOL dum_bool;
-		mScrollContainer->calcVisibleSize(&new_container_width, &new_container_height, &dum_bool, &dum_bool);
+		LLRect new_container_rect = mScrollContainer->getContentWindowRect();
 
-		if ((new_container_width != desired_width) ||
-			(new_container_height != desired_height))  // the container size has changed, attempt to arrange again
+		if ((new_container_rect.getWidth() != scroller_rect.getWidth()) ||
+			(new_container_rect.getHeight() != scroller_rect.getHeight()))  // the container size has changed, attempt to arrange again
 		{
-			arrange(new_container_width, new_container_height, called_from_parent);
+			arrange(new_container_rect.getWidth(), new_container_rect.getHeight(), called_from_parent);
 		}
 	}
 }
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index d420d1141e..2679143bbc 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -711,10 +711,7 @@ void LLFloater::releaseFocus()
 		gFocusMgr.setTopCtrl(NULL);
 	}
 
-	if( gFocusMgr.childHasKeyboardFocus( this ) )
-	{
-		gFocusMgr.setKeyboardFocus(NULL);
-	}
+	setFocus(FALSE);
 
 	if( gFocusMgr.childHasMouseCapture( this ) )
 	{
@@ -1074,7 +1071,7 @@ void LLFloater::setFocus( BOOL b )
 	}
 	LLUICtrl* last_focus = gFocusMgr.getLastFocusForGroup(this);
 	// a descendent already has focus
-	BOOL child_had_focus = gFocusMgr.childHasKeyboardFocus(this);
+	BOOL child_had_focus = hasFocus();
 
 	// give focus to first valid descendent
 	LLPanel::setFocus(b);
@@ -1948,7 +1945,7 @@ LLRect LLFloaterView::findNeighboringPosition( LLFloater* reference_floater, LLF
 		if (sibling && 
 			sibling != neighbor && 
 			sibling->getVisible() && 
-			expanded_base_rect.rectInRect(&sibling->getRect()))
+			expanded_base_rect.overlaps(sibling->getRect()))
 		{
 			base_rect.unionWith(sibling->getRect());
 		}
@@ -2593,6 +2590,8 @@ void LLFloater::initFromParams(const LLFloater::Params& p)
 		initCommitCallback(p.close_callback, mCloseSignal);
 }
 
+LLFastTimer::DeclareTimer POST_BUILD("Floater Post Build");
+
 void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)
 {
 	Params params(LLUICtrlFactory::getDefaultParams<LLFloater>());
@@ -2626,7 +2625,12 @@ void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o
 		LLFloater::setFloaterHost(last_host);
 	}
 	
-	BOOL result = postBuild();
+	BOOL result;
+	{
+		LLFastTimer ft(POST_BUILD);
+
+		result = postBuild();
+	}
 
 	if (!result)
 	{
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 30796a5ab9..db1611abb5 100644
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -231,11 +231,13 @@ LLColor3 LLKeywords::readColor( const std::string& s )
 	return LLColor3( r, g, b );
 }
 
+LLFastTimer::DeclareTimer FTM_SYNTAX_COLORING("Syntax Coloring");
+
 // Walk through a string, applying the rules specified by the keyword token list and
 // create a list of color segments.
-void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWString& wtext, const LLColor4 &defaultColor)
+void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLWString& wtext, const LLColor4 &defaultColor, LLTextEditor& editor)
 {
-	std::for_each(seg_list->begin(), seg_list->end(), DeletePointer());
+	LLFastTimer ft(FTM_SYNTAX_COLORING);
 	seg_list->clear();
 
 	if( wtext.empty() )
@@ -245,7 +247,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 	
 	S32 text_len = wtext.size();
 
-	seg_list->push_back( new LLTextSegment( LLColor3(defaultColor), 0, text_len ) ); 
+	seg_list->push_back( new LLNormalTextSegment( defaultColor, 0, text_len, editor ) ); 
 
 	const llwchar* base = wtext.c_str();
 	const llwchar* cur = base;
@@ -296,9 +298,9 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 						}
 						S32 seg_end = cur - base;
 						
-						LLTextSegment* text_segment = new LLTextSegment( cur_token->getColor(), seg_start, seg_end );
+						LLTextSegmentPtr text_segment = new LLNormalTextSegment( cur_token->getColor(), seg_start, seg_end, editor );
 						text_segment->setToken( cur_token );
-						insertSegment( seg_list, text_segment, text_len, defaultColor);
+						insertSegment( seg_list, text_segment, text_len, defaultColor, editor);
 						line_done = TRUE; // to break out of second loop.
 						break;
 					}
@@ -405,9 +407,9 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 					}
 
 
-					LLTextSegment* text_segment = new LLTextSegment( cur_delimiter->getColor(), seg_start, seg_end );
+					LLTextSegmentPtr text_segment = new LLNormalTextSegment( cur_delimiter->getColor(), seg_start, seg_end, editor );
 					text_segment->setToken( cur_delimiter );
-					insertSegment( seg_list, text_segment, text_len, defaultColor);
+					insertSegment( seg_list, text_segment, text_len, defaultColor, editor);
 
 					// Note: we don't increment cur, since the end of one delimited seg may be immediately
 					// followed by the start of another one.
@@ -438,9 +440,9 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 						// llinfos << "Seg: [" << word.c_str() << "]" << llendl;
 
 
-						LLTextSegment* text_segment = new LLTextSegment( cur_token->getColor(), seg_start, seg_end );
+						LLTextSegmentPtr text_segment = new LLNormalTextSegment( cur_token->getColor(), seg_start, seg_end, editor );
 						text_segment->setToken( cur_token );
-						insertSegment( seg_list, text_segment, text_len, defaultColor);
+						insertSegment( seg_list, text_segment, text_len, defaultColor, editor);
 					}
 					cur += seg_len; 
 					continue;
@@ -455,25 +457,24 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 	}
 }
 
-void LLKeywords::insertSegment(std::vector<LLTextSegment*>* seg_list, LLTextSegment* new_segment, S32 text_len, const LLColor4 &defaultColor )
+void LLKeywords::insertSegment(std::vector<LLTextSegmentPtr>* seg_list, LLTextSegmentPtr new_segment, S32 text_len, const LLColor4 &defaultColor, LLTextEditor& editor )
 {
-	LLTextSegment* last = seg_list->back();
+	LLTextSegmentPtr last = seg_list->back();
 	S32 new_seg_end = new_segment->getEnd();
 
 	if( new_segment->getStart() == last->getStart() )
 	{
-		*last = *new_segment;
-		delete new_segment;
+		seg_list->pop_back();
 	}
 	else
 	{
 		last->setEnd( new_segment->getStart() );
-		seg_list->push_back( new_segment );
 	}
+	seg_list->push_back( new_segment );
 
 	if( new_seg_end < text_len )
 	{
-		seg_list->push_back( new LLTextSegment( defaultColor, new_seg_end, text_len ) );
+		seg_list->push_back( new LLNormalTextSegment( defaultColor, new_seg_end, text_len, editor ) );
 	}
 }
 
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
index 38f5e993c2..53377869ca 100644
--- a/indra/llui/llkeywords.h
+++ b/indra/llui/llkeywords.h
@@ -39,9 +39,10 @@
 #include <map>
 #include <list>
 #include <deque>
+#include "llpointer.h"
 
 class LLTextSegment;
-
+typedef LLPointer<LLTextSegment> LLTextSegmentPtr;
 
 class LLKeywordToken
 {
@@ -84,7 +85,7 @@ public:
 	BOOL		loadFromFile(const std::string& filename);
 	BOOL		isLoaded() const	{ return mLoaded; }
 
-	void		findSegments(std::vector<LLTextSegment *> *seg_list, const LLWString& text, const LLColor4 &defaultColor );
+	void		findSegments(std::vector<LLTextSegmentPtr> *seg_list, const LLWString& text, const LLColor4 &defaultColor, class LLTextEditor& editor );
 
 	// Add the token as described
 	void addToken(LLKeywordToken::TOKEN_TYPE type,
@@ -103,7 +104,7 @@ public:
 
 private:
 	LLColor3	readColor(const std::string& s);
-	void		insertSegment(std::vector<LLTextSegment *> *seg_list, LLTextSegment* new_segment, S32 text_len, const LLColor4 &defaultColor);
+	void		insertSegment(std::vector<LLTextSegmentPtr> *seg_list, LLTextSegmentPtr new_segment, S32 text_len, const LLColor4 &defaultColor, class LLTextEditor& editor);
 
 	BOOL		mLoaded;
 	word_token_map_t mWordTokenMap;
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 702d8e4a39..f98edec1f3 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -167,7 +167,7 @@ void LLLayoutStack::draw()
 
 		LLLocalClipRect clip(clip_rect, mClip);
 		// only force drawing invisible children if visible amount is non-zero
-		drawChild(panelp, 0, 0, !clip_rect.isNull());
+		drawChild(panelp, 0, 0, !clip_rect.isEmpty());
 	}
 }
 
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 42a1b9ad9c..6926415c6d 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -494,19 +494,19 @@ BOOL LLLineEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 		BOOL doSelectAll = TRUE;
 
 		// Select the word we're on
-		if( LLTextEditor::isPartOfWord( wtext[mCursorPos] ) )
+		if( LLWStringUtil::isPartOfWord( wtext[mCursorPos] ) )
 		{
 			S32 old_selection_start = mLastSelectionStart;
 			S32 old_selection_end = mLastSelectionEnd;
 
 			// Select word the cursor is over
-			while ((mCursorPos > 0) && LLTextEditor::isPartOfWord( wtext[mCursorPos-1] ))
+			while ((mCursorPos > 0) && LLWStringUtil::isPartOfWord( wtext[mCursorPos-1] ))
 			{	// Find the start of the word
 				mCursorPos--;
 			}
 			startSelection();	
 
-			while ((mCursorPos < (S32)wtext.length()) && LLTextEditor::isPartOfWord( wtext[mCursorPos] ) )
+			while ((mCursorPos < (S32)wtext.length()) && LLWStringUtil::isPartOfWord( wtext[mCursorPos] ) )
 			{	// Find the end of the word
 				mCursorPos++;
 			}
@@ -840,7 +840,7 @@ S32 LLLineEditor::prevWordPos(S32 cursorPos) const
 	{
 		cursorPos--;
 	}
-	while( (cursorPos > 0) && LLTextEditor::isPartOfWord( wtext[cursorPos-1] ) )
+	while( (cursorPos > 0) && LLWStringUtil::isPartOfWord( wtext[cursorPos-1] ) )
 	{
 		cursorPos--;
 	}
@@ -850,7 +850,7 @@ S32 LLLineEditor::prevWordPos(S32 cursorPos) const
 S32 LLLineEditor::nextWordPos(S32 cursorPos) const
 {
 	const LLWString& wtext = mText.getWString();
-	while( (cursorPos < getLength()) && LLTextEditor::isPartOfWord( wtext[cursorPos] ) )
+	while( (cursorPos < getLength()) && LLWStringUtil::isPartOfWord( wtext[cursorPos] ) )
 	{
 		cursorPos++;
 	} 
@@ -1732,11 +1732,11 @@ void LLLineEditor::draw()
 #endif
 
 	// If we're editing...
-	if( gFocusMgr.getKeyboardFocus() == this)
+	if( hasFocus())
 	{
 		//mBorder->setVisible(TRUE); // ok, programmer art just this once.
 		// (Flash the cursor every half second)
-		if (gShowTextEditCursor && !mReadOnly)
+		if (!mReadOnly && gFocusMgr.getAppHasFocus())
 		{
 			F32 elapsed = mKeystrokeTimer.getElapsedTimeF32();
 			if( (elapsed < CURSOR_FLASH_DELAY ) || (S32(elapsed * 2) & 1) )
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 5be53e6afc..b6c3ffc61c 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -184,6 +184,13 @@ LLMenuItemGL::LLMenuItemGL(const LLMenuItemGL::Params& p)
 		<< LL_ENDL;
 }
 
+//virtual
+void LLMenuItemGL::setValue(const LLSD& value)
+{
+	setLabel(value.asString());
+}
+
+//virtual
 BOOL LLMenuItemGL::handleAcceleratorKey(KEY key, MASK mask)
 {
 	if( getEnabled() && (!gKeyboard->getKeyRepeated(key) || mAllowKeyRepeat) && (key == mAcceleratorKey) && (mask == (mAcceleratorMask & MASK_NORMALKEYS)) )
@@ -201,6 +208,26 @@ BOOL LLMenuItemGL::handleHover(S32 x, S32 y, MASK mask)
 	return TRUE;
 }
 
+//virtual
+BOOL LLMenuItemGL::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	return LLUICtrl::handleRightMouseDown(x,y,mask);
+}
+
+//virtual
+BOOL LLMenuItemGL::handleRightMouseUp(S32 x, S32 y, MASK mask)
+{
+	// If this event came from a right-click context menu spawn,
+	// process as a left-click to allow menu items to be hit
+	if (LLMenuHolderGL::sContextMenuSpawnPos.mX != S32_MAX
+		|| LLMenuHolderGL::sContextMenuSpawnPos.mY != S32_MAX)
+	{
+		BOOL handled = handleMouseUp(x, y, mask);
+		return handled;
+	}
+	return LLUICtrl::handleRightMouseUp(x,y,mask);
+}
+
 // This function checks to see if the accelerator key is already in use;
 // if not, it will be added to the list
 BOOL LLMenuItemGL::addToAcceleratorList(std::list <LLKeyBinding*> *listp)
@@ -306,6 +333,17 @@ U32 LLMenuItemGL::getNominalHeight( void ) const
 	return llround(mFont->getLineHeight()) + MENU_ITEM_PADDING; 
 }
 
+//virtual
+void LLMenuItemGL::setBriefItem(BOOL brief)
+{
+	mBriefItem = brief;
+}
+
+//virtual
+BOOL LLMenuItemGL::isBriefItem() const
+{
+	return mBriefItem;
+}
 
 // Get the parent menu for this item
 LLMenuGL* LLMenuItemGL::getMenu() const
@@ -800,15 +838,8 @@ BOOL LLMenuItemCallGL::handleAcceleratorKey( KEY key, MASK mask )
 	return FALSE;
 }
 
-BOOL LLMenuItemCallGL::handleRightMouseUp(S32 x, S32 y, MASK mask)
-{
-	if (pointInView(x, y))
-	{
-		mRightClickSignal(this,x,y, mask);
-	}
-
-	return TRUE;
-}
+// handleRightMouseUp moved into base class LLMenuItemGL so clicks are
+// handled for all menu item types
 
 ///============================================================================
 /// Class LLMenuItemCheckGL
@@ -898,24 +929,38 @@ LLMenuItemBranchGL::~LLMenuItemBranchGL()
 }
 
 // virtual
-LLView* LLMenuItemBranchGL::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
+LLView* LLMenuItemBranchGL::getChildView(const std::string& name, BOOL recurse) const
 {
 	LLMenuGL* branch = getBranch();
-	if (!branch)
-		return LLView::getChildView(name, recurse, create_if_missing);
-
-	// richard: this is redundant with parent, remove
-	if (branch->getName() == name)
+	if (branch)
 	{
-		return branch;
+		if (branch->getName() == name)
+		{
+			return branch;
+		}
+
+		// Always recurse on branches
+		return branch->getChildView(name, recurse);
 	}
-	// Always recurse on branches
-	LLView* child = branch->getChildView(name, recurse, FALSE);
-	if (!child)
+
+	return LLView::getChildView(name, recurse);
+}
+
+LLView* LLMenuItemBranchGL::findChildView(const std::string& name, BOOL recurse) const
+{
+	LLMenuGL* branch = getBranch();
+	if (branch)
 	{
-		child = LLView::getChildView(name, recurse, create_if_missing);
+		if (branch->getName() == name)
+		{
+			return branch;
+		}
+
+		// Always recurse on branches
+		return branch->findChildView(name, recurse);
 	}
-	return child;
+
+	return LLView::findChildView(name, recurse);
 }
 
 // virtual
@@ -1123,6 +1168,18 @@ BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask )
 	return LLMenuItemGL::handleKeyHere(key, mask);
 }
 
+//virtual
+BOOL LLMenuItemBranchGL::isActive() const
+{
+	return isOpen() && getBranch() && getBranch()->getHighlightedItem();
+}
+
+//virtual
+BOOL LLMenuItemBranchGL::isOpen() const
+{
+	return getBranch() && getBranch()->isOpen();
+}
+
 void LLMenuItemBranchGL::openMenu()
 {
 	LLMenuGL* branch = getBranch();
@@ -1298,6 +1355,9 @@ void LLMenuItemBranchDownGL::setHighlight( BOOL highlight )
 {
 	if (highlight == getHighlight()) return;
 
+	LLMenuGL* branch = getBranch();
+	if (!branch) return;
+
 	//NOTE: Purposely calling all the way to the base to bypass auto-open.
 	LLMenuItemGL::setHighlight(highlight);
 	if( !highlight)
@@ -2803,9 +2863,9 @@ void LLMenuGL::setVisible(BOOL visible)
 	}
 }
 
-LLMenuGL* LLMenuGL::getChildMenuByName(const std::string& name, BOOL recurse) const
+LLMenuGL* LLMenuGL::findChildMenuByName(const std::string& name, BOOL recurse) const
 {
-	LLView* view = getChildView(name, recurse, FALSE);
+	LLView* view = findChildView(name, recurse);
 	if (view)
 	{
 		LLMenuItemBranchGL* branch = dynamic_cast<LLMenuItemBranchGL*>(view);
@@ -2844,9 +2904,19 @@ void hide_top_view( LLView* view )
 }
 
 
+// x and y are the desired location for the popup, NOT necessarily the
+// mouse location
 // static
 void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
 {
+	// Save click point for detecting cursor moves before mouse-up.
+	// Must be in local coords to compare with mouseUp events.
+	// If the mouse doesn't move, the menu will stay open ala the Mac.
+	// See also LLContextMenu::show()
+	S32 mouse_x, mouse_y;
+	LLUI::getCursorPositionLocal(menu->getParent(), &mouse_x, &mouse_y);
+	LLMenuHolderGL::sContextMenuSpawnPos.set(mouse_x,mouse_y);
+
 	const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect();
 
 	const S32 HPAD = 2;
@@ -2857,9 +2927,6 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
 	spawning_view->localPointToOtherView(left, top, &left, &top, menu->getParent());
 	rect.setLeftTopAndSize( left, top,
 							rect.getWidth(), rect.getHeight() );
-
-
-	//rect.setLeftTopAndSize(x + HPAD, y, rect.getWidth(), rect.getHeight());
 	menu->setRect( rect );
 
 	// Resetting scrolling position
@@ -2871,18 +2938,16 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
 	menu->arrangeAndClear(); // Fix menu rect if needed.
 	rect = menu->getRect();
 
+	// Adjust context menu to fit onscreen
 	S32 bottom;
 	left = rect.mLeft;
 	bottom = rect.mBottom;
-	//menu->getParent()->localPointToScreen( rect.mLeft, rect.mBottom, 
-	//									&left, &bottom ); 
 	S32 delta_x = 0;
 	S32 delta_y = 0;
 	if( bottom < menu_region_rect.mBottom )
 	{
 		// At this point, we need to move the context menu to the
 		// other side of the mouse.
-		//delta_y = menu_region_rect.mBottom - bottom;
 		delta_y = (rect.getHeight() + 2 * HPAD);
 	}
 
@@ -2890,7 +2955,6 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
 	{
 		// At this point, we need to move the context menu to the
 		// other side of the mouse.
-		//delta_x = (window_width - rect.getWidth()) - x;
 		delta_x = -(rect.getWidth() + 2 * HPAD);
 	}
 	menu->translate( delta_x, delta_y );
@@ -3633,6 +3697,7 @@ void LLContextMenu::show(S32 x, S32 y)
 	// Save click point for detecting cursor moves before mouse-up.
 	// Must be in local coords to compare with mouseUp events.
 	// If the mouse doesn't move, the menu will stay open ala the Mac.
+	// See also LLMenuGL::showPopup()
 	LLMenuHolderGL::sContextMenuSpawnPos.set(x,y);
 
 	arrangeAndClear();
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index d39a02da28..2e7f61c2dd 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -105,10 +105,15 @@ protected:
 	LLMenuItemGL(const Params&);
 	friend class LLUICtrlFactory;
 public:
-	virtual void setValue(const LLSD& value) { setLabel(value.asString()); }
+	// LLView overrides
 	/*virtual*/ void handleVisibilityChange(BOOL new_visibility);
+	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask);
+
+	// LLUICtrl overrides
+	/*virtual*/ void setValue(const LLSD& value);
 
-	virtual BOOL handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 
 	LLColor4 getHighlightBgColor() { return mHighlightBackground.get(); }
@@ -124,8 +129,8 @@ public:
 	virtual U32 getNominalHeight( void ) const;
 	
 	// Marks item as not needing space for check marks or accelerator keys
-	virtual void setBriefItem(BOOL brief) { mBriefItem = brief; }
-	virtual BOOL isBriefItem() const { return mBriefItem; }
+	virtual void setBriefItem(BOOL brief);
+	virtual BOOL isBriefItem() const;
 
 	virtual BOOL addToAcceleratorList(std::list<LLKeyBinding*> *listp);
 	void setAllowKeyRepeat(BOOL allow) { mAllowKeyRepeat = allow; }
@@ -283,7 +288,6 @@ public:
 
 	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
-	virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask);
 	
 	//virtual void draw();
 	
@@ -427,7 +431,7 @@ public:
 
 	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 
-	LLMenuGL* getChildMenuByName(const std::string& name, BOOL recurse) const;
+	LLMenuGL* findChildMenuByName(const std::string& name, BOOL recurse) const;
 	
 	BOOL clearHoverItem();
 
@@ -610,9 +614,9 @@ public:
 
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
 
-	virtual BOOL isActive() const { return isOpen() && getBranch() && getBranch()->getHighlightedItem(); }
+	virtual BOOL isActive() const;
 
-	virtual BOOL isOpen() const { return getBranch() && getBranch()->isOpen(); }
+	virtual BOOL isOpen() const;
 
 	LLMenuGL* getBranch() const { return (LLMenuGL*)mBranchHandle.get(); }
 
@@ -627,7 +631,8 @@ public:
 
 	virtual void openMenu();
 
-	virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+	virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE) const;
+	virtual LLView* findChildView(const std::string& name, BOOL recurse = TRUE) const;
 
 private:
 	LLHandle<LLView> mBranchHandle;
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index 11fa290de1..c8162fe466 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -279,10 +279,7 @@ void LLModalDialog::onAppFocusLost()
 			gFocusMgr.setMouseCapture( NULL );
 		}
 
-		if( gFocusMgr.childHasKeyboardFocus( instance ) )
-		{
-			gFocusMgr.setKeyboardFocus( NULL );
-		}
+		instance->setFocus(FALSE);
 	}
 }
 
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp
index 9f9e3aecac..e8ce1a8d97 100644
--- a/indra/llui/llmultifloater.cpp
+++ b/indra/llui/llmultifloater.cpp
@@ -454,14 +454,8 @@ BOOL LLMultiFloater::postBuild()
 		return TRUE;
 	}
 
-	requires<LLTabContainer>("Preview Tabs");
-	if (checkRequirements())
-	{
-		mTabContainer = getChild<LLTabContainer>("Preview Tabs");
-		return TRUE;
-	}
-
-	return FALSE;
+	mTabContainer = getChild<LLTabContainer>("Preview Tabs");
+	return TRUE;
 }
 
 void LLMultiFloater::updateResizeLimits()
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index da55ababab..667a3e10c4 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -192,10 +192,6 @@ void LLPanel::draw()
 
 void LLPanel::updateDefaultBtn()
 {
-	// This method does not call LLView::draw() so callers will need
-	// to take care of that themselves at the appropriate place in
-	// their rendering sequence
-
 	if( mDefaultBtn)
 	{
 		if (gFocusMgr.childHasKeyboardFocus( this ) && mDefaultBtn->getEnabled())
@@ -254,7 +250,7 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask )
 	// handle user hitting ESC to defocus
 	if (key == KEY_ESCAPE)
 	{
-		gFocusMgr.setKeyboardFocus(NULL);
+		setFocus(FALSE);
 		return TRUE;
 	}
 	else if( (mask == MASK_SHIFT) && (KEY_TAB == key))
@@ -315,53 +311,18 @@ void LLPanel::handleVisibilityChange ( BOOL new_visibility )
 	mVisibleSignal(this, LLSD(new_visibility) ); // Pass BOOL as LLSD
 }
 
-BOOL LLPanel::checkRequirements()
-{
-	if (!mRequirementsError.empty())
-	{
-		LLSD args;
-		args["COMPONENTS"] = mRequirementsError;
-		args["FLOATER"] = getName();
-
-		llwarns << getName() << " failed requirements check on: \n"  
-				<< mRequirementsError << llendl;
-		
-		LLNotifications::instance().add(LLNotification::Params("FailedRequirementsCheck").payload(args));
-		mRequirementsError.clear();
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
 void LLPanel::setFocus(BOOL b)
 {
-	if( b )
+	if( b && !hasFocus())
 	{
-		if (!gFocusMgr.childHasKeyboardFocus(this))
-		{
-			// give ourselves focus preemptively, to avoid infinite loop
-			LLUICtrl::setFocus(TRUE);
-			// then try to pass to first valid child
-			focusFirstItem();
-		}
+		// give ourselves focus preemptively, to avoid infinite loop
+		LLUICtrl::setFocus(TRUE);
+		// then try to pass to first valid child
+		focusFirstItem();
 	}
 	else
 	{
-		if( this == gFocusMgr.getKeyboardFocus() )
-		{
-			gFocusMgr.setKeyboardFocus( NULL );
-		}
-		else
-		{
-			//RN: why is this here?
-			LLView::ctrl_list_t ctrls = getCtrlList();
-			for (LLView::ctrl_list_t::iterator ctrl_it = ctrls.begin(); ctrl_it != ctrls.end(); ++ctrl_it)
-			{
-				LLUICtrl* ctrl = *ctrl_it;
-				ctrl->setFocus( FALSE );
-			}
-		}
+		LLUICtrl::setFocus(b);
 	}
 }
 
@@ -704,7 +665,6 @@ BOOL LLPanel::childHasFocus(const std::string& id)
 	}
 	else
 	{
-		childNotFound(id);
 		return FALSE;
 	}
 }
@@ -881,58 +841,3 @@ void LLPanel::childSetControlName(const std::string& id, const std::string& cont
 		view->setControlName(control_name, NULL);
 	}
 }
-
-//virtual
-LLView* LLPanel::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
-{
-	// just get child, don't try to create a dummy one
-	LLView* view = LLUICtrl::getChildView(name, recurse, FALSE);
-	if (!view && !recurse)
-	{
-		childNotFound(name);
-	}
-	if (!view && create_if_missing)
-	{
-		view = getDefaultWidget<LLView>(name);
-		if (!view)
-		{
-			// create LLViews explicitly, as they are not registered widget types
-			view = LLUICtrlFactory::createDefaultWidget<LLView>(name);
-		}
-	}
-	return view;
-}
-
-void LLPanel::childNotFound(const std::string& id) const
-{
-	if (mExpectedMembers.find(id) == mExpectedMembers.end())
-	{
-		mNewExpectedMembers.insert(id);
-	}
-}
-
-void LLPanel::childDisplayNotFound()
-{
-	if (mNewExpectedMembers.empty())
-	{
-		return;
-	}
-	std::string msg;
-	expected_members_list_t::iterator itor;
-	for (itor=mNewExpectedMembers.begin(); itor!=mNewExpectedMembers.end(); ++itor)
-	{
-		msg.append(*itor);
-		msg.append("\n");
-		mExpectedMembers.insert(*itor);
-	}
-	mNewExpectedMembers.clear();
-	LLSD args;
-	args["CONTROLS"] = msg;
-	LLNotifications::instance().add("FloaterNotFound", args);
-}
-
-void LLPanel::requires(const std::string& name)
-{
-	requires<LLView>(name);
-}
-
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
index 2a70467ffc..3ee11483c3 100644
--- a/indra/llui/llpanel.h
+++ b/indra/llui/llpanel.h
@@ -115,9 +115,6 @@ public:
 	/*virtual*/ BOOL	handleKeyHere( KEY key, MASK mask );
 	/*virtual*/ void 	handleVisibilityChange ( BOOL new_visibility );
 
-	// Override to set not found list:
-	/*virtual*/ LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
-
 	// From LLFocusableElement
 	/*virtual*/ void	setFocus( BOOL b );
 	
@@ -132,19 +129,6 @@ public:
 	BOOL			hasBorder() const { return mBorder != NULL; }
 	void			setBorderVisible( BOOL b );
 
-	template <class T> void requires(const std::string& name)
-	{
-		// check for widget with matching type and name
-		if (LLView::getChild<T>(name) == NULL)
-		{
-			mRequirementsError += name + "\n";
-		}
-	}
-	
-	// requires LLView by default
-	void requires(const std::string& name);
-	BOOL			checkRequirements();
-
 	void			setBackgroundColor( const LLColor4& color ) { mBgColorOpaque = color; }
 	const LLColor4&	getBackgroundColor() const { return mBgColorOpaque; }
 	void			setTransparentColor(const LLColor4& color) { mBgColorAlpha = color; }
@@ -241,10 +225,6 @@ public:
 
 	void childSetControlName(const std::string& id, const std::string& control_name);
 
-	// Error reporting
-	void childNotFound(const std::string& id) const;
-	void childDisplayNotFound();
-
 	static LLView*	fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL);
 
 	//call onOpen to let panel know when it's about to be shown or activated
@@ -279,8 +259,6 @@ private:
 	typedef std::map<std::string, std::string> ui_string_map_t;
 	ui_string_map_t	mUIStrings;
 
-	std::string		mRequirementsError;
-
 	// for setting the xml filename when building panel in context dependent cases
 	std::string		mXMLFilename;
 	
diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp
index 30adbb023c..c66b9bde2b 100644
--- a/indra/llui/llradiogroup.cpp
+++ b/indra/llui/llradiogroup.cpp
@@ -90,18 +90,6 @@ BOOL LLRadioGroup::postBuild()
 	return TRUE;
 }
 
-// virtual
-void LLRadioGroup::setEnabled(BOOL enabled)
-{
-	for (child_list_const_iter_t child_iter = getChildList()->begin();
-		 child_iter != getChildList()->end(); ++child_iter)
-	{
-		LLView *child = *child_iter;
-		child->setEnabled(enabled);
-	}
-	LLView::setEnabled(enabled);
-}
-
 void LLRadioGroup::setIndexEnabled(S32 index, BOOL enabled)
 {
 	S32 count = 0;
diff --git a/indra/llui/llradiogroup.h b/indra/llui/llradiogroup.h
index d04473fa44..b5516307fd 100644
--- a/indra/llui/llradiogroup.h
+++ b/indra/llui/llradiogroup.h
@@ -106,9 +106,7 @@ public:
 	
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
 
-	virtual void setEnabled(BOOL enabled);
 	void setIndexEnabled(S32 index, BOOL enabled);
-	
 	// return the index value of the selected item
 	S32 getSelectedIndex() const { return mSelectedIndex; }
 	
diff --git a/indra/llui/llresizehandle.h b/indra/llui/llresizehandle.h
index 1560a03796..1c09cbb1bd 100644
--- a/indra/llui/llresizehandle.h
+++ b/indra/llui/llresizehandle.h
@@ -76,8 +76,8 @@ private:
 	const ECorner	mCorner;
 };
 
-const S32 RESIZE_HANDLE_HEIGHT = 16;
-const S32 RESIZE_HANDLE_WIDTH = 16;
+const S32 RESIZE_HANDLE_HEIGHT = 11;
+const S32 RESIZE_HANDLE_WIDTH = 11;
 
 #endif  // LL_RESIZEHANDLE_H
 
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index 566825ff3b..b46915b379 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -394,7 +394,7 @@ BOOL LLScrollbar::handleHover(S32 x, S32 y, MASK mask)
 	}
 	else
 	{
-		handled = childrenHandleMouseUp( x, y, mask ) != NULL;
+		handled = childrenHandleHover( x, y, mask ) != NULL;
 	}
 
 	// Opaque
diff --git a/indra/llui/llscrollbar.h b/indra/llui/llscrollbar.h
index 5522e5d0fa..30d906e04c 100644
--- a/indra/llui/llscrollbar.h
+++ b/indra/llui/llscrollbar.h
@@ -127,11 +127,6 @@ public:
 	void				onLineUpBtnPressed(const LLSD& data);
 	void				onLineDownBtnPressed(const LLSD& data);
 
-	void setTrackColor( const LLColor4& color ) { mTrackColor = color; }
-	void setThumbColor( const LLColor4& color ) { mThumbColor = color; }
-
-	void setOnScrollEndCallback(void (*callback)(void*), void* userdata) { mOnScrollEndCallback = callback; mOnScrollEndData = userdata;}
-
 private:
 	void				updateThumbRect();
 	void				changeLine(S32 delta, BOOL update_thumb );
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index 0b455f8e17..13f862f3af 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -55,8 +55,6 @@
 
 static const S32 HORIZONTAL_MULTIPLE = 8;
 static const S32 VERTICAL_MULTIPLE = 16;
-static const F32 MIN_AUTO_SCROLL_RATE = 120.f;
-static const F32 MAX_AUTO_SCROLL_RATE = 500.f;
 static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
 
 ///----------------------------------------------------------------------------
@@ -75,6 +73,9 @@ static ScrollContainerRegistry::Register<LLPanel> r3("panel", &LLPanel::fromXML)
 LLScrollContainer::Params::Params()
 :	is_opaque("opaque"),
 	bg_color("color"),
+	border_visible("border_visible"),
+	min_auto_scroll_rate("min_auto_scroll_rate", 100),
+	max_auto_scroll_rate("max_auto_scroll_rate", 1000),
 	reserve_scroll_corner("reserve_scroll_corner", false)
 {
 	name = "scroll_container";
@@ -91,6 +92,8 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	mBackgroundColor(p.bg_color()),
 	mIsOpaque(p.is_opaque),
 	mReserveScrollCorner(p.reserve_scroll_corner),
+	mMinAutoScrollRate(p.min_auto_scroll_rate),
+	mMaxAutoScrollRate(p.max_auto_scroll_rate),
 	mScrolledView(NULL)
 {
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
@@ -98,6 +101,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	LLViewBorder::Params params;
 	params.name("scroll border");
 	params.rect(border_rect);
+	params.visible(p.border_visible);
 	params.bevel_style(LLViewBorder::BEVEL_IN);
 	mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
 	LLView::addChild( mBorder );
@@ -115,12 +119,11 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	sbparams.doc_pos(0);
 	sbparams.page_size(mInnerRect.getHeight());
 	sbparams.step_size(VERTICAL_MULTIPLE);
+	sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
+	sbparams.visible(false);
+	sbparams.change_callback(p.scroll_callback);
 	mScrollbar[VERTICAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
 	LLView::addChild( mScrollbar[VERTICAL] );
-	mScrollbar[VERTICAL]->setVisible( FALSE );
-	mScrollbar[VERTICAL]->setFollowsRight();
-	mScrollbar[VERTICAL]->setFollowsTop();
-	mScrollbar[VERTICAL]->setFollowsBottom();
 	
 	LLRect horizontal_scroll_rect = mInnerRect;
 	horizontal_scroll_rect.mTop = horizontal_scroll_rect.mBottom + scrollbar_size;
@@ -131,11 +134,11 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	sbparams.doc_pos(0);
 	sbparams.page_size(mInnerRect.getWidth());
 	sbparams.step_size(VERTICAL_MULTIPLE);
+	sbparams.visible(false);
+	sbparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT);
+	sbparams.change_callback(p.scroll_callback);
 	mScrollbar[HORIZONTAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
 	LLView::addChild( mScrollbar[HORIZONTAL] );
-	mScrollbar[HORIZONTAL]->setVisible( FALSE );
-	mScrollbar[HORIZONTAL]->setFollowsLeft();
-	mScrollbar[HORIZONTAL]->setFollowsRight();
 }
 
 // Destroys the object
@@ -181,7 +184,7 @@ void LLScrollContainer::reshape(S32 width, S32 height,
 {
 	LLUICtrl::reshape( width, height, called_from_parent );
 
-	mInnerRect.set( 0, getRect().getHeight(), getRect().getWidth(), 0 );
+	mInnerRect = getLocalRect();
 	mInnerRect.stretch( -mBorder->getBorderWidth() );
 
 	if (mScrolledView)
@@ -192,13 +195,14 @@ void LLScrollContainer::reshape(S32 width, S32 height,
 		S32 visible_height = 0;
 		BOOL show_v_scrollbar = FALSE;
 		BOOL show_h_scrollbar = FALSE;
-		calcVisibleSize( scrolled_rect, &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
+		calcVisibleSize( &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
 
 		mScrollbar[VERTICAL]->setDocSize( scrolled_rect.getHeight() );
 		mScrollbar[VERTICAL]->setPageSize( visible_height );
 
 		mScrollbar[HORIZONTAL]->setDocSize( scrolled_rect.getWidth() );
 		mScrollbar[HORIZONTAL]->setPageSize( visible_width );
+		updateScroll();
 	}
 }
 
@@ -217,6 +221,7 @@ BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask)
 	{
 		if( mScrollbar[i]->handleKeyHere(key, mask) )
 		{
+			updateScroll();
 			return TRUE;
 		}
 	}	
@@ -233,6 +238,7 @@ BOOL LLScrollContainer::handleScrollWheel( S32 x, S32 y, S32 clicks )
 		// Pretend the mouse is over the scrollbar
 		if( mScrollbar[i]->handleScrollWheel( 0, 0, clicks ) )
 		{
+			updateScroll();
 			return TRUE;
 		}
 	}
@@ -241,28 +247,6 @@ BOOL LLScrollContainer::handleScrollWheel( S32 x, S32 y, S32 clicks )
 	return TRUE;
 }
 
-BOOL LLScrollContainer::needsToScroll(S32 x, S32 y, LLScrollContainer::SCROLL_ORIENTATION axis) const
-{
-	if(mScrollbar[axis]->getVisible())
-	{
-		LLRect inner_rect_local( 0, mInnerRect.getHeight(), mInnerRect.getWidth(), 0 );
-		const S32 AUTOSCROLL_SIZE = 10;
-		if(mScrollbar[axis]->getVisible())
-		{
-			static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-			inner_rect_local.mRight -= scrollbar_size;
-			inner_rect_local.mTop += AUTOSCROLL_SIZE;
-			inner_rect_local.mBottom = inner_rect_local.mTop - AUTOSCROLL_SIZE;
-		}
-		if( inner_rect_local.pointInRect( x, y ) && (mScrollbar[axis]->getDocPos() > 0) )
-		{
-			return TRUE;
-		}
-
-	}
-	return FALSE;
-}
-
 BOOL LLScrollContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,
 												  BOOL drop,
 												  EDragAndDropType cargo_type,
@@ -273,12 +257,27 @@ BOOL LLScrollContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 	// Scroll folder view if needed.  Never accepts a drag or drop.
 	*accept = ACCEPT_NO;
-	BOOL handled = FALSE;
+	BOOL handled = autoScroll(x, y);
+
+	if( !handled )
+	{
+		handled = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type,
+											cargo_data, accept, tooltip_msg) != NULL;
+	}
+
+	return TRUE;
+}
+
+bool LLScrollContainer::autoScroll(S32 x, S32 y)
+{
+	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+
+	bool scrolling = false;
 	if( mScrollbar[HORIZONTAL]->getVisible() || mScrollbar[VERTICAL]->getVisible() )
 	{
-		const S32 AUTOSCROLL_SIZE = 10;
-		S32 auto_scroll_speed = llround(mAutoScrollRate * LLFrameTimer::getFrameDeltaTimeF32());
-		
+		LLRect screen_local_extents;
+		screenRectToLocal(getRootView()->getLocalRect(), &screen_local_extents);
+
 		LLRect inner_rect_local( 0, mInnerRect.getHeight(), mInnerRect.getWidth(), 0 );
 		if(	mScrollbar[HORIZONTAL]->getVisible() )
 		{
@@ -289,65 +288,61 @@ BOOL LLScrollContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,
 			inner_rect_local.mRight -= scrollbar_size;
 		}
 
+		// clip rect against root view
+		inner_rect_local.intersectWith(screen_local_extents);
+
+		S32 auto_scroll_speed = llround(mAutoScrollRate * LLFrameTimer::getFrameDeltaTimeF32());
+		// autoscroll region should take up no more than one third of visible scroller area
+		S32 auto_scroll_region_width = llmin(inner_rect_local.getWidth() / 3, 10); 
+		S32 auto_scroll_region_height = llmin(inner_rect_local.getHeight() / 3, 10); 
+
 		if(	mScrollbar[HORIZONTAL]->getVisible() )
 		{
-			LLRect left_scroll_rect = inner_rect_local;
-			left_scroll_rect.mRight = AUTOSCROLL_SIZE;
+			LLRect left_scroll_rect = screen_local_extents;
+			left_scroll_rect.mRight = inner_rect_local.mLeft + auto_scroll_region_width;
 			if( left_scroll_rect.pointInRect( x, y ) && (mScrollbar[HORIZONTAL]->getDocPos() > 0) )
 			{
 				mScrollbar[HORIZONTAL]->setDocPos( mScrollbar[HORIZONTAL]->getDocPos() - auto_scroll_speed );
 				mAutoScrolling = TRUE;
-				handled = TRUE;
+				scrolling = true;
 			}
 
-			LLRect right_scroll_rect = inner_rect_local;
-			right_scroll_rect.mLeft = inner_rect_local.mRight - AUTOSCROLL_SIZE;
+			LLRect right_scroll_rect = screen_local_extents;
+			right_scroll_rect.mLeft = inner_rect_local.mRight - auto_scroll_region_width;
 			if( right_scroll_rect.pointInRect( x, y ) && (mScrollbar[HORIZONTAL]->getDocPos() < mScrollbar[HORIZONTAL]->getDocPosMax()) )
 			{
 				mScrollbar[HORIZONTAL]->setDocPos( mScrollbar[HORIZONTAL]->getDocPos() + auto_scroll_speed );
 				mAutoScrolling = TRUE;
-				handled = TRUE;
+				scrolling = true;
 			}
 		}
 		if(	mScrollbar[VERTICAL]->getVisible() )
 		{
-			LLRect bottom_scroll_rect = inner_rect_local;
-			bottom_scroll_rect.mTop = AUTOSCROLL_SIZE + bottom_scroll_rect.mBottom;
+			LLRect bottom_scroll_rect = screen_local_extents;
+			bottom_scroll_rect.mTop = inner_rect_local.mBottom + auto_scroll_region_height;
 			if( bottom_scroll_rect.pointInRect( x, y ) && (mScrollbar[VERTICAL]->getDocPos() < mScrollbar[VERTICAL]->getDocPosMax()) )
 			{
 				mScrollbar[VERTICAL]->setDocPos( mScrollbar[VERTICAL]->getDocPos() + auto_scroll_speed );
 				mAutoScrolling = TRUE;
-				handled = TRUE;
+				scrolling = true;
 			}
 
-			LLRect top_scroll_rect = inner_rect_local;
-			top_scroll_rect.mBottom = inner_rect_local.mTop - AUTOSCROLL_SIZE;
+			LLRect top_scroll_rect = screen_local_extents;
+			top_scroll_rect.mBottom = inner_rect_local.mTop - auto_scroll_region_height;
 			if( top_scroll_rect.pointInRect( x, y ) && (mScrollbar[VERTICAL]->getDocPos() > 0) )
 			{
 				mScrollbar[VERTICAL]->setDocPos( mScrollbar[VERTICAL]->getDocPos() - auto_scroll_speed );
 				mAutoScrolling = TRUE;
-				handled = TRUE;
+				scrolling = true;
 			}
 		}
 	}
-
-	if( !handled )
-	{
-		handled = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type,
-											cargo_data, accept, tooltip_msg) != NULL;
-	}
-
-	return TRUE;
+	return scrolling;
 }
 
 void LLScrollContainer::calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const
 {
-	const LLRect& rect = getScrolledViewRect();
-	calcVisibleSize(rect, visible_width, visible_height, show_h_scrollbar, show_v_scrollbar);
-}
-
-void LLScrollContainer::calcVisibleSize( const LLRect& doc_rect, S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const
-{
+	const LLRect& doc_rect = getScrolledViewRect();
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 	S32 doc_width = doc_rect.getWidth();
 	S32 doc_height = doc_rect.getHeight();
@@ -384,20 +379,20 @@ void LLScrollContainer::draw()
 	if (mAutoScrolling)
 	{
 		// add acceleration to autoscroll
-		mAutoScrollRate = llmin(mAutoScrollRate + (LLFrameTimer::getFrameDeltaTimeF32() * AUTO_SCROLL_RATE_ACCEL), MAX_AUTO_SCROLL_RATE);
+		mAutoScrollRate = llmin(mAutoScrollRate + (LLFrameTimer::getFrameDeltaTimeF32() * AUTO_SCROLL_RATE_ACCEL), mMaxAutoScrollRate);
 	}
 	else
 	{
-		// reset to minimum
-		mAutoScrollRate = MIN_AUTO_SCROLL_RATE;
+		// reset to minimum for next time
+		mAutoScrollRate = mMinAutoScrollRate;
 	}
-	// clear this flag to be set on next call to handleDragAndDrop
+	// clear this flag to be set on next call to autoScroll
 	mAutoScrolling = FALSE;
 
 	// auto-focus when scrollbar active
 	// this allows us to capture user intent (i.e. stop automatically scrolling the view/etc)
-	if (!gFocusMgr.childHasKeyboardFocus(this) && 
-		(mScrollbar[VERTICAL]->hasMouseCapture() || mScrollbar[HORIZONTAL]->hasMouseCapture()))
+	if (!hasFocus() 
+		&& (mScrollbar[VERTICAL]->hasMouseCapture() || mScrollbar[HORIZONTAL]->hasMouseCapture()))
 	{
 		focusFirstItem();
 	}
@@ -424,7 +419,7 @@ void LLScrollContainer::draw()
 			S32 visible_height = 0;
 			BOOL show_v_scrollbar = FALSE;
 			BOOL show_h_scrollbar = FALSE;
-			calcVisibleSize( mScrolledView->getRect(), &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
+			calcVisibleSize( &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
 
 			LLLocalClipRect clip(LLRect(mInnerRect.mLeft, 
 					mInnerRect.mBottom + (show_h_scrollbar ? scrollbar_size : 0) + visible_height,
@@ -506,7 +501,7 @@ void LLScrollContainer::updateScroll()
 	S32 visible_height = 0;
 	BOOL show_v_scrollbar = FALSE;
 	BOOL show_h_scrollbar = FALSE;
-	calcVisibleSize( doc_rect, &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
+	calcVisibleSize( &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
 
 	S32 border_width = mBorder->getBorderWidth();
 	if( show_v_scrollbar )
@@ -584,71 +579,73 @@ void LLScrollContainer::setBorderVisible(BOOL b)
 	mBorder->setVisible( b );
 }
 
-// Scroll so that as much of rect as possible is showing (where rect is defined in the space of scroller view, not scrolled)
-void LLScrollContainer::scrollToShowRect(const LLRect& rect, const LLCoordGL& desired_offset)
+LLRect LLScrollContainer::getVisibleContentRect()
 {
-	if (!mScrolledView)
-	{
-		llwarns << "LLScrollContainer::scrollToShowRect with no view!" << llendl;
-		return;
-	}
+	updateScroll();
+	LLRect visible_rect = getContentWindowRect();
+	LLRect contents_rect = mScrolledView->getRect();
+	visible_rect.translate(-contents_rect.mLeft, -contents_rect.mBottom);
+	return visible_rect;
+}
 
+LLRect LLScrollContainer::getContentWindowRect() const
+{
+	LLRect scroller_view_rect;
 	S32 visible_width = 0;
 	S32 visible_height = 0;
-	BOOL show_v_scrollbar = FALSE;
 	BOOL show_h_scrollbar = FALSE;
-	const LLRect& scrolled_rect = mScrolledView->getRect();
-	calcVisibleSize( scrolled_rect, &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
-
-	// can't be so far left that right side of rect goes off screen, or so far right that left side does
-	S32 horiz_offset = llclamp(desired_offset.mX, llmin(0, -visible_width + rect.getWidth()), 0);
-	// can't be so high that bottom of rect goes off screen, or so low that top does
-	S32 vert_offset = llclamp(desired_offset.mY, 0, llmax(0, visible_height - rect.getHeight()));
-
-	// Vertical
-	// 1. First make sure the top is visible
-	// 2. Then, if possible without hiding the top, make the bottom visible.
-	S32 vert_pos = mScrollbar[VERTICAL]->getDocPos();
-
-	// find scrollbar position to get top of rect on screen (scrolling up)
-	S32 top_offset = scrolled_rect.mTop - rect.mTop - vert_offset;
-	// find scrollbar position to get bottom of rect on screen (scrolling down)
-	S32 bottom_offset = vert_offset == 0 ? scrolled_rect.mTop - rect.mBottom - visible_height : top_offset;
-	// scroll up far enough to see top or scroll down just enough if item is bigger than visual area
-	if( vert_pos >= top_offset || visible_height < rect.getHeight())
-	{
-		vert_pos = top_offset;
-	}
-	// else scroll down far enough to see bottom
-	else
-	if( vert_pos <= bottom_offset )
+	BOOL show_v_scrollbar = FALSE;
+	calcVisibleSize( &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
+	S32 border_width = mBorder->getBorderWidth();
+	scroller_view_rect.setOriginAndSize(border_width, 
+										show_h_scrollbar ? mScrollbar[HORIZONTAL]->getRect().mTop : border_width, 
+										visible_width, 
+										visible_height);
+	return scroller_view_rect;
+}
+
+// rect is in document coordinates, constraint is in display coordinates relative to content window rect
+void LLScrollContainer::scrollToShowRect(const LLRect& rect, const LLRect& constraint)
+{
+	if (!mScrolledView)
 	{
-		vert_pos = bottom_offset;
+		llwarns << "LLScrollContainer::scrollToShowRect with no view!" << llendl;
+		return;
 	}
 
+	LLRect content_window_rect = getContentWindowRect();
+	// get document rect
+	LLRect scrolled_rect = mScrolledView->getRect();
+
+	// shrink target rect to fit within constraint region, biasing towards top left
+	LLRect rect_to_constrain = rect;
+	rect_to_constrain.mBottom = llmax(rect_to_constrain.mBottom, rect_to_constrain.mTop - constraint.getHeight());
+	rect_to_constrain.mRight = llmin(rect_to_constrain.mRight, rect_to_constrain.mLeft + constraint.getWidth());
+
+	// calculate allowable positions for scroller window in document coordinates
+	LLRect allowable_scroll_rect(rect_to_constrain.mRight - constraint.mRight,
+								rect_to_constrain.mBottom - constraint.mBottom,
+								rect_to_constrain.mLeft - constraint.mLeft,
+								rect_to_constrain.mTop - constraint.mTop);
+
+	// translate from allowable region for lower left corner to upper left corner
+	allowable_scroll_rect.translate(0, content_window_rect.getHeight());
+
+	S32 vert_pos = llclamp(mScrollbar[VERTICAL]->getDocPos(), 
+					mScrollbar[VERTICAL]->getDocSize() - allowable_scroll_rect.mTop, // min vertical scroll
+					mScrollbar[VERTICAL]->getDocSize() - allowable_scroll_rect.mBottom); // max vertical scroll	
+
 	mScrollbar[VERTICAL]->setDocSize( scrolled_rect.getHeight() );
-	mScrollbar[VERTICAL]->setPageSize( visible_height );
+	mScrollbar[VERTICAL]->setPageSize( content_window_rect.getHeight() );
 	mScrollbar[VERTICAL]->setDocPos( vert_pos );
 
-	// Horizontal
-	// 1. First make sure left side is visible
-	// 2. Then, if possible without hiding the left side, make the right side visible.
-	S32 horiz_pos = mScrollbar[HORIZONTAL]->getDocPos();
-	S32 left_offset = rect.mLeft - scrolled_rect.mLeft + horiz_offset;
-	S32 right_offset = horiz_offset == 0 ? rect.mRight - scrolled_rect.mLeft - visible_width : left_offset;
+	S32 horizontal_pos = llclamp(mScrollbar[HORIZONTAL]->getDocPos(), 
+								allowable_scroll_rect.mLeft,
+								allowable_scroll_rect.mRight);
 
-	if( horiz_pos >= left_offset || visible_width < rect.getWidth() )
-	{
-		horiz_pos = left_offset;
-	}
-	else if( horiz_pos <= right_offset )
-	{
-		horiz_pos = right_offset;
-	}
-	
 	mScrollbar[HORIZONTAL]->setDocSize( scrolled_rect.getWidth() );
-	mScrollbar[HORIZONTAL]->setPageSize( visible_width );
-	mScrollbar[HORIZONTAL]->setDocPos( horiz_pos );
+	mScrollbar[HORIZONTAL]->setPageSize( content_window_rect.getWidth() );
+	mScrollbar[HORIZONTAL]->setDocPos( horizontal_pos );
 
 	// propagate scroll to document
 	updateScroll();
@@ -657,21 +654,25 @@ void LLScrollContainer::scrollToShowRect(const LLRect& rect, const LLCoordGL& de
 void LLScrollContainer::pageUp(S32 overlap)
 {
 	mScrollbar[VERTICAL]->pageUp(overlap);
+	updateScroll();
 }
 
 void LLScrollContainer::pageDown(S32 overlap)
 {
 	mScrollbar[VERTICAL]->pageDown(overlap);
+	updateScroll();
 }
 
 void LLScrollContainer::goToTop()
 {
 	mScrollbar[VERTICAL]->setDocPos(0);
+	updateScroll();
 }
 
 void LLScrollContainer::goToBottom()
 {
 	mScrollbar[VERTICAL]->setDocPos(mScrollbar[VERTICAL]->getDocSize());
+	updateScroll();
 }
 
 S32 LLScrollContainer::getBorderWidth() const
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index 912d126f23..8385bca02f 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -66,9 +66,13 @@ public:
 
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
 	{
-		Optional<bool>		is_opaque;
+		Optional<bool>		is_opaque,
+							reserve_scroll_corner,
+							border_visible;
+		Optional<F32>		min_auto_scroll_rate,
+							max_auto_scroll_rate;
 		Optional<LLUIColor>	bg_color;
-		Optional<bool>		reserve_scroll_corner;
+		Optional<LLScrollbar::callback_t> scroll_callback;
 		
 		Params();
 	};
@@ -84,21 +88,23 @@ public:
 
 	virtual void 	setValue(const LLSD& value) { mInnerRect.setValue(value); }
 
-	void			calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const;
-	void			calcVisibleSize( const LLRect& doc_rect, S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const;
 	void			setBorderVisible( BOOL b );
 
-	void			scrollToShowRect( const LLRect& rect, const LLCoordGL& desired_offset );
+	void			scrollToShowRect( const LLRect& rect, const LLRect& constraint);
+	void			scrollToShowRect( const LLRect& rect) { scrollToShowRect(rect, LLRect(0, mInnerRect.getHeight(), mInnerRect.getWidth(), 0)); }
+
 	void			setReserveScrollCorner( BOOL b ) { mReserveScrollCorner = b; }
+	LLRect			getVisibleContentRect();
+	LLRect			getContentWindowRect() const;
 	const LLRect&	getScrolledViewRect() const { return mScrolledView ? mScrolledView->getRect() : LLRect::null; }
 	void			pageUp(S32 overlap = 0);
 	void			pageDown(S32 overlap = 0);
 	void			goToTop();
 	void			goToBottom();
+	bool			isAtTop() { return mScrollbar[VERTICAL]->isAtBeginning(); }
+	bool			isAtBottom() { return mScrollbar[VERTICAL]->isAtEnd(); }
 	S32				getBorderWidth() const;
 
-	BOOL			needsToScroll(S32 x, S32 y, SCROLL_ORIENTATION axis) const;
-
 	// LLView functionality
 	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	virtual BOOL	handleKeyHere(KEY key, MASK mask);
@@ -111,12 +117,15 @@ public:
 
 	virtual void	draw();
 	virtual bool	addChild(LLView* view, S32 tab_group = 0);
+	
+	bool autoScroll(S32 x, S32 y);
 
 private:
 	// internal scrollbar handlers
 	virtual void scrollHorizontal( S32 new_pos );
 	virtual void scrollVertical( S32 new_pos );
 	void updateScroll();
+	void calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const;
 
 	LLScrollbar* mScrollbar[SCROLLBAR_COUNT];
 	LLView*		mScrolledView;
@@ -128,6 +137,8 @@ private:
 	BOOL		mReserveScrollCorner;
 	BOOL		mAutoScrolling;
 	F32			mAutoScrollRate;
+	F32			mMinAutoScrollRate;
+	F32			mMaxAutoScrollRate;
 };
 
 
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
index cd43e194d2..e28da91305 100644
--- a/indra/llui/llscrolllistcell.cpp
+++ b/indra/llui/llscrolllistcell.cpp
@@ -310,17 +310,16 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col
 		break;
 	}
 	mFont->render(mText.getWString(), 0, 
-						start_x, 2.f,
-						display_color,
-						mFontAlignment,
-						LLFontGL::BOTTOM, 
-						0,
-						LLFontGL::NO_SHADOW,
-						string_chars, 
-						getWidth(),
-						&right_x, 
-						FALSE, 
-						TRUE);
+					start_x, 2.f,
+					display_color,
+					mFontAlignment,
+					LLFontGL::BOTTOM, 
+					0,
+					LLFontGL::NO_SHADOW,
+					string_chars, 
+					getWidth(),
+					&right_x, 
+					TRUE);
 }
 
 //
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 3041773fb2..637642cdcd 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -160,7 +160,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p)
 	mNumDynamicWidthColumns(0),
 	mTotalStaticColumnWidth(0),
 	mTotalColumnPadding(0),
-	mSorted(FALSE),
+	mSorted(false),
 	mDirty(FALSE),
 	mOriginalSelection(-1),
 	mLastSelected(NULL),
@@ -374,6 +374,10 @@ std::vector<LLScrollListItem*> LLScrollListCtrl::getAllSelected() const
 S32 LLScrollListCtrl::getFirstSelectedIndex() const
 {
 	S32 CurSelectedIndex = 0;
+
+	// make sure sort is up to date before returning an index
+	updateSort();
+
 	item_list::const_iterator iter;
 	for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
 	{
@@ -507,7 +511,7 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
 		{
 		case ADD_TOP:
 			mItemList.push_front(item);
-			setSorted(FALSE);
+			setNeedsSort();
 			break;
 	
 		case ADD_SORTED:
@@ -524,18 +528,18 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
 				
 				// ADD_SORTED just sorts by first column...
 				// this might not match user sort criteria, so flag list as being in unsorted state
-				setSorted(FALSE);
+				setNeedsSort();
 				break;
 			}	
 		case ADD_BOTTOM:
 			mItemList.push_back(item);
-			setSorted(FALSE);
+			setNeedsSort();
 			break;
 	
 		default:
 			llassert(0);
 			mItemList.push_back(item);
-			setSorted(FALSE);
+			setNeedsSort();
 			break;
 		}
 	
@@ -759,6 +763,9 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
 		return FALSE;
 	}
 
+	// make sure sort is up to date
+	updateSort();
+
 	S32 listlen = (S32)mItemList.size();
 	first_index = llclamp(first_index, 0, listlen-1);
 	
@@ -812,6 +819,7 @@ void LLScrollListCtrl::swapWithNext(S32 index)
 		// At end of list, doesn't do anything
 		return;
 	}
+	updateSort();
 	LLScrollListItem *cur_itemp = mItemList[index];
 	mItemList[index] = mItemList[index + 1];
 	mItemList[index + 1] = cur_itemp;
@@ -825,6 +833,7 @@ void LLScrollListCtrl::swapWithPrevious(S32 index)
 		// At beginning of list, don't do anything
 	}
 
+	updateSort();
 	LLScrollListItem *cur_itemp = mItemList[index];
 	mItemList[index] = mItemList[index - 1];
 	mItemList[index - 1] = cur_itemp;
@@ -838,6 +847,8 @@ void LLScrollListCtrl::deleteSingleItem(S32 target_index)
 		return;
 	}
 
+	updateSort();
+
 	LLScrollListItem *itemp;
 	itemp = mItemList[target_index];
 	if (itemp == mLastSelected)
@@ -939,6 +950,8 @@ S32	LLScrollListCtrl::selectMultiple( std::vector<LLUUID> ids )
 
 S32 LLScrollListCtrl::getItemIndex( LLScrollListItem* target_item ) const
 {
+	updateSort();
+
 	S32 index = 0;
 	item_list::const_iterator iter;
 	for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
@@ -955,6 +968,8 @@ S32 LLScrollListCtrl::getItemIndex( LLScrollListItem* target_item ) const
 
 S32 LLScrollListCtrl::getItemIndex( const LLUUID& target_id ) const
 {
+	updateSort();
+
 	S32 index = 0;
 	item_list::const_iterator iter;
 	for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
@@ -980,6 +995,8 @@ void LLScrollListCtrl::selectPrevItem( BOOL extend_selection)
 	}
 	else
 	{
+		updateSort();
+
 		item_list::iterator iter;
 		for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
 		{
@@ -1022,6 +1039,8 @@ void LLScrollListCtrl::selectNextItem( BOOL extend_selection)
 	}
 	else
 	{
+		updateSort();
+
 		item_list::reverse_iterator iter;
 		for (iter = mItemList.rbegin(); iter != mItemList.rend(); iter++)
 		{
@@ -1436,7 +1455,7 @@ void LLScrollListCtrl::draw()
 	LLLocalClipRect clip(getLocalRect());
 
 	// if user specifies sort, make sure it is maintained
-	sortItems();
+	updateSort();
 
 	if (mNeedsScroll)
 	{
@@ -1463,7 +1482,7 @@ void LLScrollListCtrl::draw()
 
 	if (mBorder)
 	{
-		mBorder->setKeyboardFocusHighlight(gFocusMgr.getKeyboardFocus() == this);
+		mBorder->setKeyboardFocusHighlight(hasFocus());
 	}
 
 	LLUICtrl::draw();
@@ -1754,6 +1773,8 @@ LLScrollListItem* LLScrollListCtrl::hitItem( S32 x, S32 y )
 	// Excludes disabled items.
 	LLScrollListItem* hit_item = NULL;
 
+	updateSort();
+
 	LLRect item_rect;
 	item_rect.setLeftTopAndSize( 
 		mItemListRect.mLeft,
@@ -2199,7 +2220,7 @@ BOOL LLScrollListCtrl::setSort(S32 column_idx, BOOL ascending)
 
 	sort_column_t new_sort_column(column_idx, ascending);
 	
-	setSorted(FALSE);
+	setNeedsSort();
 
 	if (mSortColumns.empty())
 	{
@@ -2241,10 +2262,10 @@ void LLScrollListCtrl::sortByColumn(const std::string& name, BOOL ascending)
 void  LLScrollListCtrl::sortByColumnIndex(U32 column, BOOL ascending)
 {
 	setSort(column, ascending);
-	sortItems();
+	updateSort();
 }
 
-void LLScrollListCtrl::sortItems()
+void LLScrollListCtrl::updateSort() const
 {
 	if (hasSortOrder() && !isSorted())
 	{
@@ -2254,7 +2275,7 @@ void LLScrollListCtrl::sortItems()
 			mItemList.end(), 
 			SortScrollListItem(mSortColumns));
 
-		setSorted(TRUE);
+		mSorted = true;
 	}
 }
 
@@ -2311,7 +2332,7 @@ void LLScrollListCtrl::scrollToShowSelected()
 		return;
 	}
 
-	sortItems();
+	updateSort();
 	
 	S32 index = getFirstSelectedIndex();
 	if (index < 0)
@@ -2552,7 +2573,7 @@ std::string LLScrollListCtrl::getSortColumnName()
 	else return "";
 }
 
-BOOL LLScrollListCtrl::hasSortOrder()
+BOOL LLScrollListCtrl::hasSortOrder() const
 {
 	return !mSortColumns.empty();
 }
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index e699711bd4..253a58ab73 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -329,15 +329,16 @@ public:
 
 	std::string     getSortColumnName();
 	BOOL			getSortAscending() { return mSortColumns.empty() ? TRUE : mSortColumns.back().second; }
-	BOOL			hasSortOrder();
+	BOOL			hasSortOrder() const;
 
 	S32		selectMultiple( std::vector<LLUUID> ids );
-	void			sortItems();
+	// conceptually const, but mutates mItemList
+	void			updateSort() const;
 	// sorts a list without affecting the permanent sort order (so further list insertions can be unsorted, for example)
 	void			sortOnce(S32 column, BOOL ascending);
 
 	// manually call this whenever editing list items in place to flag need for resorting
-	void			setSorted(BOOL sorted) { mSorted = sorted; }
+	void			setNeedsSort() { mSorted = false; }
 	void			dirtyColumns(); // some operation has potentially affected column layout or ordering
 
 protected:
@@ -390,7 +391,7 @@ private:
 	const BOOL		mDisplayColumnHeaders;
 	BOOL			mColumnsDirty;
 
-	item_list		mItemList;
+	mutable item_list	mItemList;
 
 	LLScrollListItem *mLastSelected;
 
@@ -429,7 +430,7 @@ private:
 	S32				mTotalStaticColumnWidth;
 	S32				mTotalColumnPadding;
 
-	BOOL			mSorted;
+	mutable bool	mSorted;
 	
 	typedef std::map<std::string, LLScrollListColumn> column_map_t;
 	column_map_t mColumns;
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp
index 432d54dfee..929a809d88 100644
--- a/indra/llui/llstyle.cpp
+++ b/indra/llui/llstyle.cpp
@@ -38,119 +38,34 @@
 #include "llstring.h"
 #include "llui.h"
 
-
-LLStyle::LLStyle()
-{
-	init(TRUE, LLColor4(0,0,0,1),LLStringUtil::null);
-}
-
-LLStyle::LLStyle(const LLStyle &style)
-{
-	if (this != &style)
-	{
-		init(style.isVisible(),style.getColor(),style.getFontString());
-		if (style.isLink())
-		{
-			setLinkHREF(style.getLinkHREF());
-		}
-		mItalic = style.mItalic;
-		mBold = style.mBold;
-		mUnderline = style.mUnderline;
-		mDropShadow = style.mDropShadow;
-		mImageHeight = style.mImageHeight;
-		mImageWidth = style.mImageWidth;
-		mImagep = style.mImagep;
-		mIsEmbeddedItem = style.mIsEmbeddedItem;
-	}
-	else
-	{
-		init(TRUE, LLColor4(0,0,0,1),LLStringUtil::null);
-	}
-}
-
-LLStyle::LLStyle(BOOL is_visible, const LLColor4 &color, const std::string& font_name)
-{
-	init(is_visible, color, font_name);
-}
-
-void LLStyle::init(BOOL is_visible, const LLColor4 &color, const std::string& font_name)
+LLStyle::Params::Params()
+:	visible("visible", true),
+	drop_shadow("drop_shadow", false),
+	color("color", LLColor4::black),
+	font("font", LLFontGL::getFontMonospace()),
+	image("image"),
+	link_href("href")
+{}
+
+
+LLStyle::LLStyle(const LLStyle::Params& p)
+:	mVisible(p.visible),
+	mColor(p.color()),
+	mFont(p.font()),
+	mLink(p.link_href),
+	mDropShadow(p.drop_shadow),
+	mImageHeight(0),
+	mImageWidth(0),
+	mImagep(p.image())
+{}
+
+void LLStyle::setFont(const LLFontGL* font)
 {
-	mVisible = is_visible;
-	mColor = color;
-	setFontName(font_name);
-	setLinkHREF(LLStringUtil::null);
-	mItalic = FALSE;
-	mBold = FALSE;
-	mUnderline = FALSE;
-	mDropShadow = FALSE;
-	mImageHeight = 0;
-	mImageWidth = 0;
-	mIsEmbeddedItem = FALSE;
-}
-
-
-// Copy assignment
-LLStyle &LLStyle::operator=(const LLStyle &rhs)
-{
-	if (this != &rhs)
-	{
-		setVisible(rhs.isVisible());
-		setColor(rhs.getColor());
-		this->mFontName = rhs.getFontString();
-		this->mLink = rhs.getLinkHREF();
-		mImagep = rhs.mImagep;
-		mImageHeight = rhs.mImageHeight;
-		mImageWidth = rhs.mImageWidth;
-		mItalic = rhs.mItalic;
-		mBold = rhs.mBold;
-		mUnderline = rhs.mUnderline;
-		mDropShadow = rhs.mDropShadow;
-		mIsEmbeddedItem = rhs.mIsEmbeddedItem;
-	}
-	
-	return *this;
+	mFont = font;
 }
 
-//virtual
-const std::string& LLStyle::getFontString() const
-{
-	return mFontName;
-}
-
-//virtual
-void LLStyle::setFontName(const std::string& fontname)
-{
-	mFontName = fontname;
-
-	std::string fontname_lc = fontname;
-	LLStringUtil::toLower(fontname_lc);
-	
-	// cache the font pointer for speed when rendering text
-	if ((fontname_lc == "sansserif") || (fontname_lc == "sans-serif"))
-	{
-		mFont = LLFontGL::getFontSansSerif();
-	}
-	else if ((fontname_lc == "serif"))
-	{
-		// *TODO: Do we have a real serif font?
-		mFont = LLFontGL::getFontMonospace();
-	}
-	else if ((fontname_lc == "sansserifbig"))
-	{
-		mFont = LLFontGL::getFontSansSerifBig();
-	}
-	else if (fontname_lc ==  "small")
-	{
-		mFont = LLFontGL::getFontSansSerifSmall();
-	}
-	else
-	{
-		mFont = LLFontGL::getFontMonospace();
-	}
-}
 
-//virtual
-LLFontGL* LLStyle::getFont() const
+const LLFontGL* LLStyle::getFont() const
 {
 	return mFont;
 }
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h
index 32ddded2c8..dcf274a651 100644
--- a/indra/llui/llstyle.h
+++ b/indra/llui/llstyle.h
@@ -35,59 +35,59 @@
 
 #include "v4color.h"
 #include "llui.h"
+#include "llinitparam.h"
 
 class LLFontGL;
 
 class LLStyle : public LLRefCount
 {
 public:
-	LLStyle();
-	LLStyle(const LLStyle &style);
-	LLStyle(BOOL is_visible, const LLColor4 &color, const std::string& font_name);
-
-	LLStyle &operator=(const LLStyle &rhs);
-
-	virtual void init (BOOL is_visible, const LLColor4 &color, const std::string& font_name);
-
-	virtual const LLColor4& getColor() const { return mColor; }
-	virtual void setColor(const LLColor4 &color) { mColor = color; }
-
-	virtual BOOL isVisible() const;
-	virtual void setVisible(BOOL is_visible);
+	struct Params : public LLInitParam::Block<Params>
+	{
+		Optional<bool>				visible,
+									drop_shadow;
+		Optional<LLUIColor>			color;
+		Optional<const LLFontGL*>	font;
+		Optional<LLUIImage*>		image;
+		Optional<std::string>		link_href;
+		Params();
+	};
+	LLStyle(const Params& p = Params());
+public:
+	const LLColor4& getColor() const { return mColor; }
+	void setColor(const LLColor4 &color) { mColor = color; }
 
-	virtual const std::string& getFontString() const;
-	virtual void setFontName(const std::string& fontname);
-	virtual LLFontGL* getFont() const;
+	BOOL isVisible() const;
+	void setVisible(BOOL is_visible);
 
-	virtual const std::string& getLinkHREF() const { return mLink; }
-	virtual void setLinkHREF(const std::string& href);
-	virtual BOOL isLink() const;
+	void setFont(const LLFontGL* font);
+	const LLFontGL* getFont() const;
 
-	virtual LLUIImagePtr getImage() const;
-	virtual void setImage(const LLUUID& src);
+	const std::string& getLinkHREF() const { return mLink; }
+	void setLinkHREF(const std::string& href);
+	BOOL isLink() const;
 
-	virtual BOOL isImage() const { return ((mImageWidth != 0) && (mImageHeight != 0)); }
-	virtual void setImageSize(S32 width, S32 height);
+	LLUIImagePtr getImage() const;
+	void setImage(const LLUUID& src);
 
-	BOOL	getIsEmbeddedItem() const	{ return mIsEmbeddedItem; }
-	void	setIsEmbeddedItem( BOOL b ) { mIsEmbeddedItem = b; }
+	BOOL isImage() const { return ((mImageWidth != 0) && (mImageHeight != 0)); }
+	void setImageSize(S32 width, S32 height);
 
 	// inlined here to make it easier to compare to member data below. -MG
 	bool operator==(const LLStyle &rhs) const
 	{
 		return 
-			mVisible == rhs.isVisible()
-			&& mColor == rhs.getColor()
-			&& mFontName == rhs.getFontString()
-			&& mLink == rhs.getLinkHREF()
+			mVisible == rhs.mVisible
+			&& mColor == rhs.mColor
+			&& mFont == rhs.mFont
+			&& mLink == rhs.mLink
 			&& mImagep == rhs.mImagep
 			&& mImageHeight == rhs.mImageHeight
 			&& mImageWidth == rhs.mImageWidth
 			&& mItalic == rhs.mItalic
 			&& mBold == rhs.mBold
 			&& mUnderline == rhs.mUnderline
-			&& mDropShadow == rhs.mDropShadow
-			&& mIsEmbeddedItem == rhs.mIsEmbeddedItem;
+			&& mDropShadow == rhs.mDropShadow;
 	}
 
 	bool operator!=(const LLStyle& rhs) const { return !(*this == rhs); }
@@ -101,16 +101,15 @@ public:
 	S32         mImageHeight;
 
 protected:
-	virtual ~LLStyle() { }
+	~LLStyle() { }
 
 private:
 	BOOL		mVisible;
 	LLUIColor	mColor;
 	std::string	mFontName;
-	LLFontGL*   mFont;		// cached for performance
+	const LLFontGL*   mFont;		// cached for performance
 	std::string	mLink;
 	LLUIImagePtr mImagep;
-	BOOL		mIsEmbeddedItem;
 };
 
 typedef LLPointer<LLStyle> LLStyleSP;
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 29c30004ef..ee36318107 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -190,7 +190,7 @@ void LLTabContainer::reshape(S32 width, S32 height, BOOL called_from_parent)
 }
 
 //virtual
-LLView* LLTabContainer::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
+LLView* LLTabContainer::getChildView(const std::string& name, BOOL recurse) const
 {
 	tuple_list_t::const_iterator itor;
 	for (itor = mTabList.begin(); itor != mTabList.end(); ++itor)
@@ -207,14 +207,42 @@ LLView* LLTabContainer::getChildView(const std::string& name, BOOL recurse, BOOL
 		for (itor = mTabList.begin(); itor != mTabList.end(); ++itor)
 		{
 			LLPanel *panel = (*itor)->mTabPanel;
-			LLView *child = panel->getChildView(name, recurse, FALSE);
+			LLView *child = panel->getChildView(name, recurse);
 			if (child)
 			{
 				return child;
 			}
 		}
 	}
-	return LLView::getChildView(name, recurse, create_if_missing);
+	return LLView::getChildView(name, recurse);
+}
+
+//virtual
+LLView* LLTabContainer::findChildView(const std::string& name, BOOL recurse) const
+{
+	tuple_list_t::const_iterator itor;
+	for (itor = mTabList.begin(); itor != mTabList.end(); ++itor)
+	{
+		LLPanel *panel = (*itor)->mTabPanel;
+		if (panel->getName() == name)
+		{
+			return panel;
+		}
+	}
+
+	if (recurse)
+	{
+		for (itor = mTabList.begin(); itor != mTabList.end(); ++itor)
+		{
+			LLPanel *panel = (*itor)->mTabPanel;
+			LLView *child = panel->findChildView(name, recurse);
+			if (child)
+			{
+				return child;
+			}
+		}
+	}
+	return LLView::findChildView(name, recurse);
 }
 
 bool LLTabContainer::addChild(LLView* view, S32 tab_group)
@@ -457,7 +485,7 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
 			index = llclamp(index, 0, tab_count-1);
 			LLButton* tab_button = getTab(index)->mButton;
 			gFocusMgr.setMouseCapture(this);
-			gFocusMgr.setKeyboardFocus(tab_button);
+			tab_button->setFocus(TRUE);
 		}
 	}
 	return handled;
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h
index 78592a0f9a..ebe76af966 100644
--- a/indra/llui/lltabcontainer.h
+++ b/indra/llui/lltabcontainer.h
@@ -104,7 +104,8 @@ public:
 	/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,
 									   EDragAndDropType type, void* cargo_data,
 									   EAcceptance* accept, std::string& tooltip);
-	/*virtual*/ LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+	/*virtual*/ LLView* getChildView(const std::string& name, BOOL recurse = TRUE) const;
+	/*virtual*/ LLView* findChildView(const std::string& name, BOOL recurse = TRUE) const;
 	/*virtual*/ void initFromParams(const LLPanel::Params& p);
 	/*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
 	/*virtual*/ BOOL postBuild();
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index f9bcb685b8..96e72487b8 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -389,7 +389,7 @@ void LLTextBox::drawText( S32 x, S32 y, const LLColor4& color )
 						mHAlign, mVAlign, 
 						0,
 						mShadowType,
-						S32_MAX, getRect().getWidth(), NULL, TRUE, mUseEllipses);
+						S32_MAX, getRect().getWidth(), NULL, mUseEllipses);
 	}
 	else
 	{
@@ -402,7 +402,7 @@ void LLTextBox::drawText( S32 x, S32 y, const LLColor4& color )
 							mHAlign, mVAlign,
 							0,
 							mShadowType,
-							line_length, getRect().getWidth(), NULL, TRUE, mUseEllipses );
+							line_length, getRect().getWidth(), NULL, mUseEllipses );
 			cur_pos += line_length + 1;
 			y -= llfloor(mFontGL->getLineHeight()) + mLineSpacing;
 		}
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 48816e4b9e..7d13220c94 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -58,7 +58,10 @@
 #include "llcontrol.h"
 #include "llwindow.h"
 #include "lltextparser.h"
+#include "llscrollcontainer.h"
+#include "llpanel.h"
 #include <queue>
+#include "llcombobox.h"
 
 // 
 // Globals
@@ -75,19 +78,73 @@ const S32	CURSOR_THICKNESS = 2;
 const S32	SPACES_PER_TAB = 4;
 
 
-LLUIColor LLTextEditor::mLinkColor = LLColor4::blue;
-void (* LLTextEditor::mURLcallback)(const std::string&)   = NULL;
-bool (* LLTextEditor::mSecondlifeURLcallback)(const std::string&)   = NULL;
-bool (* LLTextEditor::mSecondlifeURLcallbackRightClick)(const std::string&)   = NULL;
+void (* LLTextEditor::sURLcallback)(const std::string&)   = NULL;
+bool (* LLTextEditor::sSecondlifeURLcallback)(const std::string&)   = NULL;
+bool (* LLTextEditor::sSecondlifeURLcallbackRightClick)(const std::string&)   = NULL;
 
+// helper functors
+struct LLTextEditor::compare_bottom
+{
+	bool operator()(const S32& a, const LLTextEditor::line_info& b) const
+	{
+		return a > b.mBottom; // bottom of a is higher than bottom of b
+	}
+
+	bool operator()(const LLTextEditor::line_info& a, const S32& b) const
+	{
+		return a.mBottom > b; // bottom of a is higher than bottom of b
+	}
+};
+
+// helper functors
+struct LLTextEditor::compare_top
+{
+	bool operator()(const S32& a, const LLTextEditor::line_info& b) const
+	{
+		return a > b.mTop; // top of a is higher than top of b
+	}
+
+	bool operator()(const LLTextEditor::line_info& a, const S32& b) const
+	{
+		return a.mTop > b; // top of a is higher than top of b
+	}
+};
+
+struct LLTextEditor::line_end_compare
+{
+	bool operator()(const S32& pos, const LLTextEditor::line_info& info) const
+	{
+		return (pos < info.mDocIndexEnd);
+	}
+
+	bool operator()(const LLTextEditor::line_info& info, const S32& pos) const
+	{
+		return (info.mDocIndexEnd < pos);
+	}
+
+};
+
+//
+// DocumentPanel
+//
+
+class DocumentPanel : public LLPanel
+{
+public:
+	DocumentPanel(const Params&);
+};
+
+DocumentPanel::DocumentPanel(const Params& p)
+: LLPanel(p)
+{}
 
 ///////////////////////////////////////////////////////////////////
 
 class LLTextEditor::LLTextCmdInsert : public LLTextEditor::LLTextCmd
 {
 public:
-	LLTextCmdInsert(S32 pos, BOOL group_with_next, const LLWString &ws)
-		: LLTextCmd(pos, group_with_next), mWString(ws)
+	LLTextCmdInsert(S32 pos, BOOL group_with_next, const LLWString &ws, LLTextSegmentPtr segment)
+		: LLTextCmd(pos, group_with_next, segment), mWString(ws)
 	{
 	}
 	virtual ~LLTextCmdInsert() {}
@@ -117,8 +174,8 @@ private:
 class LLTextEditor::LLTextCmdAddChar : public LLTextEditor::LLTextCmd
 {
 public:
-	LLTextCmdAddChar( S32 pos, BOOL group_with_next, llwchar wc)
-		: LLTextCmd(pos, group_with_next), mWString(1, wc), mBlockExtensions(FALSE)
+	LLTextCmdAddChar( S32 pos, BOOL group_with_next, llwchar wc, LLTextSegmentPtr segment)
+		: LLTextCmd(pos, group_with_next, segment), mWString(1, wc), mBlockExtensions(FALSE)
 	{
 	}
 	virtual void blockExtensions()
@@ -127,6 +184,9 @@ public:
 	}
 	virtual BOOL canExtend(S32 pos) const
 	{
+		// cannot extend text with custom segments
+		if (!mSegments.empty()) return FALSE;
+
 		return !mBlockExtensions && (pos == getPosition() + (S32)mWString.length());
 	}
 	virtual BOOL execute( LLTextEditor* editor, S32* delta )
@@ -201,9 +261,10 @@ private:
 class LLTextEditor::LLTextCmdRemove : public LLTextEditor::LLTextCmd
 {
 public:
-	LLTextCmdRemove( S32 pos, BOOL group_with_next, S32 len ) :
+	LLTextCmdRemove( S32 pos, BOOL group_with_next, S32 len, segment_vec_t& segments ) :
 		LLTextCmd(pos, group_with_next), mLen(len)
 	{
+		std::swap(mSegments, segments);
 	}
 	virtual BOOL execute( LLTextEditor* editor, S32* delta )
 	{ 
@@ -213,7 +274,7 @@ public:
 	}
 	virtual S32 undo( LLTextEditor* editor )
 	{
-		insert(editor, getPosition(), mWString );
+		insert(editor, getPosition(), mWString);
 		return getPosition() + mWString.length();
 	}
 	virtual S32 redo( LLTextEditor* editor )
@@ -233,12 +294,13 @@ LLTextEditor::Params::Params()
 	max_text_length("max_length", 255),
 	read_only("read_only", false),
 	embedded_items("embedded_items", false),
-	hide_scrollbar("hide_scrollbar", false),
+	hide_scrollbar("hide_scrollbar"),
 	hide_border("hide_border", false),
 	word_wrap("word_wrap", false),
 	ignore_tab("ignore_tab", true),
 	track_bottom("track_bottom", false),
-	takes_non_scroll_clicks("takes_non_scroll_clicks", true),
+	handle_edit_keys_directly("handle_edit_keys_directly", false),
+	show_line_numbers("show_line_numbers", false),
 	cursor_color("cursor_color"),
 	default_color("default_color"),
 	text_color("text_color"),
@@ -246,6 +308,8 @@ LLTextEditor::Params::Params()
 	bg_readonly_color("bg_readonly_color"),
 	bg_writeable_color("bg_writeable_color"),
 	bg_focus_color("bg_focus_color"),
+	link_color("link_color"),
+    commit_on_focus_lost("commit_on_focus_lost", false),
 	length("length"),		// ignored
 	type("type"),			// ignored
 	is_unicode("is_unicode")// ignored
@@ -261,8 +325,6 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p)
 	mIsSelecting( FALSE ),
 	mSelectionStart( 0 ),
 	mSelectionEnd( 0 ),
-	mScrolledToBottom( TRUE ),
-	mOnScrollEndCallback( NULL ),
 	mOnScrollEndData( NULL ),
 	mCursorColor(		p.cursor_color() ),
 	mFgColor(			p.text_color() ),
@@ -271,15 +333,14 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p)
 	mWriteableBgColor(	p.bg_writeable_color() ),
 	mReadOnlyBgColor(	p.bg_readonly_color() ),
 	mFocusBgColor(		p.bg_focus_color() ),
+	mLinkColor(			p.link_color() ),
 	mReadOnly(p.read_only),
 	mWordWrap( p.word_wrap ),
-	mShowLineNumbers ( FALSE ),
-	mCommitOnFocusLost( FALSE ),
-	mHideScrollbarForShortDocs( FALSE ),
-	mTakesNonScrollClicks( p.takes_non_scroll_clicks ),
+	mShowLineNumbers ( p.show_line_numbers ),
+	mCommitOnFocusLost( p.commit_on_focus_lost),
 	mTrackBottom( p.track_bottom ),
 	mAllowEmbeddedItems( p.embedded_items ),
-	mHandleEditKeysDirectly( FALSE ),
+	mHandleEditKeysDirectly( p.handle_edit_keys_directly ),
 	mMouseDownX(0),
 	mMouseDownY(0),
 	mLastSelectionX(-1),
@@ -289,7 +350,8 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p)
 	mParseHTML(FALSE),
 	mParseHighlights(FALSE),
 	mTabsToNextField(p.ignore_tab),
-	mGLFont(p.font)
+	mDefaultFont(p.font),
+	mScrollIndex(-1)
 {
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
@@ -298,44 +360,42 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p)
 	// reset desired x cursor position
 	mDesiredXPixel = -1;
 
-	updateTextRect();
+	LLScrollContainer::Params scroll_params;
+	scroll_params.name = "text scroller";
+	scroll_params.rect = getLocalRect();
+	scroll_params.follows.flags = FOLLOWS_ALL;
+	scroll_params.is_opaque = false;
+	scroll_params.mouse_opaque = false;
+	scroll_params.min_auto_scroll_rate = 200;
+	scroll_params.max_auto_scroll_rate = 800;
+	mScroller = LLUICtrlFactory::create<LLScrollContainer>(scroll_params);
+	addChild(mScroller);
+
+	LLPanel::Params panel_params;
+	panel_params.name = "text_contents";
+	panel_params.rect =  LLRect(0, 500, 500, 0);
+	panel_params.background_visible = true;
+	panel_params.background_opaque = true;
+	panel_params.mouse_opaque = false;
+
+	mDocumentPanel = LLUICtrlFactory::create<DocumentPanel>(panel_params);
+	mScroller->addChild(mDocumentPanel);
 
-	S32 line_height = llround( mGLFont->getLineHeight() );
-	S32 page_size = mTextRect.getHeight() / line_height;
-
-	// Init the scrollbar
-	LLRect scroll_rect;
-	scroll_rect.setOriginAndSize( 
-		getRect().getWidth() - scrollbar_size,
-		1,
-		scrollbar_size,
-		getRect().getHeight() - 1);
-	S32 lines_in_doc = getLineCount();
-	LLScrollbar::Params sbparams;
-	sbparams.name("Scrollbar");
-	sbparams.rect(scroll_rect);
-	sbparams.orientation(LLScrollbar::VERTICAL);
-	sbparams.doc_size(lines_in_doc);
-	sbparams.doc_pos(0);
-	sbparams.page_size(page_size);
-	sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
-	mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
-	mScrollbar->setOnScrollEndCallback(mOnScrollEndCallback, mOnScrollEndData);
-	addChild(mScrollbar);
+	updateTextRect();
 
 	static LLUICachedControl<S32> text_editor_border ("UITextEditorBorder", 0);
 	LLViewBorder::Params params;
-	params.name("text ed border");
-	params.rect(getLocalRect());
-	params.bevel_style(LLViewBorder::BEVEL_IN);
-	params.border_thickness(text_editor_border);
+	params.name = "text ed border";
+	params.rect = getLocalRect();
+	params.bevel_style = LLViewBorder::BEVEL_IN;
+	params.border_thickness = text_editor_border;
 	mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
 	addChild( mBorder );
 	mBorder->setVisible(!p.hide_border);
 
-	appendText(p.default_text, FALSE, FALSE);
+	createDefaultSegment();
 
-	setHideScrollbarForShortDocs(p.hide_scrollbar);
+	appendText(p.default_text, FALSE, FALSE);
 
 	mHTML.clear();
 }
@@ -350,16 +410,23 @@ void LLTextEditor::initFromParams( const LLTextEditor::Params& p)
 	if (p.read_only.isProvided())
 	{
 		mReadOnly = p.read_only;
-		updateSegments();
-		updateAllowingLanguageInput();
 	}
+	
+	if (p.commit_on_focus_lost.isProvided())
+	{
+		mCommitOnFocusLost = p.commit_on_focus_lost;
+	}
+	
+	updateSegments();
+	updateAllowingLanguageInput();
+
 	// HACK:  text editors always need to be enabled so that we can scroll
 	LLView::setEnabled(true);
 }
 
 LLTextEditor::~LLTextEditor()
 {
-	gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit()
+	gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit() while LLTextEditor still valid
 
 	// Route menu back to the default
 	if( gEditMenuHandler == this )
@@ -369,8 +436,6 @@ LLTextEditor::~LLTextEditor()
 
 	// Scrollbar is deleted by LLView
 	mHoverSegment = NULL;
-	std::for_each(mSegments.begin(), mSegments.end(), DeletePointer());
-
 	std::for_each(mUndoStack.begin(), mUndoStack.end(), DeletePointer());
 }
 
@@ -379,117 +444,183 @@ LLTextViewModel* LLTextEditor::getViewModel() const
 	return (LLTextViewModel*)mViewModel.get();
 }
 
-void LLTextEditor::setTrackColor( const LLColor4& color )
-{ 
-	mScrollbar->setTrackColor(color); 
-}
-
-void LLTextEditor::setThumbColor( const LLColor4& color ) 
-{ 
-	mScrollbar->setThumbColor(color); 
-}
-
-void LLTextEditor::updateLineStartList(S32 startpos)
+static LLFastTimer::DeclareTimer FTM_TEXT_REFLOW ("Text Reflow");
+void LLTextEditor::reflow(S32 start_index)
 {
-	updateSegments();
-	
-	bindEmbeddedChars(mGLFont);
+	if (!mReflowNeeded) return;
 
-	S32 seg_num = mSegments.size();
-	S32 seg_idx = 0;
-	S32 seg_offset = 0;
+	LLFastTimer ft(FTM_TEXT_REFLOW);
+	static LLUICachedControl<S32> texteditor_vpad_top ("UITextEditorVPadTop", 0);
 
+	updateSegments();
 
-	if (!mLineStartList.empty())
+	while(mReflowNeeded)
 	{
-		getSegmentAndOffset(startpos, &seg_idx, &seg_offset);
-		line_info t(seg_idx, seg_offset);
-		line_list_t::iterator iter = std::upper_bound(mLineStartList.begin(), mLineStartList.end(), t, line_info_compare());
-		if (iter != mLineStartList.begin()) --iter;
-		seg_idx = iter->mSegment;
-		seg_offset = iter->mOffset;
-		mLineStartList.erase(iter, mLineStartList.end());
-	}
+		bool scrolled_to_bottom = mScroller->isAtBottom();
+		mReflowNeeded = FALSE;
 
-    LLWString text(getWText());
-	while( seg_idx < seg_num )
-	{
-		mLineStartList.push_back(line_info(seg_idx,seg_offset));
-		BOOL line_ended = FALSE;
-		S32 start_x = mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0;
-		S32 line_width = start_x;
-		while(!line_ended && seg_idx < seg_num)
+		LLRect old_cursor_rect = getLocalRectFromDocIndex(mCursorPos);
+		bool follow_selection = mTextRect.overlaps(old_cursor_rect); // cursor is visible
+		S32 first_line = getFirstVisibleLine();
+		// if scroll anchor not on first line, update it to first character of first line
+		if (!mLineInfoList.empty()
+			&&	(mScrollIndex <  mLineInfoList[first_line].mDocIndexStart
+				||	mScrollIndex >= mLineInfoList[first_line].mDocIndexEnd))
+		{
+			mScrollIndex = mLineInfoList[first_line].mDocIndexStart;
+		}
+		LLRect first_char_rect = getLocalRectFromDocIndex(mScrollIndex);
+		//first_char_rect.intersectWith(mTextRect);
+
+		S32 cur_top = -texteditor_vpad_top;
+		
+		if (getLength())
 		{
-			LLTextSegment* segment = mSegments[seg_idx];
-			S32 start_idx = segment->getStart() + seg_offset;
-			S32 end_idx = start_idx;
-			while (end_idx < segment->getEnd() && text[end_idx] != '\n')
+			segment_set_t::iterator seg_iter = mSegments.begin();
+			S32 seg_offset = 0;
+			S32 line_start_index = 0;
+			S32 text_width = mTextRect.getWidth();  // optionally reserve room for margin
+			S32 remaining_pixels = text_width;
+			LLWString text(getWText());
+			S32 line_count = 0;
+
+			// find and erase line info structs starting at start_index and going to end of document
+			if (!mLineInfoList.empty())
 			{
-				end_idx++;
+				// find first element whose end comes after start_index
+				line_list_t::iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), start_index, line_end_compare());
+				line_start_index = iter->mDocIndexStart;
+				line_count = iter->mLineNum;
+				getSegmentAndOffset(iter->mDocIndexStart, &seg_iter, &seg_offset);
+				mLineInfoList.erase(iter, mLineInfoList.end());
 			}
-			if (start_idx == end_idx)
+
+			// reserve enough space for line numbers
+			S32 line_height = mShowLineNumbers ? (S32)(LLFontGL::getFontMonospace()->getLineHeight()) : 0;
+
+			while(seg_iter != mSegments.end())
 			{
-				if (end_idx >= segment->getEnd())
-				{
-					// empty segment
-					seg_idx++;
-					seg_offset = 0;
-				}
-				else
-				{
-					// empty line
-					line_ended = TRUE;
-					seg_offset++;
-				}
-			}
-			else
-			{ 
-				const llwchar* str = text.c_str() + start_idx;
-				S32 drawn = mGLFont->maxDrawableChars(str, (F32)abs(mTextRect.getWidth()) - line_width,
-													  end_idx - start_idx, mWordWrap, mAllowEmbeddedItems );
-				if( 0 == drawn && line_width == start_x)
+				LLTextSegmentPtr segment = *seg_iter;
+
+				// track maximum height of any segment on this line
+				line_height = llmax(line_height, segment->getMaxHeight());
+				S32 cur_index = segment->getStart() + seg_offset;
+				// find run of text from this segment that we can display on one line
+				S32 end_index = cur_index;
+				while(end_index < segment->getEnd() && text[end_index] != '\n')
 				{
-					// If at the beginning of a line, draw at least one character, even if it doesn't all fit.
-					drawn = 1;
+					++end_index;
 				}
-				seg_offset += drawn;
-				line_width += mGLFont->getWidth(str, 0, drawn, mAllowEmbeddedItems);
-				end_idx = segment->getStart() + seg_offset;
-				if (end_idx < segment->getEnd())
+
+				// ask segment how many character fit in remaining space
+				S32 max_characters = end_index - cur_index;
+				S32 character_count = segment->getNumChars(llmax(0, remaining_pixels), seg_offset, cur_index - line_start_index, max_characters);
+
+				seg_offset += character_count;
+
+				S32 last_segment_char_on_line = segment->getStart() + seg_offset;
+
+				// if we didn't finish the current segment...
+				if (last_segment_char_on_line < segment->getEnd())
 				{
-					line_ended = TRUE;
-					if (text[end_idx] == '\n')
+					// set up index for next line
+					// ...skip newline, we don't want to draw
+					S32 next_line_count = line_count;
+					if (text[last_segment_char_on_line] == '\n')
 					{
-						seg_offset++; // skip newline
+						seg_offset++;
+						last_segment_char_on_line++;
+						next_line_count++;
 					}
+
+					// add line info and keep going
+					mLineInfoList.push_back(line_info(line_start_index, last_segment_char_on_line, cur_top, cur_top - line_height, line_count));
+
+					line_start_index = segment->getStart() + seg_offset;
+					cur_top -= line_height;
+					remaining_pixels = text_width;
+					line_height = 0;
+					line_count = next_line_count;
+				}
+				// ...just consumed last segment..
+				else if (++segment_set_t::iterator(seg_iter) == mSegments.end())
+				{
+					mLineInfoList.push_back(line_info(line_start_index, last_segment_char_on_line, cur_top, cur_top - line_height, line_count));
+					cur_top -= line_height;
+					break;
 				}
+				// finished a segment and there are segments remaining on this line
 				else
 				{
-					// finished with segment
-					seg_idx++;
+					// subtract pixels used and increment segment
+					remaining_pixels -= segment->getWidth(seg_offset, character_count);
+					++seg_iter;
 					seg_offset = 0;
 				}
 			}
 		}
-	}
-	
-	unbindEmbeddedChars(mGLFont);
 
-	mScrollbar->setDocSize( getLineCount() );
+		// change mDocumentPanel document size to accomodate reflowed text
+		LLRect document_rect;
+		document_rect.setOriginAndSize(1, 1, 
+									mScroller->getContentWindowRect().getWidth(), 
+									llmax(mScroller->getContentWindowRect().getHeight(), -cur_top));
+		mDocumentPanel->setShape(document_rect);
 
-	if (mHideScrollbarForShortDocs)
-	{
-		BOOL short_doc = (mScrollbar->getDocSize() <= mScrollbar->getPageSize());
-		mScrollbar->setVisible(!short_doc);
-	}
+		// after making document big enough to hold all the text, move the text to fit in the document
+		if (!mLineInfoList.empty())
+		{
+			S32 delta_pos = mDocumentPanel->getRect().getHeight() - mLineInfoList.begin()->mTop - texteditor_vpad_top;
+			// move line segments to fit new document rect
+			for (line_list_t::iterator it = mLineInfoList.begin(); it != mLineInfoList.end(); ++it)
+			{
+				it->mTop += delta_pos;
+				it->mBottom += delta_pos;
+			}
+		}
 
-	// if scrolled to bottom, stay at bottom
-	// unless user is selecting text
-	// do this after updating page size
-	if (mScrolledToBottom && mTrackBottom && !hasMouseCapture())
-	{
-		endOfDoc();
+		// calculate visible region for diplaying text
+		updateTextRect();
+
+		for (segment_set_t::iterator segment_it = mSegments.begin();
+			segment_it != mSegments.end();
+			++segment_it)
+		{
+			LLTextSegmentPtr segmentp = *segment_it;
+			segmentp->updateLayout(*this);
+
+		}
+
+		// apply scroll constraints after reflowing text
+		if (!hasMouseCapture())
+		{
+			LLRect visible_content_rect = mScroller->getVisibleContentRect();
+			if (scrolled_to_bottom && mTrackBottom)
+			{
+				// keep bottom of text buffer visible
+				endOfDoc();
+			}
+			else if (hasSelection() && follow_selection)
+			{
+				// keep cursor in same vertical position on screen when selecting text
+				LLRect new_cursor_rect_doc = getLocalRectFromDocIndex(mCursorPos);
+				new_cursor_rect_doc.translate(visible_content_rect.mLeft, visible_content_rect.mBottom);
+				mScroller->scrollToShowRect(new_cursor_rect_doc, old_cursor_rect);
+				//llassert_always(getLocalRectFromDocIndex(mCursorPos).mBottom == old_cursor_rect.mBottom);
+			}
+			else
+			{
+				// keep first line of text visible
+				LLRect new_first_char_rect = getLocalRectFromDocIndex(mScrollIndex);
+				new_first_char_rect.translate(visible_content_rect.mLeft, visible_content_rect.mBottom);
+				mScroller->scrollToShowRect(new_first_char_rect, first_char_rect);
+				//llassert_always(getLocalRectFromDocIndex(mScrollIndex).mBottom == first_char_rect.mBottom);
+			}
+		}
 	}
+
+	// reset desired x cursor position
+	updateCursorXPos();
 }
 
 ////////////////////////////////////////////////////////////
@@ -519,35 +650,53 @@ BOOL LLTextEditor::truncate()
 	return did_truncate;
 }
 
+void LLTextEditor::clearSegments()
+{
+	mHoverSegment = NULL;
+	mSegments.clear();
+}
+
 void LLTextEditor::setText(const LLStringExplicit &utf8str)
 {
+	clearSegments();
+
 	// LLStringUtil::removeCRLF(utf8str);
-	mViewModel->setValue(utf8str_removeCRLF(utf8str));
+	getViewModel()->setValue(utf8str_removeCRLF(utf8str));
 
 	truncate();
 	blockUndo();
 
-	setCursorPos(0);
+	createDefaultSegment();
+
+	startOfDoc();
 	deselect();
 
 	needsReflow();
 
 	resetDirty();
+
+	onValueChange(0, getLength());
 }
 
 void LLTextEditor::setWText(const LLWString &wtext)
 {
+	clearSegments();
+
 	getViewModel()->setDisplay(wtext);
 
 	truncate();
 	blockUndo();
 
-	setCursorPos(0);
+	createDefaultSegment();
+
+	startOfDoc();
 	deselect();
 
 	needsReflow();
 
 	resetDirty();
+
+	onValueChange(0, getLength());
 }
 
 // virtual
@@ -562,39 +711,7 @@ std::string LLTextEditor::getText() const
 	{
 		llwarns << "getText() called on text with embedded items (not supported)" << llendl;
 	}
-	return mViewModel->getValue().asString();
-}
-
-void LLTextEditor::setWordWrap(BOOL b)
-{
-	mWordWrap = b; 
-
-	setCursorPos(0);
-	deselect();
-	
-	needsReflow();
-}
-
-
-void LLTextEditor::setBorderVisible(BOOL b)
-{
-	mBorder->setVisible(b);
-}
-
-BOOL LLTextEditor::isBorderVisible() const 
-{
-	return mBorder->getVisible();
-}
-
-void LLTextEditor::setHideScrollbarForShortDocs(BOOL b)
-{
-	mHideScrollbarForShortDocs = b;
-
-	if (mHideScrollbarForShortDocs)
-	{
-		BOOL short_doc = (mScrollbar->getDocSize() <= mScrollbar->getPageSize());
-		mScrollbar->setVisible(!short_doc);
-	}
+	return getViewModel()->getValue().asString();
 }
 
 void LLTextEditor::selectNext(const std::string& search_text_in, BOOL case_insensitive, BOOL wrap)
@@ -619,7 +736,7 @@ void LLTextEditor::selectNext(const std::string& search_text_in, BOOL case_insen
 		if (selected_text == search_text)
 		{
 			// We already have this word selected, we are searching for the next.
-			mCursorPos += search_text.size();
+			setCursorPos(mCursorPos + search_text.size());
 		}
 	}
 	
@@ -682,9 +799,7 @@ BOOL LLTextEditor::replaceText(const std::string& search_text_in, const std::str
 
 void LLTextEditor::replaceTextAll(const std::string& search_text, const std::string& replace_text, BOOL case_insensitive)
 {
-	S32 cur_pos = mScrollbar->getDocPos();
-
-	setCursorPos(0);
+	startOfDoc();
 	selectNext(search_text, case_insensitive, FALSE);
 
 	BOOL replaced = TRUE;
@@ -692,14 +807,12 @@ void LLTextEditor::replaceTextAll(const std::string& search_text, const std::str
 	{
 		replaced = replaceText(search_text,replace_text, case_insensitive, FALSE);
 	}
-
-	mScrollbar->setDocPos(cur_pos);
 }
 
 // Picks a new cursor position based on the screen size of text being drawn.
-void LLTextEditor::setCursorAtLocalPos( S32 local_x, S32 local_y, BOOL round )
+void LLTextEditor::setCursorAtLocalPos( S32 local_x, S32 local_y, bool round, bool keep_cursor_offset )
 {
-	setCursorPos(getCursorPosFromLocalCoord(local_x, local_y, round));
+	setCursorPos(getDocIndexFromLocalCoord(local_x, local_y, round), keep_cursor_offset);
 }
 
 S32 LLTextEditor::prevWordPos(S32 cursorPos) const
@@ -709,7 +822,7 @@ S32 LLTextEditor::prevWordPos(S32 cursorPos) const
 	{
 		cursorPos--;
 	}
-	while( (cursorPos > 0) && isPartOfWord( wtext[cursorPos-1] ) )
+	while( (cursorPos > 0) && LLWStringUtil::isPartOfWord( wtext[cursorPos-1] ) )
 	{
 		cursorPos--;
 	}
@@ -719,7 +832,7 @@ S32 LLTextEditor::prevWordPos(S32 cursorPos) const
 S32 LLTextEditor::nextWordPos(S32 cursorPos) const
 {
 	LLWString wtext(getWText());
-	while( (cursorPos < getLength()) && isPartOfWord( wtext[cursorPos] ) )
+	while( (cursorPos < getLength()) && LLWStringUtil::isPartOfWord( wtext[cursorPos] ) )
 	{
 		cursorPos++;
 	} 
@@ -739,171 +852,331 @@ S32 LLTextEditor::getLineStart( S32 line ) const
     }
 
 	line = llclamp(line, 0, num_lines-1);
-	S32 segidx = mLineStartList[line].mSegment;
-	S32 segoffset = mLineStartList[line].mOffset;
-	LLTextSegment* seg = mSegments[segidx];
-	S32 res = seg->getStart() + segoffset;
-	if (res > seg->getEnd()) llerrs << "wtf" << llendl;
-	return res;
+	return mLineInfoList[line].mDocIndexStart;
+}
+
+S32 LLTextEditor::getLineHeight( S32 line ) const
+{
+	S32 num_lines = getLineCount();
+	if (num_lines == 0)
+    {
+		return 0;
+    }
+
+	line = llclamp(line, 0, num_lines-1);
+	return mLineInfoList[line].mTop - mLineInfoList[line].mBottom;
 }
 
 // Given an offset into text (pos), find the corresponding line (from the start of the doc) and an offset into the line.
-void LLTextEditor::getLineAndOffset( S32 startpos, S32* linep, S32* offsetp ) const
+void LLTextEditor::getLineAndOffset( S32 startpos, S32* linep, S32* offsetp, bool include_wordwrap) const
 {
-	if (mLineStartList.empty())
+	if (mLineInfoList.empty())
 	{
 		*linep = 0;
 		*offsetp = startpos;
 	}
 	else
 	{
-		S32 seg_idx, seg_offset;
-		getSegmentAndOffset( startpos, &seg_idx, &seg_offset );
+		line_list_t::const_iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), startpos, line_end_compare());
+		if (include_wordwrap)
+		{
+			*linep = iter - mLineInfoList.begin();
+		}
+		else
+		{
+			if (iter == mLineInfoList.end())
+			{
+				*linep = mLineInfoList.back().mLineNum;
+			}
+			else
+			{
+				*linep = iter->mLineNum;
+			}
+		}
+		*offsetp = startpos - iter->mDocIndexStart;
+	}
+}
 
-		line_info tline(seg_idx, seg_offset);
-		line_list_t::const_iterator iter = std::upper_bound(mLineStartList.begin(), mLineStartList.end(), tline, line_info_compare());
-		if (iter != mLineStartList.begin()) --iter;
-		*linep = iter - mLineStartList.begin();
-		S32 line_start = mSegments[iter->mSegment]->getStart() + iter->mOffset;
-		*offsetp = startpos - line_start;
+void LLTextEditor::getSegmentAndOffset( S32 startpos, segment_set_t::const_iterator* seg_iter, S32* offsetp ) const
+{
+	*seg_iter = getSegIterContaining(startpos);
+	if (*seg_iter == mSegments.end())
+	{
+		*offsetp = 0;
+	}
+	else
+	{
+		*offsetp = startpos - (**seg_iter)->getStart();
 	}
 }
 
-void LLTextEditor::getSegmentAndOffset( S32 startpos, S32* segidxp, S32* offsetp ) const
+void LLTextEditor::getSegmentAndOffset( S32 startpos, segment_set_t::iterator* seg_iter, S32* offsetp )
 {
-	if (mSegments.empty())
+	*seg_iter = getSegIterContaining(startpos);
+	if (*seg_iter == mSegments.end())
 	{
-		*segidxp = -1;
-		*offsetp = startpos;
+		*offsetp = 0;
+	}
+	else
+	{
+		*offsetp = startpos - (**seg_iter)->getStart();
 	}
-	
-	LLTextSegment tseg(startpos);
-	segment_list_t::const_iterator seg_iter;
-	seg_iter = std::upper_bound(mSegments.begin(), mSegments.end(), &tseg, LLTextSegment::compare());
-	if (seg_iter != mSegments.begin()) --seg_iter;
-	*segidxp = seg_iter - mSegments.begin();
-	*offsetp = startpos - (*seg_iter)->getStart();
 }
 
-const LLTextSegment*	LLTextEditor::getPreviousSegment() const
+const LLTextSegmentPtr	LLTextEditor::getPreviousSegment() const
 {
 	// find segment index at character to left of cursor (or rightmost edge of selection)
-	S32 idx = llmax(0, getSegmentIdxAtOffset(mCursorPos) - 1);
-	return idx >= 0 ? mSegments[idx] : NULL;
+	segment_set_t::const_iterator it = mSegments.lower_bound(new LLIndexSegment(mCursorPos));
+
+	if (it != mSegments.end())
+	{
+		return *it;
+	}
+	else
+	{
+		return LLTextSegmentPtr();
+	}
 }
 
-void LLTextEditor::getSelectedSegments(std::vector<const LLTextSegment*>& segments) const
+void LLTextEditor::getSelectedSegments(LLTextEditor::segment_vec_t& segments) const
 {
 	S32 left = hasSelection() ? llmin(mSelectionStart, mSelectionEnd) : mCursorPos;
 	S32 right = hasSelection() ? llmax(mSelectionStart, mSelectionEnd) : mCursorPos;
-	S32 first_idx = llmax(0, getSegmentIdxAtOffset(left));
-	S32 last_idx = llmax(0, first_idx, getSegmentIdxAtOffset(right));
 
-	for (S32 idx = first_idx; idx <= last_idx; ++idx)
-	{
-		segments.push_back(mSegments[idx]);
-	}
+	return getSegmentsInRange(segments, left, right, true);
 }
 
-S32 LLTextEditor::getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const
+void LLTextEditor::getSegmentsInRange(LLTextEditor::segment_vec_t& segments_out, S32 start, S32 end, bool include_partial) const
 {
-	if(mShowLineNumbers)
+	segment_set_t::const_iterator first_it = getSegIterContaining(start);
+	segment_set_t::const_iterator end_it = getSegIterContaining(end - 1);
+	if (end_it != mSegments.end()) ++end_it;
+
+	for (segment_set_t::const_iterator it = first_it; it != end_it; ++it)
 	{
-		local_x -= UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
+		LLTextSegmentPtr segment = *it;
+		if (include_partial
+			||	(segment->getStart() >= start
+				&& segment->getEnd() <= end))
+		{
+			segments_out.push_back(segment);
+		}
 	}
+}
 
-	// If round is true, if the position is on the right half of a character, the cursor
-	// will be put to its right.  If round is false, the cursor will always be put to the
-	// character's left.
+// If round is true, if the position is on the right half of a character, the cursor
+// will be put to its right.  If round is false, the cursor will always be put to the
+// character's left.
 
+S32 LLTextEditor::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const
+{
 	// Figure out which line we're nearest to.
-	S32 total_lines = getLineCount();
-	S32 line_height = llround( mGLFont->getLineHeight() );
-	S32 max_visible_lines = mTextRect.getHeight() / line_height;
-	S32 scroll_lines = mScrollbar->getDocPos();
-	S32 visible_lines = llmin( total_lines - scroll_lines, max_visible_lines );			// Lines currently visible 
+	LLRect visible_region = mScroller->getVisibleContentRect();
+
+	// binary search for line that starts before local_y
+	line_list_t::const_iterator line_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), local_y - mTextRect.mBottom + visible_region.mBottom, compare_bottom());
 
-	//S32 line = S32( 0.5f + ((mTextRect.mTop - local_y) / mGLFont->getLineHeight()) );
-	S32 line = (mTextRect.mTop - 1 - local_y) / line_height;
-	if (line >= total_lines)
+	if (line_iter == mLineInfoList.end())
 	{
 		return getLength(); // past the end
 	}
 	
-	line = llclamp( line, 0, visible_lines ) + scroll_lines;
+	S32 pos = getLength();
+	S32 start_x = mTextRect.mLeft;
+
+	segment_set_t::iterator line_seg_iter;
+	S32 line_seg_offset;
+	for(getSegmentAndOffset(line_iter->mDocIndexStart, &line_seg_iter, &line_seg_offset);
+		line_seg_iter != mSegments.end(); 
+		++line_seg_iter, line_seg_offset = 0)
+	{
+		const LLTextSegmentPtr segmentp = *line_seg_iter;
+
+		S32 segment_line_start = segmentp->getStart() + line_seg_offset;
+		S32 segment_line_length = llmin(segmentp->getEnd(), line_iter->mDocIndexEnd - 1) - segment_line_start;
+		S32 text_width = segmentp->getWidth(line_seg_offset, segment_line_length);
+		if (local_x < start_x + text_width						// cursor to left of right edge of text
+			|| segmentp->getEnd() >= line_iter->mDocIndexEnd - 1)	// or this segment wraps to next line
+		{
+			// Figure out which character we're nearest to.
+			S32 offset;
+			if (!segmentp->canEdit())
+			{
+				S32 segment_width = segmentp->getWidth(0, segmentp->getEnd() - segmentp->getStart());
+				if (round && local_x - start_x > segment_width / 2)
+				{
+					offset = segment_line_length;
+				}
+				else
+				{
+					offset = 0;
+				}
+			}
+			else
+			{
+				offset = segmentp->getOffset(local_x - start_x, line_seg_offset, segment_line_length, round);
+			}
+			pos = segment_line_start + offset;
+			break;
+		}
+		start_x += text_width;
+	}
 
-	S32 line_start = getLineStart(line);
-	S32 next_start = getLineStart(line+1);
-	S32	line_end = (next_start != line_start) ? next_start - 1 : getLength();
+	return pos;
+}
 
-	if(line_start == -1)
-	{
-		return 0;
+LLRect LLTextEditor::getLocalRectFromDocIndex(S32 pos) const
+{
+	LLRect local_rect(mTextRect);
+	local_rect.mBottom = local_rect.mTop - (S32)(mDefaultFont->getLineHeight());
+	if (mLineInfoList.empty()) 
+	{ 
+		return local_rect;
 	}
-	else
+
+	// clamp pos to valid values
+	pos = llclamp(pos, 0, mLineInfoList.back().mDocIndexEnd - 1);
+
+
+	// find line that contains cursor
+	line_list_t::const_iterator line_iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), pos, line_end_compare());
+
+	LLRect scrolled_view_rect = mScroller->getVisibleContentRect();
+	local_rect.mLeft = mTextRect.mLeft - scrolled_view_rect.mLeft; 
+	local_rect.mBottom = mTextRect.mBottom + (line_iter->mBottom - scrolled_view_rect.mBottom);
+	local_rect.mTop = mTextRect.mBottom + (line_iter->mTop - scrolled_view_rect.mBottom);
+
+	segment_set_t::iterator line_seg_iter;
+	S32 line_seg_offset;
+	segment_set_t::iterator cursor_seg_iter;
+	S32 cursor_seg_offset;
+	getSegmentAndOffset(line_iter->mDocIndexStart, &line_seg_iter, &line_seg_offset);
+	getSegmentAndOffset(pos, &cursor_seg_iter, &cursor_seg_offset);
+
+	while(line_seg_iter != mSegments.end())
 	{
-		S32 line_len = line_end - line_start;
-		S32 pos;
-        LLWString text(getWText());
+		const LLTextSegmentPtr segmentp = *line_seg_iter;
 
-		if (mAllowEmbeddedItems)
+		if (line_seg_iter == cursor_seg_iter)
 		{
-			// Figure out which character we're nearest to.
-			bindEmbeddedChars(mGLFont);
-			pos = mGLFont->charFromPixelOffset(text.c_str(), line_start,
-											   (F32)(local_x - mTextRect.mLeft),
-											   (F32)(mTextRect.getWidth()),
-											   line_len,
-											   round, TRUE);
-			unbindEmbeddedChars(mGLFont);
+			// cursor advanced to right based on difference in offset of cursor to start of line
+			local_rect.mLeft += segmentp->getWidth(line_seg_offset, cursor_seg_offset - line_seg_offset);
+
+			break;
 		}
 		else
 		{
-			pos = mGLFont->charFromPixelOffset(text.c_str(), line_start,
-											   (F32)(local_x - mTextRect.mLeft),
-											   (F32)mTextRect.getWidth(),
-											   line_len,
-											   round);
+			// add remainder of current text segment to cursor position
+			local_rect.mLeft += segmentp->getWidth(line_seg_offset, (segmentp->getEnd() - segmentp->getStart()) - line_seg_offset);
+			// offset will be 0 for all segments after the first
+			line_seg_offset = 0;
+			// go to next text segment on this line
+			++line_seg_iter;
 		}
-
-		return line_start + pos;
 	}
+
+	local_rect.mRight = local_rect.mLeft; 
+
+	return local_rect;
+}
+
+void LLTextEditor::addDocumentChild(LLView* view) 
+{ 
+	mDocumentPanel->addChild(view); 
 }
 
-void LLTextEditor::setCursor(S32 row, S32 column)
+void LLTextEditor::removeDocumentChild(LLView* view) 
+{ 
+	mDocumentPanel->removeChild(view); 
+}
+
+bool LLTextEditor::setCursor(S32 row, S32 column)
 {
-    LLWString text(getWText());
-	const llwchar* doc = text.c_str();
-	const char CR = 10;
-	while(row--)
+	if (0 <= row && row < (S32)mLineInfoList.size())
 	{
-		while (CR != *doc++);
+		S32 doc_pos = mLineInfoList[row].mDocIndexStart;
+		column = llclamp(column, 0, mLineInfoList[row].mDocIndexEnd - mLineInfoList[row].mDocIndexStart - 1);
+		doc_pos += column;
+		updateCursorXPos();
+
+		return setCursorPos(doc_pos);
 	}
-	doc += column;
-	setCursorPos(doc - text.c_str());
+	return false;
 }
 
-void LLTextEditor::setCursorPos(S32 offset)
+bool LLTextEditor::setCursorPos(S32 cursor_pos, bool keep_cursor_offset)
 {
-	mCursorPos = llclamp(offset, 0, (S32)getLength());
+	S32 new_cursor_pos = cursor_pos;
+	if (new_cursor_pos != mCursorPos)
+	{
+		new_cursor_pos = getEditableIndex(new_cursor_pos, new_cursor_pos >= mCursorPos);
+	}
+
+	mCursorPos = llclamp(new_cursor_pos, 0, (S32)getLength());
 	needsScroll();
-	// reset desired x cursor position
-	mDesiredXPixel = -1;
+	if (!keep_cursor_offset)
+		updateCursorXPos();
+	// did we get requested position?
+	return new_cursor_pos == cursor_pos;
 }
 
-// virtual
-BOOL LLTextEditor::canDeselect() const
+void LLTextEditor::updateCursorXPos()
 {
-	return hasSelection(); 
+	// reset desired x cursor position
+	mDesiredXPixel = getLocalRectFromDocIndex(mCursorPos).mLeft;
 }
 
-
-void LLTextEditor::deselect()
+// constraint cursor to editable segments of document
+S32 LLTextEditor::getEditableIndex(S32 index, bool increasing_direction)
 {
-	mSelectionStart = 0;
-	mSelectionEnd = 0;
-	mIsSelecting = FALSE;
-}
+	//// always allow editable position at end of doc
+	//if (index == getLength())
+	//{
+	//	return index;
+	//}
+
+	segment_set_t::iterator segment_iter;
+	S32 offset;
+	getSegmentAndOffset(index, &segment_iter, &offset);
+
+	LLTextSegmentPtr segmentp = *segment_iter;
+
+	if (segmentp->canEdit()) 
+	{
+		return segmentp->getStart() + offset;			
+	}
+	else if (segmentp->getStart() < index && index < segmentp->getEnd())
+	{
+		// bias towards document end
+		if (increasing_direction)
+		{
+			return segmentp->getEnd();
+		}
+		// bias towards document start
+		else
+		{
+			return segmentp->getStart();
+		}
+	}
+	else
+	{
+		return index;
+	}
+}
+
+// virtual
+BOOL LLTextEditor::canDeselect() const
+{
+	return hasSelection(); 
+}
+
+
+void LLTextEditor::deselect()
+{
+	mSelectionStart = 0;
+	mSelectionEnd = 0;
+	mIsSelecting = FALSE;
+}
 
 
 void LLTextEditor::startSelection()
@@ -1029,7 +1302,7 @@ void LLTextEditor::indentSelectedLines( S32 spaces )
 			}
 			right += delta_spaces;
 
-			//text = mWText;
+			text = getWText();
 
 			// Find the next new line
 			while( (cur < right) && (text[cur] != '\n') )
@@ -1055,7 +1328,7 @@ void LLTextEditor::indentSelectedLines( S32 spaces )
 			mSelectionStart = right;
 			mSelectionEnd = left;
 		}
-		mCursorPos = mSelectionEnd;
+		setCursorPos(mSelectionEnd);
 	}
 }
 
@@ -1070,7 +1343,7 @@ void LLTextEditor::selectAll()
 {
 	mSelectionStart = getLength();
 	mSelectionEnd = 0;
-	mCursorPos = mSelectionEnd;
+	setCursorPos(mSelectionEnd);
 }
 
 
@@ -1088,12 +1361,7 @@ BOOL LLTextEditor::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_
 		}
 	}
 
-	if( mSegments.empty() )
-	{
-		return TRUE;
-	}
-
-	const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
+	const LLTextSegmentPtr cur_segment = getSegmentAtLocalPos( x, y );
 	if( cur_segment )
 	{
 		BOOL has_tool_tip = FALSE;
@@ -1114,12 +1382,6 @@ BOOL LLTextEditor::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_
 	return TRUE;
 }
 
-BOOL LLTextEditor::handleScrollWheel(S32 x, S32 y, S32 clicks)
-{
-	// Pretend the mouse is over the scrollbar
-	return mScrollbar->handleScrollWheel( 0, 0, clicks );
-}
-
 BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	BOOL	handled = FALSE;
@@ -1127,7 +1389,7 @@ BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 	// Let scrollbar have first dibs
 	handled = LLView::childrenHandleMouseDown(x, y, mask) != NULL;
 
-	if( !handled && mTakesNonScrollClicks)
+	if( !handled )
 	{
 		if (!(mask & MASK_SHIFT))
 		{
@@ -1141,31 +1403,10 @@ BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 			if (mask & MASK_SHIFT)
 			{
 				S32 old_cursor_pos = mCursorPos;
-				setCursorAtLocalPos( x, y, TRUE );
+				setCursorAtLocalPos( x, y, true );
 
 				if (hasSelection())
 				{
-					/* Mac-like behavior - extend selection towards the cursor
-					if (mCursorPos < mSelectionStart
-						&& mCursorPos < mSelectionEnd)
-					{
-						// ...left of selection
-						mSelectionStart = llmax(mSelectionStart, mSelectionEnd);
-						mSelectionEnd = mCursorPos;
-					}
-					else if (mCursorPos > mSelectionStart
-						&& mCursorPos > mSelectionEnd)
-					{
-						// ...right of selection
-						mSelectionStart = llmin(mSelectionStart, mSelectionEnd);
-						mSelectionEnd = mCursorPos;
-					}
-					else
-					{
-						mSelectionEnd = mCursorPos;
-					}
-					*/
-					// Windows behavior
 					mSelectionEnd = mCursorPos;
 				}
 				else
@@ -1178,7 +1419,7 @@ BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 			}
 			else
 			{
-				setCursorAtLocalPos( x, y, TRUE );
+				setCursorAtLocalPos( x, y, true );
 				startSelection();
 			}
 			gFocusMgr.setMouseCapture( this );
@@ -1202,11 +1443,17 @@ BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 
 BOOL LLTextEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
 {
-	setFocus( TRUE );
-	if( canPastePrimary() )
+	BOOL	handled = FALSE;
+	handled = childrenHandleMiddleMouseDown(x, y, mask) != NULL;
+
+	if (!handled)
 	{
-		setCursorAtLocalPos( x, y, TRUE );
-		pastePrimary();
+		setFocus( TRUE );
+		if( canPastePrimary() )
+		{
+			setCursorAtLocalPos( x, y, true );
+			pastePrimary();
+		}
 	}
 	return TRUE;
 }
@@ -1217,7 +1464,12 @@ BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 	BOOL handled = FALSE;
 
+	if (mHoverSegment) 
+	{
+		mHoverSegment->setHasMouseHover(false);
+	}
 	mHoverSegment = NULL;
+
 	if(hasMouseCapture() )
 	{
 		if( mIsSelecting ) 
@@ -1228,17 +1480,11 @@ BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
 				mLastSelectionY = y;
 			}
 
-			if( y > mTextRect.mTop )
-			{
-				mScrollbar->setDocPos( mScrollbar->getDocPos() - 1 );
-			}
-			else
-			if( y < mTextRect.mBottom )
-			{
-				mScrollbar->setDocPos( mScrollbar->getDocPos() + 1 );
-			}
+			mScroller->autoScroll(x, y);
 
-			setCursorAtLocalPos( x, y, TRUE );
+			S32 clamped_x = llclamp(x, mTextRect.mLeft, mTextRect.mRight);
+			S32 clamped_y = llclamp(y, mTextRect.mBottom, mTextRect.mTop);
+			setCursorAtLocalPos( clamped_x, clamped_y, true );
 			mSelectionEnd = mCursorPos;
 		}
 
@@ -1260,51 +1506,43 @@ BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
 	}
 
 	// Opaque
-	if( !handled && mTakesNonScrollClicks)
+	if( !handled )
 	{
 		// Check to see if we're over an HTML-style link
-		if( !mSegments.empty() )
+		LLTextSegmentPtr cur_segment = getSegmentAtLocalPos( x, y );
+		if( cur_segment )
 		{
-			const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
-			if( cur_segment )
+			if(cur_segment->getStyle()->isLink())
 			{
-				if(cur_segment->getStyle()->isLink())
-				{
-					lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over link, inactive)" << llendl;		
-					getWindow()->setCursor(UI_CURSOR_HAND);
-					handled = TRUE;
-				}
-				else
-				if(cur_segment->getStyle()->getIsEmbeddedItem())
-				{
-					lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over embedded item, inactive)" << llendl;		
-					getWindow()->setCursor(UI_CURSOR_HAND);
-					//getWindow()->setCursor(UI_CURSOR_ARROW);
-					handled = TRUE;
-				}
-				mHoverSegment = cur_segment;
+				lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over link, inactive)" << llendl;		
+				getWindow()->setCursor(UI_CURSOR_HAND);
+				handled = TRUE;
 			}
+			//else
+			//if(cur_segment->getStyle()->getIsEmbeddedItem())
+			//{
+			//	lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over embedded item, inactive)" << llendl;		
+			//	getWindow()->setCursor(UI_CURSOR_HAND);
+			//	//getWindow()->setCursor(UI_CURSOR_ARROW);
+			//	handled = TRUE;
+			//}
+			if (mHoverSegment) 
+			{
+				mHoverSegment->setHasMouseHover(false);
+			}
+			cur_segment->setHasMouseHover(true);
+			mHoverSegment = cur_segment;
+			mHTML = mHoverSegment->getStyle()->getLinkHREF();
 		}
 
 		if( !handled )
 		{
 			lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;		
-			if (!mScrollbar->getVisible() || x < getRect().getWidth() - scrollbar_size)
-			{
-				getWindow()->setCursor(UI_CURSOR_IBEAM);
-			}
-			else
-			{
-				getWindow()->setCursor(UI_CURSOR_ARROW);
-			}
+			getWindow()->setCursor(UI_CURSOR_IBEAM);
 			handled = TRUE;
 		}
 	}
 
-	if (mOnScrollEndCallback && mOnScrollEndData && (mScrollbar->getDocPos() == mScrollbar->getDocPosMax()))
-	{
-		mOnScrollEndCallback(mOnScrollEndData);
-	}
 	return handled;
 }
 
@@ -1316,22 +1554,14 @@ BOOL LLTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
 	// let scrollbar have first dibs
 	handled = LLView::childrenHandleMouseUp(x, y, mask) != NULL;
 
-	if( !handled && mTakesNonScrollClicks)
+	if( !handled )
 	{
 		if( mIsSelecting )
 		{
-			// Finish selection
-			if( y > mTextRect.mTop )
-			{
-				mScrollbar->setDocPos( mScrollbar->getDocPos() - 1 );
-			}
-			else
-			if( y < mTextRect.mBottom )
-			{
-				mScrollbar->setDocPos( mScrollbar->getDocPos() + 1 );
-			}
-			
-			setCursorAtLocalPos( x, y, TRUE );
+			mScroller->autoScroll(x, y);
+			S32 clamped_x = llclamp(x, mTextRect.mLeft, mTextRect.mRight);
+			S32 clamped_y = llclamp(y, mTextRect.mBottom, mTextRect.mTop);
+			setCursorAtLocalPos( clamped_x, clamped_y, true );
 			endSelection();
 		}
 		
@@ -1367,25 +1597,25 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 	// let scrollbar have first dibs
 	handled = LLView::childrenHandleDoubleClick(x, y, mask) != NULL;
 
-	if( !handled && mTakesNonScrollClicks)
+	if( !handled )
 	{
-		setCursorAtLocalPos( x, y, FALSE );
+		setCursorAtLocalPos( x, y, false );
 		deselect();
 
 		LLWString text = getWText();
 		
-		if( isPartOfWord( text[mCursorPos] ) )
+		if( LLWStringUtil::isPartOfWord( text[mCursorPos] ) )
 		{
 			// Select word the cursor is over
-			while ((mCursorPos > 0) && isPartOfWord(text[mCursorPos-1]))
+			while ((mCursorPos > 0) && LLWStringUtil::isPartOfWord(text[mCursorPos-1]))
 			{
-				mCursorPos--;
+				if (!setCursorPos(mCursorPos - 1)) break;
 			}
 			startSelection();
 
-			while ((mCursorPos < (S32)text.length()) && isPartOfWord( text[mCursorPos] ) )
+			while ((mCursorPos < (S32)text.length()) && LLWStringUtil::isPartOfWord( text[mCursorPos] ) )
 			{
-				mCursorPos++;
+				if (!setCursorPos(mCursorPos + 1)) break;
 			}
 		
 			mSelectionEnd = mCursorPos;
@@ -1394,7 +1624,7 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 		{
 			// Select the character the cursor is over
 			startSelection();
-			mCursorPos++;
+			setCursorPos(mCursorPos + 1);
 			mSelectionEnd = mCursorPos;
 		}
 
@@ -1457,19 +1687,25 @@ S32 LLTextEditor::execute( LLTextCmd* cmd )
 	return delta;
 }
 
-S32 LLTextEditor::insert(const S32 pos, const LLWString &wstr, const BOOL group_with_next_op)
+S32 LLTextEditor::insert(S32 pos, const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment)
 {
-	return execute( new LLTextCmdInsert( pos, group_with_next_op, wstr ) );
+	return execute( new LLTextCmdInsert( pos, group_with_next_op, wstr, segment ) );
 }
 
-S32 LLTextEditor::remove(const S32 pos, const S32 length, const BOOL group_with_next_op)
+S32 LLTextEditor::remove(S32 pos, S32 length, bool group_with_next_op)
 {
-	return execute( new LLTextCmdRemove( pos, group_with_next_op, length ) );
+	S32 end_pos = getEditableIndex(pos + length, true);
+
+	segment_vec_t segments_to_remove;
+	// store text segments
+	getSegmentsInRange(segments_to_remove, pos, pos + length, false);
+
+	return execute( new LLTextCmdRemove( pos, group_with_next_op, end_pos - pos, segments_to_remove ) );
 }
 
-S32 LLTextEditor::append(const LLWString &wstr, const BOOL group_with_next_op)
+S32 LLTextEditor::append(const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment)
 {
-	return insert(getLength(), wstr, group_with_next_op);
+	return insert(getLength(), wstr, group_with_next_op, segment);
 }
 
 S32 LLTextEditor::overwriteChar(S32 pos, llwchar wc)
@@ -1575,7 +1811,7 @@ S32 LLTextEditor::addChar(S32 pos, llwchar wc)
 	}
 	else
 	{
-		return execute(new LLTextCmdAddChar(pos, FALSE, wc));
+		return execute(new LLTextCmdAddChar(pos, FALSE, wc, LLTextSegmentPtr()));
 	}
 }
 
@@ -1612,10 +1848,10 @@ BOOL LLTextEditor::handleSelectionKey(const KEY key, const MASK mask)
 			if( 0 < mCursorPos )
 			{
 				startSelection();
-				mCursorPos--;
+				setCursorPos(mCursorPos - 1);
 				if( mask & MASK_CONTROL )
 				{
-					mCursorPos = prevWordPos(mCursorPos);
+					setCursorPos(prevWordPos(mCursorPos));
 				}
 				mSelectionEnd = mCursorPos;
 			}
@@ -1625,10 +1861,10 @@ BOOL LLTextEditor::handleSelectionKey(const KEY key, const MASK mask)
 			if( mCursorPos < getLength() )
 			{
 				startSelection();
-				mCursorPos++;
+				setCursorPos(mCursorPos + 1);
 				if( mask & MASK_CONTROL )
 				{
-					mCursorPos = nextWordPos(mCursorPos);
+					setCursorPos(nextWordPos(mCursorPos));
 				}
 				mSelectionEnd = mCursorPos;
 			}
@@ -1650,7 +1886,7 @@ BOOL LLTextEditor::handleSelectionKey(const KEY key, const MASK mask)
 			startSelection();
 			if( mask & MASK_CONTROL )
 			{
-				mCursorPos = 0;
+				setCursorPos(0);
 			}
 			else
 			{
@@ -1675,7 +1911,7 @@ BOOL LLTextEditor::handleSelectionKey(const KEY key, const MASK mask)
 			startSelection();
 			if( mask & MASK_CONTROL )
 			{
-				mCursorPos = getLength();
+				setCursorPos(getLength());
 			}
 			else
 			{
@@ -1726,14 +1962,7 @@ BOOL LLTextEditor::handleNavigationKey(const KEY key, const MASK mask)
 		switch( key )
 		{
 		case KEY_UP:
-			if (mReadOnly)
-			{
-				mScrollbar->setDocPos(mScrollbar->getDocPos() - 1);
-			}
-			else
-			{
-				changeLine( -1 );
-			}
+			changeLine( -1 );
 			break;
 
 		case KEY_PAGE_UP:
@@ -1741,25 +1970,11 @@ BOOL LLTextEditor::handleNavigationKey(const KEY key, const MASK mask)
 			break;
 
 		case KEY_HOME:
-			if (mReadOnly)
-			{
-				mScrollbar->setDocPos(0);
-			}
-			else
-			{
-				startOfLine();
-			}
+			startOfLine();
 			break;
 
 		case KEY_DOWN:
-			if (mReadOnly)
-			{
-				mScrollbar->setDocPos(mScrollbar->getDocPos() + 1);
-			}
-			else
-			{
-				changeLine( 1 );
-			}
+			changeLine( 1 );
 			break;
 
 		case KEY_PAGE_DOWN:
@@ -1767,21 +1982,10 @@ BOOL LLTextEditor::handleNavigationKey(const KEY key, const MASK mask)
 			break;
  
 		case KEY_END:
-			if (mReadOnly)
-			{
-				mScrollbar->setDocPos(mScrollbar->getDocPosMax());
-			}
-			else
-			{
-				endOfLine();
-			}
+			endOfLine();
 			break;
 
 		case KEY_LEFT:
-			if (mReadOnly)
-			{
-				break;
-			}
 			if( hasSelection() )
 			{
 				setCursorPos(llmin( mCursorPos - 1, mSelectionStart, mSelectionEnd ));
@@ -1800,10 +2004,6 @@ BOOL LLTextEditor::handleNavigationKey(const KEY key, const MASK mask)
 			break;
 
 		case KEY_RIGHT:
-			if (mReadOnly)
-			{
-				break;
-			}
 			if( hasSelection() )
 			{
 				setCursorPos(llmax( mCursorPos + 1, mSelectionStart, mSelectionEnd ));
@@ -1827,10 +2027,6 @@ BOOL LLTextEditor::handleNavigationKey(const KEY key, const MASK mask)
 		}
 	}
 	
-	if (mOnScrollEndCallback && mOnScrollEndData && (mScrollbar->getDocPos() == mScrollbar->getDocPosMax()))
-	{
-		mOnScrollEndCallback(mOnScrollEndData);
-	}
 	return handled;
 }
 
@@ -1967,7 +2163,7 @@ void LLTextEditor::pasteHelper(bool is_primary)
 	}
 
 	// Insert the new text into the existing text.
-	setCursorPos(mCursorPos + insert(mCursorPos, clean_string, FALSE));
+	setCursorPos(mCursorPos + insert(mCursorPos, clean_string, FALSE, LLTextSegmentPtr()));
 	deselect();
 
 	needsReflow();
@@ -2014,7 +2210,7 @@ BOOL LLTextEditor::handleControlKey(const KEY key, const MASK mask)
 			if( mask & MASK_SHIFT )
 			{
 				startSelection();
-				mCursorPos = 0;
+				setCursorPos(0);
 				mSelectionEnd = mCursorPos;
 			}
 			else
@@ -2022,7 +2218,7 @@ BOOL LLTextEditor::handleControlKey(const KEY key, const MASK mask)
 				// Ctrl-Home, Ctrl-Left, Ctrl-Right, Ctrl-Down
 				// all move the cursor as if clicking, so should deselect.
 				deselect();
-				setCursorPos(0);
+				startOfDoc();
 			}
 			break;
 
@@ -2251,42 +2447,87 @@ BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask )
 	BOOL	return_key_hit = FALSE;
 	BOOL	text_may_have_changed = TRUE;
 
-	if ( gFocusMgr.getKeyboardFocus() == this )
+	// Special case for TAB.  If want to move to next field, report
+	// not handled and let the parent take care of field movement.
+	if (KEY_TAB == key && mTabsToNextField)
 	{
-		// Special case for TAB.  If want to move to next field, report
-		// not handled and let the parent take care of field movement.
-		if (KEY_TAB == key && mTabsToNextField)
-		{
-			return FALSE;
-		}
+		return FALSE;
+	}
+	/*
+	if (KEY_F10 == key)
+	{
+		LLComboBox::Params cp;
+		cp.name = "combo box";
+		cp.label = "my combo";
+		cp.rect.width = 100;
+		cp.rect.height = 20;
+		cp.items.add().label = "item 1";
+		cp.items.add().label = "item 2";
+		cp.items.add().label = "item 3";
+		
+		appendWidget(LLUICtrlFactory::create<LLComboBox>(cp), "combo", true, false);
+	}
+	if (KEY_F11 == key)
+	{
+		LLButton::Params bp;
+		bp.name = "text button";
+		bp.label = "Click me";
+		bp.rect.width = 100;
+		bp.rect.height = 20;
 
+		appendWidget(LLUICtrlFactory::create<LLButton>(bp), "button", true, false);
+	}
+	*/
+	if (mReadOnly)
+	{
+		handled = mScroller->handleKeyHere( key, mask );
+	}
+	else
+	{
+		// handle navigation keys ourself
 		handled = handleNavigationKey( key, mask );
+	}
+
+
+	if( handled )
+	{
+		text_may_have_changed = FALSE;
+	}
+		
+	if( !handled )
+	{
+		handled = handleSelectionKey( key, mask );
 		if( handled )
 		{
-			text_may_have_changed = FALSE;
+			selection_modified = TRUE;
 		}
-			
-		if( !handled )
+	}
+
+	if( !handled )
+	{
+		handled = handleControlKey( key, mask );
+		if( handled )
 		{
-			handled = handleSelectionKey( key, mask );
-			if( handled )
-			{
-				selection_modified = TRUE;
-			}
+			selection_modified = TRUE;
 		}
-	
-		if( !handled )
+	}
+
+	if( !handled && mHandleEditKeysDirectly )
+	{
+		handled = handleEditKey( key, mask );
+		if( handled )
 		{
-			handled = handleControlKey( key, mask );
-			if( handled )
-			{
-				selection_modified = TRUE;
-			}
+			selection_modified = TRUE;
+			text_may_have_changed = TRUE;
 		}
+	}
 
-		if( !handled && mHandleEditKeysDirectly )
+	// Handle most keys only if the text editor is writeable.
+	if( !mReadOnly )
+	{
+		if( !handled )
 		{
-			handled = handleEditKey( key, mask );
+			handled = handleSpecialKey( key, mask, &return_key_hit );
 			if( handled )
 			{
 				selection_modified = TRUE;
@@ -2294,41 +2535,27 @@ BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask )
 			}
 		}
 
-		// Handle most keys only if the text editor is writeable.
-		if( !mReadOnly )
-		{
-			if( !handled )
-			{
-				handled = handleSpecialKey( key, mask, &return_key_hit );
-				if( handled )
-				{
-					selection_modified = TRUE;
-					text_may_have_changed = TRUE;
-				}
-			}
+	}
 
-		}
+	if( handled )
+	{
+		resetKeystrokeTimer();
 
-		if( handled )
+		// Most keystrokes will make the selection box go away, but not all will.
+		if( !selection_modified &&
+			KEY_SHIFT != key &&
+			KEY_CONTROL != key &&
+			KEY_ALT != key &&
+			KEY_CAPSLOCK )
 		{
-			resetKeystrokeTimer();
-
-			// Most keystrokes will make the selection box go away, but not all will.
-			if( !selection_modified &&
-				KEY_SHIFT != key &&
-				KEY_CONTROL != key &&
-				KEY_ALT != key &&
-				KEY_CAPSLOCK )
-			{
-				deselect();
-			}
+			deselect();
+		}
 
-			if(text_may_have_changed)
-			{
-				needsReflow();
-			}
-			needsScroll();
+		if(text_may_have_changed)
+		{
+			needsReflow();
 		}
+		needsScroll();
 	}
 
 	return handled;
@@ -2344,34 +2571,31 @@ BOOL LLTextEditor::handleUnicodeCharHere(llwchar uni_char)
 
 	BOOL	handled = FALSE;
 
-	if ( gFocusMgr.getKeyboardFocus() == this )
+	// Handle most keys only if the text editor is writeable.
+	if( !mReadOnly )
 	{
-		// Handle most keys only if the text editor is writeable.
-		if( !mReadOnly )
+		if( '}' == uni_char )
 		{
-			if( '}' == uni_char )
-			{
-				unindentLineBeforeCloseBrace();
-			}
+			unindentLineBeforeCloseBrace();
+		}
 
-			// TODO: KLW Add auto show of tool tip on (
-			addChar( uni_char );
+		// TODO: KLW Add auto show of tool tip on (
+		addChar( uni_char );
 
-			// Keys that add characters temporarily hide the cursor
-			getWindow()->hideCursorUntilMouseMove();
+		// Keys that add characters temporarily hide the cursor
+		getWindow()->hideCursorUntilMouseMove();
 
-			handled = TRUE;
-		}
+		handled = TRUE;
+	}
 
-		if( handled )
-		{
-			resetKeystrokeTimer();
+	if( handled )
+	{
+		resetKeystrokeTimer();
 
-			// Most keystrokes will make the selection box go away, but not all will.
-			deselect();
+		// Most keystrokes will make the selection box go away, but not all will.
+		deselect();
 
-			needsReflow();
-		}
+		needsReflow();
 	}
 
 	return handled;
@@ -2544,6 +2768,12 @@ void LLTextEditor::onFocusLost()
 	LLUICtrl::onFocusLost();
 }
 
+void LLTextEditor::onCommit()
+{
+	setControlValue(getValue()); 
+	LLUICtrl::onCommit(); 
+}
+
 void LLTextEditor::setEnabled(BOOL enabled)
 {
 	// just treat enabled as read-only flag
@@ -2560,300 +2790,187 @@ void LLTextEditor::drawBackground()
 {
 	S32 left = 0;
 	S32 top = getRect().getHeight();
-	S32 right = getRect().getWidth();
 	S32 bottom = 0;
 
 	LLColor4 bg_color = mReadOnly ? mReadOnlyBgColor.get()
-		: gFocusMgr.getKeyboardFocus() == this ? mFocusBgColor.get() : mWriteableBgColor.get();
+		: hasFocus() ? mFocusBgColor.get() : mWriteableBgColor.get();
 	if( mShowLineNumbers ) {
 		gl_rect_2d(left, top, UI_TEXTEDITOR_LINE_NUMBER_MARGIN, bottom, mReadOnlyBgColor.get() ); // line number area always read-only
-		gl_rect_2d(UI_TEXTEDITOR_LINE_NUMBER_MARGIN, top, right, bottom, bg_color); // body text area to the right of line numbers
 		gl_rect_2d(UI_TEXTEDITOR_LINE_NUMBER_MARGIN, top, UI_TEXTEDITOR_LINE_NUMBER_MARGIN-1, bottom, LLColor4::grey3); // separator
-	} else {
-		gl_rect_2d(left, top, right, bottom, bg_color); // body text area
-	}
-
-	LLView::draw();
+	} 
 }
 
 // Draws the black box behind the selected text
 void LLTextEditor::drawSelectionBackground()
 {
 	// Draw selection even if we don't have keyboard focus for search/replace
-	if( hasSelection() )
+	if( hasSelection() && !mLineInfoList.empty())
 	{
 		LLWString text = getWText();
-		const S32 text_len = getLength();
-		std::queue<S32> line_endings;
-
-		S32 line_height = llround( mGLFont->getLineHeight() );
+		std::vector<LLRect> selection_rects;
 
 		S32 selection_left		= llmin( mSelectionStart, mSelectionEnd );
 		S32 selection_right		= llmax( mSelectionStart, mSelectionEnd );
-		S32 selection_left_x	= mTextRect.mLeft;
-		S32 selection_left_y	= mTextRect.mTop - line_height;
-		S32 selection_right_x	= mTextRect.mRight;
-		S32 selection_right_y	= mTextRect.mBottom;
-
-		BOOL selection_left_visible = FALSE;
-		BOOL selection_right_visible = FALSE;
+		LLRect selection_rect = mTextRect;
 
 		// Skip through the lines we aren't drawing.
-		S32 cur_line = mScrollbar->getDocPos();
-
-		S32 left_line_num = cur_line;
-		S32 num_lines = getLineCount();
-		S32 right_line_num = num_lines - 1;
-
-		S32 line_start = -1;
-		if (cur_line >= num_lines)
-		{
-			return;
-		}
+		LLRect content_display_rect = mScroller->getVisibleContentRect();
 
-		line_start = getLineStart(cur_line);
+		// binary search for line that starts before top of visible buffer
+		line_list_t::const_iterator line_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), content_display_rect.mTop, compare_bottom());
+		line_list_t::const_iterator end_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), content_display_rect.mBottom, compare_top());
 
-		S32 left_visible_pos	= line_start;
-		S32 right_visible_pos	= line_start;
-
-		S32 text_y = mTextRect.mTop - line_height;
+		bool done = false;
 
 		// Find the coordinates of the selected area
-		while((cur_line < num_lines))
+		for (;line_iter != end_iter && !done; ++line_iter)
 		{
-			S32 next_line = -1;
-			S32 line_end = text_len;
-			
-			if ((cur_line + 1) < num_lines)
+			// is selection visible on this line?
+			if (line_iter->mDocIndexEnd > selection_left && line_iter->mDocIndexStart < selection_right)
 			{
-				next_line = getLineStart(cur_line + 1);
-				line_end = next_line;
-
-				line_end = ( (line_end - line_start)==0 || text[next_line-1] == '\n' || text[next_line-1] == '\0' || text[next_line-1] == ' ' || text[next_line-1] == '\t'  ) ? next_line-1 : next_line;
-			}
+				segment_set_t::iterator segment_iter;
+				S32 segment_offset;
+				getSegmentAndOffset(line_iter->mDocIndexStart, &segment_iter, &segment_offset);
+				
+				LLRect selection_rect;
+				selection_rect.mLeft = 0;
+				selection_rect.mRight = 0;
+				selection_rect.mBottom = line_iter->mBottom;
+				selection_rect.mTop = line_iter->mTop;
+					
+				for(;segment_iter != mSegments.end(); ++segment_iter, segment_offset = 0)
+				{
+					LLTextSegmentPtr segmentp = *segment_iter;
 
-			const llwchar* line = text.c_str() + line_start;
+					S32 segment_line_start = segmentp->getStart() + segment_offset;
+					S32 segment_line_end = llmin(segmentp->getEnd(), line_iter->mDocIndexEnd);
 
-			if( line_start <= selection_left && selection_left <= line_end )
-			{
-				left_line_num = cur_line;
-				selection_left_visible = TRUE;
-				selection_left_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_left - line_start, mAllowEmbeddedItems);
-				selection_left_y = text_y;
-			}
-			if( line_start <= selection_right && selection_right <= line_end )
-			{
-				right_line_num = cur_line;
-				selection_right_visible = TRUE;
-				selection_right_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_right - line_start, mAllowEmbeddedItems);
-				if (selection_right == line_end)
-				{
-					// add empty space for "newline"
-					//selection_right_x += mGLFont->getWidth("n");
-				}
-				selection_right_y = text_y;
-			}
-			
-			// if selection spans end of current line...
-			if (selection_left <= line_end && line_end < selection_right && selection_left != selection_right)
-			{
-				// extend selection slightly beyond end of line
-				// to indicate selection of newline character (use "n" character to determine width)
-				const LLWString nstr(utf8str_to_wstring(std::string("n")));
-				line_endings.push(mTextRect.mLeft + mGLFont->getWidth(line, 0, line_end - line_start, mAllowEmbeddedItems) + mGLFont->getWidth(nstr.c_str()));
-			}
-			
-			// move down one line
-			text_y -= line_height;
+					// if selection after beginning of segment
+					if(selection_left >= segment_line_start)
+					{
+						S32 num_chars = llmin(selection_left, segment_line_end) - segment_line_start;
+						selection_rect.mLeft += segmentp->getWidth(segment_offset, num_chars);
+					}
 
-			right_visible_pos = line_end;
-			line_start = next_line;
-			cur_line++;
+					// if selection spans end of current segment...
+					if (selection_right > segment_line_end)
+					{
+						// extend selection slightly beyond end of line
+						// to indicate selection of newline character (use "n" character to determine width)
+						selection_rect.mRight += segmentp->getWidth(segment_offset, segment_line_end - segment_line_start);
+					}
+					// else if selection ends on current segment...
+					else
+					{
+						S32 num_chars = selection_right - segment_line_start;
+						selection_rect.mRight += segmentp->getWidth(segment_offset, num_chars);
 
-			if (selection_right_visible)
-			{
-				break;
+						break;
+					}
+				}
+				selection_rects.push_back(selection_rect);
 			}
 		}
 		
 		// Draw the selection box (we're using a box instead of reversing the colors on the selected text).
-		BOOL selection_visible = (left_visible_pos <= selection_right) && (selection_left <= right_visible_pos);
-		if( selection_visible )
+		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+		const LLColor4& color = mReadOnly ? mReadOnlyBgColor.get() : mWriteableBgColor.get();
+		F32 alpha = hasFocus() ? 0.7f : 0.3f;
+		gGL.color4f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], alpha );
+
+		for (std::vector<LLRect>::iterator rect_it = selection_rects.begin();
+			rect_it != selection_rects.end();
+			++rect_it)
 		{
-			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-			const LLColor4& color = mReadOnly ? mReadOnlyBgColor.get() : mWriteableBgColor.get();
-			F32 alpha = hasFocus() ? 1.f : 0.5f;
-			gGL.color4f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], alpha );
-			S32 margin_offset = mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0;
-
-			if( selection_left_y == selection_right_y )
-			{
-				// Draw from selection start to selection end
-				gl_rect_2d( selection_left_x + margin_offset, selection_left_y + line_height + 1,
-					selection_right_x + margin_offset, selection_right_y);
-			}
-			else
-			{
-				// Draw from selection start to the end of the first line
-				if( mTextRect.mRight == selection_left_x )
-				{
-					selection_left_x -= CURSOR_THICKNESS;
-				}
-				
-				S32 line_end = line_endings.front();
-				line_endings.pop();
-				gl_rect_2d( selection_left_x + margin_offset, selection_left_y + line_height + 1,
-					line_end + margin_offset, selection_left_y );
-
-				S32 line_num = left_line_num + 1;
-				while(line_endings.size())
-				{
-					S32 vert_offset = -(line_num - left_line_num) * line_height;
-					// Draw the block between the two lines
-					gl_rect_2d( mTextRect.mLeft + margin_offset, selection_left_y + vert_offset + line_height + 1,
-						line_endings.front() + margin_offset, selection_left_y + vert_offset);
-					line_endings.pop();
-					line_num++;
-				}
-
-				// Draw from the start of the last line to selection end
-				if( mTextRect.mLeft == selection_right_x )
-				{
-					selection_right_x += CURSOR_THICKNESS;
-				}
-				gl_rect_2d( mTextRect.mLeft + margin_offset, selection_right_y + line_height + 1,
-					selection_right_x + margin_offset, selection_right_y );
-			}
-		}
-	}
-}
+			LLRect selection_rect = *rect_it;
+			selection_rect.translate(mTextRect.mLeft - content_display_rect.mLeft, mTextRect.mBottom - content_display_rect.mBottom);
+			gl_rect_2d(selection_rect);
+		}
+	}
+}
 
 void LLTextEditor::drawCursor()
 {
-	if( gFocusMgr.getKeyboardFocus() == this
-		&& gShowTextEditCursor && !mReadOnly)
+	if( hasFocus()
+		&& gFocusMgr.getAppHasFocus()
+		&& !mReadOnly)
 	{
-		LLWString text = getWText();
-		const S32 text_len = getLength();
+		LLWString wtext = getWText();
+		const llwchar* text = wtext.c_str();
 
-		// Skip through the lines we aren't drawing.
-		S32 cur_pos = mScrollbar->getDocPos();
+		LLRect cursor_rect = getLocalRectFromDocIndex(mCursorPos);
+		cursor_rect.translate(-1, 0);
+		segment_set_t::iterator seg_it = getSegIterContaining(mCursorPos);
 
-		S32 num_lines = getLineCount();
-		if (cur_pos >= num_lines)
+		// take style from last segment
+		LLTextSegmentPtr segmentp;
+
+		if (seg_it != mSegments.end())
 		{
+			segmentp = *seg_it;
+		}
+		else
+		{
+			//segmentp = mSegments.back();
 			return;
 		}
-		S32 line_start = getLineStart(cur_pos);
-
-		F32 line_height = mGLFont->getLineHeight();
-		F32 text_y = (F32)(mTextRect.mTop) - line_height;
-
-		F32 cursor_left = 0.f; 
-		F32 next_char_left = 0.f;
-		F32 cursor_bottom = 0.f;
-		BOOL cursor_visible = FALSE;
 
-		S32 line_end = 0;
-		// Determine if the cursor is visible and if so what its coordinates are.
-		while( (mTextRect.mBottom <= llround(text_y)) && (cur_pos < num_lines))
+		// Draw the cursor
+		// (Flash the cursor every half second starting a fixed time after the last keystroke)
+		F32 elapsed = mKeystrokeTimer.getElapsedTimeF32();
+		if( (elapsed < CURSOR_FLASH_DELAY ) || (S32(elapsed * 2) & 1) )
 		{
-			line_end = text_len + 1;
-			S32 next_line = -1;
 
-			if ((cur_pos + 1) < num_lines)
+			if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection())
 			{
-				next_line = getLineStart(cur_pos + 1);
-				line_end = next_line - 1;
+				S32 width = llmax(CURSOR_THICKNESS, segmentp->getWidth(mCursorPos - segmentp->getStart(), 1));
+				cursor_rect.mRight = cursor_rect.mLeft + width;
 			}
-
-			const llwchar* line = text.c_str() + line_start;
-
-			// Find the cursor and selection bounds
-			if( line_start <= mCursorPos && mCursorPos <= line_end )
+			else
 			{
-				cursor_visible = TRUE;
-				next_char_left = (F32)mTextRect.mLeft + mGLFont->getWidthF32(line, 0, mCursorPos - line_start, mAllowEmbeddedItems );
-				cursor_left = next_char_left - 1.f;
-				cursor_bottom = text_y;
-				break;
+				cursor_rect.mRight = cursor_rect.mLeft + CURSOR_THICKNESS;
 			}
+			
+			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
-			// move down one line
-			text_y -= line_height;
-			line_start = next_line;
-			cur_pos++;
-		}
-
-		if(mShowLineNumbers)
-		{
-			cursor_left += UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
-		}
+			gGL.color4fv( mCursorColor.get().mV );
+			
+			gl_rect_2d(cursor_rect);
 
-		// Draw the cursor
-		if( cursor_visible )
-		{
-			// (Flash the cursor every half second starting a fixed time after the last keystroke)
-			F32 elapsed = mKeystrokeTimer.getElapsedTimeF32();
-			if( (elapsed < CURSOR_FLASH_DELAY ) || (S32(elapsed * 2) & 1) )
+			if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection() && text[mCursorPos] != '\n')
 			{
-				F32 cursor_top = cursor_bottom + line_height + 1.f;
-				F32 cursor_right = cursor_left + (F32)CURSOR_THICKNESS;
-				if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection())
+				LLColor4 text_color;
+				const LLFontGL* fontp;
+				if (segmentp)
 				{
-					cursor_left += CURSOR_THICKNESS;
-					const LLWString space(utf8str_to_wstring(std::string(" ")));
-					F32 spacew = mGLFont->getWidthF32(space.c_str());
-					if (mCursorPos == line_end)
-					{
-						cursor_right = cursor_left + spacew;
-					}
-					else
-					{
-						F32 width = mGLFont->getWidthF32(text.c_str(), mCursorPos, 1, mAllowEmbeddedItems);
-						cursor_right = cursor_left + llmax(spacew, width);
-					}
+					text_color = segmentp->getColor();
+					fontp = segmentp->getStyle()->getFont();
 				}
-				
-				gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-
-				gGL.color4fv( mCursorColor.get().mV );
-				
-				gl_rect_2d(llfloor(cursor_left), llfloor(cursor_top),
-					llfloor(cursor_right), llfloor(cursor_bottom));
-
-				if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection() && text[mCursorPos] != '\n')
+				else if (mReadOnly)
 				{
-					const LLTextSegment* segmentp = getSegmentAtOffset(mCursorPos);
-					LLColor4 text_color;
-					if (segmentp)
-					{
-						text_color = segmentp->getColor();
-					}
-					else if (mReadOnly)
-					{
-						text_color = mReadOnlyFgColor.get();
-					}
-					else
-					{
-						text_color = mFgColor.get();
-					}
-					mGLFont->render(text, mCursorPos, next_char_left, cursor_bottom + line_height, 
-						LLColor4(1.f - text_color.mV[VRED], 1.f - text_color.mV[VGREEN], 1.f - text_color.mV[VBLUE], 1.f),
-						LLFontGL::LEFT, LLFontGL::TOP,
-						LLFontGL::NORMAL,
-						LLFontGL::NO_SHADOW,
-						1);
+					text_color = mReadOnlyFgColor.get();
+					fontp = mDefaultFont;
 				}
+				else
+				{
+					text_color = mFgColor.get();
+					fontp = mDefaultFont;
+				}
+				fontp->render(text, mCursorPos, cursor_rect.mLeft, cursor_rect.mBottom, 
+					LLColor4(1.f - text_color.mV[VRED], 1.f - text_color.mV[VGREEN], 1.f - text_color.mV[VBLUE], 1.f),
+					LLFontGL::LEFT, LLFontGL::BOTTOM,
+					LLFontGL::NORMAL,
+					LLFontGL::NO_SHADOW,
+					1);
+			}
 
-				// Make sure the IME is in the right place
-				LLRect screen_pos = calcScreenRect();
-				LLCoordGL ime_pos( screen_pos.mLeft + llfloor(cursor_left), screen_pos.mBottom + llfloor(cursor_top) );
+			// Make sure the IME is in the right place
+			LLRect screen_pos = calcScreenRect();
+			LLCoordGL ime_pos( screen_pos.mLeft + llfloor(cursor_rect.mLeft), screen_pos.mBottom + llfloor(cursor_rect.mTop) );
 
-				ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]);
-				ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]);
-				getWindow()->setLanguageTextInput( ime_pos );
-			}
+			ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]);
+			ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]);
+			getWindow()->setLanguageTextInput( ime_pos );
 		}
 	}
 }
@@ -2879,13 +2996,13 @@ void LLTextEditor::drawPreeditMarker()
 	const S32 text_len = getLength();
 	const S32 num_lines = getLineCount();
 
-	S32 cur_line = mScrollbar->getDocPos();
+	S32 cur_line = getFirstVisibleLine();
 	if (cur_line >= num_lines)
 	{
 		return;
 	}
 		
-	const S32 line_height = llround( mGLFont->getLineHeight() );
+	const S32 line_height = llround( mDefaultFont->getLineHeight() );
 
 	S32 line_start = getLineStart(cur_line);
 	S32 line_y = mTextRect.mTop - line_height;
@@ -2924,16 +3041,16 @@ void LLTextEditor::drawPreeditMarker()
 				S32 preedit_left = mTextRect.mLeft;
 				if (left > line_start)
 				{
-					preedit_left += mGLFont->getWidth(text, line_start, left - line_start, mAllowEmbeddedItems);
+					preedit_left += mDefaultFont->getWidth(text, line_start, left - line_start);
 				}
 				S32 preedit_right = mTextRect.mLeft;
 				if (right < line_end)
 				{
-					preedit_right += mGLFont->getWidth(text, line_start, right - line_start, mAllowEmbeddedItems);
+					preedit_right += mDefaultFont->getWidth(text, line_start, right - line_start);
 				}
 				else
 				{
-					preedit_right += mGLFont->getWidth(text, line_start, line_end - line_start, mAllowEmbeddedItems);
+					preedit_right += mDefaultFont->getWidth(text, line_start, line_end - line_start);
 				}
 
 				if (mPreeditStandouts[i])
@@ -2981,25 +3098,34 @@ void LLTextEditor::drawText()
 	}
 
 	LLGLSUIDefault gls_ui;
-
-	S32 cur_line = mScrollbar->getDocPos();
+	LLRect scrolled_view_rect = mScroller->getVisibleContentRect();
+	LLRect content_rect = mScroller->getContentWindowRect();
+	S32 first_line = getFirstVisibleLine();
 	S32 num_lines = getLineCount();
-	if (cur_line >= num_lines)
+	if (first_line >= num_lines)
 	{
 		return;
 	}
 	
-	S32 line_start = getLineStart(cur_line);
-	LLTextSegment t(line_start);
-	segment_list_t::iterator seg_iter;
-	seg_iter = std::upper_bound(mSegments.begin(), mSegments.end(), &t, LLTextSegment::compare());
-	if (seg_iter == mSegments.end() || (*seg_iter)->getStart() > line_start) --seg_iter;
-	LLTextSegment* cur_segment = *seg_iter;
-	
-	S32 line_height = llround( mGLFont->getLineHeight() );
-	F32 text_y = (F32)(mTextRect.mTop - line_height);
-	while((mTextRect.mBottom <= text_y) && (cur_line < num_lines))
+	S32 line_start = getLineStart(first_line);
+	// find first text segment that spans top of visible portion of text buffer
+	segment_set_t::iterator seg_iter = getSegIterContaining(line_start);
+	if (seg_iter == mSegments.end()) 
 	{
+		return;
+	}
+
+	LLTextSegmentPtr cur_segment = *seg_iter;
+
+	for (S32 cur_line = first_line; cur_line < num_lines; cur_line++)
+	{
+		line_info& line = mLineInfoList[cur_line];
+
+		if ((line.mTop - scrolled_view_rect.mBottom) < mTextRect.mBottom) 
+		{
+			break;
+		}
+
 		S32 next_start = -1;
 		S32 line_end = text_len;
 
@@ -3012,9 +3138,13 @@ void LLTextEditor::drawText()
 		{
 			--line_end;
 		}
-		
-		F32 text_x = (F32)mTextRect.mLeft;
 
+		LLRect text_rect(mTextRect.mLeft - scrolled_view_rect.mLeft,
+						line.mTop - scrolled_view_rect.mBottom + mTextRect.mBottom,
+						mTextRect.getWidth() - scrolled_view_rect.mLeft,
+						line.mBottom - scrolled_view_rect.mBottom + mTextRect.mBottom);
+
+		// draw a single line of text
 		S32 seg_start = line_start;
 		while( seg_start < line_end )
 		{
@@ -3024,184 +3154,120 @@ void LLTextEditor::drawText()
 				if (seg_iter == mSegments.end())
 				{
 					llwarns << "Ran off the segmentation end!" << llendl;
+
 					return;
 				}
 				cur_segment = *seg_iter;
 			}
 			
-			// Draw a segment within the line
-			S32 clipped_end	=	llmin( line_end, cur_segment->getEnd() );
-			S32 clipped_len =	clipped_end - seg_start;
-			if( clipped_len > 0 )
-			{
-				LLStyleSP style = cur_segment->getStyle();
-				if ( style->isImage() && (cur_segment->getStart() >= seg_start) && (cur_segment->getStart() <= clipped_end))
-				{
-					S32 style_image_height = style->mImageHeight;
-					S32 style_image_width = style->mImageWidth;
-					LLUIImagePtr image = style->getImage();
-					image->draw(llround(text_x), llround(text_y)+line_height-style_image_height, 
-						style_image_width, style_image_height);
-				}
+			S32 clipped_end	=	llmin( line_end, cur_segment->getEnd() )  - cur_segment->getStart();
+			text_rect.mLeft = (S32)(cur_segment->draw(seg_start - cur_segment->getStart(), clipped_end, selection_left, selection_right, text_rect));
 
-				if (cur_segment == mHoverSegment && style->getIsEmbeddedItem())
-				{
-					style->mUnderline = TRUE;
-				}
-
-				S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
-				
-				if ( (mParseHTML) && (left_pos > seg_start) && (left_pos < clipped_end) &&  mIsSelecting && (mSelectionStart == mSelectionEnd) )
-				{
-					mHTML = style->getLinkHREF();
-				}
-
-				drawClippedSegment( text, seg_start, clipped_end, text_x, text_y, selection_left, selection_right, style, &text_x );
-
-				// Note: text_x is incremented by drawClippedSegment()
-				seg_start += clipped_len;
-			}
+			seg_start = clipped_end + cur_segment->getStart();
 		}
 
-			// move down one line
-			text_y -= (F32)line_height;
-
 		line_start = next_start;
-		cur_line++;
 	}
 }
 
-
-// Draws a single text segment, reversing the color for selection if needed.
-void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32 seg_end, F32 x, F32 y, S32 selection_left, S32 selection_right, const LLStyleSP& style, F32* right_x )
+void LLTextEditor::drawLineNumbers()
 {
-	if (!style->isVisible())
-	{
-		return;
-	}
-
-	const LLFontGL* font = mGLFont;
-
-	LLColor4 color = style->getColor();
+	LLGLSUIDefault gls_ui;
 
-	if ( style->getFontString()[0] )
+	LLRect scrolled_view_rect = mScroller->getVisibleContentRect();
+	LLRect content_rect = mScroller->getContentWindowRect();
+	LLLocalClipRect clip(content_rect);
+	S32 first_line = getFirstVisibleLine();
+	S32 num_lines = getLineCount();
+	if (first_line >= num_lines)
 	{
-		font = style->getFont();
+		return;
 	}
-
-	U8 font_flags = LLFontGL::NORMAL;
 	
-	if (style->mBold)
-	{
-		font_flags |= LLFontGL::BOLD;
-	}
-	if (style->mItalic)
-	{
-		font_flags |= LLFontGL::ITALIC;
-	}
-	if (style->mUnderline)
-	{
-		font_flags |= LLFontGL::UNDERLINE;
-	}
+	S32 cursor_line = getCurrentLine();
 
-	if (style->getIsEmbeddedItem())
+	if (mShowLineNumbers)
 	{
-		static LLUIColor text_embedded_item_readonly_color = LLUIColorTable::instance().getColor("TextEmbeddedItemReadOnlyColor");
-		static LLUIColor text_embedded_item_color = LLUIColorTable::instance().getColor("TextEmbeddedItemColor");
-		if (mReadOnly)
-		{
-			color = text_embedded_item_readonly_color;
-		}
-		else
-		{
-			color = text_embedded_item_color;
-		}
-	}
+		S32 last_line_num = -1;
 
-	F32 y_top = y + (F32)llround(font->getLineHeight());
+		for (S32 cur_line = first_line; cur_line < num_lines; cur_line++)
+		{
+			line_info& line = mLineInfoList[cur_line];
 
-  	if( selection_left > seg_start )
-	{
-		// Draw normally
-		S32 start = seg_start;
-		S32 end = llmin( selection_left, seg_end );
-		S32 length =  end - start;
-		font->render(text, start, x, y_top, color, LLFontGL::LEFT, LLFontGL::TOP, 0, LLFontGL::NO_SHADOW, length, S32_MAX, right_x, mAllowEmbeddedItems);
-	}
-	x = *right_x;
-	
-	if( (selection_left < seg_end) && (selection_right > seg_start) )
-	{
-		// Draw reversed
-		S32 start = llmax( selection_left, seg_start );
-		S32 end = llmin( selection_right, seg_end );
-		S32 length = end - start;
+			if ((line.mTop - scrolled_view_rect.mBottom) < mTextRect.mBottom) 
+			{
+				break;
+			}
 
-		font->render(text, start, x, y_top,
-					 LLColor4( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], 1.f ),
-					 LLFontGL::LEFT, LLFontGL::TOP, 0, LLFontGL::NO_SHADOW, length, S32_MAX, right_x, mAllowEmbeddedItems);
-	}
-	x = *right_x;
-	if( selection_right < seg_end )
-	{
-		// Draw normally
-		S32 start = llmax( selection_right, seg_start );
-		S32 end = seg_end;
-		S32 length = end - start;
-		font->render(text, start, x, y_top, color, LLFontGL::LEFT, LLFontGL::TOP, 0, LLFontGL::NO_SHADOW, length, S32_MAX, right_x, mAllowEmbeddedItems);
+			S32 line_bottom = line.mBottom - scrolled_view_rect.mBottom + mTextRect.mBottom;
+			// draw the line numbers
+			if(line.mLineNum != last_line_num && line.mTop <= scrolled_view_rect.mTop) 
+			{
+				const LLFontGL *num_font = LLFontGL::getFontMonospace();
+				const LLWString ltext = utf8str_to_wstring(llformat("%d", line.mLineNum ));
+				BOOL is_cur_line = cursor_line == line.mLineNum;
+				const U8 style = is_cur_line ? LLFontGL::BOLD : LLFontGL::NORMAL;
+				const LLColor4 fg_color = is_cur_line ? mCursorColor : mReadOnlyFgColor;
+				num_font->render( 
+					ltext, // string to draw
+					0, // begin offset
+					UI_TEXTEDITOR_LINE_NUMBER_MARGIN - 2, // x
+					line_bottom, // y
+					fg_color, 
+					LLFontGL::RIGHT, // horizontal alignment
+					LLFontGL::BOTTOM, // vertical alignment
+					style,
+					LLFontGL::NO_SHADOW,
+					S32_MAX, // max chars
+					UI_TEXTEDITOR_LINE_NUMBER_MARGIN - 2); // max pixels
+				last_line_num = line.mLineNum;
+			}
+		}
 	}
- }
-
+}
 
 void LLTextEditor::draw()
 {
-	// do on-demand reflow 
-	if (mReflowNeeded)
-	{
-		updateLineStartList();
-		mReflowNeeded = FALSE;
-	}
+	// reflow if needed, on demand
+	reflow();
 
 	// then update scroll position, as cursor may have moved
-	if (mScrollNeeded)
-	{
-		updateScrollFromCursor();
-		mScrollNeeded = FALSE; 
-	}
+	updateScrollFromCursor();
 
-	{
-		static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-		LLLocalClipRect clip(LLRect(0, getRect().getHeight(), getRect().getWidth() - (mScrollbar->getVisible() ? scrollbar_size : 0), 0));
+	LLColor4 bg_color = mReadOnly 
+						? mReadOnlyBgColor.get()
+						: hasFocus() 
+							? mFocusBgColor.get() 
+							: mWriteableBgColor.get();
+
+	mDocumentPanel->setBackgroundColor(bg_color);
 
-		bindEmbeddedChars( mGLFont );
+	drawChildren();
+	drawBackground(); //overlays scrolling panel bg
+	drawLineNumbers();
 
-		drawBackground();
+	{
+		LLLocalClipRect clip(mTextRect);
 		drawSelectionBackground();
 		drawPreeditMarker();
 		drawText();
 		drawCursor();
-
-		unbindEmbeddedChars( mGLFont );
-
-		//RN: the decision was made to always show the orange border for keyboard focus but do not put an insertion caret
-		// when in readonly mode
-		mBorder->setKeyboardFocusHighlight( gFocusMgr.getKeyboardFocus() == this);// && !mReadOnly);
 	}
-	
-	LLView::draw();  // Draw children (scrollbar and border)
 
-	// remember if we are supposed to be at the bottom of the buffer
-	mScrolledToBottom = isScrolledToBottom();
+	//RN: the decision was made to always show the orange border for keyboard focus but do not put an insertion caret
+	// when in readonly mode
+	mBorder->setKeyboardFocusHighlight( hasFocus() );// && !mReadOnly);
 }
 
 
-void LLTextEditor::onTabInto()
+S32	LLTextEditor::getFirstVisibleLine() const
 {
-	// selecting all on tabInto causes users to hit tab twice and replace their text with a tab character
-	// theoretically, one could selectAll if mTabsToNextField is true, but we couldn't think of a use case
-	// where you'd want to select all anyway
-	// preserve insertion point when returning to the editor
-	//selectAll();
+	LLRect visible_region = mScroller->getVisibleContentRect();
+
+	// binary search for line that starts before top of visible buffer
+	line_list_t::const_iterator iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mTop, compare_bottom());
+
+	return iter - mLineInfoList.begin();
 }
 
 // virtual
@@ -3270,103 +3336,62 @@ S32 LLTextEditor::getPos( S32 line, S32 offset )
 
 void LLTextEditor::changePage( S32 delta )
 {
+	const S32 PIXEL_OVERLAP_ON_PAGE_CHANGE = 10;
+	if (delta == 0) return;
+
+	//RN: use pixel heights
 	S32 line, offset;
 	getLineAndOffset( mCursorPos, &line, &offset );
 
-	// get desired x position to remember previous position
-	S32 desired_x_pixel = mDesiredXPixel;
+	LLRect cursor_rect = getLocalRectFromDocIndex(mCursorPos);
 
-	// allow one line overlap
-	S32 page_size = mScrollbar->getPageSize() - 1;
 	if( delta == -1 )
 	{
-		line = llmax( line - page_size, 0);
-		setCursorPos(getPos( line, offset ));
-		mScrollbar->setDocPos( mScrollbar->getDocPos() - page_size );
+		mScroller->pageUp(PIXEL_OVERLAP_ON_PAGE_CHANGE);
 	}
 	else
 	if( delta == 1 )
 	{
-		setCursorPos(getPos( line + page_size, offset ));
-		mScrollbar->setDocPos( mScrollbar->getDocPos() + page_size );
+		mScroller->pageDown(PIXEL_OVERLAP_ON_PAGE_CHANGE);
 	}
 
-	// put desired position into remember-buffer after setCursorPos()
-	mDesiredXPixel = desired_x_pixel;
-
-	if (mOnScrollEndCallback && mOnScrollEndData && (mScrollbar->getDocPos() == mScrollbar->getDocPosMax()))
+	if (getLocalRectFromDocIndex(mCursorPos) == cursor_rect)
+	{
+		// cursor didn't change apparent position, so move to top or bottom of document, respectively
+		if (delta < 0)
+		{
+			startOfDoc();
+		}
+		else
+		{
+			endOfDoc();
+		}
+	}
+	else
 	{
-		mOnScrollEndCallback(mOnScrollEndData);
+		setCursorAtLocalPos(cursor_rect.getCenterX(), cursor_rect.getCenterY(), true, false);
 	}
 }
 
 void LLTextEditor::changeLine( S32 delta )
 {
-	bindEmbeddedChars(mGLFont);
-
 	S32 line, offset;
 	getLineAndOffset( mCursorPos, &line, &offset );
 
-	S32  line_start = getLineStart(line);
-
-	// set desired x position to remembered previous position
-	S32 desired_x_pixel = mDesiredXPixel;
-	// if remembered position was reset (thus -1), calculate new one here
-	if( desired_x_pixel == -1 )
-	{
-        LLWString text(getWText());
-		desired_x_pixel = mGLFont->getWidth(text.c_str(), line_start, offset, mAllowEmbeddedItems );
-	}
-
-	S32 new_line = 0;
+	S32 new_line = line;
 	if( (delta < 0) && (line > 0 ) )
 	{
 		new_line = line - 1;
 	}
-	else
-	if( (delta > 0) && (line < (getLineCount() - 1)) )
+	else if( (delta > 0) && (line < (getLineCount() - 1)) )
 	{
 		new_line = line + 1;
 	}
-	else
-	{
-		unbindEmbeddedChars(mGLFont);
-		return;
-	}
-
-	S32 num_lines = getLineCount();
-	S32 new_line_start = getLineStart(new_line);
-	S32 new_line_end = getLength();
-	if (new_line + 1 < num_lines)
-	{
-		new_line_end = getLineStart(new_line + 1) - 1;
-	}
 
-	S32 new_line_len = new_line_end - new_line_start;
+	LLRect visible_region = mScroller->getVisibleContentRect();
 
-	S32 new_offset;
-    LLWString text(getWText());
-	new_offset = mGLFont->charFromPixelOffset(text.c_str(), new_line_start,
-											  (F32)desired_x_pixel,
-											  (F32)mTextRect.getWidth(),
-											  new_line_len,
-											  mAllowEmbeddedItems);
-
-	setCursorPos (getPos( new_line, new_offset ));
-
-	// put desired position into remember-buffer after setCursorPos()
-	mDesiredXPixel = desired_x_pixel;
-	unbindEmbeddedChars(mGLFont);
-}
-
-BOOL LLTextEditor::isScrolledToTop() 
-{ 
-	return mScrollbar->isAtBeginning(); 
-}
-
-BOOL LLTextEditor::isScrolledToBottom() 
-{ 
-	return mScrollbar->isAtEnd(); 
+	S32 new_cursor_pos = getDocIndexFromLocalCoord(mDesiredXPixel, mLineInfoList[new_line].mBottom + mTextRect.mBottom - visible_region.mBottom, TRUE);
+	setCursorPos(new_cursor_pos, true);
 }
 
 
@@ -3383,32 +3408,11 @@ void LLTextEditor::setCursorAndScrollToEnd()
 {
 	deselect();
 	endOfDoc();
-	needsScroll();
 }
 
 void LLTextEditor::getLineAndColumnForPosition( S32 position, S32* line, S32* col, BOOL include_wordwrap )
 {
-	if( include_wordwrap )
-	{
-		getLineAndOffset( mCursorPos, line, col );
-	}
-	else
-	{
-		LLWString text = getWText();
-		S32 line_count = 0;
-		S32 line_start = 0;
-		S32 i;
-		for( i = 0; text[i] && (i < position); i++ )
-		{
-			if( '\n' == text[i] )
-			{
-				line_start = i + 1;
-				line_count++;
-			}
-		}
-		*line = line_count;
-		*col = i - line_start;
-	}
+	getLineAndOffset( mCursorPos, line, col, include_wordwrap );
 }
 
 void LLTextEditor::getCurrentLineAndColumn( S32* line, S32* col, BOOL include_wordwrap ) 
@@ -3444,64 +3448,39 @@ void LLTextEditor::endOfLine()
 	}
 }
 
-void LLTextEditor::endOfDoc()
+void LLTextEditor::startOfDoc()
 {
-	mScrollbar->setDocPos(mScrollbar->getDocPosMax());
-	mScrolledToBottom = true;
+	setCursorPos(0);
+}
 
-	S32 len = getLength();
-	if( len )
-	{
-		setCursorPos(len);
-	}
-	if (mOnScrollEndCallback && mOnScrollEndData && (mScrollbar->getDocPos() == mScrollbar->getDocPosMax()))
-	{
-		mOnScrollEndCallback(mOnScrollEndData);
-	}
+void LLTextEditor::endOfDoc()
+{
+	setCursorPos(getLength());
 }
 
 // Sets the scrollbar from the cursor position
 void LLTextEditor::updateScrollFromCursor()
 {
-	mScrollbar->setDocSize( getLineCount() );
-
 	if (mReadOnly)
 	{
 		// no cursor in read only mode
 		return;
 	}
 
-	S32 line, offset;
-	getLineAndOffset( mCursorPos, &line, &offset ); 
-
-	S32 page_size = mScrollbar->getPageSize();
-
-	if( line < mScrollbar->getDocPos() )
-	{
-		// scroll so that the cursor is at the top of the page
-		mScrollbar->setDocPos( line );
-	}
-	else if( line >= mScrollbar->getDocPos() + page_size - 1 )
+	if (!mScrollNeeded)
 	{
-		S32 new_pos = 0;
-		if( line < mScrollbar->getDocSize() - 1 )
-		{
-			// scroll so that the cursor is one line above the bottom of the page,
-			new_pos = line - page_size + 1;
-		}
-		else
-		{
-			// if there is less than a page of text remaining, scroll so that the cursor is at the bottom
-			new_pos = mScrollbar->getDocPosMax();
-		}
-		mScrollbar->setDocPos( new_pos );
+		return;
 	}
+	mScrollNeeded = FALSE; 
 
-	// Check if we've scrolled to bottom for callback if asked for callback
-	if (mOnScrollEndCallback && mOnScrollEndData && (mScrollbar->getDocPos() == mScrollbar->getDocPosMax()))
-	{
-		mOnScrollEndCallback(mOnScrollEndData);
-	}
+	S32 line, offset;
+	getLineAndOffset( mCursorPos, &line, &offset ); 
+
+	// scroll so that the cursor is at the top of the page
+	LLRect scroller_doc_window = mScroller->getVisibleContentRect();
+	LLRect cursor_rect_doc = getLocalRectFromDocIndex(mCursorPos);
+	cursor_rect_doc.translate(scroller_doc_window.mLeft, scroller_doc_window.mBottom);
+	mScroller->scrollToShowRect(cursor_rect_doc, LLRect(0, scroller_doc_window.getHeight() - 5, scroller_doc_window.getWidth(), 5));
 }
 
 void LLTextEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
@@ -3513,13 +3492,6 @@ void LLTextEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
 	updateTextRect();
 	
 	needsReflow();
-
-	// propagate shape information to scrollbar
-	mScrollbar->setDocSize( getLineCount() );
-
-	S32 line_height = llround( mGLFont->getLineHeight() );
-	S32 page_lines = mTextRect.getHeight() / line_height;
-	mScrollbar->setPageSize( page_lines );
 }
 
 void LLTextEditor::autoIndent()
@@ -3564,7 +3536,7 @@ void LLTextEditor::insertText(const std::string &new_text)
 		deleteSelection(TRUE);
 	}
 
-	setCursorPos(mCursorPos + insert( mCursorPos, utf8str_to_wstring(new_text), FALSE ));
+	setCursorPos(mCursorPos + insert( mCursorPos, utf8str_to_wstring(new_text), FALSE, LLTextSegmentPtr() ));
 	
 	needsReflow();
 
@@ -3585,17 +3557,23 @@ void LLTextEditor::appendColoredText(const std::string &new_text,
 		highlight->parseFullLineHighlights(new_text, &lcolor);
 	}
 	
-	LLStyleSP style(new LLStyle);
-	style->setVisible(true);
-	style->setColor(lcolor);
-	style->setFontName(font_name);
-	appendStyledText(new_text, allow_undo, prepend_newline, style);
+	LLStyle::Params style_params;
+	style_params.color = lcolor;
+	if (font_name.empty())
+	{
+		style_params.font = mDefaultFont;
+	}
+	else
+	{
+		style_params.font.name = font_name;
+	}
+	appendStyledText(new_text, allow_undo, prepend_newline, style_params);
 }
 
 void LLTextEditor::appendStyledText(const std::string &new_text, 
 									 bool allow_undo, 
 									 bool prepend_newline,
-									 LLStyleSP stylep)
+									 const LLStyle::Params& style_params)
 {
 	S32 part = (S32)LLTextParser::WHOLE;
 	if(mParseHTML)
@@ -3605,14 +3583,10 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
 		std::string text = new_text;
 		while ( findHTML(text, &start, &end) )
 		{
-			LLStyleSP html(new LLStyle);
-			html->setVisible(true);
-			html->setColor(mLinkColor);
-			if (stylep)
-			{
-				html->setFontName(stylep->getFontString());
-			}
-			html->mUnderline = TRUE;
+			LLStyle::Params link_params = style_params;
+			link_params.color = mLinkColor;
+			link_params.font.style = "UNDERLINE";
+			link_params.link_href = text.substr(start,end-start);
 
 			if (start > 0)
 			{
@@ -3626,11 +3600,10 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
 					part = (S32)LLTextParser::MIDDLE;
 				}
 				std::string subtext=text.substr(0,start);
-				appendHighlightedText(subtext,allow_undo, prepend_newline, part, stylep); 
+				appendHighlightedText(subtext,allow_undo, prepend_newline, part, style_params); 
 			}
 			
-			html->setLinkHREF(text.substr(start,end-start));
-			appendText(text.substr(start, end-start),allow_undo, prepend_newline, html);
+			appendText(text.substr(start, end-start),allow_undo, prepend_newline, link_params);
 			if (end < (S32)text.length()) 
 			{
 				text = text.substr(end,text.length() - end);
@@ -3643,11 +3616,11 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
 			}
 		}
 		if (part != (S32)LLTextParser::WHOLE) part=(S32)LLTextParser::END;
-		if (end < (S32)text.length()) appendHighlightedText(text,allow_undo, prepend_newline, part, stylep);		
+		if (end < (S32)text.length()) appendHighlightedText(text,allow_undo, prepend_newline, part, style_params);		
 	}
 	else
 	{
-		appendHighlightedText(new_text, allow_undo, prepend_newline, part, stylep);
+		appendHighlightedText(new_text, allow_undo, prepend_newline, part, style_params);
 	}
 }
 
@@ -3655,38 +3628,40 @@ void LLTextEditor::appendHighlightedText(const std::string &new_text,
 										 bool allow_undo, 
 										 bool prepend_newline,
 										 S32  highlight_part,
-										 LLStyleSP stylep)
+										 const LLStyle::Params& style_params)
 {
 	if (mParseHighlights) 
 	{
 		LLTextParser* highlight = LLTextParser::getInstance();
 		
-		if (highlight && stylep)
+		if (highlight && !style_params.isDefault())
 		{
-			LLSD pieces = highlight->parsePartialLineHighlights(new_text, stylep->getColor(), highlight_part);
+			LLStyle::Params highlight_params = style_params;
+
+			LLSD pieces = highlight->parsePartialLineHighlights(new_text, highlight_params.color(), highlight_part);
 			bool lprepend=prepend_newline;
 			for (S32 i=0;i<pieces.size();i++)
 			{
 				LLSD color_llsd = pieces[i]["color"];
 				LLColor4 lcolor;
 				lcolor.setValue(color_llsd);
-				LLStyleSP lstylep(new LLStyle(*stylep));
-				lstylep->setColor(lcolor);
+				highlight_params.color = lcolor;
 				if (i != 0 && (pieces.size() > 1) ) lprepend=FALSE;
-				appendText((std::string)pieces[i]["text"], allow_undo, lprepend, lstylep);
+				appendText((std::string)pieces[i]["text"], allow_undo, lprepend, highlight_params);
 			}
 			return;
 		}
 	}
-	appendText(new_text, allow_undo, prepend_newline, stylep);
+	appendText(new_text, allow_undo, prepend_newline, style_params);
 }
 
 // Appends new text to end of document
 void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool prepend_newline,
-							  const LLStyleSP stylep)
+							  const LLStyle::Params& stylep)
 {
+	if (new_text.empty()) return;
+
 	// Save old state
-	BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
 	S32 selection_start = mSelectionStart;
 	S32 selection_end = mSelectionEnd;
 	BOOL was_selecting = mIsSelecting;
@@ -3698,49 +3673,93 @@ void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool
 
 	setCursorPos(old_length);
 
+	LLWString wide_text;
+
 	// Add carriage return if not first line
 	if (getLength() != 0
 		&& prepend_newline)
 	{
-		std::string final_text = "\n";
-		final_text += new_text;
-		append(utf8str_to_wstring(final_text), TRUE);
+		wide_text = utf8str_to_wstring(std::string("\n") + new_text);
 	}
 	else
 	{
-		append(utf8str_to_wstring(new_text), TRUE );
+		wide_text = utf8str_to_wstring(new_text);
 	}
 
-	if (stylep)
+	LLTextSegmentPtr segmentp;
+	if (!stylep.isDefault())
 	{
 		S32 segment_start = old_length;
-		S32 segment_end = getLength();
-		LLTextSegment* segment = new LLTextSegment(stylep, segment_start, segment_end );
-		mSegments.push_back(segment);
+		S32 segment_end = old_length + wide_text.size();
+		segmentp = new LLNormalTextSegment(new LLStyle(stylep), segment_start, segment_end, *this );
 	}
+
+	append(wide_text, TRUE, segmentp);
 	
 	needsReflow();
 	
 	// Set the cursor and scroll position
-	// Maintain the scroll position unless the scroll was at the end of the doc (in which 
-	// case, move it to the new end of the doc) or unless the user was doing actively selecting
-	if( was_scrolled_to_bottom && !was_selecting )
-	{
-		if( selection_start != selection_end )
-		{
-			// maintain an existing non-active selection
-			mSelectionStart = selection_start;
-			mSelectionEnd = selection_end;
-		}	
-		endOfDoc();
-	}
-	else if( selection_start != selection_end )
+	if( selection_start != selection_end )
 	{
 		mSelectionStart = selection_start;
 		mSelectionEnd = selection_end;
 
+		mIsSelecting = was_selecting;
+		setCursorPos(cursor_pos);
+	}
+	else if( cursor_was_at_end )
+	{
+		setCursorPos(getLength());
+	}
+	else
+	{
+		setCursorPos(cursor_pos);
+	}
+
+	if( !allow_undo )
+	{
+		blockUndo();
+	}
+}
+
+
+void LLTextEditor::appendWidget(LLView* widget, const std::string &widget_text, bool allow_undo, bool prepend_newline)
+{
+	// Save old state
+	S32 selection_start = mSelectionStart;
+	S32 selection_end = mSelectionEnd;
+	BOOL was_selecting = mIsSelecting;
+	S32 cursor_pos = mCursorPos;
+	S32 old_length = getLength();
+	BOOL cursor_was_at_end = (mCursorPos == old_length);
+
+	deselect();
+
+	setCursorPos(old_length);
+
+	LLWString widget_wide_text;
 
+	// Add carriage return if not first line
+	if (getLength() != 0
+		&& prepend_newline)
+	{
+		widget_wide_text = utf8str_to_wstring(std::string("\n") + widget_text);
+	}
+	else
+	{
+		widget_wide_text = utf8str_to_wstring(widget_text);
+	}
 
+	LLTextSegmentPtr segment = new LLInlineViewSegment(widget, old_length, old_length + widget_text.size());
+	append(widget_wide_text, FALSE, segment);
+
+	needsReflow();
+	
+	// Set the cursor and scroll position
+	if( selection_start != selection_end )
+	{
+		mSelectionStart = selection_start;
+		mSelectionEnd = selection_end;
 
 		mIsSelecting = was_selecting;
 		setCursorPos(cursor_pos);
@@ -3767,26 +3786,79 @@ void LLTextEditor::removeTextFromEnd(S32 num_chars)
 	remove(getLength() - num_chars, num_chars, FALSE);
 
 	S32 len = getLength();
-	mCursorPos = llclamp(mCursorPos, 0, len);
+	setCursorPos (llclamp(mCursorPos, 0, len));
 	mSelectionStart = llclamp(mSelectionStart, 0, len);
 	mSelectionEnd = llclamp(mSelectionEnd, 0, len);
 
-	pruneSegments();
-	
-	// pruneSegments will invalidate mLineStartList.
-	updateLineStartList();
+	reflow();
 	needsScroll();
 }
 
 ///////////////////////////////////////////////////////////////////
 // Returns change in number of characters in mWText
 
-S32 LLTextEditor::insertStringNoUndo(const S32 pos, const LLWString &wstr)
+S32 LLTextEditor::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextEditor::segment_vec_t* segments )
 {
-    LLWString text(getWText());
+	LLWString text(getWText());
 	S32 old_len = text.length();		// length() returns character length
 	S32 insert_len = wstr.length();
 
+	pos = getEditableIndex(pos, true);
+
+	segment_set_t::iterator seg_iter = getSegIterContaining(pos);
+
+	LLTextSegmentPtr default_segment;
+
+	LLTextSegmentPtr segmentp;
+	if (seg_iter != mSegments.end())
+	{
+		segmentp = *seg_iter;
+	}
+	else
+	{
+		//segmentp = mSegments.back();
+		return pos;
+	}
+
+	if (segmentp->canEdit())
+	{
+		segmentp->setEnd(segmentp->getEnd() + insert_len);
+		if (seg_iter != mSegments.end())
+		{
+			++seg_iter;
+		}
+	}
+	else
+	{
+		// create default editable segment to hold new text
+		default_segment = new LLNormalTextSegment( getDefaultStyle(), pos, pos + insert_len, *this);
+	}
+
+	// shift remaining segments to right
+	for(;seg_iter != mSegments.end(); ++seg_iter)
+	{
+		LLTextSegmentPtr segmentp = *seg_iter;
+		segmentp->setStart(segmentp->getStart() + insert_len);
+		segmentp->setEnd(segmentp->getEnd() + insert_len);
+	}
+
+	// insert new segments
+	if (segments)
+	{
+		if (default_segment.notNull())
+		{
+			// potentially overwritten by segments passed in
+			insertSegment(default_segment);
+		}
+		for (segment_vec_t::iterator seg_iter = segments->begin();
+			seg_iter != segments->end();
+			++seg_iter)
+		{
+			LLTextSegment* segmentp = *seg_iter;
+			insertSegment(segmentp);
+		}
+	}
+
 	text.insert(pos, wstr);
     getViewModel()->setDisplay(text);
 
@@ -3797,14 +3869,67 @@ S32 LLTextEditor::insertStringNoUndo(const S32 pos, const LLWString &wstr)
 		insert_len = getLength() - old_len;
 	}
 
+	onValueChange(pos, pos + insert_len);
+
 	return insert_len;
 }
 
 S32 LLTextEditor::removeStringNoUndo(S32 pos, S32 length)
 {
     LLWString text(getWText());
+	segment_set_t::iterator seg_iter = getSegIterContaining(pos);
+	while(seg_iter != mSegments.end())
+	{
+		LLTextSegmentPtr segmentp = *seg_iter;
+		S32 end = pos + length;
+		if (segmentp->getStart() < pos)
+		{
+			// deleting from middle of segment
+			if (segmentp->getEnd() > end)
+			{
+				segmentp->setEnd(segmentp->getEnd() - length);
+			}
+			// truncating segment
+			else
+			{
+				segmentp->setEnd(pos);
+			}
+		}
+		else if (segmentp->getStart() < end)
+		{
+			// deleting entire segment
+			if (segmentp->getEnd() <= end)
+			{
+				// remove segment
+				segmentp->unlinkFromDocument(this);
+				segment_set_t::iterator seg_to_erase(seg_iter++);
+				mSegments.erase(seg_to_erase);
+				continue;
+			}
+			// deleting head of segment
+			else
+			{
+				segmentp->setStart(pos);
+				segmentp->setEnd(segmentp->getEnd() - length);
+			}
+		}
+		else
+		{
+			// shifting segments backward to fill deleted portion
+			segmentp->setStart(segmentp->getStart() - length);
+			segmentp->setEnd(segmentp->getEnd() - length);
+		}
+		++seg_iter;
+	}
+
 	text.erase(pos, length);
     getViewModel()->setDisplay(text);
+
+	// recreate default segment in case we erased everything
+	createDefaultSegment();
+
+	onValueChange(pos, pos);
+
 	return -length;	// This will be wrong if someone calls removeStringNoUndo with an excessive length
 }
 
@@ -3817,6 +3942,9 @@ S32 LLTextEditor::overwriteCharNoUndo(S32 pos, llwchar wc)
     LLWString text(getWText());
 	text[pos] = wc;
     getViewModel()->setDisplay(text);
+
+	onValueChange(pos, pos + 1);
+
 	return 1;
 }
 
@@ -3887,21 +4015,25 @@ void LLTextEditor::updateTextRect()
 {
 	static LLUICachedControl<S32> texteditor_border ("UITextEditorBorder", 0);
 	static LLUICachedControl<S32> texteditor_h_pad ("UITextEditorHPad", 0);
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-	static LLUICachedControl<S32> texteditor_vpad_top ("UITextEditorVPadTop", 0);
-
-	mTextRect.setOriginAndSize( 
-		texteditor_border + texteditor_h_pad,
-		texteditor_border, 
-		getRect().getWidth() - scrollbar_size - 2 * (texteditor_border + texteditor_h_pad),
-		getRect().getHeight() - 2 * texteditor_border - texteditor_vpad_top );
+	
+	LLRect old_text_rect = mTextRect;
+	mTextRect = mScroller->getContentWindowRect();
+	mTextRect.stretch(texteditor_border * -1);
+	mTextRect.mLeft += texteditor_h_pad;
+	mTextRect.mLeft += mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0;
+	if (mTextRect != old_text_rect)
+	{
+		needsReflow();
+	}
 }
 
+LLFastTimer::DeclareTimer FTM_TEXT_EDITOR_LOAD_KEYWORD("Text Editor Load Keywords");
 void LLTextEditor::loadKeywords(const std::string& filename,
 								const std::vector<std::string>& funcs,
 								const std::vector<std::string>& tooltips,
 								const LLColor3& color)
 {
+	LLFastTimer ft(FTM_TEXT_EDITOR_LOAD_KEYWORD);
 	if(mKeywords.loadFromFile(filename))
 	{
 		S32 count = llmin(funcs.size(), tooltips.size());
@@ -3910,133 +4042,115 @@ void LLTextEditor::loadKeywords(const std::string& filename,
 			std::string name = utf8str_trim(funcs[i]);
 			mKeywords.addToken(LLKeywordToken::WORD, name, color, tooltips[i] );
 		}
+		segment_vec_t segment_list;
+		mKeywords.findSegments(&segment_list, getWText(), mDefaultColor.get(), *this);
 
-		mKeywords.findSegments( &mSegments, getWText(), mDefaultColor.get() );
-
-		llassert( mSegments.front()->getStart() == 0 );
-		llassert( mSegments.back()->getEnd() == getLength() );
+		mSegments.clear();
+		segment_set_t::iterator insert_it = mSegments.begin();
+		for (segment_vec_t::iterator list_it = segment_list.begin(); list_it != segment_list.end(); ++list_it)
+		{
+			insert_it = mSegments.insert(insert_it, *list_it);
+		}
 	}
 }
 
-void LLTextEditor::updateSegments()
+void LLTextEditor::createDefaultSegment()
 {
-	if (mKeywords.isLoaded())
-	{
-		// HACK:  No non-ascii keywords for now
-		mKeywords.findSegments(&mSegments, getWText(), mDefaultColor.get());
-	}
-	else if (mAllowEmbeddedItems)
-	{
-		findEmbeddedItemSegments();
-	}
-
-	// Make sure we have at least one segment
-	if (mSegments.size() == 1 && mSegments[0]->getIsDefault())
-	{
-		delete mSegments[0];
-		mSegments.clear(); // create default segment
-	}
+	// ensures that there is always at least one segment
 	if (mSegments.empty())
 	{
-		LLColor4 text_color = ( mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get() );
-		LLTextSegment* default_segment = new LLTextSegment( text_color, 0, getLength() );
-		default_segment->setIsDefault(TRUE);
-		mSegments.push_back(default_segment);
+		LLTextSegmentPtr default_segment = new LLNormalTextSegment( getDefaultStyle(), 0, getLength() + 1, *this);
+		mSegments.insert(default_segment);
+		default_segment->linkToDocument(this);
 	}
 }
 
-// Only effective if text was removed from the end of the editor
-// *NOTE: Using this will invalidate references to mSegments from mLineStartList.
-void LLTextEditor::pruneSegments()
+LLStyleSP	LLTextEditor::getDefaultStyle()
 {
-	S32 len = getLength();
-	// Find and update the first valid segment
-	segment_list_t::iterator iter = mSegments.end();
-	while(iter != mSegments.begin())
-	{
-		--iter;
-		LLTextSegment* seg = *iter;
-		if (seg->getStart() < len)
-		{
-			// valid segment
-			if (seg->getEnd() > len)
-			{
-				seg->setEnd(len);
-			}
-			break; // done
-		}			
-	}
-	if (iter != mSegments.end())
-	{
-		// erase invalid segments
-		++iter;
-		std::for_each(iter, mSegments.end(), DeletePointer());
-		mSegments.erase(iter, mSegments.end());
-	}
-	else
-	{
-		llwarns << "Tried to erase end of empty LLTextEditor" << llendl;
-	}
+	LLColor4 text_color = ( mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get() );
+	return LLStyleSP(new LLStyle(LLStyle::Params().color(text_color).font(mDefaultFont)));
 }
 
-void LLTextEditor::findEmbeddedItemSegments()
+LLFastTimer::DeclareTimer FTM_UPDATE_TEXT_SEGMENTS("Update Text Segments");
+void LLTextEditor::updateSegments()
 {
-	mHoverSegment = NULL;
-	std::for_each(mSegments.begin(), mSegments.end(), DeletePointer());
-	mSegments.clear();
-
-	BOOL found_embedded_items = FALSE;
-	LLWString text = getWText();
-	S32 idx = 0;
-	while( text[idx] )
+	LLFastTimer ft(FTM_UPDATE_TEXT_SEGMENTS);
+	if (mKeywords.isLoaded())
 	{
-		if( text[idx] >= FIRST_EMBEDDED_CHAR && text[idx] <= LAST_EMBEDDED_CHAR )
- 		{
-			found_embedded_items = TRUE;
-			break;
+		// HACK:  No non-ascii keywords for now
+		segment_vec_t segment_list;
+		mKeywords.findSegments(&segment_list, getWText(), mDefaultColor.get(), *this);
+
+		mSegments.clear();
+		segment_set_t::iterator insert_it = mSegments.begin();
+		for (segment_vec_t::iterator list_it = segment_list.begin(); list_it != segment_list.end(); ++list_it)
+		{
+			insert_it = mSegments.insert(insert_it, *list_it);
 		}
-		++idx;
 	}
 
-	if( !found_embedded_items )
+	createDefaultSegment();
+
+}
+
+void LLTextEditor::insertSegment(LLTextSegmentPtr segment_to_insert)
+{
+	if (segment_to_insert.isNull()) 
 	{
 		return;
 	}
 
-	S32 text_len = text.length();
-
-	BOOL in_text = FALSE;
-
-	LLColor4 text_color = ( mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get()  );
+	segment_set_t::iterator cur_seg_iter = getSegIterContaining(segment_to_insert->getStart());
 
-	if( idx > 0 )
+	if (cur_seg_iter == mSegments.end())
 	{
-		mSegments.push_back( new LLTextSegment( text_color, 0, text_len ) ); // text
-		in_text = TRUE;
+		mSegments.insert(segment_to_insert);
+		segment_to_insert->linkToDocument(this);
 	}
-
-	LLStyleSP embedded_style(new LLStyle);
-	embedded_style->setIsEmbeddedItem( TRUE );
-
-	// Start with i just after the first embedded item
-	while ( text[idx] )
+	else
 	{
-		if( text[idx] >= FIRST_EMBEDDED_CHAR && text[idx] <= LAST_EMBEDDED_CHAR )
+		LLTextSegmentPtr cur_segmentp = *cur_seg_iter;
+		if (cur_segmentp->getStart() < segment_to_insert->getStart())
 		{
-			if( in_text )
-			{
-				mSegments.back()->setEnd( idx );
-			}
-			mSegments.push_back( new LLTextSegment( embedded_style, idx, idx + 1 ) );  // item
-			in_text = FALSE;
+			S32 old_segment_end = cur_segmentp->getEnd();
+			// split old at start point for new segment
+			cur_segmentp->setEnd(segment_to_insert->getStart());
+			// advance to next segment
+			++cur_seg_iter;
+			// insert remainder of old segment
+			LLTextSegmentPtr remainder_segment = new LLNormalTextSegment( cur_segmentp->getStyle(), segment_to_insert->getStart(), old_segment_end, *this);
+			cur_seg_iter = mSegments.insert(cur_seg_iter, remainder_segment);
+			remainder_segment->linkToDocument(this);
+			// insert new segment before remainder of old segment
+			cur_seg_iter = mSegments.insert(cur_seg_iter, segment_to_insert);
+
+			segment_to_insert->linkToDocument(this);
+			// move to "remanider" segment and start truncation there
+			++cur_seg_iter;
 		}
 		else
-		if( !in_text )
 		{
-			mSegments.push_back( new LLTextSegment( text_color, idx, text_len ) );  // text
-			in_text = TRUE;
+			cur_seg_iter = mSegments.insert(cur_seg_iter, segment_to_insert);
+			++cur_seg_iter;
+			segment_to_insert->linkToDocument(this);
+		}
+
+		// now delete/truncate remaining segments as necessary
+		while(cur_seg_iter != mSegments.end())
+		{
+			cur_segmentp = *cur_seg_iter;
+			if (cur_segmentp->getEnd() <= segment_to_insert->getEnd())
+			{
+				cur_segmentp->unlinkFromDocument(this);
+				segment_set_t::iterator seg_to_erase(cur_seg_iter++);
+				mSegments.erase(seg_to_erase);
+			}
+			else
+			{
+				cur_segmentp->setStart(segment_to_insert->getEnd());
+				break;
+			}
 		}
-		++idx;
 	}
 }
 
@@ -4050,9 +4164,9 @@ BOOL LLTextEditor::handleMouseUpOverSegment(S32 x, S32 y, MASK mask)
 		if (mParseHTML && mHTML.length() > 0)
 		{
 				//Special handling for slurls
-			if ( (mSecondlifeURLcallback!=NULL) && !(*mSecondlifeURLcallback)(mHTML) )
+			if ( (sSecondlifeURLcallback!=NULL) && !(*sSecondlifeURLcallback)(mHTML) )
 			{
-				if (mURLcallback!=NULL) (*mURLcallback)(mHTML);
+				if (sURLcallback!=NULL) (*sURLcallback)(mHTML);
 			}
 			mHTML.clear();
 		}
@@ -4063,44 +4177,37 @@ BOOL LLTextEditor::handleMouseUpOverSegment(S32 x, S32 y, MASK mask)
 
 
 // Finds the text segment (if any) at the give local screen position
-const LLTextSegment* LLTextEditor::getSegmentAtLocalPos( S32 x, S32 y ) const
+LLTextSegmentPtr LLTextEditor::getSegmentAtLocalPos( S32 x, S32 y )
 {
 	// Find the cursor position at the requested local screen position
-	S32 offset = getCursorPosFromLocalCoord( x, y, FALSE );
-	S32 idx = getSegmentIdxAtOffset(offset);
-	return idx >= 0 ? mSegments[idx] : NULL;
-}
-
-const LLTextSegment* LLTextEditor::getSegmentAtOffset(S32 offset) const
-{
-	S32 idx = getSegmentIdxAtOffset(offset);
-	return idx >= 0 ? mSegments[idx] : NULL;
-}
-
-S32 LLTextEditor::getSegmentIdxAtOffset(S32 offset) const
-{
-	if (mSegments.empty() || offset < 0 || offset >= getLength())
+	S32 offset = getDocIndexFromLocalCoord( x, y, FALSE );
+	segment_set_t::iterator seg_iter = getSegIterContaining(offset);
+	if (seg_iter != mSegments.end())
 	{
-		return -1;
+		return *seg_iter;
 	}
 	else
 	{
-		S32 segidx, segoff;
-		getSegmentAndOffset(offset, &segidx, &segoff);
-		return segidx;
+		return LLTextSegmentPtr();
 	}
 }
 
-void LLTextEditor::onMouseCaptureLost()
+LLTextEditor::segment_set_t::iterator LLTextEditor::getSegIterContaining(S32 index)
 {
-	endSelection();
+	segment_set_t::iterator it = mSegments.upper_bound(new LLIndexSegment(index));
+	return it;
+}
+
+LLTextEditor::segment_set_t::const_iterator LLTextEditor::getSegIterContaining(S32 index) const
+{
+	LLTextEditor::segment_set_t::const_iterator it =  mSegments.upper_bound(new LLIndexSegment(index));
+	return it;
 }
 
-void LLTextEditor::setOnScrollEndCallback(void (*callback)(void*), void* userdata)
+
+void LLTextEditor::onMouseCaptureLost()
 {
-	mOnScrollEndCallback = callback;
-	mOnScrollEndData = userdata;
-	mScrollbar->setOnScrollEndCallback(callback, userdata);
+	endSelection();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -4186,7 +4293,7 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
 
 	delete[] text;
 
-	setCursorPos(0);
+	startOfDoc();
 	deselect();
 
 	needsReflow();
@@ -4207,74 +4314,6 @@ BOOL LLTextEditor::exportBuffer(std::string &buffer )
 	return TRUE;
 }
 
-//////////////////////////////////////////////////////////////////////////
-// LLTextSegment
-
-LLTextSegment::LLTextSegment(S32 start) :
-	mStart(start),
-	mEnd(0),
-	mToken(NULL),
-	mIsDefault(FALSE)
-{
-} 
-LLTextSegment::LLTextSegment( const LLStyleSP& style, S32 start, S32 end ) :
-	mStyle( style ),
-	mStart( start),
-	mEnd( end ),
-	mToken(NULL),
-	mIsDefault(FALSE)
-{
-}
-LLTextSegment::LLTextSegment( const LLColor4& color, S32 start, S32 end, BOOL is_visible) :
-	mStyle(new LLStyle(is_visible,color,LLStringUtil::null)),
-	mStart( start),
-	mEnd( end ),
-	mToken(NULL),
-	mIsDefault(FALSE)
-{
-}
-LLTextSegment::LLTextSegment( const LLColor4& color, S32 start, S32 end ) :
-	mStyle(new LLStyle(TRUE, color,LLStringUtil::null )),
-	mStart( start),
-	mEnd( end ),
-	mToken(NULL),
-	mIsDefault(FALSE)
-{
-}
-LLTextSegment::LLTextSegment( const LLColor3& color, S32 start, S32 end ) :
-	mStyle(new LLStyle(TRUE, color,LLStringUtil::null )),
-	mStart( start),
-	mEnd( end ),
-	mToken(NULL),
-	mIsDefault(FALSE)
-{
-}
-
-BOOL LLTextSegment::getToolTip(std::string& msg) const
-{
-	if (mToken && !mToken->getToolTip().empty())
-	{
-		const LLWString& wmsg = mToken->getToolTip();
-		msg = wstring_to_utf8str(wmsg);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-
-void LLTextSegment::dump() const
-{
-	llinfos << "Segment [" << 
-//			mColor.mV[VX] << ", " <<
-//			mColor.mV[VY] << ", " <<
-//			mColor.mV[VZ] << "]\t[" <<
-		mStart << ", " <<
-		getEnd() << "]" <<
-		llendl;
-
-}
-
 ///////////////////////////////////////////////////////////////////
 // Refactoring note: We may eventually want to replace this with boost::regex or 
 // boost::tokenizer capabilities since we've already fixed at least two JIRAs
@@ -4473,7 +4512,7 @@ void LLTextEditor::resetPreedit()
 			deselect();
 		}
 
-		mCursorPos = mPreeditPositions.front();
+		setCursorPos(mPreeditPositions.front());
 		removeStringNoUndo(mCursorPos, mPreeditPositions.back() - mCursorPos);
 		insertStringNoUndo(mCursorPos, mPreeditOverwrittenWString);
 
@@ -4557,7 +4596,7 @@ BOOL LLTextEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect
 		return FALSE;
 	}
 
-	const S32 first_visible_line = mScrollbar->getDocPos();
+	const S32 first_visible_line = getFirstVisibleLine();
 	if (query < getLineStart(first_visible_line))
 	{
 		return FALSE;
@@ -4583,11 +4622,11 @@ BOOL LLTextEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect
 
     const LLWString textString(getWText());
 	const llwchar * const text = textString.c_str();
-	const S32 line_height = llround(mGLFont->getLineHeight());
+	const S32 line_height = llround(mDefaultFont->getLineHeight());
 
 	if (coord)
 	{
-		const S32 query_x = mTextRect.mLeft + mGLFont->getWidth(text, current_line_start, query - current_line_start, mAllowEmbeddedItems);
+		const S32 query_x = mTextRect.mLeft + mDefaultFont->getWidth(text, current_line_start, query - current_line_start);
 		const S32 query_y = mTextRect.mTop - (current_line - first_visible_line) * line_height - line_height / 2;
 		S32 query_screen_x, query_screen_y;
 		localPointToScreen(query_x, query_y, &query_screen_x, &query_screen_y);
@@ -4599,17 +4638,17 @@ BOOL LLTextEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect
 		S32 preedit_left = mTextRect.mLeft;
 		if (preedit_left_position > current_line_start)
 		{
-			preedit_left += mGLFont->getWidth(text, current_line_start, preedit_left_position - current_line_start, mAllowEmbeddedItems);
+			preedit_left += mDefaultFont->getWidth(text, current_line_start, preedit_left_position - current_line_start);
 		}
 
 		S32 preedit_right = mTextRect.mLeft;
 		if (preedit_right_position < current_line_end)
 		{
-			preedit_right += mGLFont->getWidth(text, current_line_start, preedit_right_position - current_line_start, mAllowEmbeddedItems);
+			preedit_right += mDefaultFont->getWidth(text, current_line_start, preedit_right_position - current_line_start);
 		}
 		else
 		{
-			preedit_right += mGLFont->getWidth(text, current_line_start, current_line_end - current_line_start, mAllowEmbeddedItems);
+			preedit_right += mDefaultFont->getWidth(text, current_line_start, current_line_end - current_line_start);
 		}
 
 		const S32 preedit_top = mTextRect.mTop - (current_line - first_visible_line) * line_height;
@@ -4686,10 +4725,267 @@ void LLTextEditor::markAsPreedit(S32 position, S32 length)
 
 S32 LLTextEditor::getPreeditFontSize() const
 {
-	return llround(mGLFont->getLineHeight() * LLUI::sGLScaleFactor.mV[VY]);
+	return llround(mDefaultFont->getLineHeight() * LLUI::sGLScaleFactor.mV[VY]);
 }
 
 LLWString       LLTextEditor::getWText() const
 {
     return getViewModel()->getDisplay();
 }
+
+void	LLTextEditor::onValueChange(S32 start, S32 end)
+{
+}
+
+//
+// LLTextSegment
+//
+
+LLTextSegment::~LLTextSegment()
+{}
+
+S32	LLTextSegment::getWidth(S32 first_char, S32 num_chars) const { return 0; }
+S32	LLTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const { return 0; }
+S32	LLTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const { return 0; }
+void LLTextSegment::updateLayout(const LLTextEditor& editor) {}
+F32	LLTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect) { return draw_rect.mLeft; }
+S32	LLTextSegment::getMaxHeight() const { return 0; }
+bool LLTextSegment::canEdit() const { return false; }
+void LLTextSegment::unlinkFromDocument(LLTextEditor*) {}
+void LLTextSegment::linkToDocument(LLTextEditor*) {}
+void LLTextSegment::setHasMouseHover(bool hover) {}
+const LLColor4& LLTextSegment::getColor() const { return LLColor4::white; }
+void LLTextSegment::setColor(const LLColor4 &color) {}
+const LLStyleSP LLTextSegment::getStyle() const {static LLStyleSP sp(new LLStyle()); return sp; }
+void LLTextSegment::setStyle(const LLStyleSP &style) {}
+void LLTextSegment::setToken( LLKeywordToken* token ) {}
+LLKeywordToken*	LLTextSegment::getToken() const { return NULL; }
+BOOL LLTextSegment::getToolTip( std::string& msg ) const { return FALSE; }
+void LLTextSegment::dump() const {}
+
+
+//
+// LLNormalTextSegment
+//
+
+LLNormalTextSegment::LLNormalTextSegment( const LLStyleSP& style, S32 start, S32 end, LLTextEditor& editor ) 
+:	LLTextSegment(start, end),
+	mStyle( style ),
+	mToken(NULL),
+	mHasMouseHover(false),
+	mEditor(editor)
+{
+	mMaxHeight = llceil(mStyle->getFont()->getLineHeight());
+}
+
+LLNormalTextSegment::LLNormalTextSegment( const LLColor4& color, S32 start, S32 end, LLTextEditor& editor, BOOL is_visible) 
+:	LLTextSegment(start, end),
+	mToken(NULL),
+	mHasMouseHover(false),
+	mEditor(editor)
+{
+	mStyle = new LLStyle(LLStyle::Params().visible(is_visible).color(color));
+
+	mMaxHeight = llceil(mStyle->getFont()->getLineHeight());
+}
+
+F32 LLNormalTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
+{
+	if( end - start > 0 )
+	{
+		if ( mStyle->isImage() && (start >= 0) && (end <= mEnd - mStart))
+		{
+			S32 style_image_height = mStyle->mImageHeight;
+			S32 style_image_width = mStyle->mImageWidth;
+			LLUIImagePtr image = mStyle->getImage();
+			image->draw(draw_rect.mLeft, draw_rect.mTop-style_image_height, 
+				style_image_width, style_image_height);
+		}
+
+		return drawClippedSegment( getStart() + start, getStart() + end, selection_start, selection_end, draw_rect.mLeft, draw_rect.mBottom);
+	}
+	return draw_rect.mLeft;
+}
+
+// Draws a single text segment, reversing the color for selection if needed.
+F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 selection_start, S32 selection_end, F32 x, F32 y)
+{
+	const LLWString &text = mEditor.getWText();
+
+	F32 right_x = x;
+	if (!mStyle->isVisible())
+	{
+		return right_x;
+	}
+
+	const LLFontGL* font = mStyle->getFont();
+
+	LLColor4 color = mStyle->getColor();
+
+	font = mStyle->getFont();
+
+  	if( selection_start > seg_start )
+	{
+		// Draw normally
+		S32 start = seg_start;
+		S32 end = llmin( selection_start, seg_end );
+		S32 length =  end - start;
+		font->render(text, start, x, y, color, LLFontGL::LEFT, LLFontGL::BOTTOM, 0, LLFontGL::NO_SHADOW, length, S32_MAX, &right_x, mEditor.allowsEmbeddedItems());
+	}
+	x = right_x;
+	
+	if( (selection_start < seg_end) && (selection_end > seg_start) )
+	{
+		// Draw reversed
+		S32 start = llmax( selection_start, seg_start );
+		S32 end = llmin( selection_end, seg_end );
+		S32 length = end - start;
+
+		font->render(text, start, x, y,
+					 LLColor4( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], 1.f ),
+					 LLFontGL::LEFT, LLFontGL::BOTTOM, 0, LLFontGL::NO_SHADOW, length, S32_MAX, &right_x, mEditor.allowsEmbeddedItems());
+	}
+	x = right_x;
+	if( selection_end < seg_end )
+	{
+		// Draw normally
+		S32 start = llmax( selection_end, seg_start );
+		S32 end = seg_end;
+		S32 length = end - start;
+		font->render(text, start, x, y, color, LLFontGL::LEFT, LLFontGL::BOTTOM, 0, LLFontGL::NO_SHADOW, length, S32_MAX, &right_x, mEditor.allowsEmbeddedItems());
+	}
+	return right_x;
+}
+
+S32	LLNormalTextSegment::getMaxHeight() const	
+{ 
+	return mMaxHeight; 
+}
+
+BOOL LLNormalTextSegment::getToolTip(std::string& msg) const
+{
+	if (mToken && !mToken->getToolTip().empty())
+	{
+		const LLWString& wmsg = mToken->getToolTip();
+		msg = wstring_to_utf8str(wmsg);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+
+S32	LLNormalTextSegment::getWidth(S32 first_char, S32 num_chars) const
+{
+	LLWString text = mEditor.getWText();
+	return mStyle->getFont()->getWidth(text.c_str(), mStart + first_char, num_chars);
+}
+
+S32	LLNormalTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const
+{
+	LLWString text = mEditor.getWText();
+	return mStyle->getFont()->charFromPixelOffset(text.c_str(), mStart + start_offset,
+											   (F32)segment_local_x_coord,
+											   F32_MAX,
+											   num_chars,
+											   round);
+}
+
+S32	LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
+{
+	LLWString text = mEditor.getWText();
+	S32 num_chars = mStyle->getFont()->maxDrawableChars(text.c_str() + segment_offset + mStart, 
+												(F32)num_pixels,
+												max_chars, 
+												mEditor.getWordWrap());
+
+	if (num_chars == 0 
+		&& line_offset == 0 
+		&& max_chars > 0)
+	{
+		// If at the beginning of a line, and a single character won't fit, draw it anyway
+		num_chars = 1;
+	}
+	if (mStart + segment_offset + num_chars == mEditor.getLength())
+	{
+		// include terminating NULL
+		num_chars++;
+	}
+	return num_chars;
+}
+
+void LLNormalTextSegment::dump() const
+{
+	llinfos << "Segment [" << 
+//			mColor.mV[VX] << ", " <<
+//			mColor.mV[VY] << ", " <<
+//			mColor.mV[VZ] << "]\t[" <<
+		mStart << ", " <<
+		getEnd() << "]" <<
+		llendl;
+}
+
+//
+// LLInlineViewSegment
+//
+
+LLInlineViewSegment::LLInlineViewSegment(LLView* view, S32 start, S32 end)
+:	LLTextSegment(start, end),
+	mView(view)
+{
+} 
+
+LLInlineViewSegment::~LLInlineViewSegment()
+{
+	mView->die();
+}
+
+S32	LLInlineViewSegment::getWidth(S32 first_char, S32 num_chars) const
+{
+	if (first_char == 0 && num_chars == 0) 
+	{
+		return 0;
+	}
+	else
+	{
+		return mView->getRect().getWidth();
+	}
+}
+
+S32	LLInlineViewSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
+{
+	if (line_offset != 0 && num_pixels < mView->getRect().getWidth()) 
+	{
+		return 0;
+	}
+	else
+	{
+		return mEnd - mStart;
+	}
+}
+
+void LLInlineViewSegment::updateLayout(const LLTextEditor& editor)
+{
+	LLRect start_rect = editor.getLocalRectFromDocIndex(mStart);
+	LLRect doc_rect = editor.getDocumentPanel()->getRect();
+	mView->setOrigin(doc_rect.mLeft + start_rect.mLeft, doc_rect.mBottom + start_rect.mBottom);
+}
+
+F32	LLInlineViewSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
+{
+	return (F32)(draw_rect.mLeft + mView->getRect().getWidth());
+}
+
+S32	LLInlineViewSegment::getMaxHeight() const
+{
+	return mView->getRect().getHeight();
+}
+
+void LLInlineViewSegment::unlinkFromDocument(LLTextEditor* editor)
+{
+	editor->removeDocumentChild(mView);
+}
+
+void LLInlineViewSegment::linkToDocument(LLTextEditor* editor)
+{
+	editor->addDocumentChild(mView);
+}
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 0babd7ba58..67c67d0f67 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -53,6 +53,101 @@ class LLScrollbar;
 class LLKeywordToken;
 class LLTextCmd;
 class LLUICtrlFactory;
+class LLScrollContainer;
+
+class LLTextSegment : public LLRefCount
+{
+public:
+	LLTextSegment(S32 start, S32 end) : mStart(start), mEnd(end){};
+	virtual ~LLTextSegment();
+
+	virtual S32					getWidth(S32 first_char, S32 num_chars) const;
+	virtual S32					getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
+	virtual S32					getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
+	virtual void				updateLayout(const class LLTextEditor& editor);
+	virtual F32					draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
+	virtual S32					getMaxHeight() const;
+	virtual bool				canEdit() const;
+	virtual void				unlinkFromDocument(class LLTextEditor* editor);
+	virtual void				linkToDocument(class LLTextEditor* editor);
+
+	virtual void				setHasMouseHover(bool hover);
+	virtual const LLColor4&		getColor() const;
+	virtual void 				setColor(const LLColor4 &color);
+	virtual const LLStyleSP		getStyle() const;
+	virtual void 				setStyle(const LLStyleSP &style);
+	virtual void				setToken( LLKeywordToken* token );
+	virtual LLKeywordToken*		getToken() const;
+	virtual BOOL				getToolTip( std::string& msg ) const;
+	virtual void				dump() const;
+
+	S32							getStart() const 					{ return mStart; }
+	void						setStart(S32 start)					{ mStart = start; }
+	S32							getEnd() const						{ return mEnd; }
+	void						setEnd( S32 end )					{ mEnd = end; }
+
+protected:
+	S32				mStart;
+	S32				mEnd;
+};
+
+class LLNormalTextSegment : public LLTextSegment
+{
+public:
+	LLNormalTextSegment( const LLStyleSP& style, S32 start, S32 end, LLTextEditor& editor );
+	LLNormalTextSegment( const LLColor4& color, S32 start, S32 end, LLTextEditor& editor, BOOL is_visible = TRUE);
+
+	/*virtual*/ S32					getWidth(S32 first_char, S32 num_chars) const;
+	/*virtual*/ S32					getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
+	/*virtual*/ S32					getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
+	/*virtual*/ F32					draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
+	/*virtual*/ S32					getMaxHeight() const;
+	/*virtual*/ bool				canEdit() const { return true; }
+	/*virtual*/ void				setHasMouseHover(bool hover)		{ mHasMouseHover = hover; }
+	/*virtual*/ const LLColor4&		getColor() const					{ return mStyle->getColor(); }
+	/*virtual*/ void 				setColor(const LLColor4 &color)		{ mStyle->setColor(color); }
+	/*virtual*/ const LLStyleSP		getStyle() const					{ return mStyle; }
+	/*virtual*/ void 				setStyle(const LLStyleSP &style)	{ mStyle = style; }
+	/*virtual*/ void				setToken( LLKeywordToken* token )	{ mToken = token; }
+	/*virtual*/ LLKeywordToken*		getToken() const					{ return mToken; }
+	/*virtual*/ BOOL				getToolTip( std::string& msg ) const;
+	/*virtual*/ void				dump() const;
+
+protected:
+	F32				drawClippedSegment(S32 seg_start, S32 seg_end, S32 selection_start, S32 selection_end, F32 x, F32 y);
+
+	class LLTextEditor&	mEditor;
+	LLStyleSP		mStyle;
+	S32				mMaxHeight;
+	LLKeywordToken* mToken;
+	bool			mHasMouseHover;
+};
+
+typedef LLPointer<LLTextSegment> LLTextSegmentPtr;
+
+class LLInlineViewSegment : public LLTextSegment
+{
+public:
+	LLInlineViewSegment(LLView* widget, S32 start, S32 end);
+	~LLInlineViewSegment();
+	/*virtual*/ S32			getWidth(S32 first_char, S32 num_chars) const;
+	/*virtual*/ S32			getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
+	/*virtual*/ void		updateLayout(const class LLTextEditor& editor);
+	/*virtual*/ F32			draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
+	/*virtuaL*/ S32			getMaxHeight() const;
+	/*virtual*/ bool		canEdit() const { return false; }
+	/*virtual*/ void		unlinkFromDocument(class LLTextEditor* editor);
+	/*virtual*/ void		linkToDocument(class LLTextEditor* editor);
+
+private:
+	LLView* mView;
+};
+
+class LLIndexSegment : public LLTextSegment
+{
+public:
+	LLIndexSegment(S32 pos) : LLTextSegment(pos, pos) {}
+};
 
 class LLTextEditor : public LLUICtrl, LLEditMenuHandler, protected LLPreeditor
 {
@@ -64,12 +159,13 @@ public:
 
 		Optional<bool>			read_only,
 								embedded_items,
-								hide_scrollbar,
 								word_wrap,
 								ignore_tab,
 								hide_border,
 								track_bottom,
-								takes_non_scroll_clicks;
+								handle_edit_keys_directly,
+								show_line_numbers,
+								commit_on_focus_lost;
 
 		//colors
 		Optional<LLUIColor>		cursor_color,
@@ -78,13 +174,15 @@ public:
 								text_readonly_color,
 								bg_readonly_color,
 								bg_writeable_color,
-								bg_focus_color;
+								bg_focus_color,
+								link_color;
 
 		Optional<LLViewBorder::Params> border;
 
 		Ignored					type,
 								length,
-								is_unicode;
+								is_unicode,
+								hide_scrollbar;
 
 		Params();
 	};
@@ -101,6 +199,17 @@ public:
 	static const llwchar LAST_EMBEDDED_CHAR =  0x10ffff;
 	static const S32 MAX_EMBEDDED_ITEMS = LAST_EMBEDDED_CHAR - FIRST_EMBEDDED_CHAR + 1;
 
+
+	struct compare_segment_end
+	{
+		bool operator()(const LLTextSegmentPtr& a, const LLTextSegmentPtr& b) const
+		{
+			return a->getEnd() < b->getEnd();
+		}
+	};
+
+	typedef std::multiset<LLTextSegmentPtr, compare_segment_end> segment_set_t;
+
 	virtual ~LLTextEditor();
 
 	void	setParseHTML(BOOL parsing) {mParseHTML=parsing;}
@@ -110,7 +219,6 @@ public:
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
 	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask );
 	virtual BOOL	handleMiddleMouseDown(S32 x,S32 y,MASK mask);
 
@@ -128,14 +236,15 @@ public:
 	virtual void	draw();
 	virtual void	onFocusReceived();
 	virtual void	onFocusLost();
+	virtual void	onCommit();
 	virtual void	setEnabled(BOOL enabled);
 
 	// uictrl overrides
-	virtual void	onTabInto();
 	virtual void	clear();
 	virtual void	setFocus( BOOL b );
 	virtual BOOL	acceptsTextInput() const;
-	virtual BOOL	isDirty() const { return( mLastCmd != NULL || (mPristineCmd && (mPristineCmd != mLastCmd)) ); }
+	virtual BOOL	isDirty() const { return isPristine(); }
+	virtual void 	setValue(const LLSD& value);
 
 	// LLEditMenuHandler interface
 	virtual void	undo();
@@ -162,9 +271,12 @@ public:
 	virtual void	deselect();
 	virtual BOOL	canDeselect() const;
 
+	virtual void	onValueChange(S32 start, S32 end);
+
 	void			selectNext(const std::string& search_text_in, BOOL case_insensitive, BOOL wrap = TRUE);
 	BOOL			replaceText(const std::string& search_text, const std::string& replace_text, BOOL case_insensitive, BOOL wrap = TRUE);
 	void			replaceTextAll(const std::string& search_text, const std::string& replace_text, BOOL case_insensitive);
+	BOOL			hasSelection() const		{ return (mSelectionStart !=mSelectionEnd); }
 	
 	// Undo/redo stack
 	void			blockUndo();
@@ -173,12 +285,20 @@ public:
 	virtual void	makePristine();
 	BOOL			isPristine() const;
 	BOOL			allowsEmbeddedItems() const { return mAllowEmbeddedItems; }
+	BOOL			getWordWrap() { return mWordWrap; }
+	S32				getLength() const { return getWText().length(); }
+	void			setReadOnly(bool read_only) { mReadOnly = read_only; }
+	bool			getReadOnly() { return mReadOnly; }
+
+	//
+	// Text manipulation
+	//
 
 	// inserts text at cursor
 	void			insertText(const std::string &text);
 	// appends text at end
 	void 			appendText(const std::string &wtext, bool allow_undo, bool prepend_newline,
-							   const LLStyleSP stylep = NULL);
+								const LLStyle::Params& style = LLStyle::Params());
 
 	void 			appendColoredText(const std::string &wtext, bool allow_undo, 
 									  bool prepend_newline,
@@ -187,19 +307,24 @@ public:
 	// if styled text starts a line, you need to prepend a newline.
 	void 			appendStyledText(const std::string &new_text, bool allow_undo, 
 									 bool prepend_newline,
-									 LLStyleSP stylep = NULL);
+									 const LLStyle::Params& style);
 	void			appendHighlightedText(const std::string &new_text,  bool allow_undo, 
 										  bool prepend_newline,	 S32  highlight_part,
-										  LLStyleSP stylep);
-	
+										  const LLStyle::Params& style);
+	void			appendWidget(LLView* widget, const std::string &widget_text, bool allow_undo, bool prepend_newline);
+	// Non-undoable
+	void			setText(const LLStringExplicit &utf8str);
+	void			setWText(const LLWString &wtext);
+
+
 	// Removes text from the end of document
 	// Does not change highlight or cursor position.
 	void 			removeTextFromEnd(S32 num_chars);
 
 	BOOL			tryToRevertToPristineState();
 
-	void			setCursor(S32 row, S32 column);
-	void			setCursorPos(S32 offset);
+	bool			setCursor(S32 row, S32 column);
+	bool			setCursorPos(S32 offset, bool keep_cursor_offset = false);
 	void			setCursorAndScrollToEnd();
 
 	void			getLineAndColumnForPosition( S32 position,  S32* line, S32* col, BOOL include_wordwrap );
@@ -214,90 +339,57 @@ public:
 	LLKeywords::keyword_iterator_t keywordsBegin()	{ return mKeywords.begin(); }
 	LLKeywords::keyword_iterator_t keywordsEnd()	{ return mKeywords.end(); }
 
-	// Color support
-	void 			setCursorColor(const LLColor4& c)			{ mCursorColor = c; }
-	void 			setFgColor( const LLColor4& c )				{ mFgColor = c; }
-	void			setTextDefaultColor( const LLColor4& c )				{ mDefaultColor = c; }
-	void 			setReadOnlyFgColor( const LLColor4& c )		{ mReadOnlyFgColor = c; }
-	void 			setWriteableBgColor( const LLColor4& c )	{ mWriteableBgColor = c; }
-	void 			setReadOnlyBgColor( const LLColor4& c )		{ mReadOnlyBgColor = c; }
-	void			setTrackColor( const LLColor4& color );
-	void			setThumbColor( const LLColor4& color );
-
 	// Hacky methods to make it into a word-wrapping, potentially scrolling,
 	// read-only text box.
-	void			setBorderVisible(BOOL b);
-	BOOL			isBorderVisible() const;
-	void			setTakesNonScrollClicks(BOOL b) { mTakesNonScrollClicks = b; }
-	void			setHideScrollbarForShortDocs(BOOL b);
-
-	void			setWordWrap( BOOL b );
-	void			setTabsToNextField(BOOL b)				{ mTabsToNextField = b; }
-	BOOL			tabsToNextField() const					{ return mTabsToNextField; }
 	void			setCommitOnFocusLost(BOOL b)			{ mCommitOnFocusLost = b; }
 
 	// Hack to handle Notecards
 	virtual BOOL	importBuffer(const char* buffer, S32 length );
 	virtual BOOL	exportBuffer(std::string& buffer );
 
-	// If takes focus, will take keyboard focus on click.
-	void			setTakesFocus(BOOL b)					{ mTakesFocus = b; }
+	const class DocumentPanel*	getDocumentPanel() const { return mDocumentPanel; }
 
-	void			setSourceID(const LLUUID& id) 			{ mSourceID = id; }
 	const LLUUID&	getSourceID() const						{ return mSourceID; }
 
-	void			setHandleEditKeysDirectly( BOOL b ) 	{ mHandleEditKeysDirectly = b; }
-
 	// Callbacks
-	static void		setLinkColor(LLColor4 color) { mLinkColor = color; }
 	static void		setURLCallbacks(void (*callback1) (const std::string& url), 
 									bool (*callback2) (const std::string& url),      
 									bool (*callback3) (const std::string& url)	) 
-									{ mURLcallback = callback1; mSecondlifeURLcallback = callback2; mSecondlifeURLcallbackRightClick = callback3;}
-
-	void			setOnScrollEndCallback(void (*callback)(void*), void* userdata);
-
-	// new methods
-	void 			setValue(const LLSD& value);
+									{ sURLcallback = callback1; sSecondlifeURLcallback = callback2; sSecondlifeURLcallbackRightClick = callback3;}
 
  	std::string     getText() const;
 	
-	// Non-undoable
-	void			setText(const LLStringExplicit &utf8str);
-	void			setWText(const LLWString &wtext);
-	
-	// Returns byte length limit
-	S32				getMaxLength() const 			{ return mMaxTextByteLength; }
-
-	// Change cursor
-	void			startOfLine();
-	void			endOfLine();
-	void			endOfDoc();
-
-	BOOL			isScrolledToTop();
-	BOOL			isScrolledToBottom();
-
 	// Getters
 	LLWString       getWText() const;
 	llwchar			getWChar(S32 pos) const { return getWText()[pos]; }
 	LLWString		getWSubString(S32 pos, S32 len) const { return getWText().substr(pos, len); }
 	
-	const LLTextSegment*	getCurrentSegment() const { return getSegmentAtOffset(mCursorPos); }
-	const LLTextSegment*	getPreviousSegment() const;
-	void getSelectedSegments(std::vector<const LLTextSegment*>& segments) const;
+	typedef std::vector<LLTextSegmentPtr> segment_vec_t;
+
+	const LLTextSegmentPtr	getPreviousSegment() const;
+	void getSelectedSegments(segment_vec_t& segments) const;
+
+	void getSegmentsInRange(segment_vec_t& segments, S32 start, S32 end, bool include_partial) const;
+	LLRect			getLocalRectFromDocIndex(S32 index) const; 
 
-	static bool		isPartOfWord(llwchar c) { return (c == '_') || LLStringOps::isAlnum((char)c); }
+	void			addDocumentChild(LLView* view);
+	void			removeDocumentChild(LLView* view);
 
 protected:
-	//
-	// Methods
-	//
+	// Change cursor
+	void			startOfLine();
+	void			endOfLine();
+	void			startOfDoc();
+	void			endOfDoc();
 
-	S32				getLength() const { return getWText().length(); }
-	void			getSegmentAndOffset( S32 startpos, S32* segidxp, S32* offsetp ) const;
+	void			getSegmentAndOffset( S32 startpos, segment_set_t::const_iterator* seg_iter, S32* offsetp ) const;
+	void			getSegmentAndOffset( S32 startpos, segment_set_t::iterator* seg_iter, S32* offsetp ) ;
 	void			drawPreeditMarker();
 
-	void			updateLineStartList(S32 startpos = 0);
+	void			needsReflow() { mReflowNeeded = TRUE; }
+	void			needsScroll() { mScrollNeeded = TRUE; }
+	void			updateCursorXPos();
+
 	void			updateScrollFromCursor();
 	void			updateTextRect();
 	const LLRect&	getTextRect() const { return mTextRect; }
@@ -306,16 +398,16 @@ protected:
 	BOOL 			truncate();				// Returns true if truncation occurs
 	
 	void			removeCharOrTab();
-	void			setCursorAtLocalPos(S32 x, S32 y, BOOL round);
-	S32				getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const;
+	void			setCursorAtLocalPos(S32 x, S32 y, bool round, bool keep_cursor_offset = false);
+	S32				getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const;
 
 	void			indentSelectedLines( S32 spaces );
 	S32				indentLine( S32 pos, S32 spaces );
 	void			unindentLineBeforeCloseBrace();
 
-	S32				getSegmentIdxAtOffset(S32 offset) const;
-	const LLTextSegment*	getSegmentAtLocalPos(S32 x, S32 y) const;
-	const LLTextSegment*	getSegmentAtOffset(S32 offset) const;
+	LLTextSegmentPtr				getSegmentAtLocalPos(S32 x, S32 y);
+	segment_set_t::iterator			getSegIterContaining(S32 index);
+	segment_set_t::const_iterator	getSegIterContaining(S32 index) const;
 
 	void			reportBadKeystroke() { make_ui_sound("UISndBadKeystroke"); }
 
@@ -325,7 +417,6 @@ protected:
 	BOOL			handleControlKey(const KEY key, const MASK mask);
 	BOOL			handleEditKey(const KEY key, const MASK mask);
 
-	BOOL			hasSelection() const		{ return (mSelectionStart !=mSelectionEnd); }
 	BOOL			selectionContainsLineBreaks();
 	void			startSelection();
 	void			endSelection();
@@ -334,9 +425,10 @@ protected:
 	S32				prevWordPos(S32 cursorPos) const;
 	S32				nextWordPos(S32 cursorPos) const;
 
-	S32 			getLineCount() const { return mLineStartList.size(); }
+	S32 			getLineCount() const { return mLineInfoList.size(); }
 	S32 			getLineStart( S32 line ) const;
-	void			getLineAndOffset(S32 pos, S32* linep, S32* offsetp) const;
+	S32 			getLineHeight( S32 line ) const;
+	void			getLineAndOffset(S32 pos, S32* linep, S32* offsetp, bool include_wordwrap = true) const;
 	S32				getPos(S32 line, S32 offset);
 
 	void			changePage(S32 delta);
@@ -344,13 +436,13 @@ protected:
 
 	void			autoIndent();
 	
-	void			findEmbeddedItemSegments();
+	void			findEmbeddedItemSegments(S32 start, S32 end);
+	void			insertSegment(LLTextSegmentPtr segment_to_insert);
+
 	
 	virtual BOOL	handleMouseUpOverSegment(S32 x, S32 y, MASK mask);
 
 	virtual llwchar	pasteEmbeddedItem(llwchar ext_char) { return ext_char; }
-	virtual void	bindEmbeddedChars(const LLFontGL* font) const {}
-	virtual void	unbindEmbeddedChars(const LLFontGL* font) const {}
 	
 	S32				findHTMLToken(const std::string &line, S32 pos, BOOL reverse) const;
 	BOOL			findHTML(const std::string &line, S32 *begin, S32 *end) const;
@@ -361,7 +453,15 @@ protected:
 	class LLTextCmd
 	{
 	public:
-		LLTextCmd( S32 pos, BOOL group_with_next ) : mPos(pos), mGroupWithNext(group_with_next) {}
+		LLTextCmd( S32 pos, BOOL group_with_next, LLTextSegmentPtr segment = LLTextSegmentPtr() ) 
+		:	mPos(pos), 
+			mGroupWithNext(group_with_next)
+		{
+			if (segment.notNull())
+			{
+				mSegments.push_back(segment);
+			}
+		}
 		virtual			~LLTextCmd() {}
 		virtual BOOL	execute(LLTextEditor* editor, S32* delta) = 0;
 		virtual S32		undo(LLTextEditor* editor) = 0;
@@ -372,16 +472,17 @@ protected:
 		virtual BOOL	hasExtCharValue( llwchar value ) const { return FALSE; }
 
 		// Defined here so they can access protected LLTextEditor editing methods
-		S32				insert(LLTextEditor* editor, S32 pos, const LLWString &wstr) { return editor->insertStringNoUndo( pos, wstr ); }
+		S32				insert(LLTextEditor* editor, S32 pos, const LLWString &wstr) { return editor->insertStringNoUndo( pos, wstr, &mSegments ); }
 		S32 			remove(LLTextEditor* editor, S32 pos, S32 length) { return editor->removeStringNoUndo( pos, length ); }
 		S32				overwrite(LLTextEditor* editor, S32 pos, llwchar wc) { return editor->overwriteCharNoUndo(pos, wc); }
 		
 		S32				getPosition() const { return mPos; }
 		BOOL			groupWithNext() const { return mGroupWithNext; }
 		
-	private:
-		const S32		mPos;
-		BOOL			mGroupWithNext;
+	protected:
+		const S32			mPos;
+		BOOL				mGroupWithNext;
+		segment_vec_t		mSegments;
 	};
 	// Here's the method that takes and applies text commands.
 	S32 			execute(LLTextCmd* cmd);
@@ -392,12 +493,12 @@ protected:
 	S32				overwriteChar(S32 pos, llwchar wc);
 	void			removeChar();
 	S32 			removeChar(S32 pos);
-	S32				insert(const S32 pos, const LLWString &wstr, const BOOL group_with_next_op);
-	S32				remove(const S32 pos, const S32 length, const BOOL group_with_next_op);
-	S32				append(const LLWString &wstr, const BOOL group_with_next_op);
+	S32				insert(S32 pos, const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment);
+	S32				remove(S32 pos, S32 length, bool group_with_next_op);
+	S32				append(const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment);
 	
 	// Direct operations
-	S32				insertStringNoUndo(S32 pos, const LLWString &wstr); // returns num of chars actually inserted
+	S32				insertStringNoUndo(S32 pos, const LLWString &wstr, segment_vec_t* segments = NULL); // returns num of chars actually inserted
 	S32 			removeStringNoUndo(S32 pos, S32 length);
 	S32				overwriteCharNoUndo(S32 pos, llwchar wc);
 
@@ -441,22 +542,38 @@ protected:
 	BOOL			mParseHighlights;
 	std::string		mHTML;
 
-	typedef std::vector<LLTextSegment *> segment_list_t;
-	segment_list_t mSegments;
-	const LLTextSegment*	mHoverSegment;
+	segment_set_t mSegments;
+	LLTextSegmentPtr	mHoverSegment;
 	
 	// Scrollbar data
-	class LLScrollbar*	mScrollbar;
-	BOOL			mHideScrollbarForShortDocs;
-	BOOL			mTakesNonScrollClicks;
-	void			(*mOnScrollEndCallback)(void*);
+	class DocumentPanel*	mDocumentPanel;
+	LLScrollContainer*	mScroller;
+
 	void			*mOnScrollEndData;
 
 	LLWString			mPreeditWString;
 	LLWString			mPreeditOverwrittenWString;
 	std::vector<S32> 	mPreeditPositions;
 	std::vector<BOOL> 	mPreeditStandouts;
-	
+
+	S32			mScrollIndex; // index into document that controls default scroll position
+
+protected:
+	LLUIColor		mCursorColor;
+	LLUIColor		mFgColor;
+	LLUIColor		mDefaultColor;
+	LLUIColor		mReadOnlyFgColor;
+	LLUIColor		mWriteableBgColor;
+	LLUIColor		mReadOnlyBgColor;
+	LLUIColor		mFocusBgColor;
+	LLUIColor		mLinkColor;
+
+	BOOL			mReadOnly;
+	BOOL			mWordWrap;
+	BOOL			mShowLineNumbers;
+
+	void			updateSegments();
+
 private:
 
 	//
@@ -465,32 +582,28 @@ private:
 	void	        pasteHelper(bool is_primary);
 
 	virtual 		LLTextViewModel* getViewModel() const;
-					
-	void			updateSegments();
-	void			pruneSegments();
+	void			reflow(S32 startpos = 0);
+
+	void			clearSegments();
+	void			createDefaultSegment();
+	LLStyleSP		getDefaultStyle();
+	S32				getEditableIndex(S32 index, bool increasing_direction);
 
 	void			drawBackground();
 	void			drawSelectionBackground();
 	void			drawCursor();
 	void			drawText();
-	void			drawClippedSegment(const LLWString &wtext, S32 seg_start, S32 seg_end, F32 x, F32 y, S32 selection_left, S32 selection_right, const LLStyleSP& color, F32* right_x);
-
-	void			needsReflow() 
-	{ 
-		mReflowNeeded = TRUE; 
-		// cursor might have moved, need to scroll
-		mScrollNeeded = TRUE;
-	}
-	void			needsScroll() { mScrollNeeded = TRUE; }
+	void			drawLineNumbers();
+
+	S32				getFirstVisibleLine() const;
 
 	//
 	// Data
 	//
 	LLKeywords		mKeywords;
-	static LLUIColor mLinkColor;
-	static void			(*mURLcallback) (const std::string& url);
-	static bool			(*mSecondlifeURLcallback) (const std::string& url);
-	static bool			(*mSecondlifeURLcallbackRightClick) (const std::string& url);
+	static void		(*sURLcallback) (const std::string& url);
+	static bool		(*sSecondlifeURLcallback) (const std::string& url);
+	static bool		(*sSecondlifeURLcallbackRightClick) (const std::string& url);
 
 	// Concrete LLTextCmd sub-classes used by the LLTextEditor base class
 	class LLTextCmdInsert;
@@ -500,7 +613,7 @@ private:
 
 	S32				mMaxTextByteLength;		// Maximum length mText is allowed to be in bytes
 
-	const LLFontGL*	mGLFont;
+	const LLFontGL*	mDefaultFont;
 
 	class LLViewBorder*	mBorder;
 
@@ -515,49 +628,35 @@ private:
 	S32				mDesiredXPixel;			// X pixel position where the user wants the cursor to be
 	LLRect			mTextRect;				// The rect in which text is drawn.  Excludes borders.
 	// List of offsets and segment index of the start of each line.  Always has at least one node (0).
-	struct pred;
 	struct line_info
 	{
-		line_info(S32 segment, S32 offset) : mSegment(segment), mOffset(offset) {}
-		S32 mSegment;
-		S32 mOffset;
-	};
-	struct line_info_compare
-	{
-		bool operator()(const line_info& a, const line_info& b) const
-		{
-			if (a.mSegment < b.mSegment)
-				return true;
-			else if (a.mSegment > b.mSegment)
-				return false;
-			else
-				return a.mOffset < b.mOffset;
-		}
+		line_info(S32 index_start, S32 index_end, S32 top, S32 bottom, S32 line_num) 
+		:	mDocIndexStart(index_start), 
+			mDocIndexEnd(index_end),
+			mTop(top),
+			mBottom(bottom),
+			mLineNum(line_num)
+		{}
+		S32 mDocIndexStart;
+		S32 mDocIndexEnd;
+		S32 mTop;
+		S32 mBottom;
+		S32 mLineNum; // actual line count (ignoring soft newlines due to word wrap)
 	};
+	struct compare_bottom;
+	struct compare_top;
+	struct line_end_compare;
 	typedef std::vector<line_info> line_list_t;
-	line_list_t mLineStartList;
+	line_list_t		mLineInfoList;
 	BOOL			mReflowNeeded;
 	BOOL			mScrollNeeded;
 
 	LLFrameTimer	mKeystrokeTimer;
 
-	LLUIColor	mCursorColor;
-	LLUIColor	mFgColor;
-	LLUIColor	mDefaultColor;
-	LLUIColor	mReadOnlyFgColor;
-	LLUIColor	mWriteableBgColor;
-	LLUIColor	mReadOnlyBgColor;
-	LLUIColor	mFocusBgColor;
-
-	BOOL			mReadOnly;
-	BOOL			mWordWrap;
-	BOOL			mShowLineNumbers;
-
 	BOOL			mTabsToNextField;		// if true, tab moves focus to next field, else inserts spaces
 	BOOL			mCommitOnFocusLost;
 	BOOL			mTakesFocus;
 	BOOL			mTrackBottom;			// if true, keeps scroll position at bottom during resize
-	BOOL			mScrolledToBottom;
 
 	BOOL			mAllowEmbeddedItems;
 
@@ -571,47 +670,4 @@ private:
 }; // end class LLTextEditor
 
 
-
-class LLTextSegment
-{
-public:
-	// for creating a compare value
-	LLTextSegment(S32 start);
-	LLTextSegment( const LLStyleSP& style, S32 start, S32 end );
-	LLTextSegment( const LLColor4& color, S32 start, S32 end, BOOL is_visible);
-	LLTextSegment( const LLColor4& color, S32 start, S32 end );
-	LLTextSegment( const LLColor3& color, S32 start, S32 end );
-
-	S32					getStart() const					{ return mStart; }
-	S32					getEnd() const						{ return mEnd; }
-	void				setEnd( S32 end )					{ mEnd = end; }
-	const LLColor4&		getColor() const					{ return mStyle->getColor(); }
-	void 				setColor(const LLColor4 &color)		{ mStyle->setColor(color); }
-	const LLStyleSP&	getStyle() const					{ return mStyle; }
-	void 				setStyle(const LLStyleSP &style)	{ mStyle = style; }
-	void 				setIsDefault(BOOL b)   				{ mIsDefault = b; }
-	BOOL 				getIsDefault() const   				{ return mIsDefault; }
-	void				setToken( LLKeywordToken* token )	{ mToken = token; }
-	LLKeywordToken*		getToken() const					{ return mToken; }
-	BOOL				getToolTip( std::string& msg ) const;
-
-	void				dump() const;
-
-	struct compare
-	{
-		bool operator()(const LLTextSegment* a, const LLTextSegment* b) const
-		{
-			return a->mStart < b->mStart;
-		}
-	};
-	
-private:
-	LLStyleSP	mStyle;
-	S32			mStart;
-	S32			mEnd;
-	LLKeywordToken* mToken;
-	BOOL		mIsDefault;
-};
-
-
 #endif  // LL_TEXTEDITOR_
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index fab8f61356..7e4df892c4 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -71,9 +71,6 @@
 //
 const LLColor4 UI_VERTEX_COLOR(1.f, 1.f, 1.f, 1.f);
 
-// Used to hide the flashing text cursor when window doesn't have focus.
-BOOL gShowTextEditCursor = TRUE;
-
 // Language for UI construction
 std::map<std::string, std::string> gTranslation;
 std::list<std::string> gUntranslated;
@@ -1898,6 +1895,12 @@ void LLScreenClipRect::pushClipRect(const LLRect& rect)
 	{
 		LLRect top = sClipRectStack.top();
 		combined_clip_rect.intersectWith(top);
+
+		if(combined_clip_rect.isEmpty())
+		{
+			// avoid artifacts where zero area rects show up as lines
+			combined_clip_rect = LLRect::null;
+		}
 	}
 	sClipRectStack.push(combined_clip_rect);
 }
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index b1943a7b02..1f9b0b2dbc 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -151,9 +151,6 @@ inline void gl_rect_2d_offset_local( const LLRect& rect, S32 pixel_offset, BOOL
 	gl_rect_2d_offset_local( rect.mLeft, rect.mTop, rect.mRight, rect.mBottom, pixel_offset, filled );
 }
 
-// Used to hide the flashing text cursor when window doesn't have focus.
-extern BOOL gShowTextEditCursor;
-
 class LLImageProviderInterface;
 
 typedef	void (*LLUIAudioCallback)(const LLUUID& uuid);
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 8aa7540446..4a9fec3191 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -278,24 +278,46 @@ void LLUICtrl::onMouseLeave(S32 x, S32 y, MASK mask)
 {
 	mMouseLeaveSignal(this, getValue());
 }
+
 //virtual 
-BOOL LLUICtrl::handleMouseDown(S32 x, S32 y, MASK mask){
+BOOL LLUICtrl::handleMouseDown(S32 x, S32 y, MASK mask)
+{
 	BOOL handled  = LLView::handleMouseDown(x,y,mask);
 	mMouseDownSignal(this,x,y,mask);
 	return handled;
 }
+
 //virtual
-BOOL LLUICtrl::handleMouseUp(S32 x, S32 y, MASK mask){
+BOOL LLUICtrl::handleMouseUp(S32 x, S32 y, MASK mask)
+{
 	BOOL handled  = LLView::handleMouseUp(x,y,mask);
 	mMouseUpSignal(this,x,y,mask);
 	return handled;
 }
+
+//virtual
+BOOL LLUICtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	BOOL handled  = LLView::handleRightMouseDown(x,y,mask);
+	mRightMouseDownSignal(this,x,y,mask);
+	return handled;
+}
+
 //virtual
-BOOL LLUICtrl::handleRightMouseUp(S32 x, S32 y, MASK mask){
+BOOL LLUICtrl::handleRightMouseUp(S32 x, S32 y, MASK mask)
+{
 	BOOL handled  = LLView::handleRightMouseUp(x,y,mask);
-	mRightClickSignal(this,x,y,mask);
+	mRightMouseUpSignal(this,x,y,mask);
 	return handled;
 }
+
+// can't tab to children of a non-tab-stop widget
+BOOL LLUICtrl::canFocusChildren() const
+{
+	return hasTabStop();
+}
+
+
 void LLUICtrl::onCommit()
 {
 	mCommitSignal(this, getValue());
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 6ba3b01fcb..a4f539af14 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -186,8 +186,10 @@ public:
 	/*virtual*/ BOOL	getTentative() const;
 	/*virtual*/ void	onMouseEnter(S32 x, S32 y, MASK mask);
 	/*virtual*/ void	onMouseLeave(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL	canFocusChildren() const;
 	/*virtual*/ BOOL 	handleMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL 	handleMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);
 
 	// From LLFocusableElement
@@ -258,7 +260,8 @@ public:
 	
 	boost::signals2::connection setMouseDownCallback( const mouse_signal_t::slot_type& cb ) { return mMouseDownSignal.connect(cb); }
 	boost::signals2::connection setMouseUpCallback( const mouse_signal_t::slot_type& cb ) { return mMouseUpSignal.connect(cb); }
-	boost::signals2::connection setRightClickedCallback( const mouse_signal_t::slot_type& cb ) { return mRightClickSignal.connect(cb); }
+	boost::signals2::connection setRightMouseDownCallback( const mouse_signal_t::slot_type& cb ) { return mRightMouseDownSignal.connect(cb); }
+	boost::signals2::connection setRightMouseUpCallback( const mouse_signal_t::slot_type& cb ) { return mRightMouseUpSignal.connect(cb); }
 	
 	// *TODO: Deprecate; for backwards compatability only:
 	boost::signals2::connection setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data);	
@@ -292,7 +295,8 @@ protected:
 	
 	mouse_signal_t		mMouseDownSignal;
 	mouse_signal_t		mMouseUpSignal;
-	mouse_signal_t		mRightClickSignal;
+	mouse_signal_t		mRightMouseDownSignal;
+	mouse_signal_t		mRightMouseUpSignal;
 	
     LLViewModelPtr  mViewModel;
 
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 2bbede8c13..1161101f90 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -45,31 +45,7 @@
 #include "llquaternion.h"
 
 // this library includes
-#include "llbutton.h"
-#include "llcheckboxctrl.h"
-//#include "llcolorswatch.h"
-#include "llcombobox.h"
-#include "llcontrol.h"
-#include "lldir.h"
-#include "llevent.h"
 #include "llfloater.h"
-#include "lliconctrl.h"
-#include "lllineeditor.h"
-#include "llmenugl.h"
-#include "llradiogroup.h"
-#include "llscrollcontainer.h"
-#include "llscrollingpanellist.h"
-#include "llscrolllistctrl.h"
-#include "llslider.h"
-#include "llsliderctrl.h"
-#include "llmultislider.h"
-#include "llmultisliderctrl.h"
-#include "llspinctrl.h"
-#include "lltabcontainer.h"
-#include "lltextbox.h"
-#include "lltexteditor.h"
-#include "llui.h"
-#include "llviewborder.h"
 
 LLFastTimer::DeclareTimer FTM_WIDGET_CONSTRUCTION("Widget Construction");
 LLFastTimer::DeclareTimer FTM_INIT_FROM_PARAMS("Widget InitFromParams");
@@ -149,7 +125,7 @@ void LLUICtrlFactory::createChildren(LLView* viewp, LLXMLNodePtr node, const wid
 
 }
 
-LLFastTimer::DeclareTimer FTM_XML_PARSE("XML Reading/Parsing");
+static LLFastTimer::DeclareTimer FTM_XML_PARSE("XML Reading/Parsing");
 //-----------------------------------------------------------------------------
 // getLayeredXMLNode()
 //-----------------------------------------------------------------------------
@@ -177,14 +153,14 @@ bool LLUICtrlFactory::getLocalizedXMLNode(const std::string &xui_filename, LLXML
 	}
 }
 
-static LLFastTimer::DeclareTimer BUILD_FLOATERS("Build Floaters");
+static LLFastTimer::DeclareTimer FTM_BUILD_FLOATERS("Build Floaters");
 
 //-----------------------------------------------------------------------------
 // buildFloater()
 //-----------------------------------------------------------------------------
 void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filename, LLXMLNodePtr output_node)
 {
-	LLFastTimer timer(BUILD_FLOATERS);
+	LLFastTimer timer(FTM_BUILD_FLOATERS);
 	LLXMLNodePtr root;
 
 	//if exporting, only load the language being exported, 
@@ -248,14 +224,14 @@ S32 LLUICtrlFactory::saveToXML(LLView* viewp, const std::string& filename)
 	return 0;
 }
 
-static LLFastTimer::DeclareTimer BUILD_PANELS("Build Panels");
+static LLFastTimer::DeclareTimer FTM_BUILD_PANELS("Build Panels");
 
 //-----------------------------------------------------------------------------
 // buildPanel()
 //-----------------------------------------------------------------------------
 BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename, LLXMLNodePtr output_node)
 {
-	LLFastTimer timer(BUILD_PANELS);
+	LLFastTimer timer(FTM_BUILD_PANELS);
 	BOOL didPost = FALSE;
 	LLXMLNodePtr root;
 
@@ -317,7 +293,7 @@ BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename, L
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-LLFastTimer::DeclareTimer FTM_CREATE_FROM_XML("Create child widget");
+static LLFastTimer::DeclareTimer FTM_CREATE_FROM_XML("Create child widget");
 
 LLView *LLUICtrlFactory::createFromXML(LLXMLNodePtr node, LLView* parent, const std::string& filename, const widget_registry_t& registry, LLXMLNodePtr output_node)
 {
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 0ba028e1c8..e2dc85d03f 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1300,6 +1300,11 @@ LLView* LLView::childrenHandleMiddleMouseUp(S32 x, S32 y, MASK mask)
 }
 
 void LLView::draw()
+{
+	drawChildren();
+}
+
+void LLView::drawChildren()
 {
 	if (sDebugRects)
 	{
@@ -1329,7 +1334,7 @@ void LLView::draw()
 			{
 				// Only draw views that are within the root view
 				localRectToScreen(viewp->getRect(),&screenRect);
-				if ( rootRect.rectInRect(&screenRect) )
+				if ( rootRect.overlaps(screenRect) )
 				{
 					glMatrixMode(GL_MODELVIEW);
 					LLUI::pushMatrix();
@@ -1540,7 +1545,7 @@ void LLView::updateBoundingRect()
 
 			LLRect child_bounding_rect = childp->getBoundingRect();
 
-			if (local_bounding_rect.isNull())
+			if (local_bounding_rect.isEmpty())
 			{
 				// start out with bounding rect equal to first visible child's bounding rect
 				local_bounding_rect = child_bounding_rect;
@@ -1548,7 +1553,7 @@ void LLView::updateBoundingRect()
 			else
 			{
 				// accumulate non-null children rectangles
-				if (!child_bounding_rect.isNull())
+				if (!child_bounding_rect.isEmpty())
 				{
 					local_bounding_rect.unionWith(child_bounding_rect);
 				}
@@ -1639,7 +1644,7 @@ BOOL LLView::hasAncestor(const LLView* parentp) const
 
 BOOL LLView::childHasKeyboardFocus( const std::string& childname ) const
 {
-	LLView *child = getChildView(childname, TRUE, FALSE);
+	LLView *child = findChildView(childname, TRUE);
 	if (child)
 	{
 		return gFocusMgr.childHasKeyboardFocus(child);
@@ -1654,13 +1659,27 @@ BOOL LLView::childHasKeyboardFocus( const std::string& childname ) const
 
 BOOL LLView::hasChild(const std::string& childname, BOOL recurse) const
 {
-	return getChildView(childname, recurse, FALSE) != NULL;
+	return findChildView(childname, recurse) != NULL;
 }
 
 //-----------------------------------------------------------------------------
 // getChildView()
 //-----------------------------------------------------------------------------
-LLView* LLView::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
+LLView* LLView::getChildView(const std::string& name, BOOL recurse) const
+{
+	LLView* child = findChildView(name, recurse);
+	if (!child)
+	{
+		child = getDefaultWidget<LLView>(name);
+		if (!child)
+		{
+			 child = LLUICtrlFactory::createDefaultWidget<LLView>(name);
+		}
+	}
+	return child;
+}
+
+LLView* LLView::findChildView(const std::string& name, BOOL recurse) const
 {
 	//richard: should we allow empty names?
 	//if(name.empty())
@@ -1681,23 +1700,13 @@ LLView* LLView::getChildView(const std::string& name, BOOL recurse, BOOL create_
 		for ( child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
 		{
 			LLView* childp = *child_it;
-			LLView* viewp = childp->getChildView(name, recurse, FALSE);
+			LLView* viewp = childp->findChildView(name, recurse);
 			if ( viewp )
 			{
 				return viewp;
 			}
 		}
 	}
-
-	if (create_if_missing)
-	{
-		LLView* view = getDefaultWidget<LLView>(name);
-		if (!view)
-		{
-			 view = LLUICtrlFactory::createDefaultWidget<LLView>(name);
-		}
-		return view;
-	}
 	return NULL;
 }
 
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index ee49276139..6247bf036c 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -213,6 +213,9 @@ protected:
 	LLView(const LLView::Params&);
 	friend class LLUICtrlFactory;
 
+private:
+	// widgets in general are not copyable
+	LLView(const LLView& other) {};
 public:
 #if LL_DEBUG
 	static BOOL sIsDrawing;
@@ -421,6 +424,7 @@ public:
 	virtual std::string getShowNamesToolTip();
 
 	virtual void	draw();
+	void	drawChildren();
 
 	void parseFollowsFlags(const LLView::Params& params);
 
@@ -484,19 +488,20 @@ public:
 
 	template <class T> T* findChild(const std::string& name, BOOL recurse = TRUE) const
 	{
-		LLView* child = getChildView(name, recurse, FALSE);
+		LLView* child = findChildView(name, recurse);
 		T* result = dynamic_cast<T*>(child);
 		return result;
 	}
 
-	template <class T> T* getChild(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+	template <class T> T* getChild(const std::string& name, BOOL recurse = TRUE) const;
 
 	template <class T> T& getChildRef(const std::string& name, BOOL recurse = TRUE) const
 	{
-		return *getChild<T>(name, recurse, TRUE);
+		return *getChild<T>(name, recurse);
 	}
 
-	virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+	virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE) const;
+	virtual LLView* findChildView(const std::string& name, BOOL recurse = TRUE) const;
 
 	template <class T> T* getDefaultWidget(const std::string& name) const
 	{
@@ -636,9 +641,9 @@ private:
 	LLView::child_tab_order_t mTabOrder;
 };
 
-template <class T> T* LLView::getChild(const std::string& name, BOOL recurse, BOOL create_if_missing) const
+template <class T> T* LLView::getChild(const std::string& name, BOOL recurse) const
 {
-	LLView* child = getChildView(name, recurse, FALSE);
+	LLView* child = findChildView(name, recurse);
 	T* result = dynamic_cast<T*>(child);
 	if (!result)
 	{
@@ -647,28 +652,25 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse, BO
 		{
 			llwarns << "Found child named " << name << " but of wrong type " << typeid(child).name() << ", expecting " << typeid(T*).name() << llendl;
 		}
-		if (create_if_missing)
+		result = getDefaultWidget<T>(name);
+		if (!result)
 		{
-			result = getDefaultWidget<T>(name);
-			if (!result)
+			result = LLUICtrlFactory::getDefaultWidget<T>(name);
+
+			if (result)
 			{
-				result = LLUICtrlFactory::getDefaultWidget<T>(name);
-
-				if (result)
-				{
-					// *NOTE: You cannot call mFoo = getChild<LLFoo>("bar")
-					// in a floater or panel constructor.  The widgets will not
-					// be ready.  Instead, put it in postBuild().
-					llwarns << "Making dummy " << typeid(T).name() << " named \"" << name << "\" in " << getName() << llendl;
-				}
-				else
-				{
-					llwarns << "Failed to create dummy " << typeid(T).name() << llendl;
-					return NULL;
-				}
-
-				getDefaultWidgetMap()[name] = result;
+				// *NOTE: You cannot call mFoo = getChild<LLFoo>("bar")
+				// in a floater or panel constructor.  The widgets will not
+				// be ready.  Instead, put it in postBuild().
+				llwarns << "Making dummy " << typeid(T).name() << " named \"" << name << "\" in " << getName() << llendl;
 			}
+			else
+			{
+				llwarns << "Failed to create dummy " << typeid(T).name() << llendl;
+				return NULL;
+			}
+
+			getDefaultWidgetMap()[name] = result;
 		}
 	}
 	return result;
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
index 860aa3302e..f41c98f7b3 100644
--- a/indra/llui/llviewborder.cpp
+++ b/indra/llui/llviewborder.cpp
@@ -134,9 +134,7 @@ void LLViewBorder::draw()
 		}
 	}
 
-	// draw the children
-	LLView::draw();
-
+	drawChildren();
 }
 
 void LLViewBorder::drawOnePixelLines()
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp
index 6b1563bab1..5fdf41188d 100644
--- a/indra/llvfs/llvfile.cpp
+++ b/indra/llvfs/llvfile.cpp
@@ -44,6 +44,8 @@ const S32 LLVFile::WRITE		= 0x00000002;
 const S32 LLVFile::READ_WRITE	= 0x00000003;  // LLVFile::READ & LLVFile::WRITE
 const S32 LLVFile::APPEND		= 0x00000006;  // 0x00000004 & LLVFile::WRITE
 
+static LLFastTimer::DeclareTimer FTM_VFILE_WAIT("VFile Wait");
+
 //----------------------------------------------------------------------------
 LLVFSThread* LLVFile::sVFSThread = NULL;
 BOOL LLVFile::sAllocdVFSThread = FALSE;
@@ -318,7 +320,7 @@ BOOL LLVFile::setMaxSize(S32 size)
 
 	if (!mVFS->checkAvailable(size))
 	{
-		LLFastTimer t(LLFastTimer::FTM_VFILE_WAIT);
+		LLFastTimer t(FTM_VFILE_WAIT);
 		S32 count = 0;
 		while (sVFSThread->getPending() > 1000)
 		{
@@ -426,7 +428,7 @@ bool LLVFile::isLocked(EVFSLock lock)
 
 void LLVFile::waitForLock(EVFSLock lock)
 {
-	LLFastTimer t(LLFastTimer::FTM_VFILE_WAIT);
+	LLFastTimer t(FTM_VFILE_WAIT);
 	// spin until the lock clears
 	while (isLocked(lock))
 	{
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index ce1bc82168..9936b24292 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1645,6 +1645,9 @@ void LLWindowWin32::gatherInput()
 	mMousePositionModified = FALSE;
 }
 
+static LLFastTimer::DeclareTimer FTM_KEYHANDLER("Handle Keyboard");
+static LLFastTimer::DeclareTimer FTM_MOUSEHANDLER("Handle Mouse");
+
 LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_param, LPARAM l_param)
 {
 	LLWindowWin32 *window_imp = (LLWindowWin32 *)GetWindowLong(h_wnd, GWL_USERDATA);
@@ -1878,7 +1881,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 		case WM_KEYUP:
 		{
 			window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_KEYUP");
-			LLFastTimer t2(LLFastTimer::FTM_KEYHANDLER);
+			LLFastTimer t2(FTM_KEYHANDLER);
 
 			if (gDebugWindowProc)
 			{
@@ -1987,7 +1990,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 		case WM_LBUTTONDOWN:
 			{
 				window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_LBUTTONDOWN");
-				LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
+				LLFastTimer t2(FTM_MOUSEHANDLER);
 				if (LLWinImm::isAvailable() && window_imp->mPreeditor)
 				{
 					window_imp->interruptLanguageTextInput();
@@ -2051,7 +2054,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 		case WM_LBUTTONUP:
 			{
 				window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_LBUTTONUP");
-				LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
+				LLFastTimer t2(FTM_MOUSEHANDLER);
 				//if (gDebugClicks)
 				//{
 				//	LL_INFOS("Window") << "WndProc left button up" << LL_ENDL;
@@ -2085,7 +2088,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 		case WM_RBUTTONDOWN:
 			{
 				window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_RBUTTONDOWN");
-				LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
+				LLFastTimer t2(FTM_MOUSEHANDLER);
 				if (LLWinImm::isAvailable() && window_imp->mPreeditor)
 				{
 					window_imp->interruptLanguageTextInput();
@@ -2119,7 +2122,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 		case WM_RBUTTONUP:
 			{
 				window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_RBUTTONUP");
-				LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
+				LLFastTimer t2(FTM_MOUSEHANDLER);
 				// Because we move the cursor position in the app, we need to query
 				// to find out where the cursor at the time the event is handled.
 				// If we don't do this, many clicks could get buffered up, and if the
@@ -2149,7 +2152,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 //		case WM_MBUTTONDBLCLK:
 			{
 				window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_MBUTTONDOWN");
-				LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
+				LLFastTimer t2(FTM_MOUSEHANDLER);
 				if (LLWinImm::isAvailable() && window_imp->mPreeditor)
 				{
 					window_imp->interruptLanguageTextInput();
@@ -2183,7 +2186,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 		case WM_MBUTTONUP:
 			{
 				window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_MBUTTONUP");
-				LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER);
+				LLFastTimer t2(FTM_MOUSEHANDLER);
 				// Because we move the cursor position in tllviewerhe app, we need to query
 				// to find out where the cursor at the time the event is handled.
 				// If we don't do this, many clicks could get buffered up, and if the
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
index 0864940866..7d94601568 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -96,7 +96,7 @@ typedef enum e_control_type
 	TYPE_COUNT
 } eControlType;
 
-class LLControlVariable : public LLRefCount, boost::noncopyable
+class LLControlVariable : public LLRefCount
 {
 	friend class LLControlGroup;
 	
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index cb56049ae2..a1d0831939 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -430,6 +430,7 @@ namespace LLInitParam
 
 		const Param* getLastChangedParam() const { return mLastChangedParam ? getParamFromHandle(mLastChangedParam) : NULL; }
 		S32 getLastChangeVersion() const { return mChangeVersion; }
+		bool isDefault() const { return mChangeVersion == 0; }
 
 		bool deserializeBlock(Parser& p, Parser::name_stack_range_t name_stack);
 		bool serializeBlock(Parser& p, Parser::name_stack_t name_stack = Parser::name_stack_t(), const BaseBlock* diff_block = NULL) const;
diff --git a/indra/llxuixml/lltrans.cpp b/indra/llxuixml/lltrans.cpp
index db7421575c..2efc475f57 100644
--- a/indra/llxuixml/lltrans.cpp
+++ b/indra/llxuixml/lltrans.cpp
@@ -169,3 +169,28 @@ std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::
 	}
 }
 
+//static 
+bool LLTrans::findString(std::string &result, const std::string &xml_desc, const LLStringUtil::format_map_t& msg_args)
+{
+	LLFastTimer timer(FTM_GET_TRANS);
+	
+	template_map_t::iterator iter = sStringTemplates.find(xml_desc);
+	if (iter != sStringTemplates.end())
+	{
+		std::string text = iter->second.mText;
+		LLStringUtil::format_map_t args = sDefaultArgs;
+		args.insert(msg_args.begin(), msg_args.end());
+		LLStringUtil::format(text, args);
+		result = text;
+		return true;
+	}
+	else
+	{
+		LLSD args;
+		args["STRING_NAME"] = xml_desc;
+		LL_WARNS_ONCE("configuration") << "Missing String in strings.xml: [" << xml_desc << "]" << LL_ENDL;
+		//LLNotifications::instance().add("MissingString", args);
+		
+		return false;
+	}
+}
diff --git a/indra/llxuixml/lltrans.h b/indra/llxuixml/lltrans.h
index 6423c88245..340d70e434 100644
--- a/indra/llxuixml/lltrans.h
+++ b/indra/llxuixml/lltrans.h
@@ -78,6 +78,7 @@ public:
 	 * @returns Translated string
 	 */
 	static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args);
+	static bool findString(std::string &result, const std::string &xml_desc, const LLStringUtil::format_map_t& args);
 
 	/**
 	 * @brief Returns a translated string
@@ -89,7 +90,14 @@ public:
 		LLStringUtil::format_map_t empty;
 		return getString(xml_desc, empty);
 	}
-	
+
+	static bool findString(std::string &result, const std::string &xml_desc)
+	{
+		LLStringUtil::format_map_t empty;
+		return findString(result, xml_desc, empty);
+	}
+
+
 	// get the default args
 	static const LLStringUtil::format_map_t& getDefaultArgs()
 	{
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp
index e1f61906e2..e28e52fd16 100644
--- a/indra/llxuixml/llxuiparser.cpp
+++ b/indra/llxuixml/llxuiparser.cpp
@@ -399,11 +399,11 @@ LLXUIParser::LLXUIParser()
 								boost::bind(&LLXUIParser::writeSDValue, this, _1, _2));
 }
 
-static LLFastTimer::DeclareTimer PARSE_XUI("XUI Parsing");
+static LLFastTimer::DeclareTimer FTM_PARSE_XUI("XUI Parsing");
 
 void LLXUIParser::readXUI(LLXMLNodePtr node, LLInitParam::BaseBlock& block, bool silent)
 {
-	LLFastTimer timer(PARSE_XUI);
+	LLFastTimer timer(FTM_PARSE_XUI);
 	mNameStack.clear();
 	mCurReadDepth = 0;
 	setParseSilently(silent);
diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp
index 05fee9a419..d7f445d3d8 100644
--- a/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -4280,7 +4280,6 @@ BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 	}
 
 	{
-		// LLFastTimer time_in_libraries1(LLFastTimer::FTM_TEMP7);
 		gScriptLibrary.mFunctions[arg]->mExecFunc(returnvalue, arguments, id);
 	}
 	add_register_fp(buffer, LREG_ESR, -gScriptLibrary.mFunctions[arg]->mEnergyUse);
@@ -4351,7 +4350,6 @@ BOOL run_calllib_two_byte(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &i
 	}
 
 	{
-		// LLFastTimer time_in_libraries2(LLFastTimer::FTM_TEMP8);
 		gScriptLibrary.mFunctions[arg]->mExecFunc(returnvalue, arguments, id);
 	}
 	add_register_fp(buffer, LREG_ESR, -gScriptLibrary.mFunctions[arg]->mEnergyUse);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5045f18784..fe9eae04a1 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -290,9 +290,9 @@ static std::set<std::string> default_trans_args;
 void init_default_trans_args()
 {
 	default_trans_args.insert("SECOND_LIFE"); // World
-	default_trans_args.insert("SECOND_LIFE_VIEWER");
+	default_trans_args.insert("APP_NAME");
 	default_trans_args.insert("SECOND_LIFE_GRID");
-	default_trans_args.insert("SECOND_LIFE_SUPPORT");
+	default_trans_args.insert("SUPPORT_SITE");
 }
 
 //----------------------------------------------------------------------------
@@ -863,6 +863,11 @@ bool LLAppViewer::init()
 	return true;
 }
 
+static LLFastTimer::DeclareTimer FTM_MESSAGES("System Messages");
+static LLFastTimer::DeclareTimer FTM_SLEEP("Sleep");
+static LLFastTimer::DeclareTimer FTM_IDLE("Idle");
+static LLFastTimer::DeclareTimer FTM_PUMP("Pump");
+
 bool LLAppViewer::mainLoop()
 {
 	LLMemType mt1(LLMemType::MTYPE_MAIN);
@@ -905,7 +910,7 @@ bool LLAppViewer::mainLoop()
 
 			if (gViewerWindow)
 			{
-				LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
+				LLFastTimer t2(FTM_MESSAGES);
 				gViewerWindow->mWindow->processMiscNativeEvents();
 			}
 			
@@ -913,7 +918,7 @@ bool LLAppViewer::mainLoop()
 			
 			if (gViewerWindow)
 			{
-				LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
+				LLFastTimer t2(FTM_MESSAGES);
 				if (!restoreErrorTrap())
 				{
 					llwarns << " Someone took over my signal/exception handler (post messagehandling)!" << llendl;
@@ -963,14 +968,14 @@ bool LLAppViewer::mainLoop()
 				{
 					pauseMainloopTimeout(); // *TODO: Remove. Messages shouldn't be stalling for 20+ seconds!
 					
-					LLFastTimer t3(LLFastTimer::FTM_IDLE);
+					LLFastTimer t3(FTM_IDLE);
 					idle();
 
 					if (gAres != NULL && gAres->isInitialized())
 					{
 						LLMemType mt_ip(LLMemType::MTYPE_IDLE_PUMP);
 						pingMainloopTimeout("Main:ServicePump");				
-						LLFastTimer t4(LLFastTimer::FTM_PUMP);
+						LLFastTimer t4(FTM_PUMP);
 						gAres->process();
 						// this pump is necessary to make the login screen show up
 						gServicePump->pump();
@@ -1007,7 +1012,7 @@ bool LLAppViewer::mainLoop()
 			// Sleep and run background threads
 			{
 				LLMemType mt_sleep(LLMemType::MTYPE_SLEEP);
-				LLFastTimer t2(LLFastTimer::FTM_SLEEP);
+				LLFastTimer t2(FTM_SLEEP);
 				bool run_multiple_threads = gSavedSettings.getBOOL("RunMultipleThreads");
 
 				// yield some time to the os based on command line option
@@ -2025,7 +2030,7 @@ bool LLAppViewer::initConfiguration()
 
 #if LL_DARWIN
 	// Initialize apple menubar and various callbacks
-	init_apple_menu(LLTrans::getString("SECOND_LIFE_VIEWER").c_str());
+	init_apple_menu(LLTrans::getString("APP_NAME").c_str());
 
 #if __ppc__
 	// If the CPU doesn't have Altivec (i.e. it's not at least a G4), don't go any further.
@@ -2064,7 +2069,7 @@ bool LLAppViewer::initConfiguration()
 	//
 	// Set the name of the window
 	//
-	gWindowTitle = LLTrans::getString("SECOND_LIFE_VIEWER");
+	gWindowTitle = LLTrans::getString("APP_NAME");
 #if LL_DEBUG
 	gWindowTitle += std::string(" [DEBUG] ") + gArgs;
 #else
@@ -2181,7 +2186,7 @@ void LLAppViewer::checkForCrash(void)
         {
             std::ostringstream msg;
 			msg << LLTrans::getString("MBFrozenCrashed");
-			std::string alert = LLTrans::getString("SECOND_LIFE_VIEWER") + " " + LLTrans::getString("MBAlert");
+			std::string alert = LLTrans::getString("APP_NAME") + " " + LLTrans::getString("MBAlert");
             choice = OSMessageBox(msg.str(),
                                   alert,
                                   OSMB_YESNO);
@@ -2391,7 +2396,7 @@ void LLAppViewer::writeSystemInfo()
 	gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)true;
 	
 	// Dump some debugging info
-	LL_INFOS("SystemInfo") << LLTrans::getString("SECOND_LIFE_VIEWER")
+	LL_INFOS("SystemInfo") << LLTrans::getString("APP_NAME")
 			<< " version " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH
 			<< LL_ENDL;
 
@@ -3069,7 +3074,7 @@ void LLAppViewer::purgeCache()
 
 std::string LLAppViewer::getSecondLifeTitle() const
 {
-	return LLTrans::getString("SECOND_LIFE_VIEWER");
+	return LLTrans::getString("APP_NAME");
 }
 
 std::string LLAppViewer::getWindowTitle() const 
@@ -3234,6 +3239,15 @@ public:
 		}
 };
 
+static LLFastTimer::DeclareTimer FTM_AUDIO_UPDATE("Update Audio");
+static LLFastTimer::DeclareTimer FTM_CLEANUP("Cleanup");
+static LLFastTimer::DeclareTimer FTM_IDLE_CB("Idle Callbacks");
+static LLFastTimer::DeclareTimer FTM_LOD_UPDATE("Update LOD");
+static LLFastTimer::DeclareTimer FTM_OBJECTLIST_UPDATE("Update Objectlist");
+static LLFastTimer::DeclareTimer FTM_REGION_UPDATE("Update Region");
+static LLFastTimer::DeclareTimer FTM_WORLD_UPDATE("Update World");
+static LLFastTimer::DeclareTimer FTM_NETWORK("Network");
+
 ///////////////////////////////////////////////////////
 // idle()
 //
@@ -3300,7 +3314,7 @@ void LLAppViewer::idle()
 
 	if (!gDisconnected)
 	{
-		LLFastTimer t(LLFastTimer::FTM_NETWORK);
+		LLFastTimer t(FTM_NETWORK);
 		// Update spaceserver timeinfo
 	    LLWorld::getInstance()->setSpaceTimeUSec(LLWorld::getInstance()->getSpaceTimeUSec() + (U32)(dt_raw * SEC_TO_MICROSEC));
     
@@ -3381,7 +3395,7 @@ void LLAppViewer::idle()
 
 	if (!gDisconnected)
 	{
-		LLFastTimer t(LLFastTimer::FTM_NETWORK);
+		LLFastTimer t(FTM_NETWORK);
 	
 	    ////////////////////////////////////////////////
 	    //
@@ -3410,7 +3424,7 @@ void LLAppViewer::idle()
 	//
 
 	{
-// 		LLFastTimer t(LLFastTimer::FTM_IDLE_CB);
+// 		LLFastTimer t(FTM_IDLE_CB);
 
 		// Do event notifications if necessary.  Yes, we may want to move this elsewhere.
 		gEventNotifier.update();
@@ -3445,7 +3459,7 @@ void LLAppViewer::idle()
 	}
 
 	{
-		LLFastTimer t(LLFastTimer::FTM_OBJECTLIST_UPDATE); // Actually "object update"
+		LLFastTimer t(FTM_OBJECTLIST_UPDATE); // Actually "object update"
 		
         if (!(logoutRequestSent() && hasSavedFinalSnapshot()))
 		{
@@ -3460,7 +3474,7 @@ void LLAppViewer::idle()
 	//
 
 	{
-		LLFastTimer t(LLFastTimer::FTM_CLEANUP);
+		LLFastTimer t(FTM_CLEANUP);
 		gObjectList.cleanDeadObjects();
 		LLDrawable::cleanupDeadDrawables();
 	}
@@ -3492,7 +3506,7 @@ void LLAppViewer::idle()
 	//
 
 	{
-		LLFastTimer t(LLFastTimer::FTM_NETWORK);
+		LLFastTimer t(FTM_NETWORK);
 		gVLManager.unpackData();
 	}
 	
@@ -3504,7 +3518,7 @@ void LLAppViewer::idle()
 	LLWorld::getInstance()->updateVisibilities();
 	{
 		const F32 max_region_update_time = .001f; // 1ms
-		LLFastTimer t(LLFastTimer::FTM_REGION_UPDATE);
+		LLFastTimer t(FTM_REGION_UPDATE);
 		LLWorld::getInstance()->updateRegions(max_region_update_time);
 	}
 	
@@ -3551,7 +3565,7 @@ void LLAppViewer::idle()
 	
 	if (!gNoRender)
 	{
-		LLFastTimer t(LLFastTimer::FTM_WORLD_UPDATE);
+		LLFastTimer t(FTM_WORLD_UPDATE);
 		gPipeline.updateMove();
 
 		LLWorld::getInstance()->updateParticles();
@@ -3574,12 +3588,12 @@ void LLAppViewer::idle()
 
 	// objects and camera should be in sync, do LOD calculations now
 	{
-		LLFastTimer t(LLFastTimer::FTM_LOD_UPDATE);
+		LLFastTimer t(FTM_LOD_UPDATE);
 		gObjectList.updateApparentAngles(gAgent);
 	}
 
 	{
-		LLFastTimer t(LLFastTimer::FTM_AUDIO_UPDATE);
+		LLFastTimer t(FTM_AUDIO_UPDATE);
 		
 		if (gAudiop)
 		{
@@ -3719,6 +3733,8 @@ void LLAppViewer::sendLogoutRequest()
 static F32 CheckMessagesMaxTime = CHECK_MESSAGES_DEFAULT_MAX_TIME;
 #endif
 
+static LLFastTimer::DeclareTimer FTM_IDLE_NETWORK("Network");
+
 void LLAppViewer::idleNetwork()
 {
 	LLMemType mt_in(LLMemType::MTYPE_IDLE_NETWORK);
@@ -3731,7 +3747,7 @@ void LLAppViewer::idleNetwork()
 
 	if (!gSavedSettings.getBOOL("SpeedTest"))
 	{
-		LLFastTimer t(LLFastTimer::FTM_IDLE_NETWORK); // decode
+		LLFastTimer t(FTM_IDLE_NETWORK); // decode
 		
 		// deal with any queued name requests and replies.
 		gCacheName->processPending();
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index a85f8710c7..f557adf6a6 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -200,7 +200,7 @@ BOOL LLAvatarList::update(const std::vector<LLUUID>& all_buddies, const std::str
 	// Changed item in place, need to request sort and update columns
 	// because we might have changed data in a column on which the user
 	// has already sorted. JC
-	sortItems();
+	updateSort();
 
 	// re-select items
 	selectMultiple(selected_ids);
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 2687feb68b..2403e891f6 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -164,7 +164,7 @@ void LLBottomTray::setVisible(BOOL visible)
 {
 	LLPanel::setVisible(visible);
 
-	// *NOTE: we must check mToolbarStack against NULL because sewtVisible is called from the 
+	// *NOTE: we must check mToolbarStack against NULL because setVisible is called from the 
 	// LLPanel::initFromParams BEFORE postBuild is called and child controls are not exist yet
 	if (NULL != mToolbarStack)
 	{
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 7a118deb8a..bea11ecfeb 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -103,10 +103,6 @@ LLChatBar::LLChatBar()
 	mObserver(NULL)
 {
 	setIsChrome(TRUE);
-	
-#if !LL_RELEASE_FOR_DOWNLOAD
-	childDisplayNotFound();
-#endif
 }
 
 
@@ -125,7 +121,7 @@ BOOL LLChatBar::postBuild()
 	// * NOTE: mantipov: getChild with default parameters returns dummy widget.
 	// Seems this class will be completle removed
 	// attempt to bind to an existing combo box named gesture
-	setGestureCombo(getChild<LLComboBox>( "Gesture", TRUE, FALSE));
+	setGestureCombo(findChild<LLComboBox>( "Gesture"));
 
 	mInputEditor = getChild<LLLineEditor>("Chat Editor");
 	mInputEditor->setKeystrokeCallback(&onInputEditorKeystroke, this);
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 45b322e106..05c574b154 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -93,13 +93,11 @@ void	LLChatItemCtrl::reshape		(S32 width, S32 height, BOOL called_from_parent )
 		caption->reshape( width - 4, caption_rect.getHeight(), 1);
 		caption->setRect(caption_rect);
 
-		
 		LLRect msg_text_rect = msg_text->getRect();
 		msg_text_rect.setLeftTopAndSize( msg_left_offset, height - caption_rect.getHeight() , width - msg_left_offset - msg_right_offset, height - caption_rect.getHeight());
 		msg_text->reshape( width - msg_left_offset - msg_right_offset, height - caption_rect.getHeight(), 1);
 		msg_text->setRect(msg_text_rect);
 	}
-		
 }
 
 BOOL LLChatItemCtrl::postBuild()
diff --git a/indra/newview/llchatmsgbox.cpp b/indra/newview/llchatmsgbox.cpp
index 933d9b8771..9399e1f68d 100644
--- a/indra/newview/llchatmsgbox.cpp
+++ b/indra/newview/llchatmsgbox.cpp
@@ -371,7 +371,7 @@ void LLChatMsgBox::drawText( S32 x, S32 y, const LLColor4& color )
 							mHAlign, mVAlign,
 							mFontStyle,
 							mShadowType,
-							line_length, getRect().getWidth(), NULL, TRUE, mUseEllipses );
+							line_length, getRect().getWidth(), NULL, mUseEllipses );
 			cur_pos += line_length + 1;
 			y -= llfloor(mFontGL->getLineHeight()) + mLineSpacing;
 
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index d8bd32382f..7cc78aff92 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -60,6 +60,9 @@ const F32 MAX_INTERPOLATE_DISTANCE_SQUARED = 10.f * 10.f;
 const F32 OBJECT_DAMPING_TIME_CONSTANT = 0.06f;
 const F32 MIN_SHADOW_CASTER_RADIUS = 2.0f;
 
+static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound");
+
+
 ////////////////////////
 //
 // Inline implementations.
@@ -188,7 +191,7 @@ BOOL LLDrawable::isLight() const
 
 void LLDrawable::cleanupReferences()
 {
-	LLFastTimer t(LLFastTimer::FTM_PIPELINE);
+	LLFastTimer t(FTM_PIPELINE);
 	
 	std::for_each(mFaces.begin(), mFaces.end(), DeletePointer());
 	mFaces.clear();
@@ -1033,7 +1036,7 @@ void LLSpatialBridge::updateSpatialExtents()
 	LLSpatialGroup* root = (LLSpatialGroup*) mOctree->getListener(0);
 	
 	{
-		LLFastTimer ftm(LLFastTimer::FTM_CULL_REBOUND);
+		LLFastTimer ftm(FTM_CULL_REBOUND);
 		root->rebound();
 	}
 	
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
index 940e1fc968..c765980c30 100644
--- a/indra/newview/lldrawable.h
+++ b/indra/newview/lldrawable.h
@@ -63,7 +63,6 @@ class LLViewerTexture;
 // Can have multiple silhouettes for each object
 const U32 SILHOUETTE_HIGHLIGHT = 0;
 
-
 // All data for new renderer goes into this class.
 class LLDrawable : public LLRefCount
 {
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 267f83f295..de97e2406d 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -90,7 +90,7 @@ void LLDrawPoolAlpha::endDeferredPass(S32 pass)
 {
 	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.4f);
 	{
-		LLFastTimer t(LLFastTimer::FTM_RENDER_GRASS);
+		LLFastTimer t(FTM_RENDER_GRASS);
 		gDeferredTreeProgram.bind();
 		LLGLEnable test(GL_ALPHA_TEST);
 		//render alpha masked objects
@@ -112,7 +112,7 @@ S32 LLDrawPoolAlpha::getNumPostDeferredPasses()
 
 void LLDrawPoolAlpha::beginPostDeferredPass(S32 pass) 
 { 
-	LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+	LLFastTimer t(FTM_RENDER_ALPHA);
 
 	simple_shader = &gDeferredAlphaProgram;
 	fullbright_shader = &gDeferredFullbrightProgram;
@@ -139,7 +139,7 @@ void LLDrawPoolAlpha::renderPostDeferred(S32 pass)
 
 void LLDrawPoolAlpha::beginRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+	LLFastTimer t(FTM_RENDER_ALPHA);
 	
 	if (LLPipeline::sUnderWaterRender)
 	{
@@ -163,7 +163,7 @@ void LLDrawPoolAlpha::beginRenderPass(S32 pass)
 
 void LLDrawPoolAlpha::endRenderPass( S32 pass )
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+	LLFastTimer t(FTM_RENDER_ALPHA);
 	LLRenderPass::endRenderPass(pass);
 
 	if(gPipeline.canUseWindLightShaders()) 
@@ -174,7 +174,7 @@ void LLDrawPoolAlpha::endRenderPass( S32 pass )
 
 void LLDrawPoolAlpha::render(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+	LLFastTimer t(FTM_RENDER_ALPHA);
 
 	LLGLSPipelineAlpha gls_pipeline_alpha;
 
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index b15cd0b0dc..a2d8c965ec 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -89,12 +89,13 @@ S32 AVATAR_OFFSET_TEX0 = 32;
 S32 AVATAR_OFFSET_TEX1 = 40;
 S32 AVATAR_VERTEX_BYTES = 48;
 
-
 BOOL gAvatarEmbossBumpMap = FALSE;
 static BOOL sRenderingSkinned = FALSE;
 S32 normal_channel = -1;
 S32 specular_channel = -1;
 
+static LLFastTimer::DeclareTimer FTM_SHADOW_AVATAR("Avatar Shadow");
+
 LLDrawPoolAvatar::LLDrawPoolAvatar() : 
 	LLFacePool(POOL_AVATAR)	
 {
@@ -154,7 +155,7 @@ S32 LLDrawPoolAvatar::getNumDeferredPasses()
 
 void LLDrawPoolAvatar::beginDeferredPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_CHARACTERS);
+	LLFastTimer t(FTM_RENDER_CHARACTERS);
 	
 	if (LLPipeline::sImpostorRender)
 	{
@@ -178,7 +179,7 @@ void LLDrawPoolAvatar::beginDeferredPass(S32 pass)
 
 void LLDrawPoolAvatar::endDeferredPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_CHARACTERS);
+	LLFastTimer t(FTM_RENDER_CHARACTERS);
 
 	if (LLPipeline::sImpostorRender)
 	{
@@ -248,7 +249,7 @@ S32 LLDrawPoolAvatar::getNumShadowPasses()
 
 void LLDrawPoolAvatar::beginShadowPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_SHADOW_AVATAR);
+	LLFastTimer t(FTM_SHADOW_AVATAR);
 	
 	sVertexProgram = &gDeferredAvatarShadowProgram;
 	if (sShaderLevel > 0)
@@ -270,7 +271,7 @@ void LLDrawPoolAvatar::beginShadowPass(S32 pass)
 
 void LLDrawPoolAvatar::endShadowPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_SHADOW_AVATAR);
+	LLFastTimer t(FTM_SHADOW_AVATAR);
 
 	if (sShaderLevel > 0)
 	{
@@ -284,7 +285,7 @@ void LLDrawPoolAvatar::endShadowPass(S32 pass)
 
 void LLDrawPoolAvatar::renderShadow(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_SHADOW_AVATAR);
+	LLFastTimer t(FTM_SHADOW_AVATAR);
 
 	if (mDrawFace.empty())
 	{
@@ -320,7 +321,7 @@ S32 LLDrawPoolAvatar::getNumPasses()
 
 void LLDrawPoolAvatar::render(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_CHARACTERS);
+	LLFastTimer t(FTM_RENDER_CHARACTERS);
 	if (LLPipeline::sImpostorRender)
 	{
 		renderAvatars(NULL, 2);
@@ -332,7 +333,7 @@ void LLDrawPoolAvatar::render(S32 pass)
 
 void LLDrawPoolAvatar::beginRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_CHARACTERS);
+	LLFastTimer t(FTM_RENDER_CHARACTERS);
 	//reset vertex buffer mappings
 	LLVertexBuffer::unbind();
 
@@ -358,7 +359,7 @@ void LLDrawPoolAvatar::beginRenderPass(S32 pass)
 
 void LLDrawPoolAvatar::endRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_CHARACTERS);
+	LLFastTimer t(FTM_RENDER_CHARACTERS);
 
 	if (LLPipeline::sImpostorRender)
 	{
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index 971949e885..2cb4d5d6d5 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -74,6 +74,7 @@ const U32 VERTEX_MASK_BUMP = LLVertexBuffer::MAP_VERTEX |LLVertexBuffer::MAP_TEX
 
 U32 LLDrawPoolBump::sVertexMask = VERTEX_MASK_SHINY;
 
+
 static LLGLSLShader* shader = NULL;
 static S32 cube_channel = -1;
 static S32 diffuse_channel = -1;
@@ -220,7 +221,7 @@ S32 LLDrawPoolBump::getNumPasses()
 
 void LLDrawPoolBump::beginRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_BUMP);
+	LLFastTimer t(FTM_RENDER_BUMP);
 	switch( pass )
 	{
 		case 0:
@@ -247,7 +248,7 @@ void LLDrawPoolBump::beginRenderPass(S32 pass)
 
 void LLDrawPoolBump::render(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_BUMP);
+	LLFastTimer t(FTM_RENDER_BUMP);
 	
 	if (!gPipeline.hasRenderType(LLDrawPool::POOL_SIMPLE))
 	{
@@ -280,7 +281,7 @@ void LLDrawPoolBump::render(S32 pass)
 
 void LLDrawPoolBump::endRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_BUMP);
+	LLFastTimer t(FTM_RENDER_BUMP);
 	switch( pass )
 	{
 		case 0:
@@ -308,7 +309,7 @@ void LLDrawPoolBump::endRenderPass(S32 pass)
 //static
 void LLDrawPoolBump::beginShiny(bool invisible)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
+	LLFastTimer t(FTM_RENDER_SHINY);
 	if (!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY)|| 
 		invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY))
 	{
@@ -383,7 +384,7 @@ void LLDrawPoolBump::beginShiny(bool invisible)
 
 void LLDrawPoolBump::renderShiny(bool invisible)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
+	LLFastTimer t(FTM_RENDER_SHINY);
 	if (!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY)|| 
 		invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY))
 	{
@@ -410,7 +411,7 @@ void LLDrawPoolBump::renderShiny(bool invisible)
 
 void LLDrawPoolBump::endShiny(bool invisible)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
+	LLFastTimer t(FTM_RENDER_SHINY);
 	if (!invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_SHINY)|| 
 		invisible && !gPipeline.hasRenderBatches(LLRenderPass::PASS_INVISI_SHINY))
 	{
@@ -450,7 +451,7 @@ void LLDrawPoolBump::endShiny(bool invisible)
 
 void LLDrawPoolBump::beginFullbrightShiny()
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
+	LLFastTimer t(FTM_RENDER_SHINY);
 	if (!gPipeline.hasRenderBatches(LLRenderPass::PASS_FULLBRIGHT_SHINY))
 	{
 		return;
@@ -499,7 +500,7 @@ void LLDrawPoolBump::beginFullbrightShiny()
 
 void LLDrawPoolBump::renderFullbrightShiny()
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
+	LLFastTimer t(FTM_RENDER_SHINY);
 	if (!gPipeline.hasRenderBatches(LLRenderPass::PASS_FULLBRIGHT_SHINY))
 	{
 		return;
@@ -514,7 +515,7 @@ void LLDrawPoolBump::renderFullbrightShiny()
 
 void LLDrawPoolBump::endFullbrightShiny()
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
+	LLFastTimer t(FTM_RENDER_SHINY);
 	if (!gPipeline.hasRenderBatches(LLRenderPass::PASS_FULLBRIGHT_SHINY))
 	{
 		return;
@@ -624,7 +625,7 @@ void LLDrawPoolBump::beginBump()
 	}
 
 	sVertexMask = VERTEX_MASK_BUMP;
-	LLFastTimer t(LLFastTimer::FTM_RENDER_BUMP);
+	LLFastTimer t(FTM_RENDER_BUMP);
 	// Optional second pass: emboss bump map
 	stop_glerror();
 
@@ -668,7 +669,7 @@ void LLDrawPoolBump::renderBump()
 		return;
 	}
 
-	LLFastTimer ftm(LLFastTimer::FTM_RENDER_BUMP);
+	LLFastTimer ftm(FTM_RENDER_BUMP);
 	LLGLDisable fog(GL_FOG);
 	LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_LEQUAL);
 	LLGLEnable blend(GL_BLEND);
@@ -705,7 +706,7 @@ void LLDrawPoolBump::beginDeferredPass(S32 pass)
 	{
 		return;
 	}
-	LLFastTimer ftm(LLFastTimer::FTM_RENDER_BUMP);
+	LLFastTimer ftm(FTM_RENDER_BUMP);
 	mShiny = TRUE;
 	gDeferredBumpProgram.bind();
 	diffuse_channel = gDeferredBumpProgram.enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
@@ -720,7 +721,7 @@ void LLDrawPoolBump::endDeferredPass(S32 pass)
 	{
 		return;
 	}
-	LLFastTimer ftm(LLFastTimer::FTM_RENDER_BUMP);
+	LLFastTimer ftm(FTM_RENDER_BUMP);
 	mShiny = FALSE;
 	gDeferredBumpProgram.disableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
 	gDeferredBumpProgram.disableTexture(LLViewerShaderMgr::BUMP_MAP);
@@ -734,7 +735,7 @@ void LLDrawPoolBump::renderDeferred(S32 pass)
 	{
 		return;
 	}
-	LLFastTimer ftm(LLFastTimer::FTM_RENDER_BUMP);
+	LLFastTimer ftm(FTM_RENDER_BUMP);
 
 	U32 type = LLRenderPass::PASS_BUMP;
 	LLCullResult::drawinfo_list_t::iterator begin = gPipeline.beginRenderMap(type);
@@ -1250,7 +1251,7 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
 
 void LLDrawPoolInvisible::render(S32 pass)
 { //render invisiprims
-	LLFastTimer t(LLFastTimer::FTM_RENDER_INVISIBLE);
+	LLFastTimer t(FTM_RENDER_INVISIBLE);
   
 	U32 invisi_mask = LLVertexBuffer::MAP_VERTEX;
 	glStencilMask(0);
@@ -1279,7 +1280,7 @@ void LLDrawPoolInvisible::endDeferredPass( S32 pass )
 
 void LLDrawPoolInvisible::renderDeferred( S32 pass )
 { //render invisiprims; this doesn't work becaue it also blocks all the post-deferred stuff
-	LLFastTimer t(LLFastTimer::FTM_RENDER_INVISIBLE);
+	LLFastTimer t(FTM_RENDER_INVISIBLE);
   
 	U32 invisi_mask = LLVertexBuffer::MAP_VERTEX;
 	glStencilMask(0);
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp
index 1fdf87f6d2..d084bda2ea 100644
--- a/indra/newview/lldrawpoolsimple.cpp
+++ b/indra/newview/lldrawpoolsimple.cpp
@@ -50,7 +50,7 @@ static LLGLSLShader* fullbright_shader = NULL;
 
 void LLDrawPoolGlow::render(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_GLOW);
+	LLFastTimer t(FTM_RENDER_GLOW);
 	LLGLEnable blend(GL_BLEND);
 	LLGLDisable test(GL_ALPHA_TEST);
 	gGL.setSceneBlendType(LLRender::BT_ADD);
@@ -98,7 +98,7 @@ void LLDrawPoolSimple::prerender()
 
 void LLDrawPoolSimple::beginRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
+	LLFastTimer t(FTM_RENDER_SIMPLE);
 
 	if (LLPipeline::sUnderWaterRender)
 	{
@@ -125,7 +125,7 @@ void LLDrawPoolSimple::beginRenderPass(S32 pass)
 
 void LLDrawPoolSimple::endRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
+	LLFastTimer t(FTM_RENDER_SIMPLE);
 	LLRenderPass::endRenderPass(pass);
 
 	if (mVertexShaderLevel > 0){
@@ -140,7 +140,7 @@ void LLDrawPoolSimple::render(S32 pass)
 	LLGLDisable alpha_test(GL_ALPHA_TEST);
 	
 	{ //render simple
-		LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
+		LLFastTimer t(FTM_RENDER_SIMPLE);
 		gPipeline.enableLightsDynamic();
 		renderTexture(LLRenderPass::PASS_SIMPLE, getVertexDataMask());
 
@@ -157,13 +157,13 @@ void LLDrawPoolSimple::render(S32 pass)
 
 void LLDrawPoolSimple::beginDeferredPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
+	LLFastTimer t(FTM_RENDER_SIMPLE);
 	gDeferredDiffuseProgram.bind();
 }
 
 void LLDrawPoolSimple::endDeferredPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
+	LLFastTimer t(FTM_RENDER_SIMPLE);
 	LLRenderPass::endRenderPass(pass);
 
 	gDeferredDiffuseProgram.unbind();
@@ -175,7 +175,7 @@ void LLDrawPoolSimple::renderDeferred(S32 pass)
 	LLGLDisable alpha_test(GL_ALPHA_TEST);
 
 	{ //render simple
-		LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
+		LLFastTimer t(FTM_RENDER_SIMPLE);
 		renderTexture(LLRenderPass::PASS_SIMPLE, getVertexDataMask());
 	}
 }
@@ -195,7 +195,7 @@ void LLDrawPoolGrass::prerender()
 
 void LLDrawPoolGrass::beginRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_GRASS);
+	LLFastTimer t(FTM_RENDER_GRASS);
 
 	if (LLPipeline::sUnderWaterRender)
 	{
@@ -222,7 +222,7 @@ void LLDrawPoolGrass::beginRenderPass(S32 pass)
 
 void LLDrawPoolGrass::endRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_GRASS);
+	LLFastTimer t(FTM_RENDER_GRASS);
 	LLRenderPass::endRenderPass(pass);
 
 	if (mVertexShaderLevel > 0)
@@ -237,7 +237,7 @@ void LLDrawPoolGrass::render(S32 pass)
 	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
 
 	{
-		LLFastTimer t(LLFastTimer::FTM_RENDER_GRASS);
+		LLFastTimer t(FTM_RENDER_GRASS);
 		LLGLEnable test(GL_ALPHA_TEST);
 		gGL.setSceneBlendType(LLRender::BT_ALPHA);
 		//render grass
@@ -262,7 +262,7 @@ void LLDrawPoolGrass::renderDeferred(S32 pass)
 	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
 
 	{
-		LLFastTimer t(LLFastTimer::FTM_RENDER_GRASS);
+		LLFastTimer t(FTM_RENDER_GRASS);
 		gDeferredTreeProgram.bind();
 		LLGLEnable test(GL_ALPHA_TEST);
 		//render grass
@@ -286,7 +286,7 @@ void LLDrawPoolFullbright::prerender()
 
 void LLDrawPoolFullbright::beginRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_FULLBRIGHT);
+	LLFastTimer t(FTM_RENDER_FULLBRIGHT);
 	
 	if (LLPipeline::sUnderWaterRender)
 	{
@@ -300,7 +300,7 @@ void LLDrawPoolFullbright::beginRenderPass(S32 pass)
 
 void LLDrawPoolFullbright::endRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_FULLBRIGHT);
+	LLFastTimer t(FTM_RENDER_FULLBRIGHT);
 	LLRenderPass::endRenderPass(pass);
 
 	if (mVertexShaderLevel > 0)
@@ -311,7 +311,7 @@ void LLDrawPoolFullbright::endRenderPass(S32 pass)
 
 void LLDrawPoolFullbright::render(S32 pass)
 { //render fullbright
-	LLFastTimer t(LLFastTimer::FTM_RENDER_FULLBRIGHT);
+	LLFastTimer t(FTM_RENDER_FULLBRIGHT);
 	if (mVertexShaderLevel > 0)
 	{
 		fullbright_shader->bind();
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp
index a01c9026c8..345dd6bb84 100644
--- a/indra/newview/lldrawpoolterrain.cpp
+++ b/indra/newview/lldrawpoolterrain.cpp
@@ -61,6 +61,8 @@ int DebugDetailMap = 0;
 S32 LLDrawPoolTerrain::sDetailMode = 1;
 F32 LLDrawPoolTerrain::sDetailScale = DETAIL_SCALE;
 static LLGLSLShader* sShader = NULL;
+static LLFastTimer::DeclareTimer FTM_SHADOW_TERRAIN("Terrain Shadow");
+
 
 LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerTexture *texturep) :
 	LLFacePool(POOL_TERRAIN),
@@ -131,7 +133,7 @@ void LLDrawPoolTerrain::prerender()
 
 void LLDrawPoolTerrain::beginRenderPass( S32 pass )
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TERRAIN);
+	LLFastTimer t(FTM_RENDER_TERRAIN);
 	LLFacePool::beginRenderPass(pass);
 
 	sShader = LLPipeline::sUnderWaterRender ? 
@@ -146,7 +148,7 @@ void LLDrawPoolTerrain::beginRenderPass( S32 pass )
 
 void LLDrawPoolTerrain::endRenderPass( S32 pass )
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TERRAIN);
+	LLFastTimer t(FTM_RENDER_TERRAIN);
 	LLFacePool::endRenderPass(pass);
 
 	if (mVertexShaderLevel > 1 && sShader->mShaderLevel > 0) {
@@ -162,7 +164,7 @@ S32 LLDrawPoolTerrain::getDetailMode()
 
 void LLDrawPoolTerrain::render(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TERRAIN);
+	LLFastTimer t(FTM_RENDER_TERRAIN);
 	
 	if (mDrawFace.empty())
 	{
@@ -235,7 +237,7 @@ void LLDrawPoolTerrain::render(S32 pass)
 
 void LLDrawPoolTerrain::beginDeferredPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TERRAIN);
+	LLFastTimer t(FTM_RENDER_TERRAIN);
 	LLFacePool::beginRenderPass(pass);
 
 	sShader = &gDeferredTerrainProgram;
@@ -245,14 +247,14 @@ void LLDrawPoolTerrain::beginDeferredPass(S32 pass)
 
 void LLDrawPoolTerrain::endDeferredPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TERRAIN);
+	LLFastTimer t(FTM_RENDER_TERRAIN);
 	LLFacePool::endRenderPass(pass);
 	sShader->unbind();
 }
 
 void LLDrawPoolTerrain::renderDeferred(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TERRAIN);
+	LLFastTimer t(FTM_RENDER_TERRAIN);
 	if (mDrawFace.empty())
 	{
 		return;
@@ -262,7 +264,7 @@ void LLDrawPoolTerrain::renderDeferred(S32 pass)
 
 void LLDrawPoolTerrain::beginShadowPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_SHADOW_TERRAIN);
+	LLFastTimer t(FTM_SHADOW_TERRAIN);
 	LLFacePool::beginRenderPass(pass);
 	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 	gDeferredShadowProgram.bind();
@@ -270,14 +272,14 @@ void LLDrawPoolTerrain::beginShadowPass(S32 pass)
 
 void LLDrawPoolTerrain::endShadowPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_SHADOW_TERRAIN);
+	LLFastTimer t(FTM_SHADOW_TERRAIN);
 	LLFacePool::endRenderPass(pass);
 	gDeferredShadowProgram.unbind();
 }
 
 void LLDrawPoolTerrain::renderShadow(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_SHADOW_TERRAIN);
+	LLFastTimer t(FTM_SHADOW_TERRAIN);
 	if (mDrawFace.empty())
 	{
 		return;
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp
index f572e2cb44..5cb1fcb635 100644
--- a/indra/newview/lldrawpooltree.cpp
+++ b/indra/newview/lldrawpooltree.cpp
@@ -46,6 +46,7 @@
 
 S32 LLDrawPoolTree::sDiffTex = 0;
 static LLGLSLShader* shader = NULL;
+static LLFastTimer::DeclareTimer FTM_SHADOW_TREE("Tree Shadow");
 
 LLDrawPoolTree::LLDrawPoolTree(LLViewerTexture *texturep) :
 	LLFacePool(POOL_TREE),
@@ -67,7 +68,7 @@ void LLDrawPoolTree::prerender()
 
 void LLDrawPoolTree::beginRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TREES);
+	LLFastTimer t(FTM_RENDER_TREES);
 	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
 	
 	if (LLPipeline::sUnderWaterRender)
@@ -91,7 +92,7 @@ void LLDrawPoolTree::beginRenderPass(S32 pass)
 
 void LLDrawPoolTree::render(S32 pass)
 {
-	LLFastTimer t(LLPipeline::sShadowRender ? LLFastTimer::FTM_SHADOW_TREE : LLFastTimer::FTM_RENDER_TREES);
+	LLFastTimer t(LLPipeline::sShadowRender ? FTM_SHADOW_TREE : FTM_RENDER_TREES);
 
 	if (mDrawFace.empty())
 	{
@@ -122,7 +123,7 @@ void LLDrawPoolTree::render(S32 pass)
 
 void LLDrawPoolTree::endRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TREES);
+	LLFastTimer t(FTM_RENDER_TREES);
 	gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 	
 	if (gPipeline.canUseWindLightShadersOnObjects())
@@ -136,7 +137,7 @@ void LLDrawPoolTree::endRenderPass(S32 pass)
 //============================================
 void LLDrawPoolTree::beginDeferredPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TREES);
+	LLFastTimer t(FTM_RENDER_TREES);
 	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
 		
 	shader = &gDeferredTreeProgram;
@@ -150,7 +151,7 @@ void LLDrawPoolTree::renderDeferred(S32 pass)
 
 void LLDrawPoolTree::endDeferredPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_TREES);
+	LLFastTimer t(FTM_RENDER_TREES);
 	gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 	
 	shader->unbind();
@@ -161,7 +162,7 @@ void LLDrawPoolTree::endDeferredPass(S32 pass)
 //============================================
 void LLDrawPoolTree::beginShadowPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_SHADOW_TREE);
+	LLFastTimer t(FTM_SHADOW_TREE);
 	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
 	gDeferredShadowProgram.bind();
 }
@@ -173,7 +174,7 @@ void LLDrawPoolTree::renderShadow(S32 pass)
 
 void LLDrawPoolTree::endShadowPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_SHADOW_TREE);
+	LLFastTimer t(FTM_SHADOW_TREE);
 	gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 	gDeferredShadowProgram.unbind();
 }
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 16623ca2b6..fd4dc123d5 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -138,7 +138,7 @@ void LLDrawPoolWater::endPostDeferredPass(S32 pass)
 
 void LLDrawPoolWater::render(S32 pass)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_RENDER_WATER);
+	LLFastTimer ftm(FTM_RENDER_WATER);
 	if (mDrawFace.empty() || LLDrawable::getCurrentFrame() <= 1)
 	{
 		return;
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp
index 917b6fafbc..9b52ddb73c 100644
--- a/indra/newview/lldrawpoolwlsky.cpp
+++ b/indra/newview/lldrawpoolwlsky.cpp
@@ -260,7 +260,7 @@ void LLDrawPoolWLSky::render(S32 pass)
 	{
 		return;
 	}
-	LLFastTimer ftm(LLFastTimer::FTM_RENDER_WL_SKY);
+	LLFastTimer ftm(FTM_RENDER_WL_SKY);
 
 	const F32 camHeightLocal = LLWLParamManager::instance()->getDomeOffset() * LLWLParamManager::instance()->getDomeRadius();
 
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 0aef3123d6..8ceb41c27a 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -195,7 +195,8 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask)
 
 	if(LLFastTimer::sPauseHistory && mBarRect.pointInRect(x, y))
 	{
-		mHoverBarIndex = llmin(LLFastTimer::getCurFrameIndex() - 1, MAX_VISIBLE_HISTORY - ((y - mBarRect.mBottom) * (MAX_VISIBLE_HISTORY + 2) / mBarRect.getHeight()));
+		mHoverBarIndex = llmin(LLFastTimer::getCurFrameIndex() - 1, 
+								MAX_VISIBLE_HISTORY - ((y - mBarRect.mBottom) * (MAX_VISIBLE_HISTORY + 2) / mBarRect.getHeight()));
 		if (mHoverBarIndex == 0)
 		{
 			return TRUE;
@@ -217,9 +218,9 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask)
 				mHoverID = (*it);
 				mHoverTimer = (*it);	
 				mToolTipRect.set(mBarStart[mHoverBarIndex][i], 
-					mBarRect.mBottom + llround(((F32)mHoverBarIndex + 1.f) * ((F32)mBarRect.getHeight() / ((F32)MAX_VISIBLE_HISTORY + 2.f))),
+					mBarRect.mBottom + llround(((F32)(MAX_VISIBLE_HISTORY - mHoverBarIndex + 1)) * ((F32)mBarRect.getHeight() / ((F32)MAX_VISIBLE_HISTORY + 2.f))),
 					mBarEnd[mHoverBarIndex][i],
-					mBarRect.mBottom + llround((F32)mHoverBarIndex * ((F32)mBarRect.getHeight() / ((F32)MAX_VISIBLE_HISTORY + 2.f))));
+					mBarRect.mBottom + llround((F32)(MAX_VISIBLE_HISTORY - mHoverBarIndex) * ((F32)mBarRect.getHeight() / ((F32)MAX_VISIBLE_HISTORY + 2.f))));
 			}
 
 			if ((*it)->getCollapsed())
@@ -248,6 +249,7 @@ BOOL LLFastTimerView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* stic
 		// tooltips for timer bars
 		if (mHoverTimer)
 		{
+			localRectToScreen(mToolTipRect, sticky_rect_screen);
 			msg = mHoverTimer->getToolTip(LLFastTimer::NamedTimer::HISTORY_NUM - mScrollIndex - mHoverBarIndex);
 			return TRUE;
 		}
@@ -960,9 +962,14 @@ void LLFastTimerView::draw()
 	LLView::draw();
 }
 
-F64 LLFastTimerView::getTime(LLFastTimer::NamedTimer::FrameState& id)
+F64 LLFastTimerView::getTime(const std::string& name)
 {
-	return (F64)id.mTimer->getCountAverage() / (F64)LLFastTimer::countsPerSecond();
+	const LLFastTimer::NamedTimer* timerp = LLFastTimer::getTimerByName(name);
+	if (timerp)
+	{
+		return (F64)timerp->getCountAverage() / (F64)LLFastTimer::countsPerSecond();
+	}
+	return 0.0;
 }
 
 //static
diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h
index 78ca7b50d6..f301888984 100644
--- a/indra/newview/llfasttimerview.h
+++ b/indra/newview/llfasttimerview.h
@@ -62,7 +62,7 @@ public:
 	virtual void draw();
 
 	LLFastTimer::NamedTimer* getLegendID(S32 y);
-	F64 getTime(LLFastTimer::NamedTimer::FrameState& id);
+	F64 getTime(const std::string& name);
 	
 private:	
 	typedef std::vector<std::vector<S32> > bar_positions_t;
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 7fc127f803..9c1a7ecb04 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -36,6 +36,7 @@
 
 #include "llbutton.h"
 #include "llfloaterreg.h"
+#include "llfocusmgr.h"
 #include "llinventory.h"
 #include "lluictrlfactory.h"
 #include "llmenugl.h"
@@ -292,7 +293,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 	if (mFirstDropDownItem != count)
 	{
 		// Chevron button should stay right aligned
-		LLView *chevron_button = getChildView(std::string(">>"), FALSE, FALSE);
+		LLView *chevron_button = findChildView(std::string(">>"), FALSE);
 		if (chevron_button)
 		{
 			LLRect rect;
@@ -335,7 +336,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width)
 	else
 	{
 		// Hide chevron button if all items are visible on bar
-		LLView *chevron_button = getChildView(std::string(">>"), FALSE, FALSE);
+		LLView *chevron_button = findChildView(std::string(">>"), FALSE);
 		if (chevron_button)
 		{
 			chevron_button->setVisible(FALSE);
@@ -366,7 +367,7 @@ void LLFavoritesBarCtrl::createButtons(const LLInventoryModel::item_array_t &ite
 		fav_btn->setLabel(item->getName());
 		fav_btn->setToolTip(item->getName());
 		fav_btn->setCommitCallback(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
-		fav_btn->setRightClickedCallback(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID(), _1, _2, _3,_4 ));
+		fav_btn->setRightMouseDownCallback(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID(), _1, _2, _3,_4 ));
 		sendChildToBack(fav_btn);
 
 		curr_x += buttonWidth + buttonHGap;
@@ -486,7 +487,7 @@ void LLFavoritesBarCtrl::showDropDownMenu()
 			
 			item_params.on_click.function(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
 			LLMenuItemCallGL *menu_item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
-			menu_item->setRightClickedCallback(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this,item->getUUID(),_1,_2,_3,_4));
+			menu_item->setRightMouseDownCallback(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this,item->getUUID(),_1,_2,_3,_4));
 			// Check whether item name wider than menu
 			if ((S32) menu_item->getNominalWidth() > bar_width)
 			{
@@ -545,6 +546,10 @@ void LLFavoritesBarCtrl::onButtonRightClick( LLUUID item_id,LLView* fav_button,S
 		return;
 	}
 	
+	// Release mouse capture so hover events go to the popup menu
+	// because this is happening during a mouse down.
+	gFocusMgr.setMouseCapture(NULL);
+
 	menu->updateParent(LLMenuGL::sMenuContainer);
 	LLMenuGL::showPopup(fav_button, menu, x, y);
 }
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index bafb69a835..216bca8262 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -261,6 +261,7 @@ void LLVolumeImplFlexible::onSetVolume(const LLVolumeParams &volume_params, cons
 // updated every time step. In the future, perhaps there could be an 
 // optimization similar to what Havok does for objects that are stationary. 
 //---------------------------------------------------------------------------------
+static LLFastTimer::DeclareTimer FTM_FLEXIBLE_UPDATE("Update Flexies");
 BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
 	if (mVO->mDrawable.isNull())
@@ -279,7 +280,7 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
 		parent->mDrawable->mQuietCount = 0;
 	}
 
-	LLFastTimer ftm(LLFastTimer::FTM_FLEXIBLE_UPDATE);
+	LLFastTimer ftm(FTM_FLEXIBLE_UPDATE);
 		
 	S32 new_res = mAttributes->getSimulateLOD();
 
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 7332ca4b5c..3c27d37ee9 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -61,6 +61,8 @@
 #include "llmediamanager.h"
 #include "llwindow.h"
 
+#include "llbutton.h"
+
 #if LL_WINDOWS
 #include "lldxhardware.h"
 #endif
@@ -102,20 +104,18 @@ BOOL LLFloaterAbout::postBuild()
 	support_widget->setParseHTML(TRUE);
 
 	// Text styles for release notes hyperlinks
-	LLStyleSP viewer_link_style(new LLStyle);
-	viewer_link_style->setVisible(true);
-	viewer_link_style->setFontName(LLStringUtil::null);
-	viewer_link_style->setLinkHREF(get_viewer_release_notes_url());
-	viewer_link_style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
+	LLStyle::Params link_style_params;
+	link_style_params.color.control = "HTMLLinkColor";
+	link_style_params.link_href = get_viewer_release_notes_url();
 
 	// Version string
-	std::string version = LLTrans::getString("SECOND_LIFE_VIEWER")
+	std::string version = LLTrans::getString("APP_NAME")
 		+ llformat(" %d.%d.%d (%d) %s %s (%s)\n",
 				   LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
 				   __DATE__, __TIME__,
 				   gSavedSettings.getString("VersionChannelName").c_str());
 	support_widget->appendColoredText(version, FALSE, FALSE, LLUIColorTable::instance().getColor("TextFgReadOnlyColor"));
-	support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
+	support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, link_style_params);
 
 	std::string support;
 	support.append("\n\n");
@@ -132,11 +132,9 @@ BOOL LLFloaterAbout::postBuild()
 	LLViewerRegion* region = gAgent.getRegion();
 	if (region)
 	{
-		LLStyleSP server_link_style(new LLStyle);
-		server_link_style->setVisible(true);
-		server_link_style->setFontName(LLStringUtil::null);
-		server_link_style->setLinkHREF(region->getCapability("ServerReleaseNotes"));
-		server_link_style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
+		LLStyle::Params server_link_style_params;
+		server_link_style_params.color.control = "HTMLLinkColor";
+		server_link_style_params.link_href = region->getCapability("ServerReleaseNotes");
 
 		const LLVector3d &pos = gAgent.getPositionGlobal();
 		LLUIString pos_text = getString("you_are_at");
@@ -159,7 +157,7 @@ BOOL LLFloaterAbout::postBuild()
 		support.append("\n");
 
 		support_widget->appendColoredText(support, FALSE, FALSE, LLUIColorTable::instance().getColor("TextFgReadOnlyColor"));
-		support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style);
+		support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style_params);
 
 		support = "\n\n";
 	}
@@ -251,13 +249,9 @@ BOOL LLFloaterAbout::postBuild()
 	// Fix views
 	support_widget->setCursorPos(0);
 	support_widget->setEnabled(FALSE);
-	support_widget->setTakesFocus(TRUE);
-	support_widget->setHandleEditKeysDirectly(TRUE);
 
 	credits_widget->setCursorPos(0);
 	credits_widget->setEnabled(FALSE);
-	credits_widget->setTakesFocus(TRUE);
-	credits_widget->setHandleEditKeysDirectly(TRUE);
 
 	return TRUE;
 }
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index 3d1b7965a1..7075719299 100644
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -566,32 +566,25 @@ void LLFloaterBuyLandUI::onChangeAgreeCovenant(LLUICtrl* ctrl, void* user_data)
 void LLFloaterBuyLandUI::updateFloaterCovenantText(const std::string &string, const LLUUID& asset_id)
 {
 	LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("covenant_editor");
-	if (editor)
-	{
-		editor->setHandleEditKeysDirectly(FALSE);
-		editor->setText(string);
+	editor->setText(string);
 
-		LLCheckBoxCtrl* check = getChild<LLCheckBoxCtrl>("agree_covenant");
-		LLTextBox* box = getChild<LLTextBox>("covenant_text");
-		if(check && box)
-		{
-			if (asset_id.isNull())
-			{
-				check->set(true);
-				check->setEnabled(false);
-				refreshUI();
+	LLCheckBoxCtrl* check = getChild<LLCheckBoxCtrl>("agree_covenant");
+	LLTextBox* box = getChild<LLTextBox>("covenant_text");
+	if (asset_id.isNull())
+	{
+		check->set(true);
+		check->setEnabled(false);
+		refreshUI();
 
-				// remove the line stating that you must agree
-				box->setVisible(FALSE);
-			}
-			else
-			{
-				check->setEnabled(true);
+		// remove the line stating that you must agree
+		box->setVisible(FALSE);
+	}
+	else
+	{
+		check->setEnabled(true);
 
-				// remove the line stating that you must agree
-				box->setVisible(TRUE);
-			}
-		}
+		// remove the line stating that you must agree
+		box->setVisible(TRUE);
 	}
 }
 
diff --git a/indra/newview/llfloaterbuyland.h b/indra/newview/llfloaterbuyland.h
index 7df07f752d..00d44035ae 100644
--- a/indra/newview/llfloaterbuyland.h
+++ b/indra/newview/llfloaterbuyland.h
@@ -35,7 +35,6 @@
 
 class LLFloater;
 class LLViewerRegion;
-class LLViewerTextEditor;
 class LLParcelSelection;
 
 class LLFloaterBuyLand
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 742cc5c5de..8c09ee7d48 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -172,8 +172,7 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
 	{
 		std::string start_line = line.substr(0, chat.mFromName.length() + 1);
 		line = line.substr(chat.mFromName.length() + 1);
-		const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
-		edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
+		edit->appendStyledText(start_line, false, prepend_newline, LLStyleMap::instance().lookup(chat.mFromID,chat.mURL));
 		prepend_newline = false;
 	}
 	edit->appendColoredText(line, false, prepend_newline, color);
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index e8af48d095..6ba3165d6a 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -42,14 +42,8 @@
 #include "lllogchat.h"
 
 class LLChat;
-class LLViewerTextEditor;
-class LLMessageSystem;
-class LLUUID;
-class LLCheckBoxCtrl;
 class LLPanelActiveSpeakers;
 class LLLogChat;
-class LLVector3d;
-class LLWindow;
 
 enum ELogOptions
 {
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp
index 1e8e7bad74..eb73bd6d8f 100644
--- a/indra/newview/llfloaterfriends.cpp
+++ b/indra/newview/llfloaterfriends.cpp
@@ -404,7 +404,7 @@ void LLPanelFriends::refreshNames(U32 changed_mask)
 	// Changed item in place, need to request sort and update columns
 	// because we might have changed data in a column on which the user
 	// has already sorted. JC
-	mFriendsList->sortItems();
+	mFriendsList->updateSort();
 
 	// re-select items
 	mFriendsList->selectMultiple(selected_ids);
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp
index 3c66a2add1..45a42f994d 100644
--- a/indra/newview/llfloaterinventory.cpp
+++ b/indra/newview/llfloaterinventory.cpp
@@ -1000,7 +1000,7 @@ BOOL LLFloaterInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 {
 	// Check to see if we are auto scrolling from the last frame
 	LLInventoryPanel* panel = (LLInventoryPanel*)this->getActivePanel();
-	BOOL needsToScroll = panel->getScrollableContainer()->needsToScroll(x, y, LLScrollContainer::VERTICAL);
+	BOOL needsToScroll = panel->getScrollableContainer()->autoScroll(x, y);
 	if(mFilterTabs)
 	{
 		if(needsToScroll)
@@ -1320,9 +1320,11 @@ LLInventoryFilter::EFolderShow LLInventoryPanel::getShowFolderState()
 	return mFolders->getFilter()->getShowFolderState();
 }
 
+static LLFastTimer::DeclareTimer FTM_REFRESH("Inventory Refresh");
+
 void LLInventoryPanel::modelChanged(U32 mask)
 {
-	LLFastTimer t2(LLFastTimer::FTM_REFRESH);
+	LLFastTimer t2(FTM_REFRESH);
 
 	bool handled = false;
 	if(mask & LLInventoryObserver::LABEL)
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index c5e07c6596..1746d6d435 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -2847,11 +2847,7 @@ void LLPanelLandCovenant::updateCovenantText(const std::string &string)
 	if (self)
 	{
 		LLViewerTextEditor* editor = self->getChild<LLViewerTextEditor>("covenant_editor");
-		if (editor)
-		{
-			editor->setHandleEditKeysDirectly(TRUE);
-			editor->setText(string);
-		}
+		editor->setText(string);
 	}
 }
 
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 7fc5ed0c9e..29d1c4dd84 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -59,7 +59,6 @@ class LLTextBox;
 class LLTextEditor;
 class LLTextureCtrl;
 class LLUIImage;
-class LLViewerTextEditor;
 class LLParcelSelection;
 
 class LLPanelLandGeneral;
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index 0a3d97245b..f2dff55044 100644
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -39,7 +39,6 @@
 #include "llscrolllistitem.h"
 #include "llpanel.h"
 #include "llcombobox.h"
-#include "llviewertexteditor.h"
 
 const S32 NOTIFICATION_PANEL_HEADER_HEIGHT = 20;
 const S32 HEADER_PADDING = 38;
@@ -250,7 +249,7 @@ LLFloaterNotification::LLFloaterNotification(LLNotification* note)
 BOOL LLFloaterNotification::postBuild()
 {
 	setTitle(mNote->getName());
-	getChild<LLViewerTextEditor>("payload")->setText(mNote->getMessage());
+	getChild<LLUICtrl>("payload")->setValue(mNote->getMessage());
 
 	LLComboBox* responses_combo = getChild<LLComboBox>("response");
 	LLCtrlListInterface* response_list = responses_combo->getListInterface();
diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp
index aa68a1b229..ac687ed3e9 100644
--- a/indra/newview/llfloaterpostcard.cpp
+++ b/indra/newview/llfloaterpostcard.cpp
@@ -43,8 +43,8 @@
 #include "llagent.h"
 #include "llui.h"
 #include "lllineeditor.h"
-#include "llviewertexteditor.h"
 #include "llbutton.h"
+#include "lltexteditor.h"
 #include "llfloaterreg.h"
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
@@ -104,14 +104,8 @@ BOOL LLFloaterPostcard::postBuild()
 	gAgent.buildFullname(name_string);
 	childSetValue("name_form", LLSD(name_string));
 
-	LLTextEditor* MsgField = getChild<LLTextEditor>("msg_form");
-	if (MsgField)
-	{
-		MsgField->setWordWrap(TRUE);
-
-		// For the first time a user focusess to .the msg box, all text will be selected.
-		MsgField->setFocusChangedCallback(onMsgFormFocusRecieved, this);
-	}
+	// For the first time a user focusess to .the msg box, all text will be selected.
+	getChild<LLUICtrl>("msg_form")->setFocusChangedCallback(onMsgFormFocusRecieved, this);
 	
 	childSetFocus("to_form", TRUE);
 
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 1a7f72d49c..79f8f412fd 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -62,13 +62,11 @@
 #include "llpanellogin.h"
 #include "llradiogroup.h"
 #include "llsky.h"
-#include "llstylemap.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
 #include "llsliderctrl.h"
 #include "lltabcontainer.h"
 #include "lltrans.h"
-#include "lltexteditor.h"
 #include "llviewercontrol.h"
 #include "llviewercamera.h"
 #include "llviewerwindow.h"
@@ -169,7 +167,6 @@ void LLVoiceSetKeyDialog::onCancel(void* user_data)
 // a static member and update all our static callbacks
 
 void free_web_media(LLMediaBase *media_source);
-void handleHTMLLinkColorChanged(const LLSD& newvalue);	
 void handleNameTagOptionChanged(const LLSD& newvalue);	
 LLMediaBase *get_web_media();
 bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response);
@@ -239,12 +236,6 @@ bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response
 	return false;
 }
 
-void handleHTMLLinkColorChanged(const LLSD& newvalue)
-{
-	LLTextEditor::setLinkColor(LLColor4(newvalue));
-	LLStyleMap::instance().update();
-	
-}
 void handleNameTagOptionChanged(const LLSD& newvalue)
 {
 	S32 name_tag_option = S32(newvalue);
@@ -458,14 +449,12 @@ void LLFloaterPreference::apply()
 	}
 	free_web_media(media_source);
 	
-	LLTextEditor* busy = getChild<LLTextEditor>("busy_response");
-	LLWString busy_response;
-	if (busy) busy_response = busy->getWText(); 
-	LLWStringUtil::replaceTabsWithSpaces(busy_response, 4);
+//	LLWString busy_response = utf8str_to_wstring(getChild<LLUICtrl>("busy_response")->getValue().asString());
+//	LLWStringUtil::replaceTabsWithSpaces(busy_response, 4);
 	
 	if(mGotPersonalInfo)
 	{ 
-		gSavedPerAccountSettings.setString("BusyModeResponse2", std::string(wstring_to_utf8str(busy_response)));
+//		gSavedSettings.setString("BusyModeResponse2", std::string(wstring_to_utf8str(busy_response)));
 		bool new_im_via_email = childGetValue("send_im_to_email").asBoolean();
 		bool new_hide_online = childGetValue("online_visibility").asBoolean();		
 	
@@ -1172,13 +1161,13 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
 	childSetValue("send_im_to_email", im_via_email);
 	childEnable("log_instant_messages");
 //	childEnable("log_chat");
-	childEnable("busy_response");
+//	childEnable("busy_response");
 //	childEnable("log_instant_messages_timestamp");
 //	childEnable("log_chat_timestamp");
 	childEnable("log_chat_IM");
 	childEnable("log_date_timestamp");
 	
-	childSetText("busy_response", gSavedPerAccountSettings.getString("BusyModeResponse2"));
+//	childSetText("busy_response", gSavedSettings.getString("BusyModeResponse2"));
 	
 	enableHistory();
 	std::string display_email(email);
@@ -1349,8 +1338,7 @@ static LLRegisterPanelClassWrapper<LLPanelPreference> t_places("panel_preference
 LLPanelPreference::LLPanelPreference()
 : LLPanel()
 {
-	//
-	mCommitCallbackRegistrar.add("setControlFalse",		boost::bind(&LLPanelPreference::setControlFalse,this, _2));
+	mCommitCallbackRegistrar.add("Pref.setControlFalse",		boost::bind(&LLPanelPreference::setControlFalse,this, _2));
 }
 
 static void applyUIColor(const std::string& color_name, LLUICtrl* ctrl, const LLSD& param)
@@ -1422,23 +1410,17 @@ BOOL LLPanelPreference::postBuild()
 	//////
 	if(hasChild("online_visibility") && hasChild("send_im_to_email"))
 	{
-		requires("online_visibility");
-		requires("send_im_to_email");
-		if (!checkRequirements())
-		{
-			return FALSE;
-		}
 		childSetText("email_address",getString("log_in_to_change") );
-		childSetText("busy_response", getString("log_in_to_change"));
+//		childSetText("busy_response", getString("log_in_to_change"));
 		
 	}
 
 
-	if(hasChild("fullscreen combo"))
+	if(hasChild("aspect_ratio"))
 	{
 		//============================================================================
 		// Resolution
-
+/*
 		S32 num_resolutions = 0;
 		LLWindow::LLWindowResolution* supported_resolutions = gViewerWindow->getWindow()->getSupportedResolutions(num_resolutions);
 		
@@ -1481,7 +1463,7 @@ BOOL LLPanelPreference::postBuild()
 				ctrl_full_screen->setCurrentByIndex(0);
 			}
 		}
-		
+	*/	
 		LLFloaterPreference::initWindowSizeControls(this);
 		
 		if (gSavedSettings.getBOOL("FullScreenAutoDetectAspectRatio"))
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 8ac00832c9..ab281e9f9f 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -46,6 +46,7 @@
 #include "llavataractions.h"
 #include "llinventorymodel.h"
 #include "lllineeditor.h"
+#include "llspinctrl.h"
 #include "llradiogroup.h"
 #include "llresmgr.h"
 #include "roles_constants.h"
@@ -151,7 +152,7 @@ BOOL LLFloaterProperties::postBuild()
 	getChild<LLUICtrl>("CheckPurchase")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleInfo, this));
 	getChild<LLUICtrl>("RadioSaleType")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleType, this));
 	// "Price" label for edit
-	getChild<LLUICtrl>("EditPrice")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleInfo, this));
+	getChild<LLUICtrl>("Edit Cost")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleInfo, this));
 	// The UI has been built, now fill in all the values
 	refresh();
 
@@ -195,7 +196,7 @@ void LLFloaterProperties::refresh()
 			"CheckNextOwnerTransfer",
 			"CheckPurchase",
 			"RadioSaleType",
-			"EditPrice"
+			"Edit Cost"
 		};
 		for(size_t t=0; t<LL_ARRAY_SIZE(enableNames); ++t)
 		{
@@ -499,7 +500,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 
 		childSetEnabled("RadioSaleType",is_complete && is_for_sale);
 		childSetEnabled("TextPrice",is_complete && is_for_sale);
-		childSetEnabled("EditPrice",is_complete && is_for_sale);
+		childSetEnabled("Edit Cost",is_complete && is_for_sale);
 	}
 	else
 	{
@@ -513,11 +514,13 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 
 		childSetEnabled("RadioSaleType",FALSE);
 		childSetEnabled("TextPrice",FALSE);
-		childSetEnabled("EditPrice",FALSE);
+		childSetEnabled("Edit Cost",FALSE);
 	}
 
 	// Set values.
 	childSetValue("CheckPurchase", is_for_sale);
+	childSetEnabled("combobox sale copy", is_for_sale);
+	childSetEnabled("Edit Cost", is_for_sale);
 	childSetValue("CheckNextOwnerModify",LLSD(BOOL(next_owner_mask & PERM_MODIFY)));
 	childSetValue("CheckNextOwnerCopy",LLSD(BOOL(next_owner_mask & PERM_COPY)));
 	childSetValue("CheckNextOwnerTransfer",LLSD(BOOL(next_owner_mask & PERM_TRANSFER)));
@@ -528,12 +531,12 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 		radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1);
 		S32 numerical_price;
 		numerical_price = sale_info.getSalePrice();
-		childSetText("EditPrice",llformat("%d",numerical_price));
+		childSetText("Edit Cost",llformat("%d",numerical_price));
 	}
 	else
 	{
 		radioSaleType->setSelectedIndex(-1);
-		childSetText("EditPrice",llformat("%d",0));
+		childSetText("Edit Cost",llformat("%d",0));
 	}
 }
 
@@ -790,12 +793,13 @@ void LLFloaterProperties::updateSaleInfo()
 			sale_type = LLSaleInfo::FS_ORIGINAL;
 		}
 
-		LLLineEditor* EditPrice = getChild<LLLineEditor>("EditPrice");
+	//	LLLineEditor* EditPrice = getChild<LLLineEditor>("EditPrice");
+		LLSpinCtrl *EditPrice = getChild<LLSpinCtrl>("Edit Cost");
 		
 		S32 price = -1;
 		if(EditPrice)
 		{
-			price = atoi(EditPrice->getText().c_str());
+			price =  EditPrice->getValue().asInteger();;
 		}
 		// Invalid data - turn off the sale
 		if (price < 0)
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 94d25aa0c8..a50bcaa098 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -2746,7 +2746,6 @@ BOOL LLPanelEstateCovenant::postBuild()
 	mEstateOwnerText = getChild<LLTextBox>("estate_owner_text");
 	mLastModifiedText = getChild<LLTextBox>("covenant_timestamp_text");
 	mEditor = getChild<LLViewerTextEditor>("covenant_editor");
-	if (mEditor) mEditor->setHandleEditKeysDirectly(TRUE);
 	LLButton* reset_button = getChild<LLButton>("reset_covenant");
 	reset_button->setEnabled(gAgent.canManageEstate());
 	reset_button->setClickedCallback(LLPanelEstateCovenant::resetCovenantID, NULL);
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 00cbc2f0c8..e2176350c9 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -48,6 +48,7 @@
 #include "llversionviewer.h"
 #include "message.h"
 #include "v3math.h"
+#include "lltexteditor.h"
 
 // viewer project includes
 #include "llagent.h"
@@ -61,7 +62,6 @@
 #include "llimview.h"
 #include "lltextbox.h"
 #include "lldispatcher.h"
-#include "llviewertexteditor.h"
 #include "llviewerobject.h"
 #include "llviewerregion.h"
 #include "llcombobox.h"
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp
index c8690de68c..328fb6450e 100644
--- a/indra/newview/llfloaterscriptdebug.cpp
+++ b/indra/newview/llfloaterscriptdebug.cpp
@@ -80,9 +80,6 @@ BOOL LLFloaterScriptDebug::postBuild()
 
 	if (mTabContainer)
 	{
-		// *FIX: apparantly fails for tab containers?
-// 		mTabContainer->requires<LLFloater>("all_scripts");
-// 		mTabContainer->checkRequirements();
 		return TRUE;
 	}
 
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 53b40f8b7a..616e9bac35 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -39,6 +39,7 @@
 #include "llspinctrl.h"
 #include "llcolorswatch.h"
 #include "llviewercontrol.h"
+#include "lltexteditor.h"
 
 
 LLFloaterSettingsDebug::LLFloaterSettingsDebug(const LLSD& key) 
diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
index e7dda3a5f4..65803fbf70 100644
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -35,7 +35,6 @@
 
 #include "llcontrol.h"
 #include "llfloater.h"
-#include "lltexteditor.h"
 
 class LLFloaterSettingsDebug 
 :	public LLFloater
@@ -60,7 +59,7 @@ private:
 	virtual ~LLFloaterSettingsDebug();
 	
 protected:
-	LLTextEditor* mComment;
+	class LLTextEditor* mComment;
 };
 
 #endif //LLFLOATERDEBUGSETTINGS_H
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 371dfa50cd..814395395c 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -41,7 +41,6 @@
 #include "llcallbacklist.h"
 #include "llcriticaldamp.h"
 #include "llui.h"
-#include "llviewertexteditor.h"
 #include "llfocusmgr.h"
 #include "llbutton.h"
 #include "llcombobox.h"
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
index 1e84902594..f61d5cb077 100644
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -39,7 +39,6 @@
 #include "llappviewer.h"
 #include "llstartup.h"
 #include "llviewerstats.h"
-#include "llviewertexteditor.h"
 #include "llviewerwindow.h"
 
 // linden library includes
@@ -118,12 +117,10 @@ BOOL LLFloaterTOS::postBuild()
 	if (hasChild("tos_text"))
 	{
 		// this displays the critical message
-		LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
-		editor->setHandleEditKeysDirectly( TRUE );
-		editor->setEnabled( FALSE );
-		editor->setWordWrap(TRUE);
-		editor->setFocus(TRUE);
-		editor->setValue(LLSD(mMessage));
+		LLUICtrl *tos_text = getChild<LLUICtrl>("tos_text");
+		tos_text->setEnabled( FALSE );
+		tos_text->setFocus(TRUE);
+		tos_text->setValue(LLSD(mMessage));
 
 		return TRUE;
 	}
@@ -133,7 +130,7 @@ BOOL LLFloaterTOS::postBuild()
 	tos_agreement->setEnabled( false );
 
 	// hide the SL text widget if we're displaying TOS with using a browser widget.
-	LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
+	LLUICtrl *editor = getChild<LLUICtrl>("tos_text");
 	editor->setVisible( FALSE );
 
 	LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index e5b4657742..2eb4e7580e 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -747,8 +747,8 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save)
 			panel->setUseBoundingRect(TRUE);								// enable the use of its outer bounding rect (normally disabled because it's O(n) on the number of sub-elements)
 			panel->updateBoundingRect();									// update bounding rect
 			LLRect bounding_rect = panel->getBoundingRect();				// get the bounding rect
-			LLRect panel_rect = panel->getRect();							// get the panel's rect
-			LLRect new_rect = panel_rect.unionWith(bounding_rect);			// union them to make sure we get the biggest one possible
+			LLRect new_rect = panel->getRect();								// get the panel's rect
+			new_rect.unionWith(bounding_rect);								// union them to make sure we get the biggest one possible
 			(*floaterp)->reshape(new_rect.getWidth(), new_rect.getHeight() + floater_header_size);	// reshape floater to match the union rect's dimensions
 			panel->reshape(new_rect.getWidth(), new_rect.getHeight());		// reshape panel to match the union rect's dimensions as well (both are needed)
 			(*floaterp)->addChild(panel);					// add panel as child
@@ -1274,7 +1274,7 @@ void LLFloaterUIPreview::highlightChangedElements()
 		BOOL failed = FALSE;
 		for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
 		{
-			element = element->getChild<LLView>(*token_iter,FALSE,FALSE);	// try to find element: don't recur, and don't create if missing
+			element = element->findChild<LLView>(*token_iter,FALSE);	// try to find element: don't recur, and don't create if missing
 
 			// if we still didn't find it...
 			if(NULL == element)												
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 4a5a775a05..d1f0f94fa0 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -176,7 +176,7 @@ LLFolderView::LLFolderView(const Params& p)
 	mSourceID(p.task_id),
 	mRenameItem( NULL ),
 	mNeedsScroll( FALSE ),
-	mLastScrollItem( NULL ),
+	mPinningSelectedItem(FALSE),
 	mNeedsAutoSelect( FALSE ),
 	mAutoSelectOverride(FALSE),
 	mNeedsAutoRename(FALSE),
@@ -191,7 +191,6 @@ LLFolderView::LLFolderView(const Params& p)
 	mDragAndDropThisFrame(FALSE),
 	mCallbackRegistrar(NULL),
 	mParentPanel(p.parent_panel)
-
 {
 	LLRect rect = p.rect;
 	LLRect new_rect(rect.mLeft, rect.mBottom + getRect().getHeight(), rect.mLeft + getRect().getWidth(), rect.mBottom);
@@ -290,11 +289,13 @@ void LLFolderView::checkTreeResortForModelChanged()
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_SORT("Sort Inventory");
+
 void LLFolderView::setSortOrder(U32 order)
 {
 	if (order != mSortOrder)
 	{
-		LLFastTimer t(LLFastTimer::FTM_SORT);
+		LLFastTimer t(FTM_SORT);
 		mSortOrder = order;
 
 		for (folders_t::iterator iter = mFolders.begin();
@@ -359,10 +360,12 @@ void LLFolderView::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse
 	mIsOpen = TRUE;
 }
 
+static LLFastTimer::DeclareTimer FTM_ARRANGE("Arrange");
+
 // This view grows and shinks to enclose all of its children items and folders.
 S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_generation )
 {
-	LLFastTimer t2(LLFastTimer::FTM_ARRANGE);
+	LLFastTimer t2(FTM_ARRANGE);
 
 	filter_generation = mFilter->getMinRequiredGeneration();
 	mMinWidth = 0;
@@ -431,17 +434,13 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen
 		}
 	}
 
-	S32 dummy_s32;
-	BOOL dummy_bool;
-	S32 min_width;
-	mScrollContainer->calcVisibleSize( &min_width, &dummy_s32, &dummy_bool, &dummy_bool);
-	reshape( llmax(min_width, total_width), running_height );
+	LLRect scroll_rect = mScrollContainer->getContentWindowRect();
+	reshape( llmax(scroll_rect.getWidth(), total_width), running_height );
 
-	S32 new_min_width;
-	mScrollContainer->calcVisibleSize( &new_min_width, &dummy_s32, &dummy_bool, &dummy_bool);
-	if (new_min_width != min_width)
+	LLRect new_scroll_rect = mScrollContainer->getContentWindowRect();
+	if (new_scroll_rect.getWidth() != scroll_rect.getWidth())
 	{
-		reshape( llmax(min_width, total_width), running_height );
+		reshape( llmax(scroll_rect.getWidth(), total_width), running_height );
 	}
 
 	// move item renamer text field to item's new position
@@ -456,9 +455,11 @@ const std::string LLFolderView::getFilterSubString(BOOL trim)
 	return mFilter->getFilterSubString(trim);
 }
 
+static LLFastTimer::DeclareTimer FTM_FILTER("Filter Inventory");
+
 void LLFolderView::filter( LLInventoryFilter& filter )
 {
-	LLFastTimer t2(LLFastTimer::FTM_FILTER);
+	LLFastTimer t2(FTM_FILTER);
 	filter.setFilterCount(llclamp(gSavedSettings.getS32("FilterItemsPerFrame"), 1, 5000));
 
 	if (getCompletedFilterGeneration() < filter.getCurrentGeneration())
@@ -467,18 +468,20 @@ void LLFolderView::filter( LLInventoryFilter& filter )
 		mMinWidth = 0;
 		LLFolderViewFolder::filter(filter);
 	}
+	else
+	{
+		mFiltered = TRUE;
+	}
 }
 
 void LLFolderView::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-	S32 min_width = 0;
-	S32 dummy_height;
-	BOOL dummy_bool;
+	LLRect scroll_rect;
 	if (mScrollContainer)
 	{
-		mScrollContainer->calcVisibleSize( &min_width, &dummy_height, &dummy_bool, &dummy_bool);
+		scroll_rect = mScrollContainer->getContentWindowRect();
 	}
-	width = llmax(mMinWidth, min_width);
+	width = llmax(mMinWidth, scroll_rect.getWidth());
 	LLView::reshape(width, height, called_from_parent);
 
 	mReshapeSignal(mSelectedItems, FALSE);
@@ -1127,7 +1130,9 @@ void LLFolderView::autoOpenItem( LLFolderViewFolder* item )
 	mAutoOpenItems.push(item);
 	
 	item->setOpen(TRUE);
-	scrollToShowItem(item);
+	LLRect content_rect = mScrollContainer->getContentWindowRect();
+	LLRect constraint_rect(0,content_rect.getHeight(), content_rect.getWidth(), 0);
+	scrollToShowItem(item, constraint_rect);
 }
 
 void LLFolderView::closeAutoOpenedFolders()
@@ -1791,49 +1796,41 @@ void LLFolderView::scrollToShowSelection()
 
 // If the parent is scroll containter, scroll it to make the selection
 // is maximally visible.
-void LLFolderView::scrollToShowItem(LLFolderViewItem* item)
+void LLFolderView::scrollToShowItem(LLFolderViewItem* item, const LLRect& constraint_rect)
 {
+	if (!mScrollContainer) return;
+
 	// don't scroll to items when mouse is being used to scroll/drag and drop
 	if (gFocusMgr.childHasMouseCapture(mScrollContainer))
 	{
 		mNeedsScroll = FALSE;
 		return;
 	}
-	if(item && mScrollContainer)
+
+	// if item exists and is in visible portion of parent folder...
+	if(item)
 	{
-		LLRect local_rect = item->getRect();
+		LLRect local_rect = item->getLocalRect();
 		LLRect item_scrolled_rect; // item position relative to display area of scroller
+		LLRect visible_doc_rect = mScrollContainer->getVisibleContentRect();
 		
 		S32 icon_height = mIcon.isNull() ? 0 : mIcon->getHeight(); 
 		S32 label_height = llround(sFont->getLineHeight()); 
 		// when navigating with keyboard, only move top of folders on screen, otherwise show whole folder
-		S32 max_height_to_show = gFocusMgr.childHasKeyboardFocus(this) ? (llmax( icon_height, label_height ) + ICON_PAD) : local_rect.getHeight(); 
-		item->localPointToOtherView(item->getIndentation(), llmax(0, local_rect.getHeight() - max_height_to_show), &item_scrolled_rect.mLeft, &item_scrolled_rect.mBottom, mScrollContainer);
-		item->localPointToOtherView(local_rect.getWidth(), local_rect.getHeight(), &item_scrolled_rect.mRight, &item_scrolled_rect.mTop, mScrollContainer);
-
-		item_scrolled_rect.mRight = llmin(item_scrolled_rect.mLeft + MIN_ITEM_WIDTH_VISIBLE, item_scrolled_rect.mRight);
-		LLCoordGL scroll_offset(-mScrollContainer->getBorderWidth() - item_scrolled_rect.mLeft, 
-				mScrollContainer->getRect().getHeight() - item_scrolled_rect.mTop - 1);
-
-		S32 max_scroll_offset = getVisibleRect().getHeight() - item_scrolled_rect.getHeight();
-		if (item != mLastScrollItem || // if we're scrolling to focus on a new item
-		// or the item has just appeared on screen and it wasn't onscreen before
-			(scroll_offset.mY > 0 && scroll_offset.mY < max_scroll_offset && 
-			(mLastScrollOffset.mY < 0 || mLastScrollOffset.mY > max_scroll_offset)))
-		{
-			// we now have a position on screen that we want to keep stable
-			// offset of selection relative to top of visible area
-			mLastScrollOffset = scroll_offset;
-			mLastScrollItem = item;
-		}
+		S32 max_height_to_show = mScrollContainer->hasFocus() ? (llmax( icon_height, label_height ) + ICON_PAD) : local_rect.getHeight(); 
+		
+		// get portion of item that we want to see...
+		LLRect item_local_rect = LLRect(item->getIndentation(), 
+										local_rect.getHeight(), 
+										llmin(MIN_ITEM_WIDTH_VISIBLE, local_rect.getWidth()), 
+										llmax(0, local_rect.getHeight() - max_height_to_show));
+
+		LLRect item_doc_rect;
+
+		item->localRectToOtherView(item_local_rect, &item_doc_rect, this); 
 
-		mScrollContainer->scrollToShowRect( item_scrolled_rect, mLastScrollOffset );
+		mScrollContainer->scrollToShowRect( item_doc_rect, constraint_rect );
 
-		// after scrolling, store new offset
-		// in case we don't have room to maintain the original position
-		LLCoordGL new_item_left_top;
-		item->localPointToOtherView(item->getIndentation(), item->getRect().getHeight(), &new_item_left_top.mX, &new_item_left_top.mY, mScrollContainer);
-		mLastScrollOffset.set(-mScrollContainer->getBorderWidth() - new_item_left_top.mX, mScrollContainer->getRect().getHeight() - new_item_left_top.mY - 1);
 	}
 }
 
@@ -1973,10 +1970,13 @@ bool LLFolderView::doToSelected(LLInventoryModel* model, const LLSD& userdata)
 	return true;
 }
 
+static LLFastTimer::DeclareTimer FTM_AUTO_SELECT("Open and Select");
+static LLFastTimer::DeclareTimer FTM_INVENTORY("Inventory");
+
 // Main idle routine
 void LLFolderView::doIdle()
 {
-	LLFastTimer t2(LLFastTimer::FTM_INVENTORY);
+	LLFastTimer t2(FTM_INVENTORY);
 
 	BOOL debug_filters = gSavedSettings.getBOOL("DebugInventoryFilters");
 	if (debug_filters != getDebugFilters())
@@ -1990,7 +1990,7 @@ void LLFolderView::doIdle()
 										mFilter->isNotDefault();
 	mNeedsAutoSelect = filter_modified_and_active &&
 							!(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture());
-	
+
 	// filter to determine visiblity before arranging
 	filterFromRoot();
 
@@ -2001,7 +2001,7 @@ void LLFolderView::doIdle()
 	// potentially changed
 	if (mNeedsAutoSelect)
 	{
-		LLFastTimer t3(LLFastTimer::FTM_AUTO_SELECT);
+		LLFastTimer t3(FTM_AUTO_SELECT);
 		// select new item only if a filtered item not currently selected
 		LLFolderViewItem* selected_itemp = mSelectedItems.empty() ? NULL : mSelectedItems.back();
 		if ((!selected_itemp || !selected_itemp->getFiltered()) && !mAutoSelectOverride)
@@ -2013,6 +2013,59 @@ void LLFolderView::doIdle()
 		scrollToShowSelection();
 	}
 
+	// during filtering process, try to pin selected item's location on screen
+	// this will happen when searching your inventory and when new items arrive
+	if (filter_modified_and_active)
+	{
+		// calculate rectangle to pin item to at start of animated rearrange
+		if (!mPinningSelectedItem && !mSelectedItems.empty())
+		{
+			// lets pin it!
+			mPinningSelectedItem = TRUE;
+
+			LLRect visible_content_rect = mScrollContainer->getVisibleContentRect();
+			LLFolderViewItem* selected_item = mSelectedItems.back();
+
+			LLRect item_rect;
+			selected_item->localRectToOtherView(selected_item->getLocalRect(), &item_rect, this);
+			// if item is visible in scrolled region
+			if (visible_content_rect.overlaps(item_rect))
+			{
+				// then attempt to keep it in same place on screen
+				mScrollConstraintRect = item_rect;
+				mScrollConstraintRect.translate(-visible_content_rect.mLeft, -visible_content_rect.mBottom);
+			}
+			else
+			{
+				// otherwise we just want it onscreen somewhere
+				LLRect content_rect = mScrollContainer->getContentWindowRect();
+				mScrollConstraintRect.setOriginAndSize(0, 0, content_rect.getWidth(), content_rect.getHeight());
+			}
+		}
+	}
+	else
+	{
+		// stop pinning selected item after folders stop rearranging
+		if (!needsArrange())
+		{
+			mPinningSelectedItem = FALSE;
+		}
+	}
+
+	LLRect constraint_rect;
+	if (mPinningSelectedItem)
+	{
+		// use last known constraint rect for pinned item
+		constraint_rect = mScrollConstraintRect;
+	}
+	else
+	{
+		// during normal use (page up/page down, etc), just try to fit item on screen
+		LLRect content_rect = mScrollContainer->getContentWindowRect();
+		constraint_rect.setOriginAndSize(0, 0, content_rect.getWidth(), content_rect.getHeight());
+	}
+
+
 	BOOL is_visible = isInVisibleChain();
 
 	if ( is_visible )
@@ -2026,10 +2079,10 @@ void LLFolderView::doIdle()
 
 	if (mSelectedItems.size() && mNeedsScroll)
 	{
-		scrollToShowItem(mSelectedItems.back());
+		scrollToShowItem(mSelectedItems.back(), constraint_rect);
 		// continue scrolling until animated layout change is done
-		if (getCompletedFilterGeneration() >= mFilter->getMinRequiredGeneration() &&
-			(!needsArrange() || !is_visible))
+		if (!filter_modified_and_active 
+			&& (!needsArrange() || !is_visible))
 		{
 			mNeedsScroll = FALSE;
 		}
@@ -2077,15 +2130,13 @@ void LLFolderView::updateRenamerPosition()
 		screenPointToLocal( x, y, &x, &y );
 		mRenamer->setOrigin( x, y );
 
-		S32 scroller_height = 0;
-		S32 scroller_width = gViewerWindow->getWindowWidth();
-		BOOL dummy_bool;
+		LLRect scroller_rect(0, 0, gViewerWindow->getWindowWidth(), 0);
 		if (mScrollContainer)
 		{
-			mScrollContainer->calcVisibleSize( &scroller_width, &scroller_height, &dummy_bool, &dummy_bool);
+			scroller_rect = mScrollContainer->getContentWindowRect();
 		}
 
-		S32 width = llmax(llmin(mRenameItem->getRect().getWidth() - x, scroller_width - x - getRect().mLeft), MINIMUM_RENAMER_WIDTH);
+		S32 width = llmax(llmin(mRenameItem->getRect().getWidth() - x, scroller_rect.getWidth() - x - getRect().mLeft), MINIMUM_RENAMER_WIDTH);
 		S32 height = llfloor(sFont->getLineHeight() + RENAME_HEIGHT_PAD);
 		mRenamer->reshape( width, height, TRUE );
 	}
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 8d9d52cd17..a05dec3193 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -240,7 +240,7 @@ public:
 	virtual void deleteAllChildren();
 
 	void scrollToShowSelection();
-	void scrollToShowItem(LLFolderViewItem* item);
+	void scrollToShowItem(LLFolderViewItem* item, const LLRect& constraint_rect);
 	void setScrollContainer( LLScrollContainer* parent ) { mScrollContainer = parent; }
 	LLRect getVisibleRect();
 
@@ -299,8 +299,8 @@ protected:
 	LLLineEditor*					mRenamer;
 
 	BOOL							mNeedsScroll;
-	LLFolderViewItem*				mLastScrollItem;
-	LLCoordGL						mLastScrollOffset;
+	BOOL							mPinningSelectedItem;
+	LLRect							mScrollConstraintRect;
 	BOOL							mNeedsAutoSelect;
 	BOOL							mAutoSelectOverride;
 	BOOL							mNeedsAutoRename;
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index de6a1a097d..8961508bcc 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -233,7 +233,7 @@ void LLFolderViewItem::refreshFromListener()
 		// temporary attempt to display the inventory folder in the user locale.
 		if (LLAssetType::lookupIsProtectedCategoryType(preferred_type))
 		{
-			mLabel = LLTrans::getString("InvFolder " + mLabel);
+			LLTrans::findString(mLabel, "InvFolder " + mLabel);
 		};
 
 		setIcon(mListener->getIcon());
diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp
index 8588de0fa0..bdb8dadfb4 100644
--- a/indra/newview/llhudmanager.cpp
+++ b/indra/newview/llhudmanager.cpp
@@ -62,10 +62,11 @@ LLHUDManager::~LLHUDManager()
 {
 }
 
+static LLFastTimer::DeclareTimer FTM_HUD_EFFECTS("Hud Effects");
 
 void LLHUDManager::updateEffects()
 {
-	LLFastTimer ftm(LLFastTimer::FTM_HUD_EFFECTS);
+	LLFastTimer ftm(FTM_HUD_EFFECTS);
 	S32 i;
 	for (i = 0; i < mHUDEffects.count(); i++)
 	{
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp
index bdff492948..dc55aba0db 100644
--- a/indra/newview/llhudobject.cpp
+++ b/indra/newview/llhudobject.cpp
@@ -254,10 +254,12 @@ LLHUDEffect *LLHUDObject::addHUDEffect(const U8 type)
 	return hud_objectp;
 }
 
+static LLFastTimer::DeclareTimer FTM_HUD_UPDATE("Update Hud");
+
 // static
 void LLHUDObject::updateAll()
 {
-	LLFastTimer ftm(LLFastTimer::FTM_HUD_UPDATE);
+	LLFastTimer ftm(FTM_HUD_UPDATE);
 	LLHUDText::updateAll();
 	LLHUDIcon::updateAll();
 	sortObjects();
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index c71262c311..8086400493 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -957,7 +957,7 @@ void LLHUDText::updateAll()
 				{
 					continue;
 				}
-				if (src_textp->mSoftScreenRect.rectInRect(&dst_textp->mSoftScreenRect))
+				if (src_textp->mSoftScreenRect.overlaps(dst_textp->mSoftScreenRect))
 				{
 					LLRectf intersect_rect = src_textp->mSoftScreenRect;
 					intersect_rect.intersectWith(dst_textp->mSoftScreenRect);
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 0b4e0f9317..72e2bb02d5 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1097,66 +1097,58 @@ BOOL LLFloaterIMPanel::postBuild()
 	
 	mVisibleSignal.connect(boost::bind(&LLFloaterIMPanel::onVisibilityChange, this, _2));
 	
-	requires<LLLineEditor>("chat_editor");
-	requires<LLTextEditor>("im_history");
-
-	if (checkRequirements())
-	{
-		mInputEditor = getChild<LLLineEditor>("chat_editor");
-		mInputEditor->setFocusReceivedCallback( onInputEditorFocusReceived, this );
-		mInputEditor->setFocusLostCallback( onInputEditorFocusLost, this );
-		mInputEditor->setKeystrokeCallback( onInputEditorKeystroke, this );
-		mInputEditor->setCommitCallback( onCommitChat, this );
-		mInputEditor->setCommitOnFocusLost( FALSE );
-		mInputEditor->setRevertOnEsc( FALSE );
-		mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
-
-		childSetAction("profile_callee_btn", onClickProfile, this);
-		childSetAction("group_info_btn", onClickGroupInfo, this);
+	mInputEditor = getChild<LLLineEditor>("chat_editor");
+	mInputEditor->setFocusReceivedCallback( onInputEditorFocusReceived, this );
+	mInputEditor->setFocusLostCallback( onInputEditorFocusLost, this );
+	mInputEditor->setKeystrokeCallback( onInputEditorKeystroke, this );
+	mInputEditor->setCommitCallback( onCommitChat, this );
+	mInputEditor->setCommitOnFocusLost( FALSE );
+	mInputEditor->setRevertOnEsc( FALSE );
+	mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
 
-		childSetAction("start_call_btn", onClickStartCall, this);
-		childSetAction("end_call_btn", onClickEndCall, this);
-		childSetAction("send_btn", onClickSend, this);
-		childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
+	childSetAction("profile_callee_btn", onClickProfile, this);
+	childSetAction("group_info_btn", onClickGroupInfo, this);
 
-		childSetAction("moderator_kick_speaker", onKickSpeaker, this);
-		//LLButton* close_btn = getChild<LLButton>("close_btn");
-		//close_btn->setClickedCallback(&LLFloaterIMPanel::onClickClose, this);
+	childSetAction("start_call_btn", onClickStartCall, this);
+	childSetAction("end_call_btn", onClickEndCall, this);
+	childSetAction("send_btn", onClickSend, this);
+	childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
 
-		mHistoryEditor = getChild<LLViewerTextEditor>("im_history");
-		mHistoryEditor->setParseHTML(TRUE);
-		mHistoryEditor->setParseHighlights(TRUE);
+	childSetAction("moderator_kick_speaker", onKickSpeaker, this);
+	//LLButton* close_btn = getChild<LLButton>("close_btn");
+	//close_btn->setClickedCallback(&LLFloaterIMPanel::onClickClose, this);
 
-		if ( IM_SESSION_GROUP_START == mDialog )
-		{
-			childSetEnabled("profile_btn", FALSE);
-		}
-		
-		if(!mProfileButtonEnabled)
-		{
-			childSetEnabled("profile_callee_btn", FALSE);
-		}
+	mHistoryEditor = getChild<LLViewerTextEditor>("im_history");
+	mHistoryEditor->setParseHTML(TRUE);
+	mHistoryEditor->setParseHighlights(TRUE);
 
-		sTitleString = getString("title_string");
-		sTypingStartString = getString("typing_start_string");
-		sSessionStartString = getString("session_start_string");
+	if ( IM_SESSION_GROUP_START == mDialog )
+	{
+		childSetEnabled("profile_btn", FALSE);
+	}
+	
+	if(!mProfileButtonEnabled)
+	{
+		childSetEnabled("profile_callee_btn", FALSE);
+	}
 
-		if (mSpeakerPanel)
-		{
-			mSpeakerPanel->refreshSpeakers();
-		}
+	sTitleString = getString("title_string");
+	sTypingStartString = getString("typing_start_string");
+	sSessionStartString = getString("session_start_string");
 
-		if (mDialog == IM_NOTHING_SPECIAL)
-		{
-			childSetAction("mute_btn", onClickMuteVoice, this);
-			childSetCommitCallback("speaker_volume", onVolumeChange, this);
-		}
+	if (mSpeakerPanel)
+	{
+		mSpeakerPanel->refreshSpeakers();
+	}
 
-		setDefaultBtn("send_btn");
-		return TRUE;
+	if (mDialog == IM_NOTHING_SPECIAL)
+	{
+		childSetAction("mute_btn", onClickMuteVoice, this);
+		childSetCommitCallback("speaker_volume", onVolumeChange, this);
 	}
 
-	return FALSE;
+	setDefaultBtn("send_btn");
+	return TRUE;
 }
 
 void* LLFloaterIMPanel::createSpeakersPanel(void* data)
@@ -1385,8 +1377,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
 		else
 		{
 			// Convert the name to a hotlink and add to message.
-			const LLStyleSP &source_style = LLStyleMap::instance().lookupAgent(source);
-			mHistoryEditor->appendStyledText(name + separator_string, false, prepend_newline, source_style);
+			mHistoryEditor->appendStyledText(name + separator_string, false, prepend_newline, LLStyleMap::instance().lookupAgent(source));
 		}
 		prepend_newline = false;
 	}
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 6ad483a2f1..e3902bffa0 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -69,7 +69,6 @@
 #include "llviewerwindow.h"
 #include "llnotify.h"
 #include "llviewerregion.h"
-#include "llviewertexteditor.h"
 #include "lltrans.h"
 
 #include "llfirstuse.h"
@@ -847,8 +846,13 @@ BOOL LLIncomingCallDialog::postBuild()
 	EInstantMessage type = (EInstantMessage)mPayload["type"].asInteger();
 
 	std::string call_type = getString("VoiceInviteP2P");
-	std::string caller_name = mPayload["caller_name"].asString() + " ";
-	setTitle(caller_name + call_type);
+	std::string caller_name = mPayload["caller_name"].asString();
+	if (caller_name == "anonymous")
+	{
+		caller_name = getString("anonymous");
+	}
+	
+	setTitle(caller_name + " " + call_type);
 	
 	// If it is not a P2P invite, then it's an AdHoc invite
 	if ( type != IM_SESSION_P2P_INVITE )
@@ -856,8 +860,8 @@ BOOL LLIncomingCallDialog::postBuild()
 		call_type = getString("VoiceInviteAdHoc");
 	}
 
-	LLViewerTextEditor* text = getChild<LLViewerTextEditor>("caller name");
-	text->setEmbeddedText(caller_name + call_type);
+	LLUICtrl* caller_name_widget = getChild<LLUICtrl>("caller name");
+	caller_name_widget->setValue(caller_name + " " + call_type);
 	LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon");
 	icon->setValue(caller_id);
 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 54802ee762..efa97de692 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3684,8 +3684,8 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 				// commented out for DEV-32347
 				//items.push_back(std::string("Restore to Last Position"));
 
-				LLMenuGL* attach_menu = menu.getChildMenuByName("Attach To", TRUE);
-				LLMenuGL* attach_hud_menu = menu.getChildMenuByName("Attach To HUD", TRUE);
+				LLMenuGL* attach_menu = menu.findChildMenuByName("Attach To", TRUE);
+				LLMenuGL* attach_hud_menu = menu.findChildMenuByName("Attach To HUD", TRUE);
 				LLVOAvatar *avatarp = gAgent.getAvatarObject();
 				if (attach_menu 
 					&& (attach_menu->getChildCount() == 0) 
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index cdfb15fd71..63a40e40a0 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -227,7 +227,7 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 		llwarns << "Error loading navigation bar context menu" << llendl;
 		
 	}
-	getTextEntry()->setRightClickedCallback(boost::bind(&LLLocationInputCtrl::onTextEditorRightClicked,this,_2,_3,_4));
+	getTextEntry()->setRightMouseUpCallback(boost::bind(&LLLocationInputCtrl::onTextEditorRightClicked,this,_2,_3,_4));
 	updateWidgetlayout();
 
 	// - Make the "Add landmark" button updated when either current parcel gets changed
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 9a66507eae..713c44d366 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -103,7 +103,7 @@ const std::string LLTeleportHistoryMenuItem::ICON_IMG_FORWARD("teleport_history_
 LLTeleportHistoryMenuItem::Params::Params(EType type, std::string title)
 {
 	item_type(type);
-	font.name("SansSerif");
+	font.name("SANSSERIF");
 
 	if (type == TYPE_CURRENT)
 		font.style("BOLD");
@@ -123,7 +123,6 @@ LLTeleportHistoryMenuItem::LLTeleportHistoryMenuItem(const Params& p)
 	icon_params.rect(LLRect(0, ICON_HEIGHT, ICON_WIDTH, 0));
 	icon_params.mouse_opaque(false);
 	icon_params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
-	icon_params.tab_stop(false);
 	icon_params.visible(false);
 
 	mArrowIcon = LLUICtrlFactory::create<LLIconCtrl> (icon_params);
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 32d7bc94ff..da9f50a2bc 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -208,8 +208,7 @@ void nearbychat_add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, cons
 	{
 		std::string start_line = line.substr(0, chat.mFromName.length() + 1);
 		line = line.substr(chat.mFromName.length() + 1);
-		const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
-		edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
+		edit->appendStyledText(start_line, false, prepend_newline, LLStyleMap::instance().lookup(chat.mFromID,chat.mURL));
 		prepend_newline = false;
 	}
 	edit->appendColoredText(line, false, prepend_newline, color);
@@ -343,6 +342,7 @@ BOOL	LLNearbyChat::handleMouseDown	(S32 x, S32 y, MASK mask)
 	S32 local_y = caption_local_y - nearby_speakers_btn->getRect().mBottom;
 	if(nearby_speakers_btn->pointInView(local_x, local_y))
 	{
+
 		onNearbySpeakers();
 		bringToFront( x, y );
 		return true;
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 50e31e85e4..0696d41732 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -65,7 +65,7 @@ LLGestureComboBox::LLGestureComboBox(const LLGestureComboBox::Params& p)
 	, mGestureLabelTimer()
 	, mLabel(p.label)
 {
-	setCommitCallback(boost::bind(&LLGestureComboBox::onCommitGesture, this, _1));
+	setCommitCallback(boost::bind(&LLGestureComboBox::onCommitGesture, this));
 
 	// now register us as observer since we have a place to put the results
 	LLGestureManager::instance().addObserver(this);
@@ -82,41 +82,33 @@ LLGestureComboBox::~LLGestureComboBox()
 void LLGestureComboBox::refreshGestures()
 {
 	//store current selection so we can maintain it
-	std::string cur_gesture = getValue().asString();
+	LLSD cur_gesture = getValue();
 	selectFirstItem();
 	// clear
 	clearRows();
+	mGestures.clear();
 
-	// collect list of unique gestures
-	std::map <std::string, BOOL> unique;
 	LLGestureManager::item_map_t::iterator it;
+	LLSD::Integer idx(0);
 	for (it = LLGestureManager::instance().mActive.begin(); it != LLGestureManager::instance().mActive.end(); ++it)
 	{
 		LLMultiGesture* gesture = (*it).second;
 		if (gesture)
 		{
-			if (!gesture->mTrigger.empty())
-			{
-				unique[gesture->mTrigger] = TRUE;
-			}
+			addSimpleElement(gesture->mName, ADD_BOTTOM, LLSD(idx));
+			mGestures.push_back(gesture);
+			idx++;
 		}
 	}
 
-	// add unique gestures
-	std::map <std::string, BOOL>::iterator it2;
-	for (it2 = unique.begin(); it2 != unique.end(); ++it2)
-	{
-		addSimpleElement((*it2).first);
-	}
-
 	sortByName();
 	// Insert label after sorting, at top, with separator below it
 	addSeparator(ADD_TOP);		
 	addSimpleElement(mLabel, ADD_TOP);
 
-	if (!cur_gesture.empty())
+	if (cur_gesture.isDefined())
 	{ 
-		selectByValue(LLSD(cur_gesture));
+		selectByValue(cur_gesture);
 	}
 	else
 	{
@@ -124,7 +116,7 @@ void LLGestureComboBox::refreshGestures()
 	}
 }
 
-void LLGestureComboBox::onCommitGesture(LLUICtrl* ctrl)
+void LLGestureComboBox::onCommitGesture()
 {
 	LLCtrlListInterface* gestures = getListInterface();
 	if (gestures)
@@ -134,19 +126,16 @@ void LLGestureComboBox::onCommitGesture(LLUICtrl* ctrl)
 		{
 			return;
 		}
-		const std::string& trigger = gestures->getSelectedValue().asString();
 
-		// pretend the user chatted the trigger string, to invoke
-		// substitution and logging.
-		std::string text(trigger);
-		std::string revised_text;
-		LLGestureManager::instance().triggerAndReviseString(text, &revised_text);
-
-		revised_text = utf8str_trim(revised_text);
-		if (!revised_text.empty())
+		index = gestures->getSelectedValue().asInteger();
+		LLMultiGesture* gesture = mGestures.at(index);
+		if(gesture)
 		{
-			// Don't play nodding animation
-			LLNearbyChatBar::sendChatFromViewer(revised_text, CHAT_TYPE_NORMAL, FALSE);
+			LLGestureManager::instance().playGesture(gesture);
+			if(!gesture->mReplaceText.empty())
+			{
+				LLNearbyChatBar::sendChatFromViewer(gesture->mReplaceText, CHAT_TYPE_NORMAL, FALSE);
+			}
 		}
 	}
 
@@ -267,9 +256,6 @@ void LLNearbyChatBar::onChatBoxKeystroke(LLLineEditor* caller, void* userdata)
 
 	LLNearbyChatBar* self = (LLNearbyChatBar *)userdata;
 
-	if (!self->mChatBox)
-		return;
-
 	LLWString raw_text = self->mChatBox->getWText();
 
 	// Can't trim the end, because that will cause autocompletion
@@ -429,7 +415,7 @@ void LLNearbyChatBar::sendChat( EChatType type )
 
 void LLNearbyChatBar::onChatBoxCommit()
 {
-	if (mChatBox && mChatBox->getText().length() > 0)
+	if (mChatBox->getText().length() > 0)
 	{
 		sendChat(CHAT_TYPE_NORMAL);
 	}
@@ -501,7 +487,7 @@ void LLNearbyChatBar::startChat(const char* line)
 
 	LLNearbyChatBar* cb = bt->getNearbyChatBar();
 
-	if (!cb || !cb->mChatBox)
+	if (!cb )
 		return;
 
 	bt->setVisible(TRUE);
@@ -527,7 +513,7 @@ void LLNearbyChatBar::stopChat()
 
 	LLNearbyChatBar* cb = bt->getNearbyChatBar();
 
-	if (!cb || !cb->mChatBox)
+	if (!cb)
 		return;
 
 	cb->mChatBox->setFocus(FALSE);
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h
index 4b0c42c3c0..19177e37b3 100644
--- a/indra/newview/llnearbychatbar.h
+++ b/indra/newview/llnearbychatbar.h
@@ -53,7 +53,7 @@ public:
 	~LLGestureComboBox();
 
 	void refreshGestures();
-	void onCommitGesture(LLUICtrl* ctrl);
+	void onCommitGesture();
 	virtual void draw();
 
 	// LLGestureManagerObserver trigger
@@ -61,6 +61,7 @@ public:
 
 protected:
 	LLFrameTimer mGestureLabelTimer;
+	std::vector<LLMultiGesture*> mGestures;
 	std::string mLabel;
 };
 
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index a56688d862..8124d4b36a 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -68,6 +68,8 @@ LLNearbyChatHandler::~LLNearbyChatHandler()
 }
 void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 {
+	if(chat_msg.mMuted == TRUE)
+		return;
 	if(chat_msg.mSourceType == CHAT_SOURCE_AGENT && chat_msg.mFromID.notNull())
          LLRecentPeople::instance().add(chat_msg.mFromID);
 
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 42522942f3..f58f993a2e 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -57,8 +57,8 @@
 #include "lllineeditor.h"
 #include "lltextbox.h"
 #include "llcombobox.h"
-#include "llviewertexteditor.h"
 #include "lltexturectrl.h"
+#include "lltexteditor.h"
 #include "lluiconstants.h"
 #include "llurldispatcher.h"	// for classified HTML detail click teleports
 #include "lluictrlfactory.h"
@@ -246,8 +246,7 @@ BOOL LLPanelClassified::postBuild()
 	mDescEditor->setCommitOnFocusLost(TRUE);
 	mDescEditor->setFocusReceivedCallback(focusReceived, this);
 	mDescEditor->setCommitCallback(onCommitAny, this);
-	mDescEditor->setTabsToNextField(TRUE);
-
+	
     mLocationEditor = getChild<LLLineEditor>("location_editor");
 
     mSetBtn = getChild<LLButton>( "set_location_btn");
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index d95240e30c..8caa7d85eb 100644
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -50,6 +50,7 @@
 #include "llscrolllistcell.h"
 #include "lltextbox.h"
 #include "lltabcontainer.h"
+#include "lltexteditor.h"
 #include "lltrans.h"
 #include "lltransactiontypes.h"
 #include "lltrans.h"
diff --git a/indra/newview/llpanelgrouplandmoney.h b/indra/newview/llpanelgrouplandmoney.h
index 73c52cdf2e..0f275ea9a8 100644
--- a/indra/newview/llpanelgrouplandmoney.h
+++ b/indra/newview/llpanelgrouplandmoney.h
@@ -37,10 +37,6 @@
 #include "llmap.h"
 #include "lluuid.h"
 
-#include "llbutton.h"
-#include "lltexteditor.h"
-#include "llpanel.h"
-
 class LLPanelGroupLandMoney : public LLPanelGroupTab
 {
 public:
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index f06342ebfc..56042f6bff 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -508,7 +508,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 		mNoticesList->addElement(row, ADD_BOTTOM);
 	}
 
-	mNoticesList->sortItems();
+	mNoticesList->updateSort();
 }
 
 void LLPanelGroupNotices::onSelectNotice(LLUICtrl* ctrl, void* data)
diff --git a/indra/newview/llpanelplace.cpp b/indra/newview/llpanelplace.cpp
index 2cb7fd8c14..c6840721a3 100644
--- a/indra/newview/llpanelplace.cpp
+++ b/indra/newview/llpanelplace.cpp
@@ -48,7 +48,7 @@
 #include "lllineeditor.h"
 #include "lluiconstants.h"
 #include "lltextbox.h"
-#include "llviewertexteditor.h"
+#include "lltexteditor.h"
 #include "lltexturectrl.h"
 #include "lltrans.h"
 #include "llworldmap.h"
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 39f7d41a8d..cf91972e8b 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -149,14 +149,12 @@ BOOL LLPanelPlaces::postBuild()
 	}
 
 	mPlaceInfo = getChild<LLPanelPlaceInfo>("panel_place_info");
-	if (!mPlaceInfo)
-		return FALSE;
 	
 	LLButton* back_btn = mPlaceInfo->getChild<LLButton>("back_btn");
-	if (back_btn)
-	{
-		back_btn->setClickedCallback(boost::bind(&LLPanelPlaces::onBackButtonClicked, this));
-	}
+	back_btn->setClickedCallback(boost::bind(&LLPanelPlaces::onBackButtonClicked, this));
+
+	// *TODO: Assign the action to an appropriate event.
+	mOverflowBtn->setClickedCallback(boost::bind(&LLPanelPlaces::toggleMediaPanel, this));
 
 	return TRUE;
 }
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index ce9fcd9da2..cadab71ba8 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -101,14 +101,6 @@ BOOL LLPreviewNotecard::postBuild()
 		childSetText("desc", item->getDescription());
 	childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
 
-	LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
-
-	if (editor)
-	{
-		editor->setWordWrap(TRUE);
-		editor->setHandleEditKeysDirectly(TRUE);
-	}
-	
 	return LLPreview::postBuild();
 }
 
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index ad978cc5b3..49b9bbadfb 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -340,10 +340,6 @@ BOOL LLScriptEdCore::postBuild()
 	childSetCommitCallback("Insert...", &LLScriptEdCore::onBtnInsertFunction, this);
 
 	mEditor = getChild<LLViewerTextEditor>("Script Editor");
-	mEditor->setFollowsAll();
-	mEditor->setHandleEditKeysDirectly(TRUE);
-	mEditor->setEnabled(TRUE);
-	mEditor->setWordWrap(TRUE);
 
 	childSetCommitCallback("lsl errors", &LLScriptEdCore::onErrorList, this);
 	childSetAction("Save_btn", boost::bind(&LLScriptEdCore::doSave,this,FALSE));
@@ -459,12 +455,12 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
 		return;
 	}
 
-	const LLTextSegment* segment = NULL;
-	std::vector<const LLTextSegment*> selected_segments;
+	LLTextSegmentPtr segment = NULL;
+	std::vector<LLTextSegmentPtr> selected_segments;
 	mEditor->getSelectedSegments(selected_segments);
 
 	// try segments in selection range first
-	std::vector<const LLTextSegment*>::iterator segment_iter;
+	std::vector<LLTextSegmentPtr>::iterator segment_iter;
 	for (segment_iter = selected_segments.begin(); segment_iter != selected_segments.end(); ++segment_iter)
 	{
 		if((*segment_iter)->getToken() && (*segment_iter)->getToken()->getType() == LLKeywordToken::WORD)
@@ -477,7 +473,7 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
 	// then try previous segment in case we just typed it
 	if (!segment)
 	{
-		const LLTextSegment* test_segment = mEditor->getPreviousSegment();
+		const LLTextSegmentPtr test_segment = mEditor->getPreviousSegment();
 		if(test_segment->getToken() && test_segment->getToken()->getType() == LLKeywordToken::WORD)
 		{
 			segment = test_segment;
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 9990c22dac..2e005834b5 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -158,7 +158,7 @@ void	LLSideTrayTab::arrange(S32 width, S32 height )
 	
 	S32 offset = 0;
 
-	LLView* title_panel = getChildView(TAB_PANEL_CAPTION_NAME, true, false);
+	LLView* title_panel = findChildView(TAB_PANEL_CAPTION_NAME, true);
 
 	if(title_panel)
 	{
@@ -181,7 +181,7 @@ void LLSideTrayTab::reshape		(S32 width, S32 height, BOOL called_from_parent )
 		return;
 	S32 offset = 0;
 
-	LLView* title_panel = getChildView(TAB_PANEL_CAPTION_NAME, true, false);
+	LLView* title_panel = findChildView(TAB_PANEL_CAPTION_NAME, true);
 
 	if(title_panel)
 	{
@@ -612,7 +612,7 @@ LLPanel*	LLSideTray::showPanel		(const std::string& panel_name, const LLSD& para
 	child_vector_const_iter_t child_it;
 	for ( child_it = mTabs.begin(); child_it != mTabs.end(); ++child_it)
 	{
-		LLView* view = (*child_it)->getChildView(panel_name,true,false);
+		LLView* view = (*child_it)->findChildView(panel_name,true);
 		if(view)
 		{
 			onTabButtonClick((*child_it)->getName());
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index c4364ed6ca..c2fce08ae4 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -49,6 +49,9 @@
 #include "lloctree.h"
 #include "llvoavatar.h"
 
+static LLFastTimer::DeclareTimer FTM_FRUSTUM_CULL("Frustum Culling");
+static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound");
+
 const F32 SG_OCCLUSION_FUDGE = 0.25f;
 #define SG_DISCARD_TOLERANCE 0.01f
 
@@ -570,6 +573,8 @@ void LLSpatialGroup::rebuildMesh()
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_REBUILD_VBO("VBO Rebuilt");
+
 void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group)
 {
 	if (!gPipeline.hasRenderType(mDrawableType))
@@ -588,7 +593,7 @@ void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group)
 		return;
 	}
 
-	LLFastTimer ftm(LLFastTimer::FTM_REBUILD_VBO);	
+	LLFastTimer ftm(FTM_REBUILD_VBO);	
 
 	group->clearDrawMap();
 	
@@ -1256,6 +1261,7 @@ BOOL LLSpatialGroup::rebound()
 	return TRUE;
 }
 
+static LLFastTimer::DeclareTimer FTM_OCCLUSION_READBACK("Readback Occlusion");
 void LLSpatialGroup::checkOcclusion()
 {
 	if (LLPipeline::sUseOcclusion > 1)
@@ -1267,7 +1273,7 @@ void LLSpatialGroup::checkOcclusion()
 		}
 		else if (isState(QUERY_PENDING))
 		{	//otherwise, if a query is pending, read it back
-			LLFastTimer t(LLFastTimer::FTM_OCCLUSION_READBACK);
+			LLFastTimer t(FTM_OCCLUSION_READBACK);
 			GLuint res = 1;
 			if (!isState(DISCARD_QUERY) && mOcclusionQuery)
 			{
@@ -1312,7 +1318,7 @@ void LLSpatialGroup::doOcclusion(LLCamera* camera)
 		else
 		{
 			{
-				LLFastTimer t(LLFastTimer::FTM_RENDER_OCCLUSION);
+				LLFastTimer t(FTM_RENDER_OCCLUSION);
 
 				if (!mOcclusionQuery)
 				{
@@ -1873,7 +1879,7 @@ S32 LLSpatialPartition::cull(LLCamera &camera, std::vector<LLDrawable *>* result
 	{
 		BOOL temp = sFreezeState;
 		sFreezeState = FALSE;
-		LLFastTimer ftm(LLFastTimer::FTM_CULL_REBOUND);		
+		LLFastTimer ftm(FTM_CULL_REBOUND);		
 		LLSpatialGroup* group = (LLSpatialGroup*) mOctree->getListener(0);
 		group->rebound();
 		sFreezeState = temp;
@@ -1891,19 +1897,19 @@ S32 LLSpatialPartition::cull(LLCamera &camera, std::vector<LLDrawable *>* result
 	}
 	else if (LLPipeline::sShadowRender)
 	{
-		LLFastTimer ftm(LLFastTimer::FTM_FRUSTUM_CULL);
+		LLFastTimer ftm(FTM_FRUSTUM_CULL);
 		LLOctreeCullShadow culler(&camera);
 		culler.traverse(mOctree);
 	}
 	else if (mInfiniteFarClip || !LLPipeline::sUseFarClip)
 	{
-		LLFastTimer ftm(LLFastTimer::FTM_FRUSTUM_CULL);		
+		LLFastTimer ftm(FTM_FRUSTUM_CULL);		
 		LLOctreeCullNoFarClip culler(&camera);
 		culler.traverse(mOctree);
 	}
 	else
 	{
-		LLFastTimer ftm(LLFastTimer::FTM_FRUSTUM_CULL);		
+		LLFastTimer ftm(FTM_FRUSTUM_CULL);		
 		LLOctreeCull culler(&camera);
 		culler.traverse(mOctree);
 	}
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 04a3b52e98..222672deff 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1001,9 +1001,6 @@ bool idle_startup()
 		}
 
 		
-		//For HTML parsing in text boxes.
-		LLTextEditor::setLinkColor( LLUIColorTable::instance().getColor("HTMLLinkColor") );
-
 		// Load URL History File
 		LLURLHistory::loadFile("url_history.xml");
 
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 569e7b3397..8a5de61280 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -265,7 +265,7 @@ BOOL LLStatusBar::postBuild()
 	mHideNavbarContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_hide_navbar.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	gMenuHolder->addChild(mHideNavbarContextMenu);
 
-	gMenuBarView->setRightClickedCallback(boost::bind(&LLStatusBar::onMainMenuRightClicked, this, _1, _2, _3, _4));
+	gMenuBarView->setRightMouseDownCallback(boost::bind(&LLStatusBar::onMainMenuRightClicked, this, _1, _2, _3, _4));
 
 	return TRUE;
 }
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp
index a422db1cc1..fc125dcf9c 100644
--- a/indra/newview/llstylemap.cpp
+++ b/indra/newview/llstylemap.cpp
@@ -38,83 +38,53 @@
 #include "llviewercontrol.h"
 #include "llagent.h"
 
-LLStyleMap::LLStyleMap()
-{
-}
-
-LLStyleMap::~LLStyleMap()
-{
-}
-
-LLStyleMap &LLStyleMap::instance()
-{
-	static LLStyleMap style_map;
-	return style_map;
-}
-
-// This is similar to the [] accessor except that if the entry doesn't already exist,
-// then this will create the entry.
-const LLStyleSP &LLStyleMap::lookupAgent(const LLUUID &source)
+const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source)
 {
 	// Find this style in the map or add it if not.  This map holds links to residents' profiles.
-	if (find(source) == end())
+	if (mMap.find(source) == mMap.end())
 	{
-		LLStyleSP style(new LLStyle);
-		style->setVisible(true);
-		style->setFontName(LLStringUtil::null);
+		LLStyle::Params style_params;
 		if (source != LLUUID::null && source != gAgent.getID() )
 		{
-			style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
-			std::string link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str());
-			style->setLinkHREF(link);
+			style_params.color.control = "HTMLLinkColor";
+			style_params.link_href = llformat("secondlife:///app/agent/%s/about",source.asString().c_str());
 		}
 		else
 		{
 			// Make the resident's own name white and don't make the name clickable.
-			style->setColor(LLColor4::white);
+			style_params.color = LLColor4::white;
 		}
-		(*this)[source] = style;
+
+		mMap[source] = LLStyle::Params();
 	}
-	return (*this)[source];
+	return mMap[source];
 }
 
 // This is similar to lookupAgent for any generic URL encoded style.
-const LLStyleSP &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
+const LLStyle::Params &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
 {
 	// Find this style in the map or add it if not.
-	iterator iter = find(id);
-	if (iter == end())
+	style_map_t::iterator iter = mMap.find(id);
+	if (iter == mMap.end())
 	{
-		LLStyleSP style(new LLStyle);
-		style->setVisible(true);
-		style->setFontName(LLStringUtil::null);
+		LLStyle::Params style_params;
+
 		if (id != LLUUID::null && !link.empty())
 		{
-			style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
-			style->setLinkHREF(link);
+			style_params.color.control = "HTMLLinkColor";
+			style_params.link_href = link;
 		}
 		else
-			style->setColor(LLColor4::white);
-		(*this)[id] = style;
+		{
+			style_params.color = LLColor4::white;
+		}
+		mMap[id] = style_params;
 	}
 	else 
 	{
-		LLStyleSP style = (*iter).second;
-		if ( style->getLinkHREF() != link )
-		{
-			style->setLinkHREF(link);
-		}
+		iter->second.link_href = link;
 	}
 
-	return (*this)[id];
+	return mMap[id];
 }
 
-void LLStyleMap::update()
-{
-	for (style_map_t::iterator iter = begin(); iter != end(); ++iter)
-	{
-		LLStyleSP &style = iter->second;
-		// Update the link color in case it has been changed.
-		style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
-	}
-}
diff --git a/indra/newview/llstylemap.h b/indra/newview/llstylemap.h
index 254509ea1d..d29ff1ae28 100644
--- a/indra/newview/llstylemap.h
+++ b/indra/newview/llstylemap.h
@@ -36,24 +36,22 @@
 
 #include "llstyle.h"
 #include "lluuid.h"
+#include "llsingleton.h"
 
 // Lightweight class for holding and managing mappings between UUIDs and links.
 // Used (for example) to create clickable name links off of IM chat.
 
-typedef std::map<LLUUID, LLStyleSP> style_map_t;
+typedef std::map<LLUUID, LLStyle::Params> style_map_t;
 
-class LLStyleMap : public style_map_t
+class LLStyleMap : public LLSingleton<LLStyleMap>
 {
 public:
-	LLStyleMap();
-	~LLStyleMap();
 	// Just like the [] accessor but it will add the entry in if it doesn't exist.
-	const LLStyleSP &lookupAgent(const LLUUID &source); 
-	const LLStyleSP &lookup(const LLUUID &source, const std::string& link); 
-	static LLStyleMap &instance();
+	const LLStyle::Params &lookupAgent(const LLUUID &source); 
+	const LLStyle::Params &lookup(const LLUUID &source, const std::string& link); 
 
-	// Forces refresh of the entries, call when something changes (e.g. link color).
-	void update();
+private:
+	style_map_t mMap;
 };
 
 #endif  // LL_LLSTYLE_MAP_H
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp
index 8a61f6cfda..6f26b4077c 100644
--- a/indra/newview/lltoastgroupnotifypanel.cpp
+++ b/indra/newview/lltoastgroupnotifypanel.cpp
@@ -40,12 +40,12 @@
 #include "lliconctrl.h"
 #include "llnotify.h"
 #include "lltextbox.h"
-#include "llviewertexteditor.h"
+#include "lltexteditor.h"
 #include "lluiconstants.h"
 #include "llui.h"
 #include "llviewercontrol.h"
 #include "lltrans.h"
-#include "llinitparam.h"
+#include "llstyle.h"
 
 #include "llglheaders.h"
 #include "llagent.h"
@@ -75,23 +75,25 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
 	const std::string& from_name = payload["sender_name"].asString();
 	std::stringstream from;
 	from << from_name << "/" << groupData.mName;
-	LLTextBox* pTitleText = this->getChild<LLTextBox>("title");
+	LLTextBox* pTitleText = getChild<LLTextBox>("title");
 	pTitleText->setValue(from.str());
 
 	//message body
 	const std::string& subject = payload["subject"].asString();
 	const std::string& message = payload["message"].asString();
 
-	LLTextEditor* pMessageText = getChild<	LLTextEditor>("message");
+	LLTextEditor* pMessageText = getChild<LLTextEditor>("message");
 	pMessageText->setValue("");
 	pMessageText->setEnabled(FALSE);
-	pMessageText->setTakesFocus(FALSE);
 
-	static const LLStyleSP headerstyle(new LLStyle(true, textColor,
-			"SansSerifBig"));
-	static const LLStyleSP datestyle(new LLStyle(true, textColor, "serif"));
+	LLStyle::Params date_style;
+	date_style.color = textColor;
+	date_style.font.name = "SANSSERIF";
 
-	pMessageText->appendStyledText(subject + "\n",false,false,headerstyle);
+	LLStyle::Params header_style_params;
+	header_style_params.color = textColor;
+	header_style_params.font = LLFontGL::getFontSansSerifBig();
+	pMessageText->appendStyledText(subject + "\n",false,false,header_style_params);
 
 	std::string timeStr = "["+LLTrans::getString("UTCTimeWeek")+"],["
 							+LLTrans::getString("UTCTimeDay")+"] ["
@@ -106,7 +108,10 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
 	LLSD substitution;
 	substitution["datetime"] = (S32) notice_date.secondsSinceEpoch();
 	LLStringUtil::format(timeStr, substitution);
-	pMessageText->appendStyledText(timeStr, false, false, datestyle);
+	LLStyle::Params date_style_params;
+	date_style_params.color = textColor;
+	date_style_params.font = LLFontGL::getFontMonospace();
+	pMessageText->appendStyledText(timeStr, false, false, date_style);
 	pMessageText->appendColoredText(std::string("\n\n") + message, false,
 			false, textColor);
 
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index a7b57802c1..844c54da6a 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -107,7 +107,6 @@ LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification) : LLToas
 	common_params.rect(LLRect(x, y, x+32, TOP-32));
 	common_params.mouse_opaque(false);
 	common_params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
-	common_params.tab_stop(false);
 
 	if (mIsTip)
 	{
@@ -180,8 +179,6 @@ LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification) : LLToas
 		params.mouse_opaque(false);
 		params.bg_readonly_color(LLColor4::transparent);
 		params.text_readonly_color(LLUIColorTable::instance().getColor("NotifyTextColor"));
-		params.takes_non_scroll_clicks(false);
-		params.hide_scrollbar(true);
 		params.enabled(false);
 		params.hide_border(true);
 		text = LLUICtrlFactory::create<LLTextEditor> (params);
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index f08c287529..8e65c7e65e 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -207,11 +207,17 @@ void display_stats()
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_PICK("Picking");
+static LLFastTimer::DeclareTimer FTM_RENDER("Render", true);
+static LLFastTimer::DeclareTimer FTM_UPDATE_SKY("Update Sky");
+static LLFastTimer::DeclareTimer FTM_UPDATE_TEXTURES("Update Textures");
+static LLFastTimer::DeclareTimer FTM_IMAGE_UPDATE("Update Images");
+
 // Paint the display!
 void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 {
 	LLMemType mt_render(LLMemType::MTYPE_RENDER);
-	LLFastTimer t(LLFastTimer::FTM_RENDER);
+	LLFastTimer t(FTM_RENDER);
 
 	if (LLPipeline::sRenderFrameTest)
 	{
@@ -258,7 +264,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 	gViewerWindow->checkSettings();
 	
 	{
-		LLFastTimer ftm(LLFastTimer::FTM_PICK);
+		LLFastTimer ftm(FTM_PICK);
 		LLAppViewer::instance()->pingMainloopTimeout("Display:Pick");
 		gViewerWindow->performPick();
 	}
@@ -504,7 +510,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 	if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_DYNAMIC_TEXTURES))
 	{
 		LLAppViewer::instance()->pingMainloopTimeout("Display:DynamicTextures");
-		LLFastTimer t(LLFastTimer::FTM_UPDATE_TEXTURES);
+		LLFastTimer t(FTM_UPDATE_TEXTURES);
 		if (LLViewerDynamicTexture::updateAllInstances())
 		{
 			gGL.setColorMask(true, true);
@@ -616,7 +622,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 		{ 
 			LLMemType mt_ds(LLMemType::MTYPE_DISPLAY_SWAP);
 			{
- 				LLFastTimer ftm(LLFastTimer::FTM_CLIENT_COPY);
+ 				LLFastTimer ftm(FTM_CLIENT_COPY);
 				LLVertexBuffer::clientCopy(0.016);
 			}
 
@@ -687,7 +693,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
 		{
 			LLMemType mt_iu(LLMemType::MTYPE_DISPLAY_IMAGE_UPDATE);
-			LLFastTimer t(LLFastTimer::FTM_IMAGE_UPDATE);
+			LLFastTimer t(FTM_IMAGE_UPDATE);
 			
 			LLViewerTexture::updateClass(LLViewerCamera::getInstance()->getVelocityStat()->getMean(),
 										LLViewerCamera::getInstance()->getAngularVelocityStat()->getMean());
@@ -730,7 +736,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 		{
 			LLMemType mt_ds(LLMemType::MTYPE_DISPLAY_SKY);
 			LLAppViewer::instance()->pingMainloopTimeout("Display:Sky");
-			LLFastTimer t(LLFastTimer::FTM_UPDATE_SKY);	
+			LLFastTimer t(FTM_UPDATE_SKY);	
 			gSky.updateSky();
 		}
 
@@ -860,7 +866,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 		LLAppViewer::instance()->pingMainloopTimeout("Display:RenderUI");
 		if (!for_snapshot)
 		{
-			LLFastTimer t(LLFastTimer::FTM_RENDER_UI);
+			LLFastTimer t(FTM_RENDER_UI);
 			render_ui();
 		}
 
@@ -1040,6 +1046,7 @@ BOOL setup_hud_matrices(const LLRect& screen_region)
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_SWAP("Swap");
 
 void render_ui(F32 zoom_factor, int subfield)
 {
@@ -1075,7 +1082,7 @@ void render_ui(F32 zoom_factor, int subfield)
 		gGL.color4f(1,1,1,1);
 		if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
 		{
-			LLFastTimer t(LLFastTimer::FTM_RENDER_UI);
+			LLFastTimer t(FTM_RENDER_UI);
 
 			if (!gDisconnected)
 			{
@@ -1102,7 +1109,7 @@ void render_ui(F32 zoom_factor, int subfield)
 
 	if (gDisplaySwapBuffers)
 	{
-		LLFastTimer t(LLFastTimer::FTM_SWAP);
+		LLFastTimer t(FTM_SWAP);
 		gViewerWindow->mWindow->swapBuffers();
 	}
 	gDisplaySwapBuffers = TRUE;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 499632def3..207b9592b8 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -458,13 +458,13 @@ void set_underclothes_menu_options()
 {
 	if (gMenuHolder && gAgent.isTeen())
 	{
-		gMenuHolder->getChild<LLView>("Self Underpants", TRUE)->setVisible(FALSE);
-		gMenuHolder->getChild<LLView>("Self Undershirt", TRUE)->setVisible(FALSE);
+		gMenuHolder->getChild<LLView>("Self Underpants")->setVisible(FALSE);
+		gMenuHolder->getChild<LLView>("Self Undershirt")->setVisible(FALSE);
 	}
 	if (gMenuBarView && gAgent.isTeen())
 	{
-		gMenuBarView->getChild<LLView>("Menu Underpants", TRUE)->setVisible(FALSE);
-		gMenuBarView->getChild<LLView>("Menu Undershirt", TRUE)->setVisible(FALSE);
+		gMenuBarView->getChild<LLView>("Menu Underpants")->setVisible(FALSE);
+		gMenuBarView->getChild<LLView>("Menu Undershirt")->setVisible(FALSE);
 	}
 }
 
@@ -567,8 +567,8 @@ void init_menus()
 
 	gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE);
 	gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE);
-	gAttachSubMenu = gMenuBarView->getChildMenuByName("Attach Object", TRUE);
-	gDetachSubMenu = gMenuBarView->getChildMenuByName("Detach Object", TRUE);
+	gAttachSubMenu = gMenuBarView->findChildMenuByName("Attach Object", TRUE);
+	gDetachSubMenu = gMenuBarView->findChildMenuByName("Detach Object", TRUE);
 
 	gMenuBarView->createJumpKeys();
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 33568bf3cb..d83f3d9207 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3302,11 +3302,12 @@ void process_terse_object_update_improved(LLMessageSystem *mesgsys, void **user_
 	gObjectList.processCompressedObjectUpdate(mesgsys, user_data, OUT_TERSE_IMPROVED);
 }
 
+static LLFastTimer::DeclareTimer FTM_PROCESS_OBJECTS("Process Objects");
 
 
 void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
 {
-	LLFastTimer t(LLFastTimer::FTM_PROCESS_OBJECTS);
+	LLFastTimer t(FTM_PROCESS_OBJECTS);
 
 	LLUUID		id;
 	U32			local_id;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index ec11e0aee2..99723f86a7 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -115,11 +115,13 @@ S32			LLViewerObject::sAxisArrowLength(50);
 BOOL		LLViewerObject::sPulseEnabled(FALSE);
 BOOL		LLViewerObject::sUseSharedDrawables(FALSE); // TRUE
 
+static LLFastTimer::DeclareTimer FTM_CREATE_OBJECT("Create Object");
+
 // static
 LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 {
 	LLViewerObject *res = NULL;
-	LLFastTimer t1(LLFastTimer::FTM_CREATE_OBJECT);
+	LLFastTimer t1(FTM_CREATE_OBJECT);
 	
 	switch (pcode)
 	{
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 8939faeb91..a8232e9a9d 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -258,13 +258,15 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_PROCESS_OBJECTS("Process Objects");
+
 void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 											 void **user_data,
 											 const EObjectUpdateType update_type,
 											 bool cached, bool compressed)
 {
 	LLMemType mt(LLMemType::MTYPE_OBJECT_PROCESS_UPDATE);
-	LLFastTimer t(LLFastTimer::FTM_PROCESS_OBJECTS);	
+	LLFastTimer t(FTM_PROCESS_OBJECTS);	
 	
 	LLVector3d camera_global = gAgent.getCameraPositionGlobal();
 	LLViewerObject *objectp;
@@ -1304,12 +1306,13 @@ LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLVi
 }
 
 
+static LLFastTimer::DeclareTimer FTM_CREATE_OBJECT("Create Object");
 
 LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRegion *regionp,
 												 const LLUUID &uuid, const U32 local_id, const LLHost &sender)
 {
 	LLMemType mt(LLMemType::MTYPE_OBJECT);
-	LLFastTimer t(LLFastTimer::FTM_CREATE_OBJECT);
+	LLFastTimer t(FTM_CREATE_OBJECT);
 	
 	LLUUID fullid;
 	if (uuid == LLUUID::null)
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index ec39819bc8..cfb8340462 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -631,6 +631,8 @@ void LLViewerPartSim::shift(const LLVector3 &offset)
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_SIMULATE_PARTICLES("Simulate Particles");
+
 void LLViewerPartSim::updateSimulation()
 {
 	LLMemType mt(LLMemType::MTYPE_PARTICLES);
@@ -644,7 +646,7 @@ void LLViewerPartSim::updateSimulation()
 		return;
 	}
 
-	LLFastTimer ftm(LLFastTimer::FTM_SIMULATE_PARTICLES);
+	LLFastTimer ftm(FTM_SIMULATE_PARTICLES);
 
 	// Start at a random particle system so the same
 	// particle system doesn't always get first pick at the
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 709fcdcf01..444d8e3164 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -594,14 +594,14 @@ void update_statistics(U32 frame_count)
 	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_SHADER_AVATAR, (F64)gSavedSettings.getBOOL("VertexShaderLevelAvatar"));
 	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_SHADER_ENVIRONMENT, (F64)gSavedSettings.getBOOL("VertexShaderLevelEnvironment"));
 #endif
-	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_FRAME_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::NamedTimer::getRootNamedTimer().getFrameState()));
-	F64 idle_secs = gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_IDLE);
-	F64 network_secs = gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_NETWORK);
+	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_FRAME_SECS, gDebugView->mFastTimerView->getTime("Frame"));
+	F64 idle_secs = gDebugView->mFastTimerView->getTime("Idle");
+	F64 network_secs = gDebugView->mFastTimerView->getTime("Network");
 	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_UPDATE_SECS, idle_secs - network_secs);
 	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_NETWORK_SECS, network_secs);
-	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_IMAGE_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_IMAGE_UPDATE));
-	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_REBUILD_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_STATESORT ));
-	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_RENDER_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_RENDER_GEOMETRY));
+	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_IMAGE_SECS, gDebugView->mFastTimerView->getTime("Update Images"));
+	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_REBUILD_SECS, gDebugView->mFastTimerView->getTime("Sort Draw State"));
+	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_RENDER_SECS, gDebugView->mFastTimerView->getTime("Geometry"));
 		
 	LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(gAgent.getRegion()->getHost());
 	if (cdp)
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 9e0713b494..7565c86696 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -62,6 +62,7 @@
 #include "llnotecard.h"
 #include "llmemorystream.h"
 #include "llmenugl.h"
+#include "llscrollcontainer.h"
 #include "llavataractions.h"
 
 #include "llappviewer.h" // for gPacificDaylightTime
@@ -108,6 +109,105 @@ public:
 	}
 };
 
+//
+// class LLEmbeddedItemSegment
+//
+
+const S32 EMBEDDED_ITEM_LABEL_PADDING = 2;
+
+class LLEmbeddedItemSegment : public LLTextSegment
+{
+public:
+	LLEmbeddedItemSegment(S32 pos, LLUIImagePtr image, LLPointer<LLInventoryItem> inv_item, LLTextEditor& editor)
+	:	LLTextSegment(pos, pos + 1),
+		mImage(image),
+		mLabel(utf8str_to_wstring(inv_item->getName())),
+		mItem(inv_item),
+		mEditor(editor),
+		mHasMouseHover(false)
+	{
+
+		mStyle = new LLStyle(LLStyle::Params().font(LLFontGL::getFontSansSerif()));
+		mToolTip = inv_item->getName() + '\n' + inv_item->getDescription();
+	}
+
+	/*virtual*/ S32				getWidth(S32 first_char, S32 num_chars) const
+	{
+		if (num_chars == 0)
+		{
+			return 0;
+		}
+		else
+		{
+			return EMBEDDED_ITEM_LABEL_PADDING + mImage->getWidth() + mStyle->getFont()->getWidth(mLabel.c_str());
+		}
+
+	}
+	//virtual S32					getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
+	//virtual void				updateLayout(const class LLTextEditor& editor);
+
+	/*virtual*/ S32				getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const 
+	{
+		return 1;
+	}
+	/*virtual*/ F32				draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
+	{
+		LLRect image_rect = draw_rect;
+		image_rect.mRight = image_rect.mLeft + mImage->getWidth();
+		image_rect.mTop = image_rect.mBottom + mImage->getHeight();
+		mImage->draw(image_rect);
+
+		LLColor4 color;
+		if (mEditor.getReadOnly())
+		{
+			color = LLUIColorTable::instance().getColor("TextEmbeddedItemReadOnlyColor");
+		}
+		else
+		{
+			color = LLUIColorTable::instance().getColor("TextEmbeddedItemColor");
+		}
+
+		F32 right_x;
+		mStyle->getFont()->render(mLabel, 0, image_rect.mRight + EMBEDDED_ITEM_LABEL_PADDING, draw_rect.mBottom, color, LLFontGL::LEFT, LLFontGL::BOTTOM, mHasMouseHover ? LLFontGL::UNDERLINE : 0, LLFontGL::NO_SHADOW, mLabel.length(), S32_MAX, &right_x);
+		return right_x;
+	}
+	
+	/*virtual*/ S32				getMaxHeight() const
+	{
+		return llmax(mImage->getHeight(), llceil(mStyle->getFont()->getLineHeight()));
+	}
+	/*virtual*/ bool			canEdit() const { return false; }
+	//virtual void				unlinkFromDocument(class LLTextEditor* editor);
+	//virtual void				linkToDocument(class LLTextEditor* editor);
+
+	virtual void				setHasMouseHover(bool hover) 
+	{
+		mHasMouseHover = hover; 
+	}
+	//virtual const LLColor4&	getColor() const;
+	//virtual void 				setColor(const LLColor4 &color);
+	//virtual void 				setStyle(const LLStyleSP &style);
+	virtual BOOL				getToolTip( std::string& msg ) const 
+	{ 
+		msg = mToolTip; 
+		return TRUE; 
+	}
+
+	/*virtual*/ const LLStyleSP		getStyle() const { return mStyle; }
+
+private:
+	LLUIImagePtr	mImage;
+	LLWString		mLabel;
+	LLStyleSP		mStyle;
+	std::string		mToolTip;
+	LLPointer<LLInventoryItem> mItem;
+	LLTextEditor&	mEditor;
+	bool			mHasMouseHover;
+
+};
+
+
+
 ////////////////////////////////////////////////////////////
 // LLEmbeddedItems
 //
@@ -130,13 +230,11 @@ public:
 	// return true if there are no embedded items.
 	bool empty();
 	
-	void	bindEmbeddedChars(const LLFontGL* font) const;
-	void	unbindEmbeddedChars(const LLFontGL* font) const;
-
 	BOOL	insertEmbeddedItem(LLInventoryItem* item, llwchar* value, bool is_new);
 	BOOL	removeEmbeddedItem( llwchar ext_char );
 
 	BOOL	hasEmbeddedItem(llwchar ext_char); // returns TRUE if /this/ editor has an entry for this item
+	LLUIImagePtr getItemImage(llwchar ext_char) const;
 
 	void	getEmbeddedItemList( std::vector<LLPointer<LLInventoryItem> >& items );
 	void	addItems(const std::vector<LLPointer<LLInventoryItem> >& items);
@@ -351,27 +449,13 @@ BOOL LLEmbeddedItems::hasEmbeddedItem(llwchar ext_char)
 	return FALSE;
 }
 
-void LLEmbeddedItems::bindEmbeddedChars( const LLFontGL* font ) const
-{
-	if( sEntries.empty() )
-	{
-		return; 
-	}
 
-	for (std::set<llwchar>::const_iterator iter1 = mEmbeddedUsedChars.begin(); iter1 != mEmbeddedUsedChars.end(); ++iter1)
+LLUIImagePtr LLEmbeddedItems::getItemImage(llwchar ext_char) const
+{
+	LLInventoryItem* item = getEmbeddedItem(ext_char);
+	if (item)
 	{
-		llwchar wch = *iter1;
-		item_map_t::iterator iter2 = sEntries.find(wch);
-		if (iter2 == sEntries.end())
-		{
-			continue;
-		}
-		LLInventoryItem* item = iter2->second.mItem;
-		if (!item)
-		{
-			continue;
-		}
-		const char* img_name;
+		const char* img_name = "";
 		switch( item->getType() )
 		{
 			case LLAssetType::AT_TEXTURE:
@@ -428,27 +512,14 @@ void LLEmbeddedItems::bindEmbeddedChars( const LLFontGL* font ) const
 			case LLAssetType::AT_GESTURE:			img_name = "inv_item_gesture.tga";	break;
 				//TODO need img_name
 			case LLAssetType::AT_FAVORITE:		img_name = "inv_item_landmark.tga";	 break;
-			default: llassert(0); continue;
+			default: llassert(0); 
 		}
 
-		LLUIImagePtr image = LLUI::getUIImage(img_name);
-
-		font->addEmbeddedChar( wch, image->getImage(), item->getName() );
+		return LLUI::getUIImage(img_name);
 	}
+	return LLUIImagePtr();
 }
 
-void LLEmbeddedItems::unbindEmbeddedChars( const LLFontGL* font ) const
-{
-	if( sEntries.empty() )
-	{
-		return; 
-	}
-
-	for (std::set<llwchar>::const_iterator iter1 = mEmbeddedUsedChars.begin(); iter1 != mEmbeddedUsedChars.end(); ++iter1)
-	{
-		font->removeEmbeddedChar(*iter1);
-	}
-}
 
 void LLEmbeddedItems::addItems(const std::vector<LLPointer<LLInventoryItem> >& items)
 {
@@ -613,30 +684,16 @@ BOOL LLViewerTextEditor::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* s
 	}
 
 	const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
-	if( cur_segment )
+	if( cur_segment && cur_segment->getToolTip( msg ) )
 	{
-		BOOL has_tool_tip = FALSE;
-		if( cur_segment->getStyle()->getIsEmbeddedItem() )
-		{
-			LLWString wtip;
-			has_tool_tip = getEmbeddedItemToolTipAtPos(cur_segment->getStart(), wtip);
-			msg = wstring_to_utf8str(wtip);
-		}
-		else
-		{
-			has_tool_tip = cur_segment->getToolTip( msg );
-		}
-		if( has_tool_tip )
-		{
-			// Just use a slop area around the cursor
-			// Convert rect local to screen coordinates
-			S32 SLOP = 8;
-			localPointToScreen( 
-				x - SLOP, y - SLOP, 
-				&(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
-			sticky_rect_screen->mRight = sticky_rect_screen->mLeft + 2 * SLOP;
-			sticky_rect_screen->mTop = sticky_rect_screen->mBottom + 2 * SLOP;
-		}
+		// Just use a slop area around the cursor
+		// Convert rect local to screen coordinates
+		S32 SLOP = 8;
+		localPointToScreen( 
+			x - SLOP, y - SLOP, 
+			&(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
+		sticky_rect_screen->mRight = sticky_rect_screen->mLeft + 2 * SLOP;
+		sticky_rect_screen->mTop = sticky_rect_screen->mBottom + 2 * SLOP;
 	}
 	return TRUE;
 }
@@ -648,21 +705,8 @@ BOOL LLViewerTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 	// Let scrollbar have first dibs
 	handled = LLView::childrenHandleMouseDown(x, y, mask) != NULL;
 
-	// enable I Agree checkbox if the user scrolled through entire text
-	BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
-	if (mOnScrollEndCallback && was_scrolled_to_bottom)
+	if( !handled)
 	{
-		mOnScrollEndCallback(mOnScrollEndData);
-	}
-
-	if( !handled && mTakesNonScrollClicks)
-	{
-		if (!(mask & MASK_SHIFT))
-		{
-			deselect();
-		}
-
-		BOOL start_select = TRUE;
 		if( allowsEmbeddedItems() )
 		{
 			setCursorAtLocalPos( x, y, FALSE );
@@ -685,192 +729,55 @@ BOOL LLViewerTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 				localPointToScreen(x, y, &screen_x, &screen_y );
 				LLToolDragAndDrop::getInstance()->setDragStart( screen_x, screen_y );
 
-				start_select = FALSE;
-			}
-			else
-			{
-				mDragItem = NULL;
-			}
-		}
-
-		if( start_select )
-		{
-			// If we're not scrolling (handled by child), then we're selecting
-			if (mask & MASK_SHIFT)
-			{
-				S32 old_cursor_pos = mCursorPos;
-				setCursorAtLocalPos( x, y, TRUE );
-
-				if (hasSelection())
-				{
-					/* Mac-like behavior - extend selection towards the cursor
-					if (mCursorPos < mSelectionStart
-						&& mCursorPos < mSelectionEnd)
-					{
-						// ...left of selection
-						mSelectionStart = llmax(mSelectionStart, mSelectionEnd);
-						mSelectionEnd = mCursorPos;
-					}
-					else if (mCursorPos > mSelectionStart
-						&& mCursorPos > mSelectionEnd)
-					{
-						// ...right of selection
-						mSelectionStart = llmin(mSelectionStart, mSelectionEnd);
-						mSelectionEnd = mCursorPos;
-					}
-					else
-					{
-						mSelectionEnd = mCursorPos;
-					}
-					*/
-					// Windows behavior
-					mSelectionEnd = mCursorPos;
-				}
-				else
+				if (hasTabStop())
 				{
-					mSelectionStart = old_cursor_pos;
-					mSelectionEnd = mCursorPos;
+					setFocus( TRUE );
 				}
-				// assume we're starting a drag select
-				mIsSelecting = TRUE;
 
+				handled = TRUE;
 			}
 			else
 			{
-				setCursorAtLocalPos( x, y, TRUE );
-				startSelection();
+				mDragItem = NULL;
 			}
-			gFocusMgr.setMouseCapture( this );
 		}
 
-		handled = TRUE;
-	}
-
-	if (hasTabStop())
-	{
-		setFocus(TRUE);
-		handled = TRUE;
+		if (!handled)
+		{
+			handled = LLTextEditor::handleMouseDown(x, y, mask);
+		}
 	}
 
-	// Delay cursor flashing
-	resetKeystrokeTimer();
-
 	return handled;
 }
 
 
 BOOL LLViewerTextEditor::handleHover(S32 x, S32 y, MASK mask)
 {
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-	BOOL handled = FALSE;
+	BOOL handled = LLTextEditor::handleHover(x, y, mask);
 
-	if (!mDragItem)
+	if(hasMouseCapture() && mDragItem)
 	{
-		// leave hover segment active during drag and drop
-		mHoverSegment = NULL;
-	}
-	if(hasMouseCapture() )
-	{
-		if( mIsSelecting ) 
-		{
-			if (x != mLastSelectionX || y != mLastSelectionY)
-			{
-				mLastSelectionX = x;
-				mLastSelectionY = y;
-			}
+		S32 screen_x;
+		S32 screen_y;
+		localPointToScreen(x, y, &screen_x, &screen_y );
 
-			if( y > getTextRect().mTop )
-			{
-				mScrollbar->setDocPos( mScrollbar->getDocPos() - 1 );
-			}
-			else
-			if( y < getTextRect().mBottom )
-			{
-				mScrollbar->setDocPos( mScrollbar->getDocPos() + 1 );
-			}
+		mScroller->autoScroll(x, y);
 
-			setCursorAtLocalPos( x, y, TRUE );
-			mSelectionEnd = mCursorPos;
-			
-			updateScrollFromCursor();
-			getWindow()->setCursor(UI_CURSOR_IBEAM);
-		}
-		else if( mDragItem )
+		if( LLToolDragAndDrop::getInstance()->isOverThreshold( screen_x, screen_y ) )
 		{
-			S32 screen_x;
-			S32 screen_y;
-			localPointToScreen(x, y, &screen_x, &screen_y );
-			if( LLToolDragAndDrop::getInstance()->isOverThreshold( screen_x, screen_y ) )
-			{
-				LLToolDragAndDrop::getInstance()->beginDrag(
-					LLAssetType::lookupDragAndDropType( mDragItem->getType() ),
-					mDragItem->getUUID(),
-					LLToolDragAndDrop::SOURCE_NOTECARD,
-					mPreviewID, mObjectID);
+			LLToolDragAndDrop::getInstance()->beginDrag(
+				LLAssetType::lookupDragAndDropType( mDragItem->getType() ),
+				mDragItem->getUUID(),
+				LLToolDragAndDrop::SOURCE_NOTECARD,
+				mPreviewID, mObjectID);
 
-				return LLToolDragAndDrop::getInstance()->handleHover( x, y, mask );
-			}
-			getWindow()->setCursor(UI_CURSOR_HAND);
+			return LLToolDragAndDrop::getInstance()->handleHover( x, y, mask );
 		}
-
-		lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (active)" << llendl;		
+		getWindow()->setCursor(UI_CURSOR_HAND);
 		handled = TRUE;
 	}
 
-	if( !handled )
-	{
-		// Pass to children
-		handled = LLView::childrenHandleHover(x, y, mask) != NULL;
-	}
-
-	if( handled )
-	{
-		// Delay cursor flashing
-		resetKeystrokeTimer();
-	}
-
-	// Opaque
-	if( !handled && mTakesNonScrollClicks)
-	{
-		// Check to see if we're over an HTML-style link
-		if( !mSegments.empty() )
-		{
-			const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
-			if( cur_segment )
-			{
-				if(cur_segment->getStyle()->isLink())
-				{
-					lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over link, inactive)" << llendl;		
-					getWindow()->setCursor(UI_CURSOR_HAND);
-					handled = TRUE;
-				}
-				else
-				if(cur_segment->getStyle()->getIsEmbeddedItem())
-				{
-					lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over embedded item, inactive)" << llendl;		
-					getWindow()->setCursor(UI_CURSOR_HAND);
-					//getWindow()->setCursor(UI_CURSOR_ARROW);
-					handled = TRUE;
-				}
-				mHoverSegment = cur_segment;
-			}
-		}
-
-		if( !handled )
-		{
-			lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;		
-			if (!mScrollbar->getVisible() || x < getRect().getWidth() - scrollbar_size)
-			{
-				getWindow()->setCursor(UI_CURSOR_IBEAM);
-			}
-			else
-			{
-				getWindow()->setCursor(UI_CURSOR_ARROW);
-			}
-			handled = TRUE;
-		}
-	}
-
 	return handled;
 }
 
@@ -903,13 +810,6 @@ BOOL LLViewerTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
 
 	handled = LLTextEditor::handleMouseUp(x,y,mask);
 
-	// Used to enable I Agree checkbox if the user scrolled through entire text
-	BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
-	if (mOnScrollEndCallback && was_scrolled_to_bottom)
-	{
-		mOnScrollEndCallback(mOnScrollEndData);
-	}
-
 	return handled;
 }
 
@@ -949,24 +849,6 @@ BOOL LLViewerTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	return handled;
 }
 
-BOOL LLViewerTextEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
-{
-	BOOL	handled = FALSE;
-	handled = childrenHandleMiddleMouseDown(x, y, mask) != NULL;
-	if (!handled)
-	{
-		handled = LLTextEditor::handleMiddleMouseDown(x, y, mask);
-	}
-	return handled;
-}
-
-BOOL LLViewerTextEditor::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
-{
-	BOOL handled = childrenHandleMiddleMouseUp(x, y, mask) != NULL;
-
-	return handled;
-}
-
 BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
 	BOOL	handled = FALSE;
@@ -974,14 +856,15 @@ BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 	// let scrollbar have first dibs
 	handled = LLView::childrenHandleDoubleClick(x, y, mask) != NULL;
 
-	if( !handled && mTakesNonScrollClicks)
+	if( !handled)
 	{
 		if( allowsEmbeddedItems() )
 		{
-			const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
-			if( cur_segment && cur_segment->getStyle()->getIsEmbeddedItem() )
+			S32 doc_index = getDocIndexFromLocalCoord(x, y, FALSE);
+			llwchar doc_char = getWText()[doc_index];
+			if (mEmbeddedItemList->hasEmbeddedItem(doc_char))
 			{
-				if( openEmbeddedItemAtPos( cur_segment->getStart() ) )
+				if( openEmbeddedItemAtPos( doc_index ))
 				{
 					deselect();
 					setFocus( FALSE );
@@ -989,47 +872,7 @@ BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 				}
 			}
 		}
-	
-		setCursorAtLocalPos( x, y, FALSE );
-		deselect();
-
-		const LLWString &text = getWText();
-		
-		if( isPartOfWord( text[mCursorPos] ) )
-		{
-			// Select word the cursor is over
-			while ((mCursorPos > 0) && isPartOfWord(text[mCursorPos-1]))
-			{
-				mCursorPos--;
-			}
-			startSelection();
-
-			while ((mCursorPos < (S32)text.length()) && isPartOfWord( text[mCursorPos] ) )
-			{
-				mCursorPos++;
-			}
-		
-			mSelectionEnd = mCursorPos;
-		}
-		else if ((mCursorPos < (S32)text.length()) && !iswspace( text[mCursorPos]) )
-		{
-			// Select the character the cursor is over
-			startSelection();
-			mCursorPos++;
-			mSelectionEnd = mCursorPos;
-		}
-
-		// We don't want handleMouseUp() to "finish" the selection (and thereby
-		// set mSelectionEnd to where the mouse is), so we finish the selection here.
-		mIsSelecting = FALSE;  
-
-		// delay cursor flashing
-		resetKeystrokeTimer();
-
-		// take selection to 'primary' clipboard
-		updatePrimary();
-
-		handled = TRUE;
+		handled = LLTextEditor::handleDoubleClick(x, y, mask);
 	}
 	return handled;
 }
@@ -1051,80 +894,78 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
 		return FALSE;
 	}
 	
-	if (mTakesNonScrollClicks)
+	if (getEnabled() && acceptsTextInput())
 	{
-		if (getEnabled() && acceptsTextInput())
+		switch( cargo_type )
 		{
-			switch( cargo_type )
+		case DAD_CALLINGCARD:
+		case DAD_TEXTURE:
+		case DAD_SOUND:
+		case DAD_LANDMARK:
+		case DAD_SCRIPT:
+		case DAD_CLOTHING:
+		case DAD_OBJECT:
+		case DAD_NOTECARD:
+		case DAD_BODYPART:
+		case DAD_ANIMATION:
+		case DAD_GESTURE:
 			{
-				case DAD_CALLINGCARD:
-				case DAD_TEXTURE:
-				case DAD_SOUND:
-				case DAD_LANDMARK:
-				case DAD_SCRIPT:
-				case DAD_CLOTHING:
-				case DAD_OBJECT:
-				case DAD_NOTECARD:
-				case DAD_BODYPART:
-				case DAD_ANIMATION:
-				case DAD_GESTURE:
+				LLInventoryItem *item = (LLInventoryItem *)cargo_data;
+				if( item && allowsEmbeddedItems() )
 				{
-					LLInventoryItem *item = (LLInventoryItem *)cargo_data;
-					if( item && allowsEmbeddedItems() )
+					U32 mask_next = item->getPermissions().getMaskNextOwner();
+					if((mask_next & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
 					{
-						U32 mask_next = item->getPermissions().getMaskNextOwner();
-						if((mask_next & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
-						{
-							if( drop )
-							{
-								deselect();
-								S32 old_cursor = mCursorPos;
-								setCursorAtLocalPos( x, y, TRUE );
-								S32 insert_pos = mCursorPos;
-								setCursorPos(old_cursor);
-								BOOL inserted = insertEmbeddedItem( insert_pos, item );
-								if( inserted && (old_cursor > mCursorPos) )
-								{
-									setCursorPos(mCursorPos + 1);
-								}
-
-								updateLineStartList();
-							}
-							*accept = ACCEPT_YES_COPY_MULTI;
-						}
-						else
+						if( drop )
 						{
-							*accept = ACCEPT_NO;
-							if (tooltip_msg.empty())
+							deselect();
+							S32 old_cursor = mCursorPos;
+							setCursorAtLocalPos( x, y, TRUE );
+							S32 insert_pos = mCursorPos;
+							setCursorPos(old_cursor);
+							BOOL inserted = insertEmbeddedItem( insert_pos, item );
+							if( inserted && (old_cursor > mCursorPos) )
 							{
-								// *TODO: Translate
-								tooltip_msg.assign("Only items with unrestricted\n"
-												   "'next owner' permissions \n"
-												   "can be attached to notecards.");
+								setCursorPos(mCursorPos + 1);
 							}
+
+							needsReflow();
+							
 						}
+						*accept = ACCEPT_YES_COPY_MULTI;
 					}
 					else
 					{
 						*accept = ACCEPT_NO;
+						if (tooltip_msg.empty())
+						{
+							// *TODO: Translate
+							tooltip_msg.assign("Only items with unrestricted\n"
+												"'next owner' permissions \n"
+												"can be attached to notecards.");
+						}
 					}
-					break;
 				}
-
-				default:
+				else
+				{
 					*accept = ACCEPT_NO;
-					break;
+				}
+				break;
 			}
-		}
-		else
-		{
-			// Not enabled
+
+		default:
 			*accept = ACCEPT_NO;
+			break;
 		}
-
-		handled = TRUE;
-		lldebugst(LLERR_USER_INPUT) << "dragAndDrop handled by LLViewerTextEditor " << getName() << llendl;
 	}
+	else
+	{
+		// Not enabled
+		*accept = ACCEPT_NO;
+	}
+
+	handled = TRUE;
+	lldebugst(LLERR_USER_INPUT) << "dragAndDrop handled by LLViewerTextEditor " << getName() << llendl;
 
 	return handled;
 }
@@ -1244,33 +1085,33 @@ llwchar LLViewerTextEditor::pasteEmbeddedItem(llwchar ext_char)
 	return LL_UNKNOWN_CHAR; // item not found or list full
 }
 
-void LLViewerTextEditor::bindEmbeddedChars(const LLFontGL* font) const
+void LLViewerTextEditor::onValueChange(S32 start, S32 end)
 {
-	mEmbeddedItemList->bindEmbeddedChars( font );
+	updateSegments();
+	findEmbeddedItemSegments(start, end);
 }
 
-void LLViewerTextEditor::unbindEmbeddedChars(const LLFontGL* font) const
+void LLViewerTextEditor::findEmbeddedItemSegments(S32 start, S32 end)
 {
-	mEmbeddedItemList->unbindEmbeddedChars( font );
-}
+	LLWString text = getWText();
 
-BOOL LLViewerTextEditor::getEmbeddedItemToolTipAtPos(S32 pos, LLWString &msg) const
-{
-	if (pos < getLength())
+	LLColor4 text_color = ( mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get()  );
+
+	// Start with i just after the first embedded item
+	for(S32 idx = start; idx < end; idx++ )
 	{
-		LLInventoryItem* item = LLEmbeddedItems::getEmbeddedItem(getWChar(pos));
-		if( item )
+		llwchar embedded_char = text[idx];
+		if( embedded_char >= FIRST_EMBEDDED_CHAR 
+			&& embedded_char <= LAST_EMBEDDED_CHAR 
+			&& mEmbeddedItemList->hasEmbeddedItem(embedded_char) )
 		{
-			msg = utf8str_to_wstring(item->getName());
-			msg += '\n';
-			msg += utf8str_to_wstring(item->getDescription());
-			return TRUE;
+			LLInventoryItem* itemp = mEmbeddedItemList->getEmbeddedItem(embedded_char);
+			LLUIImagePtr image = mEmbeddedItemList->getItemImage(embedded_char);
+			insertSegment(new LLEmbeddedItemSegment(idx, image, itemp, *this));
 		}
 	}
-	return FALSE;
 }
 
-
 BOOL LLViewerTextEditor::openEmbeddedItemAtPos(S32 pos)
 {
 	if( pos < getLength())
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h
index 1a69c6869d..9567bfbc48 100644
--- a/indra/newview/llviewertexteditor.h
+++ b/indra/newview/llviewertexteditor.h
@@ -65,8 +65,6 @@ public:
 	// mousehandler overrides
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMiddleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMiddleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask );
@@ -80,6 +78,8 @@ public:
 	virtual BOOL 	importBuffer(const char* buffer, S32 length);
 	virtual bool	importStream(std::istream& str);
 	virtual BOOL 	exportBuffer(std::string& buffer);
+	virtual void	onValueChange(S32 start, S32 end);
+
 	void setNotecardInfo(const LLUUID& notecard_item_id, const LLUUID& object_id, const LLUUID& preview_id)
 	{
 		mNotecardInventoryID = notecard_item_id;
@@ -106,11 +106,9 @@ public:
 
 private:
 	// Embedded object operations
+	void findEmbeddedItemSegments(S32 start, S32 end);
 	virtual llwchar	pasteEmbeddedItem(llwchar ext_char);
-	virtual void	bindEmbeddedChars(const LLFontGL* font) const;
-	virtual void	unbindEmbeddedChars(const LLFontGL* font) const;
 
-	BOOL			getEmbeddedItemToolTipAtPos(S32 pos, LLWString &wmsg) const;
 	BOOL			openEmbeddedItemAtPos( S32 pos );
 	BOOL			openEmbeddedItem(LLInventoryItem* item, llwchar wc);
 
@@ -128,6 +126,7 @@ private:
 	static bool		onNotecardDialog(const LLSD& notification, const LLSD& response );
 	
 	LLPointer<LLInventoryItem> mDragItem;
+	LLTextSegment* mDragSegment;
 	llwchar mDragItemChar;
 	BOOL mDragItemSaved;
 	class LLEmbeddedItems* mEmbeddedItemList;
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 7b01fe4280..83442dc2bb 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -75,6 +75,7 @@ const S32 IMAGES_MAX_PACKET_UPDATES = 1; // Only send N packets of IMAGES_PER_RE
 const F32 RESEND_IMAGE_REQUEST_TIME = 15.f; // seconds
 
 LLViewerTextureList gTextureList;
+static LLFastTimer::DeclareTimer FTM_PROCESS_IMAGES("Process Images");
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -542,6 +543,7 @@ void LLViewerTextureList::dirtyImage(LLViewerFetchedTexture *image)
 }
 
 ////////////////////////////////////////////////////////////////////////////
+static LLFastTimer::DeclareTimer FTM_IMAGE_MARK_DIRTY("Dirty Images");
 
 void LLViewerTextureList::updateImages(F32 max_time)
 {
@@ -559,7 +561,7 @@ void LLViewerTextureList::updateImages(F32 max_time)
 	max_time = llmin(llmax(max_time, 0.001f*10.f*gFrameIntervalSeconds), 0.001f);
 	if (!mDirtyTextureList.empty())
 	{
-		LLFastTimer t(LLFastTimer::FTM_IMAGE_MARK_DIRTY);
+		LLFastTimer t(FTM_IMAGE_MARK_DIRTY);
 		gPipeline.dirtyPoolObjectTextures(mDirtyTextureList);
 		mDirtyTextureList.clear();
 	}
@@ -697,6 +699,7 @@ void LLViewerTextureList::updateImagesDecodePriorities()
  return type_from_host;
  }
  */
+static LLFastTimer::DeclareTimer FTM_IMAGE_CREATE("Create Images");
 
 F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time)
 {
@@ -706,7 +709,7 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time)
 	// Create GL textures for all textures that need them (images which have been
 	// decoded, but haven't been pushed into GL).
 	//
-	LLFastTimer t(LLFastTimer::FTM_IMAGE_CREATE);
+	LLFastTimer t(FTM_IMAGE_CREATE);
 	
 	LLTimer create_timer;
 	image_list_t::iterator enditer = mCreateTextureList.begin();
@@ -1115,7 +1118,7 @@ void LLViewerTextureList::updateMaxResidentTexMem(S32 mem)
 // static
 void LLViewerTextureList::receiveImageHeader(LLMessageSystem *msg, void **user_data)
 {
-	LLFastTimer t(LLFastTimer::FTM_PROCESS_IMAGES);
+	LLFastTimer t(FTM_PROCESS_IMAGES);
 	
 	// Receive image header, copy into image object and decompresses 
 	// if this is a one-packet image. 
@@ -1179,7 +1182,7 @@ void LLViewerTextureList::receiveImageHeader(LLMessageSystem *msg, void **user_d
 void LLViewerTextureList::receiveImagePacket(LLMessageSystem *msg, void **user_data)
 {
 	LLMemType mt1(LLMemType::MTYPE_APPFMTIMAGE);
-	LLFastTimer t(LLFastTimer::FTM_PROCESS_IMAGES);
+	LLFastTimer t(FTM_PROCESS_IMAGES);
 	
 	// Receives image packet, copy into image object,
 	// checks if all packets received, decompresses if so. 
@@ -1244,7 +1247,7 @@ void LLViewerTextureList::receiveImagePacket(LLMessageSystem *msg, void **user_d
 // static
 void LLViewerTextureList::processImageNotInDatabase(LLMessageSystem *msg,void **user_data)
 {
-	LLFastTimer t(LLFastTimer::FTM_PROCESS_IMAGES);
+	LLFastTimer t(FTM_PROCESS_IMAGES);
 	LLUUID image_id;
 	msg->getUUIDFast(_PREHASH_ImageID, _PREHASH_ID, image_id);
 	
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 2b1dbf8e84..74ed5b12fe 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -935,8 +935,6 @@ void LLViewerWindow::handleFocus(LLWindow *window)
 	gAgent.onAppFocusGained();
 	LLToolMgr::getInstance()->onAppFocusGained();
 
-	gShowTextEditCursor = TRUE;
-
 	// See if we're coming in with modifier keys held down
 	if (gKeyboard)
 	{
@@ -966,11 +964,6 @@ void LLViewerWindow::handleFocusLost(LLWindow *window)
 	showCursor();
 	getWindow()->setMouseClipping(FALSE);
 
-	// JC - Leave keyboard focus, so if you're popping in and out editing
-	// a script, you don't have to click in the editor again and again.
-	// gFocusMgr.setKeyboardFocus( NULL );
-	gShowTextEditCursor = FALSE;
-
 	// If losing focus while keys are down, reset them.
 	if (gKeyboard)
 	{
@@ -2020,6 +2013,11 @@ void LLViewerWindow::draw()
 		// No translation needed, this view is glued to 0,0
 		mRootView->draw();
 
+		if (mToolTip->getVisible() && LLView::sDebugRects)
+		{
+			gl_rect_2d(mToolTipStickyRect, LLColor4::white, false);
+		}
+
 		// Draw optional on-top-of-everyone view
 		LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
 		if (top_ctrl && top_ctrl->getVisible())
@@ -3320,7 +3318,7 @@ void LLViewerWindow::schedulePick(LLPickInfo& pick_info)
 	
 		return;
 	}
-	llassert_always(pick_info.mScreenRegion.notNull());
+	llassert_always(pick_info.mScreenRegion.notEmpty());
 	mPicks.push_back(pick_info);
 	
 	// delay further event processing until we receive results of pick
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 2b5c3361c4..e98e4f2e6a 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2085,13 +2085,16 @@ S32 LLVOAvatar::setTETexture(const U8 te, const LLUUID& uuid)
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_AVATAR_UPDATE("Update Avatar");
+static LLFastTimer::DeclareTimer FTM_JOINT_UPDATE("Update Joints");
+
 //------------------------------------------------------------------------
 // idleUpdate()
 //------------------------------------------------------------------------
 BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
 	LLMemType mt(LLMemType::MTYPE_AVATAR);
-	LLFastTimer t(LLFastTimer::FTM_AVATAR_UPDATE);
+	LLFastTimer t(FTM_AVATAR_UPDATE);
 
 	if (isDead())
 	{
@@ -2110,7 +2113,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 	// force asynchronous drawable update
 	if(mDrawable.notNull() && !gNoRender)
 	{	
-		LLFastTimer t(LLFastTimer::FTM_JOINT_UPDATE);
+		LLFastTimer t(FTM_JOINT_UPDATE);
 	
 		if (mIsSitting && getParent())
 		{
@@ -2272,6 +2275,8 @@ void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled)
 	}//if ( voiceEnabled )
 }		
 
+static LLFastTimer::DeclareTimer FTM_ATTACHMENT_UPDATE("Update Attachments");
+
 void LLVOAvatar::idleUpdateMisc(bool detailed_update)
 {
 	if (LLVOAvatar::sJointDebug)
@@ -2293,7 +2298,7 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update)
 	// update attachments positions
 	if (detailed_update || !sUseImpostors)
 	{
-		LLFastTimer t(LLFastTimer::FTM_ATTACHMENT_UPDATE);
+		LLFastTimer t(FTM_ATTACHMENT_UPDATE);
 		for (attachment_map_t::iterator iter = mAttachmentPoints.begin(); 
 			 iter != mAttachmentPoints.end(); )
 		{
@@ -4613,9 +4618,11 @@ void LLVOAvatar::requestStopMotion( LLMotion* motion )
 //-----------------------------------------------------------------------------
 // loadAvatar()
 //-----------------------------------------------------------------------------
+static LLFastTimer::DeclareTimer FTM_LOAD_AVATAR("Load Avatar");
+
 BOOL LLVOAvatar::loadAvatar()
 {
-// 	LLFastTimer t(LLFastTimer::FTM_LOAD_AVATAR);
+// 	LLFastTimer t(FTM_LOAD_AVATAR);
 	
 	// avatar_skeleton.xml
 	if( !buildSkeleton(sAvatarSkeletonInfo) )
@@ -5168,9 +5175,10 @@ LLDrawable *LLVOAvatar::createDrawable(LLPipeline *pipeline)
 //-----------------------------------------------------------------------------
 // updateGeometry()
 //-----------------------------------------------------------------------------
+static LLFastTimer::DeclareTimer FTM_UPDATE_AVATAR("Update Avatar");
 BOOL LLVOAvatar::updateGeometry(LLDrawable *drawable)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_AVATAR);
+	LLFastTimer ftm(FTM_UPDATE_AVATAR);
  	if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_AVATAR)))
 	{
 		return TRUE;
diff --git a/indra/newview/llvoclouds.cpp b/indra/newview/llvoclouds.cpp
index fbc4e2e609..130e1fd749 100644
--- a/indra/newview/llvoclouds.cpp
+++ b/indra/newview/llvoclouds.cpp
@@ -115,9 +115,11 @@ LLDrawable* LLVOClouds::createDrawable(LLPipeline *pipeline)
 	return mDrawable;
 }
 
+static LLFastTimer::DeclareTimer FTM_UPDATE_CLOUDS("Update Clouds");
+
 BOOL LLVOClouds::updateGeometry(LLDrawable *drawable)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_CLOUDS);
+	LLFastTimer ftm(FTM_UPDATE_CLOUDS);
 	if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS)))
 	{
 		return TRUE;
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
index cf6eb8e9fd..a2793accea 100644
--- a/indra/newview/llvograss.cpp
+++ b/indra/newview/llvograss.cpp
@@ -382,9 +382,11 @@ LLDrawable* LLVOGrass::createDrawable(LLPipeline *pipeline)
 	return mDrawable;
 }
 
+static LLFastTimer::DeclareTimer FTM_UPDATE_GRASS("Update Grass");
+
 BOOL LLVOGrass::updateGeometry(LLDrawable *drawable)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_GRASS);
+	LLFastTimer ftm(FTM_UPDATE_GRASS);
 	dirtySpatialGroup();
 	plantBlades();
 	return TRUE;
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp
index 29036f4947..38c9ce28c4 100644
--- a/indra/newview/llvopartgroup.cpp
+++ b/indra/newview/llvopartgroup.cpp
@@ -139,9 +139,10 @@ LLVector3 LLVOPartGroup::getCameraPosition() const
 	return gAgent.getCameraPositionAgent();
 }
 
+static LLFastTimer::DeclareTimer FTM_UPDATE_PARTICLES("Update Particles");
 BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_PARTICLES);
+	LLFastTimer ftm(FTM_UPDATE_PARTICLES);
 
 	dirtySpatialGroup();
 	
@@ -416,12 +417,15 @@ void LLParticlePartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_co
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_REBUILD_GRASS_VB("Grass VB");
+static LLFastTimer::DeclareTimer FTM_REBUILD_PARTICLE_VB("Particle VB");
+
 void LLParticlePartition::getGeometry(LLSpatialGroup* group)
 {
 	LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
 	LLFastTimer ftm(mDrawableType == LLPipeline::RENDER_TYPE_GRASS ?
-					LLFastTimer::FTM_REBUILD_GRASS_VB :
-					LLFastTimer::FTM_REBUILD_PARTICLE_VB);
+					FTM_REBUILD_GRASS_VB :
+					FTM_REBUILD_PARTICLE_VB);
 
 	std::sort(mFaceList.begin(), mFaceList.end(), LLFace::CompareDistanceGreater());
 
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 993cf522e9..ae5992099d 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -1231,6 +1231,8 @@ void LLVOSky::createDummyVertexBuffer()
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_RENDER_FAKE_VBO_UPDATE("Fake VBO Update");
+
 void LLVOSky::updateDummyVertexBuffer()
 {	
 	if(!LLVertexBuffer::sEnableVBOs)
@@ -1242,7 +1244,7 @@ void LLVOSky::updateDummyVertexBuffer()
 		return ;
 	}
 
-	LLFastTimer t(LLFastTimer::FTM_RENDER_FAKE_VBO_UPDATE) ;
+	LLFastTimer t(FTM_RENDER_FAKE_VBO_UPDATE) ;
 
 	if(!mFace[FACE_DUMMY] || mFace[FACE_DUMMY]->mVertexBuffer.isNull())
 		createDummyVertexBuffer() ;
@@ -1255,10 +1257,11 @@ void LLVOSky::updateDummyVertexBuffer()
 //----------------------------------
 //end of fake vertex buffer updating
 //----------------------------------
+static LLFastTimer::DeclareTimer FTM_GEO_SKY("Sky Geometry");
 
 BOOL LLVOSky::updateGeometry(LLDrawable *drawable)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_GEO_SKY);
+	LLFastTimer ftm(FTM_GEO_SKY);
 	if (mFace[FACE_REFLECTION] == NULL)
 	{
 		LLDrawPoolWater *poolp = (LLDrawPoolWater*) gPipeline.getPool(LLDrawPool::POOL_WATER);
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp
index 4980b50de4..157d719fcc 100644
--- a/indra/newview/llvosurfacepatch.cpp
+++ b/indra/newview/llvosurfacepatch.cpp
@@ -176,10 +176,11 @@ LLDrawable *LLVOSurfacePatch::createDrawable(LLPipeline *pipeline)
 	return mDrawable;
 }
 
+static LLFastTimer::DeclareTimer FTM_UPDATE_TERRAIN("Update Terrain");
 
 BOOL LLVOSurfacePatch::updateGeometry(LLDrawable *drawable)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_TERRAIN);
+	LLFastTimer ftm(FTM_UPDATE_TERRAIN);
 
 	dirtySpatialGroup();
 	
@@ -1028,9 +1029,10 @@ LLVertexBuffer* LLTerrainPartition::createVertexBuffer(U32 type_mask, U32 usage)
 	return new LLVertexBufferTerrain();
 }
 
+static LLFastTimer::DeclareTimer FTM_REBUILD_TERRAIN_VB("Terrain VB");
 void LLTerrainPartition::getGeometry(LLSpatialGroup* group)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_REBUILD_TERRAIN_VB);
+	LLFastTimer ftm(FTM_REBUILD_TERRAIN_VB);
 
 	LLVertexBuffer* buffer = group->mVertexBuffer;
 
diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp
index d1cac4c77e..86d9f31d07 100644
--- a/indra/newview/llvotree.cpp
+++ b/indra/newview/llvotree.cpp
@@ -504,9 +504,11 @@ LLDrawable* LLVOTree::createDrawable(LLPipeline *pipeline)
 const S32 LEAF_INDICES = 24;
 const S32 LEAF_VERTICES = 16;
 
+static LLFastTimer::DeclareTimer FTM_UPDATE_TREE("Update Tree");
+
 BOOL LLVOTree::updateGeometry(LLDrawable *drawable)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_TREE);
+	LLFastTimer ftm(FTM_UPDATE_TREE);
 
 	if (mReferenceBuffer.isNull() || mDrawable->getFace(0)->mVertexBuffer.isNull())
 	{
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index bef38bb669..f7a16571d1 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -79,6 +79,9 @@ F32	LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectiv
 F32 LLVOVolume::sDistanceFactor = 1.0f;
 S32 LLVOVolume::sNumLODChanges = 0;
 
+static LLFastTimer::DeclareTimer FTM_GEN_TRIANGLES("Generate Triangles");
+static LLFastTimer::DeclareTimer FTM_GEN_VOLUME("Generate Volumes");
+
 LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 	: LLViewerObject(id, pcode, regionp),
 	  mVolumeImpl(NULL)
@@ -1130,15 +1133,18 @@ void LLVOVolume::updateRelativeXform()
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_GEN_FLEX("Generate Flexies");
+static LLFastTimer::DeclareTimer FTM_UPDATE_PRIMITIVES("Update Primitives");
+
 BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 {
-	LLFastTimer t(LLFastTimer::FTM_UPDATE_PRIMITIVES);
+	LLFastTimer t(FTM_UPDATE_PRIMITIVES);
 	
 	if (mVolumeImpl != NULL)
 	{
 		BOOL res;
 		{
-			LLFastTimer t(LLFastTimer::FTM_GEN_FLEX);
+			LLFastTimer t(FTM_GEN_FLEX);
 			res = mVolumeImpl->doUpdateGeometry(drawable);
 		}
 		updateFaceFlags();
@@ -1162,14 +1168,14 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 
 		if (mVolumeChanged)
 		{
-			LLFastTimer ftm(LLFastTimer::FTM_GEN_VOLUME);
+			LLFastTimer ftm(FTM_GEN_VOLUME);
 			LLVolumeParams volume_params = getVolume()->getParams();
 			setVolume(volume_params, 0);
 			drawable->setState(LLDrawable::REBUILD_VOLUME);
 		}
 
 		{
-			LLFastTimer t(LLFastTimer::FTM_GEN_TRIANGLES);
+			LLFastTimer t(FTM_GEN_TRIANGLES);
 			regenFaces();
 			genBBoxes(FALSE);
 		}
@@ -1186,7 +1192,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 		old_volumep = NULL ;
 
 		{
-			LLFastTimer ftm(LLFastTimer::FTM_GEN_VOLUME);
+			LLFastTimer ftm(FTM_GEN_VOLUME);
 			LLVolumeParams volume_params = getVolume()->getParams();
 			setVolume(volume_params, 0);
 		}
@@ -1204,7 +1210,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 			drawable->setState(LLDrawable::REBUILD_VOLUME); // for face->genVolumeTriangles()
 
 			{
-				LLFastTimer t(LLFastTimer::FTM_GEN_TRIANGLES);
+				LLFastTimer t(FTM_GEN_TRIANGLES);
 				if (new_num_faces != old_num_faces)
 				{
 					regenFaces();
@@ -1218,7 +1224,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 	{
 		compiled = TRUE;
 		// All it did was move or we changed the texture coordinate offset
-		LLFastTimer t(LLFastTimer::FTM_GEN_TRIANGLES);
+		LLFastTimer t(FTM_GEN_TRIANGLES);
 		genBBoxes(FALSE);
 	}
 
@@ -2235,6 +2241,9 @@ void LLVolumeGeometryManager::getGeometry(LLSpatialGroup* group)
 
 }
 
+static LLFastTimer::DeclareTimer FTM_REBUILD_VOLUME_VB("Volume");
+static LLFastTimer::DeclareTimer FTM_REBUILD_VBO("VBO Rebuilt");
+
 void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 {
 	if (LLPipeline::sSkipUpdate)
@@ -2253,8 +2262,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 	{
 		if (group->isState(LLSpatialGroup::MESH_DIRTY) && !LLPipeline::sDelayVBUpdate)
 		{
-			LLFastTimer ftm(LLFastTimer::FTM_REBUILD_VBO);	
-			LLFastTimer ftm2(LLFastTimer::FTM_REBUILD_VOLUME_VB);
+			LLFastTimer ftm(FTM_REBUILD_VBO);	
+			LLFastTimer ftm2(FTM_REBUILD_VOLUME_VB);
 		
 			rebuildMesh(group);
 		}
@@ -2262,9 +2271,9 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 	}
 
 	group->mBuilt = 1.f;
-	LLFastTimer ftm(LLFastTimer::FTM_REBUILD_VBO);	
+	LLFastTimer ftm(FTM_REBUILD_VBO);	
 
-	LLFastTimer ftm2(LLFastTimer::FTM_REBUILD_VOLUME_VB);
+	LLFastTimer ftm2(FTM_REBUILD_VOLUME_VB);
 
 	group->clearDrawMap();
 
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp
index 427119285b..332c9dd952 100644
--- a/indra/newview/llvowater.cpp
+++ b/indra/newview/llvowater.cpp
@@ -139,9 +139,11 @@ LLDrawable *LLVOWater::createDrawable(LLPipeline *pipeline)
 	return mDrawable;
 }
 
+static LLFastTimer::DeclareTimer FTM_UPDATE_WATER("Update Water");
+
 BOOL LLVOWater::updateGeometry(LLDrawable *drawable)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WATER);
+	LLFastTimer ftm(FTM_UPDATE_WATER);
 	LLFace *face;
 
 	if (drawable->getNumFaces() < 1)
diff --git a/indra/newview/llvowlsky.cpp b/indra/newview/llvowlsky.cpp
index abd25e6598..8621e5e1d9 100644
--- a/indra/newview/llvowlsky.cpp
+++ b/indra/newview/llvowlsky.cpp
@@ -307,9 +307,11 @@ void LLVOWLSky::restoreGL()
 	gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE);
 }
 
+static LLFastTimer::DeclareTimer FTM_GEO_SKY("Sky Geometry");
+
 BOOL LLVOWLSky::updateGeometry(LLDrawable * drawable)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_GEO_SKY);
+	LLFastTimer ftm(FTM_GEO_SKY);
 	LLStrider<LLVector3>	vertices;
 	LLStrider<LLVector2>	texCoords;
 	LLStrider<U16>			indices;
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 92c223e43d..3661be500b 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -263,9 +263,11 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_UPDATE_WLPARAM("Update Windlight Params");
+
 void LLWaterParamManager::update(LLViewerCamera * cam)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
+	LLFastTimer ftm(FTM_UPDATE_WLPARAM);
 	
 	// update the shaders and the menu
 	propagateParameters();
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index c237c0bded..ae476c88c9 100644
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -64,6 +64,7 @@
 #include "curl/curl.h"
 
 LLWLParamManager * LLWLParamManager::sInstance = NULL;
+static LLFastTimer::DeclareTimer FTM_UPDATE_WLPARAM("Update Windlight Params");
 
 LLWLParamManager::LLWLParamManager() :
 
@@ -292,7 +293,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
 
 void LLWLParamManager::propagateParameters(void)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
+	LLFastTimer ftm(FTM_UPDATE_WLPARAM);
 	
 	LLVector4 sunDir;
 	LLVector4 moonDir;
@@ -363,7 +364,7 @@ void LLWLParamManager::propagateParameters(void)
 
 void LLWLParamManager::update(LLViewerCamera * cam)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
+	LLFastTimer ftm(FTM_UPDATE_WLPARAM);
 	
 	// update clouds, sun, and general
 	mCurParams.updateCloudScrolling();
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index f422791868..bf00957212 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -138,6 +138,33 @@ BOOL	gDebugPipeline = FALSE;
 LLPipeline gPipeline;
 const LLMatrix4* gGLLastMatrix = NULL;
 
+LLFastTimer::DeclareTimer FTM_RENDER_GEOMETRY("Geometry");
+LLFastTimer::DeclareTimer FTM_RENDER_GRASS("Grass");
+LLFastTimer::DeclareTimer FTM_RENDER_INVISIBLE("Invisible");
+LLFastTimer::DeclareTimer FTM_RENDER_OCCLUSION("Occlusion");
+LLFastTimer::DeclareTimer FTM_RENDER_SHINY("Shiny");
+LLFastTimer::DeclareTimer FTM_RENDER_SIMPLE("Simple");
+LLFastTimer::DeclareTimer FTM_RENDER_TERRAIN("Terrain");
+LLFastTimer::DeclareTimer FTM_RENDER_TREES("Trees");
+LLFastTimer::DeclareTimer FTM_RENDER_UI("UI");
+LLFastTimer::DeclareTimer FTM_RENDER_WATER("Water");
+LLFastTimer::DeclareTimer FTM_RENDER_WL_SKY("Windlight Sky");
+LLFastTimer::DeclareTimer FTM_RENDER_ALPHA("Alpha Objects");
+LLFastTimer::DeclareTimer FTM_RENDER_CHARACTERS("Avatars");
+LLFastTimer::DeclareTimer FTM_RENDER_BUMP("Bump");
+LLFastTimer::DeclareTimer FTM_RENDER_FULLBRIGHT("Fullbright");
+LLFastTimer::DeclareTimer FTM_RENDER_GLOW("Glow");
+LLFastTimer::DeclareTimer FTM_GEO_UPDATE("Geo Update");
+LLFastTimer::DeclareTimer FTM_POOLRENDER("RenderPool");
+LLFastTimer::DeclareTimer FTM_POOLS("Pools");
+LLFastTimer::DeclareTimer FTM_RENDER_BLOOM_FBO("First FBO");
+LLFastTimer::DeclareTimer FTM_STATESORT("Sort Draw State");
+LLFastTimer::DeclareTimer FTM_PIPELINE("Pipeline");
+LLFastTimer::DeclareTimer FTM_CLIENT_COPY("Client Copy");
+
+static LLFastTimer::DeclareTimer FTM_STATESORT_DRAWABLE("Sort Drawables");
+static LLFastTimer::DeclareTimer FTM_STATESORT_POSTSORT("Post Sort");
+
 //----------------------------------------
 std::string gPoolNames[] = 
 {
@@ -973,7 +1000,7 @@ void LLPipeline::allocDrawable(LLViewerObject *vobj)
 
 void LLPipeline::unlinkDrawable(LLDrawable *drawable)
 {
-	LLFastTimer t(LLFastTimer::FTM_PIPELINE);
+	LLFastTimer t(FTM_PIPELINE);
 
 	assertInitialized();
 
@@ -1035,7 +1062,7 @@ U32 LLPipeline::addObject(LLViewerObject *vobj)
 
 void LLPipeline::createObjects(F32 max_dtime)
 {
-	LLFastTimer ftm(LLFastTimer::FTM_GEO_UPDATE);
+	LLFastTimer ftm(FTM_GEO_UPDATE);
 	LLMemType mt(LLMemType::MTYPE_PIPELINE_CREATE_OBJECTS);
 
 	LLTimer update_timer;
@@ -1201,9 +1228,12 @@ void LLPipeline::updateMovedList(LLDrawable::drawable_vector_t& moved_list)
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_OCTREE_BALANCE("Balance Octree");
+static LLFastTimer::DeclareTimer FTM_UPDATE_MOVE("Update Move");
+
 void LLPipeline::updateMove()
 {
-	LLFastTimer t(LLFastTimer::FTM_UPDATE_MOVE);
+	LLFastTimer t(FTM_UPDATE_MOVE);
 	LLMemType mt_um(LLMemType::MTYPE_PIPELINE_UPDATE_MOVE);
 
 	if (gSavedSettings.getBOOL("FreezeTime"))
@@ -1249,7 +1279,7 @@ void LLPipeline::updateMove()
 
 	//balance octrees
 	{
- 		LLFastTimer ot(LLFastTimer::FTM_OCTREE_BALANCE);
+ 		LLFastTimer ot(FTM_OCTREE_BALANCE);
 
 		for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
 			iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
@@ -1354,10 +1384,11 @@ BOOL LLPipeline::getVisibleExtents(LLCamera& camera, LLVector3& min, LLVector3&
 	return res;
 }
 
+static LLFastTimer::DeclareTimer FTM_CULL("Object Culling");
 
 void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_clip)
 {
-	LLFastTimer t(LLFastTimer::FTM_CULL);
+	LLFastTimer t(FTM_CULL);
 	LLMemType mt_uc(LLMemType::MTYPE_PIPELINE_UPDATE_CULL);
 
 	grabReferences(result);
@@ -1572,7 +1603,7 @@ void LLPipeline::updateGeom(F32 max_dtime)
 	LLMemType mt(LLMemType::MTYPE_PIPELINE_UPDATE_GEOM);
 	LLPointer<LLDrawable> drawablep;
 
-	LLFastTimer t(LLFastTimer::FTM_GEO_UPDATE);
+	LLFastTimer t(FTM_GEO_UPDATE);
 
 	assertInitialized();
 
@@ -1840,6 +1871,8 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f
 	}
 }
 
+static LLFastTimer::DeclareTimer FTM_RESET_DRAWORDER("Reset Draw Order");
+
 void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 {
 	const U32 face_mask = (1 << LLPipeline::RENDER_TYPE_AVATAR) |
@@ -1852,11 +1885,11 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 	if (mRenderTypeMask & face_mask)
 	{
 		//clear faces from face pools
-		LLFastTimer t(LLFastTimer::FTM_RESET_DRAWORDER);
+		LLFastTimer t(FTM_RESET_DRAWORDER);
 		gPipeline.resetDrawOrders();
 	}
 
-	LLFastTimer ftm(LLFastTimer::FTM_STATESORT);
+	LLFastTimer ftm(FTM_STATESORT);
 	LLMemType mt(LLMemType::MTYPE_PIPELINE_STATE_SORT);
 
 	//LLVertexBuffer::unbind();
@@ -1912,7 +1945,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 	}
 
 	{
-		LLFastTimer ftm(LLFastTimer::FTM_STATESORT_DRAWABLE);
+		LLFastTimer ftm(FTM_STATESORT_DRAWABLE);
 		for (LLCullResult::drawable_list_t::iterator iter = sCull->beginVisibleList();
 			 iter != sCull->endVisibleList(); ++iter)
 		{
@@ -1925,7 +1958,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 	}
 
 	{
-		LLFastTimer ftm(LLFastTimer::FTM_CLIENT_COPY);
+		LLFastTimer ftm(FTM_CLIENT_COPY);
 		LLVertexBuffer::clientCopy();
 	}
 
@@ -2188,7 +2221,7 @@ void renderSoundHighlights(LLDrawable* drawablep)
 void LLPipeline::postSort(LLCamera& camera)
 {
 	LLMemType mt(LLMemType::MTYPE_PIPELINE_POST_SORT);
-	LLFastTimer ftm(LLFastTimer::FTM_STATESORT_POSTSORT);
+	LLFastTimer ftm(FTM_STATESORT_POSTSORT);
 
 	assertInitialized();
 
@@ -2382,7 +2415,7 @@ void LLPipeline::postSort(LLCamera& camera)
 void render_hud_elements()
 {
 	LLMemType mt_rhe(LLMemType::MTYPE_PIPELINE_RENDER_HUD_ELS);
-	LLFastTimer t(LLFastTimer::FTM_RENDER_UI);
+	LLFastTimer t(FTM_RENDER_UI);
 	gPipeline.disableLights();		
 	
 	LLGLDisable fog(GL_FOG);
@@ -2495,7 +2528,7 @@ void LLPipeline::renderHighlights()
 void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 {
 	LLMemType mt(LLMemType::MTYPE_PIPELINE_RENDER_GEOM);
-	LLFastTimer t(LLFastTimer::FTM_RENDER_GEOMETRY);
+	LLFastTimer t(FTM_RENDER_GEOMETRY);
 
 	assertInitialized();
 
@@ -2594,7 +2627,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 	}
 	else
 	{
-		LLFastTimer t(LLFastTimer::FTM_POOLS);
+		LLFastTimer t(FTM_POOLS);
 		
 		// HACK: don't calculate local lights if we're rendering the HUD!
 		//    Removing this check will cause bad flickering when there are 
@@ -2626,7 +2659,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 			pool_set_t::iterator iter2 = iter1;
 			if (hasRenderType(poolp->getType()) && poolp->getNumPasses() > 0)
 			{
-				LLFastTimer t(LLFastTimer::FTM_POOLRENDER);
+				LLFastTimer t(FTM_POOLRENDER);
 
 				gGLLastMatrix = NULL;
 				glLoadMatrixd(gGLModelView);
@@ -2760,9 +2793,9 @@ void LLPipeline::renderGeomDeferred(LLCamera& camera)
 	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomDeferred");
 
 	LLMemType mt_rgd(LLMemType::MTYPE_PIPELINE_RENDER_GEOM_DEFFERRED);
-	LLFastTimer t(LLFastTimer::FTM_RENDER_GEOMETRY);
+	LLFastTimer t(FTM_RENDER_GEOMETRY);
 
-	LLFastTimer t2(LLFastTimer::FTM_POOLS);
+	LLFastTimer t2(FTM_POOLS);
 
 	LLGLEnable cull(GL_CULL_FACE);
 
@@ -2804,7 +2837,7 @@ void LLPipeline::renderGeomDeferred(LLCamera& camera)
 		pool_set_t::iterator iter2 = iter1;
 		if (hasRenderType(poolp->getType()) && poolp->getNumDeferredPasses() > 0)
 		{
-			LLFastTimer t(LLFastTimer::FTM_POOLRENDER);
+			LLFastTimer t(FTM_POOLRENDER);
 
 			gGLLastMatrix = NULL;
 			glLoadMatrixd(gGLModelView);
@@ -2862,7 +2895,7 @@ void LLPipeline::renderGeomDeferred(LLCamera& camera)
 void LLPipeline::renderGeomPostDeferred(LLCamera& camera)
 {
 	LLMemType mt_rgpd(LLMemType::MTYPE_PIPELINE_RENDER_GEOM_POST_DEF);
-	LLFastTimer t(LLFastTimer::FTM_POOLS);
+	LLFastTimer t(FTM_POOLS);
 	U32 cur_type = 0;
 
 	LLGLEnable cull(GL_CULL_FACE);
@@ -2895,7 +2928,7 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera)
 		pool_set_t::iterator iter2 = iter1;
 		if (hasRenderType(poolp->getType()) && poolp->getNumPostDeferredPasses() > 0)
 		{
-			LLFastTimer t(LLFastTimer::FTM_POOLRENDER);
+			LLFastTimer t(FTM_POOLRENDER);
 
 			gGLLastMatrix = NULL;
 			glLoadMatrixd(gGLModelView);
@@ -4979,6 +5012,7 @@ void LLPipeline::bindScreenToTexture()
 	
 }
 
+static LLFastTimer::DeclareTimer FTM_RENDER_BLOOM("Bloom");
 void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
 {
 	LLMemType mt_ru(LLMemType::MTYPE_PIPELINE_RENDER_BLOOM);
@@ -5012,7 +5046,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
 
 	gGL.setColorMask(true, true);
 		
-	LLFastTimer ftm(LLFastTimer::FTM_RENDER_BLOOM);
+	LLFastTimer ftm(FTM_RENDER_BLOOM);
 	gGL.color4f(1,1,1,1);
 	LLGLDepthTest depth(GL_FALSE);
 	LLGLDisable blend(GL_BLEND);
@@ -5087,7 +5121,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
 	
 	{
 		{
-			LLFastTimer ftm(LLFastTimer::FTM_RENDER_BLOOM_FBO);
+			LLFastTimer ftm(FTM_RENDER_BLOOM_FBO);
 			mGlow[2].bindTarget();
 			mGlow[2].clear();
 		}
@@ -5159,7 +5193,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
 	{
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 		{
-			LLFastTimer ftm(LLFastTimer::FTM_RENDER_BLOOM_FBO);
+			LLFastTimer ftm(FTM_RENDER_BLOOM_FBO);
 			mGlow[i%2].bindTarget();
 			mGlow[i%2].clear();
 		}
@@ -5201,7 +5235,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
 
 	if (LLRenderTarget::sUseFBO)
 	{
-		LLFastTimer ftm(LLFastTimer::FTM_RENDER_BLOOM_FBO);
+		LLFastTimer ftm(FTM_RENDER_BLOOM_FBO);
 		glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 	}
 
@@ -6095,6 +6129,10 @@ glh::matrix4f scale_translate_to_fit(const LLVector3 min, const LLVector3 max)
 	return ret;
 }
 
+static LLFastTimer::DeclareTimer FTM_SHADOW_RENDER("Render Shadows");
+static LLFastTimer::DeclareTimer FTM_SHADOW_ALPHA("Alpha Shadow");
+static LLFastTimer::DeclareTimer FTM_SHADOW_SIMPLE("Simple Shadow");
+
 void LLPipeline::generateSunShadow(LLCamera& camera)
 {
 
@@ -6343,7 +6381,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
 			mShadowCamera[j+4] = shadow_cam;
 		}
 
-		LLFastTimer t(LLFastTimer::FTM_SHADOW_RENDER);
+		LLFastTimer t(FTM_SHADOW_RENDER);
 
 		stop_glerror();
 
@@ -6381,7 +6419,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
 
 		gDeferredShadowProgram.bind();
 		{
-			LLFastTimer ftm(LLFastTimer::FTM_SHADOW_SIMPLE);
+			LLFastTimer ftm(FTM_SHADOW_SIMPLE);
 			LLGLDisable test(GL_ALPHA_TEST);
 			gGL.getTexUnit(0)->disable();
 			for (U32 i = 0; i < sizeof(types)/sizeof(U32); ++i)
@@ -6392,7 +6430,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
 		}
 		
 		{
-			LLFastTimer ftm(LLFastTimer::FTM_SHADOW_ALPHA);
+			LLFastTimer ftm(FTM_SHADOW_ALPHA);
 			LLGLEnable test(GL_ALPHA_TEST);
 			gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.6f);
 			renderObjects(LLRenderPass::PASS_ALPHA_SHADOW, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_COLOR, TRUE);
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index fc02e7dd88..8f6867aa01 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -78,6 +78,27 @@ glh::matrix4f gl_ortho(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
 glh::matrix4f gl_perspective(GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar);
 glh::matrix4f gl_lookat(LLVector3 eye, LLVector3 center, LLVector3 up);
 
+extern LLFastTimer::DeclareTimer FTM_RENDER_GEOMETRY;
+extern LLFastTimer::DeclareTimer FTM_RENDER_GRASS;
+extern LLFastTimer::DeclareTimer FTM_RENDER_INVISIBLE;
+extern LLFastTimer::DeclareTimer FTM_RENDER_OCCLUSION;
+extern LLFastTimer::DeclareTimer FTM_RENDER_SHINY;
+extern LLFastTimer::DeclareTimer FTM_RENDER_SIMPLE;
+extern LLFastTimer::DeclareTimer FTM_RENDER_TERRAIN;
+extern LLFastTimer::DeclareTimer FTM_RENDER_TREES;
+extern LLFastTimer::DeclareTimer FTM_RENDER_UI;
+extern LLFastTimer::DeclareTimer FTM_RENDER_WATER;
+extern LLFastTimer::DeclareTimer FTM_RENDER_WL_SKY;
+extern LLFastTimer::DeclareTimer FTM_RENDER_ALPHA;
+extern LLFastTimer::DeclareTimer FTM_RENDER_CHARACTERS;
+extern LLFastTimer::DeclareTimer FTM_RENDER_BUMP;
+extern LLFastTimer::DeclareTimer FTM_RENDER_FULLBRIGHT;
+extern LLFastTimer::DeclareTimer FTM_RENDER_GLOW;
+extern LLFastTimer::DeclareTimer FTM_STATESORT;
+extern LLFastTimer::DeclareTimer FTM_PIPELINE;
+extern LLFastTimer::DeclareTimer FTM_CLIENT_COPY;
+
+
 class LLPipeline
 {
 public:
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
index a4060e5e37..e27dbe2cad 100644
Binary files a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png
index 9c2815ebba..82d044d817 100644
Binary files a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
index 377b707529..7909d54f2b 100644
Binary files a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png
index a69a729bd4..6670667022 100644
Binary files a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
index fb59f2e61e..5dd0852a72 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png and b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png
index 7177c803b0..ea547fca6f 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png and b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png
index cadd6bc8ce..4207ba68e5 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png and b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png
index 08f8cfc3d4..2d09475783 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png and b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png
index d790cf57ef..9a71d16a3f 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png and b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png
index fdae4b75f6..3ab8c3666a 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png and b/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png differ
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index eedc588449..633fff079b 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" ?><notifications>
-
-  <global name="skipnexttime">
-
+<?xml version="1.0" encoding="utf-8"?>
+<notifications>
+	<global name="skipnexttime">
 		Vis ikke dette igen
-  </global>
-
-  <global name="alwayschoose">
-
+	</global>
+	<global name="alwayschoose">
 		Vælg altid dette
-  </global>
-
+	</global>
+	<global name="implicitclosebutton">
+		Luk
+	</global>
   <template name="okbutton">
     <form>
       <button
@@ -74,421 +73,438 @@
        text="$canceltext"/>
     </form>
   </template>
+	<notification functor="GenericAcknowledge" label="Ukendt advarsels-besked" name="MissingAlert">
+		Din version af Second Life kan ikke vise den advarselsbesked den modtog.
 
-  <notification
-   functor="GenericAcknowledge"
-   
-   name="MissingAlert"
-   >
-&apos;[_NAME]&apos; mangler fra notifications.xml.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="FloaterNotFound"
-   >
-Floater error: Kunne ikke finde følgende kontrol:
+Fejl detaljer: Advarslen &apos;[_NAME]&apos; blev ikke fundet i notifications.xml.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FloaterNotFound">
+		Floater error: Kunne ikke finde følgende kontrol:
 
 [CONTROLS]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TutorialNotFound">
+		Der er i øjeblikket ingen tilgængelig guide.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GenericAlert">
+		[MESSAGE]
+	</notification>
+	<notification name="GenericAlertYesCancel">
+		[MESSAGE]
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Ja"/>
+	</notification>
+	<notification name="BadInstallation">
+		Der opstod en fejl ved opdatering af Second Life. Hent venligst den nyeste version fra secondlife.com.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="TutorialNotFound"
-   >
-Der er i øjeblikket ingen tilgængelig guide.
-    <usetemplate
+	</notification>
+	<notification name="LoginFailedNoNetwork">
+		Netværksfejl: Kunne ikke oprette forbindelse.
+&apos;[DIAGNOSTIC]&apos;
+Check venligst din netværksforbindelse.
+	<usetemplate
      name="okbutton"
      yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="GenericAlert"
-   >
-[MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="GenericAlertYesCancel"
-   >
-[MESSAGE]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="WearableSave"
-   >
-Gem ændringer til nuværende tøj/krops del?
-    <usetemplate
-     canceltext="Annullér"
-     name="yesnocancelbuttons"
-     notext="Gem ikke"
-     yestext="Gem"/>
-  </notification>
-
-  <notification
-   
-   name="CompileQueueSaveText"
-   >
-Der var problemer med upload af teksten til et script af følgende årsager: [REASON]. Prøv igen senere.
-  </notification>
-
-  <notification
-   
-   name="CompileQueueSaveBytecode"
-   >
-Der var problemer med at uploade den kompileret script af følgende årsager: [REASON]. Prøv igen senere.
-  </notification>
-
-  <notification
-   
-   name="WriteAnimationFail"
-   >
-Der var et problem med skrivning af animations data. Prøv igen senere.
-  </notification>
-
-  <notification
-   
-   name="UploadAuctionSnapshotFail"
-   >
-Der var problemer med at uploade billedet til auktionen af følgende årsager: [REASON]
-  </notification>
-
-  <notification
-   
-   name="UnableToViewContentsMoreThanOne"
-   >
-Ude af stand til at se indholdet af mere end ét element ad gangen.
+	</notification>
+	<notification name="MessageTemplateNotFound">
+		Besked template [PATH] kunne ikke findes.
+	<usetemplate
+     name="okbutton"
+     yestext="OK"/>
+	</notification>
+	<notification name="WearableSave">
+		Gem ændringer til nuværende tøj/krops del?
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem ikke" yestext="Gem"/>
+	</notification>
+	<notification name="CompileQueueSaveText">
+		Der var problemer med upload af teksten til et script af følgende årsager: [REASON]. Prøv igen senere.
+	</notification>
+	<notification name="CompileQueueSaveBytecode">
+		Der var problemer med at uploade den kompileret script af følgende årsager: [REASON]. Prøv igen senere.
+	</notification>
+	<notification name="WriteAnimationFail">
+		Der var et problem med skrivning af animations data. Prøv igen senere.
+	</notification>
+	<notification name="UploadAuctionSnapshotFail">
+		Der var problemer med at uploade billedet til auktionen af følgende årsager: [REASON]
+	</notification>
+	<notification name="UnableToViewContentsMoreThanOne">
+		Ude af stand til at se indholdet af mere end ét element ad gangen.
 Vælg kun en genstand, og prøv igen.
-  </notification>
-
-  <notification
-   
-   name="SaveClothingBodyChanges"
-   >
-Gem alle ændringer til tøj/krops dele?
-    <usetemplate
-     canceltext="Annullér"
-     name="yesnocancelbuttons"
-     notext="Gem Ikke"
-     yestext="Gem Alt"/>
-  </notification>
-
-  <notification
-   
-   name="GrantModifyRights"
-   >
-At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
+	</notification>
+	<notification name="SaveClothingBodyChanges">
+		Gem alle ændringer til tøj/krops dele?
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem Ikke" yestext="Gem Alt"/>
+	</notification>
+	<notification name="GrantModifyRights">
+		At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
 Ønsker du at ændre rettigheder for [FIRST_NAME] [LAST_NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="GrantModifyRightsMultiple"
-   >
-At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="GrantModifyRightsMultiple">
+		At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
 Ønsker du at ændre rettigheder for de valgte beboere?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="RevokeModifyRights"
-   >
-Vil du tilbagekalde rettighederne for [FIRST_NAME] [LAST_NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="RevokeModifyRightsMultiple"
-   >
-Vil du tilbagekalde rettighederne for de valgte beboere?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="UnableToCreateGroup"
-   >
-Kunne ikke oprette gruppe.
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="RevokeModifyRights">
+		Vil du tilbagekalde rettighederne for [FIRST_NAME] [LAST_NAME]?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="RevokeModifyRightsMultiple">
+		Vil du tilbagekalde rettighederne for de valgte beboere?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="UnableToCreateGroup">
+		Kunne ikke oprette gruppe.
 [MESSAGE]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="PanelGroupApply"
-   >
-[NEEDS_APPLY_MESSAGE]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PanelGroupApply">
+		[NEEDS_APPLY_MESSAGE]
 [WANT_APPLY_MESSAGE]
-    <usetemplate
-     canceltext="Annullér"
-     name="yesnocancelbuttons"
-     notext="Ignorer Ændringer"
-     yestext="Godkend Ændringer"/>
-  </notification>
-
-  <notification
-   
-   name="MustSpecifyGroupNoticeSubject"
-   >
-Du skal angive et emne for at sende en gruppe besked.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="AddGroupOwnerWarning"
-   >
-Du er ved at tilføje medlemmer til rollen som [ROLE_NAME].
+		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Ignorer Ændringer" yestext="Godkend Ændringer"/>
+	</notification>
+	<notification name="MustSpecifyGroupNoticeSubject">
+		Du skal angive et emne for at sende en gruppe besked.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="AddGroupOwnerWarning">
+		Du er ved at tilføje medlemmer til rollen som [ROLE_NAME].
 Medlemmer ikke kan fjernes fra denne rolle.
 Medlemmerne skal fratræde sin rolle selv.
 Er du sikker på du vil fortsætte?
-    <usetemplate
-     ignoretext="Når du tilføjer medlemmer til ejer rollen"
-     name="okcancelignore"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="AssignDangerousActionWarning"
-   >
-Du er ved at tilføje muligheden for &apos;[ACTION_NAME]&apos; til
+		<usetemplate ignoretext="Når du tilføjer medlemmer til ejer rollen" name="okcancelignore" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="AssignDangerousActionWarning">
+		Du er ved at tilføje muligheden for &apos;[ACTION_NAME]&apos; til
 rollen &apos;[ROLE_NAME]&apos;.
 
 *ADVARSEL*
 Ethvert medlem i en rolle med denne evne kan tildele sig selv -- og et andet medlem - roller med flere beføjelser, end de har i øjeblikket, potentielt kan de ophøje sig selv til nær-Ejer magt. Være sikker på, at du ved, hvad du laver, før tildeling af denne evne.
 
 Add this Ability to &apos;[ROLE_NAME]&apos;?
+		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="ClickSoundHelpLand">
+		Media og musik kan kun ses og høres indenfor parcellen. Lyd og stemme valg muligheder kan begrænses til parcellen eller de kan høres af beboere udenfor parcellen, afhængigt af deres indholdsrating. Gå til &apos;Knowledge Base&apos; for at lære hvordan disse valg opsættes.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=5046
+		</url>
     <usetemplate
      name="okcancelbuttons"
-     notext="Nej"
-     yestext="Ja"/>
-  </notification>
-
-  <notification
-   
-   name="ClickPublishHelpAvatar"
-   >
-Hvis du vælger &quot;Vis i Søgning&quot; Vises:
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk" />
+	</notification>
+	<notification name="ClickSearchHelpAll">
+		Søgeresultater er organiseret baseret på den fane du står på, din indholdsrating, den valgte kategori og andre faktorer. for yderligere detaljer se i &apos;Knowledge Base&apos;.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=4722
+		</url>
+    <usetemplate
+     name="okcancelbuttons"
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk" />
+	</notification>
+	<notification name="ClickPublishHelpAvatar">
+		Hvis du vælger &quot;Vis i Søgning&quot; Vises:
 - Din profil i søgeresultater
 - Et link til din profile i de offentlige gruppe sider
-  </notification>
-
-  <notification
-   
-   name="ClickWebProfileHelpAvatar"
-   >
-Hvis en beboer har en hjemmeside adresse kan du:
+	</notification>
+	<notification name="ClickUploadHelpPermissions">
+		Dinne standard rettigheder virker muligvis ikke i ældre regioner.
+	</notification>
+	<notification name="ClickWebProfileHelpAvatar">
+		Hvis en beboer har en hjemmeside adresse kan du:
  * Klikke &apos;Load&apos; for at side deres side her.
  * Klikke Load &gt; &apos;I ekstern browser&apos; for at se siden i din standard browser.
  * Klikke Load &gt; &apos;Hjemme URL&apos; for at returnere til denne beboers side hvis du har navigeret væk.
 
 Når du ser din egen profil, kan du skrive hvilken som helst adresse og klikke ok for at få den vist i din egen profil.
 Andre beboere kan besøge den adresse du har sat, når de besøger din profil.
-  </notification>
-
-  <notification
-   
-   name="JoinGroupCannotAfford"
-   >
-Tilmelding til denne gruppe koster L$[COST].
+	</notification>
+	<notification name="JoinGroupCannotAfford">
+		Tilmelding til denne gruppe koster L$[COST].
 Du har ikke nok L$ til denne tilmelding.
-  </notification>
-
-  <notification
-   
-   name="PromptMissingSubjMsg"
-   >
-E-mail dette billede med standard emne eller besked?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="ErrorUploadingPostcard"
-   >
-Der var et problem med at sende billedet på grund af følgende: [REASON]
-  </notification>
-
-  <notification
-   
-   name="MustHaveAccountToLogIn"
-   >
-Ups! Noget var tomt.
+	</notification>
+	<notification name="PromptMissingSubjMsg">
+		E-mail dette billede med standard emne eller besked?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="ErrorUploadingPostcard">
+		Der var et problem med at sende billedet på grund af følgende: [REASON]
+	</notification>
+	<notification name="MustHaveAccountToLogIn">
+		Ups! Noget var tomt.
 Du skal skrive både fornavn og efternavn på din figur.
 
 Du har brug for en konto for at logge ind i [SECOND_LIFE]. Vil du oprette en nu?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Prøv igen"
-     yestext="Lav ny konto"/>
-  </notification>
-
-  <notification
-   
-   name="ResetShowNextTimeDialogs"
-   >
-Vil du gerne genaktivere alle disse popups, som du tidligere har bedt om ikke at få vist?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="SkipShowNextTimeDialogs"
-   >
-Vil du deaktivere alle popups som kan undværes?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="ChangeSkin"
-   >
-Det nye udseende vil vises efter du har genstartet [SECOND_LIFE].
-  </notification>
-
-  <notification
-   
-   name="UnsupportedHardware"
-   >
-    <form name="form">
-      <ignore name="ignore"
-       text="Ved opdagelse af ikke supporteret hardware"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="UnknownGPU"
-   >
-    <form name="form">
-      <ignore name="ignore"
-       text="Ved opdagelse af et ukendt grafikkort"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="CannotGiveCategory"
-   >
-Du har ikke tilladelse til at videreføre den valgte mappe.
-  </notification>
-
-  <notification
-   
-   name="CannotBuyLandNoRegion"
-   >
-Ikke i stand til at købe land:
+		<usetemplate name="okcancelbuttons" notext="Prøv igen" yestext="Lav ny konto"/>
+	</notification>
+	<notification name="ResetShowNextTimeDialogs">
+		Vil du gerne genaktivere alle disse popups, som du tidligere har bedt om ikke at få vist?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="SkipShowNextTimeDialogs">
+		Vil du deaktivere alle popups som kan undværes?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification name="ChangeSkin">
+		Det nye udseende vil vises efter du har genstartet [SECOND_LIFE].
+	</notification>
+	<notification name="UnsupportedHardware"/>
+	<notification name="UnknownGPU">
+		<form name="form">
+			<ignore name="ignore" text="Ved opdagelse af et ukendt grafikkort"/>
+		</form>
+	</notification>
+
+  <notification name="invalid_tport">
+Der er problemer med at håndtere din teleport. Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.
+Hvis du bliver ved med at have problemet kan du checke teknisk support på:
+www.secondlife.com/support
+  </notification>
+  <notification name="invalid_region_handoff">
+Problem registreret i forbindelse med skift til ny region. Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.
+Hvis du bliver ved med at have problemet kan du checke teknisk support på:
+www.secondlife.com/support
+  </notification>
+  <notification name="blocked_tport">
+Beklager, teleport er blokeret lige nu. Prøv igen senere.
+Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge ind for at løse dette problem.
+  </notification>
+  <notification name="nolandmark_tport">
+Beklager, systemet kunne ikke finde landmærke destinationen.
+  </notification>
+  <notification name="timeout_tport">
+Beklager, systemet kunne ikke fuldføre teleport forbindelse.
+Prøv igen om lidt.
+  </notification>
+  <notification name="noaccess_tport">
+Beklager, du har ikke adgang til denne teleport destination.
+  </notification>
+  <notification name="missing_attach_tport">
+Dine vedhæng er ikke ankommet endnu. Prøv at vente lidt endnu eller log ud og ind igen før du prøver at teleporte igen.
+  </notification>
+  <notification name="too_many_uploads_tport">
+Tekniske problemer hindrer at din teleport kan gennemføres.
+Prøv venligst igen om lidt eller vælg et mindre travlt område.
+  </notification>
+  <notification name="expired_tport">
+Beklager, men systemet kunne ikke fuldføre din teleport i rimelig tid. Prøv venligst igen om lidt.
+  </notification>
+  <notification name="expired_region_handoff">
+Beklager, men systemet kunne ikke fuldføre skift til anden region i rimelig tid. Prøv venligst igen om lidt.
+  </notification>
+  <notification name="no_host">
+Ikke muligt at fine teleport destination. Destinationen kan være midlertidig utilgængelig eller findes ikke mere. 
+Prøv evt. igen om lidt.
+  </notification>
+  <notification name="no_inventory_host">
+Beholdningssystemet er ikke tilgængelig lige nu.
+  </notification>
+
+	<notification name="CannotGiveCategory">
+		Du har ikke tilladelse til at videreføre den valgte mappe.
+	</notification>
+	<notification name="CannotEncodeFile">
+		Kunne ikke &apos;forstå&apos; filen: [FILE]
+	</notification>
+	<notification name="CannotBuyLandNoRegion">
+		Ikke i stand til at købe land:
 Kan ikke finde region som dette land er i.
-  </notification>
-
-  <notification
-   
-   name="YouHaveBeenLoggedOut"
-   >
-Du er blevet logget ud af [SECOND_LIFE]:
+	</notification>
+	<notification name="ShowOwnersHelp">
+		Vis ejere:
+Farver på parceller viser ejer-type.
+
+Grøn = Dit land
+Turkis = Din gruppes land
+Rød = Ejet af andre
+Gul = Til salg
+Lilla = PÃ¥ auktion
+Grå = Offentligt ejet
+	</notification>
+	<notification name="YouHaveBeenLoggedOut">
+		Du er blevet logget ud af [SECOND_LIFE]:
             [MESSAGE]
 Du kan stadig se eksiterende PB&apos;er og chat ved at klikke&apos;Se PB &amp; Chat&apos;. Ellers, klik &apos;Afslut&apos; for at afslutte [SECOND_LIFE] nu.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Quit"
-     yestext="Se IM &amp; Chat"/>
-  </notification>
-
-  <notification
-   
-   label="Add Friend"
-   name="AddFriend"
-   >
-Venner kan give tilladelse til at følge hinanden
+		<usetemplate name="okcancelbuttons" notext="Afslut" yestext="Se PB &amp; Chat"/>
+	</notification>
+	<notification label="Tilføj ven" name="AddFriend">
+		Venner kan give tilladelse til at følge hinanden
 på Verdenskortet eller modtage status opdateringer.
 
 Tilbyd venskab til [NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Annullér"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   label="Add Friend"
-   name="AddFriendWithMessage"
-   >
-Venner kan give tilladelse til at følge hinanden
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
+	<notification label="Tilføj ven" name="AddFriendWithMessage">
+		Venner kan give tilladelse til at følge hinanden
 på Verdenskortet eller modtage status opdateringer.
 
 Tilbyd venskab til [NAME]?
-    <form name="form">
-      <input name="message" type="text">
-Vil du være min ven?
-      </input>
+		<form name="form">
+			<input name="message" type="text">
+				Vil du være min ven?
+			</input>
+			<button name="Offer" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="NotEnoughCurrency">
+		[NAME] L$ [PRICE] Du har ikke nok L$ til dette.
+	</notification>
+	<notification name="BuyOneObjectOnly">
+		Ikke muligt at købe mere end et objekt ad gangen. Vælg kun ét objekt og prøv igen.
+	</notification>
+	<notification name="CannotStartAuctionAlreadyForSale">
+		Du kan ikke starte en auktion på en parcel som allerede er sat til salg. Fjern &apos;til salg&apos; muligheden hvis du ønsker at starte en auktion.
+	</notification>
+	<notification name="OfferTeleport">
+		<form name="form">
+			<input name="message" type="text">
+				Mød mig i [REGION]
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating. Dette kan skyldes manglende validering af din alder.
+
+Undersøg venligst om du har installeret den nyeste Second Life klient, og gå til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_KB">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating.
+
+GÃ¥ til &apos;Knowledge Base&apos; for mere information om indholdsratings.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk"
+	 ignoretext="Når regionen er blokeret på grund af indholdsrating"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Notify">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Change">
+		Du har ikke adgang til denne region på grund af din nuværende indholdsrating opsætning.
+
+Du kan vælge &apos;Indstillinger&apos; for at hæve din indholdsrating nu og dermed få adgang. Du vil så få mulighed for at søge og få adgang til områder med indhold af typen [REGIONMATURITY]. Hvis du senere ønsker at skifte tilbage, kan du skifte tilbage i &apos;Indstillinger&apos;.
+	<form name="form">
       <button
-       
-       
-       name="Offer"
-       text="OK"/>
+       name="OK"
+       text="Ændre præferencer"/>
       <button
-       
        name="Cancel"
-       text="Annullér"/>
+       text="Luk"/>
+       <ignore name="ignore" text="Når regionen er blokeret på grund af indholdsrating"/>
     </form>
-  </notification>
+	</notification>
+	<notification name="LandClaimAccessBlocked">
+		Du kan ikke kræve dette land på grund af din nuværende indholdsrating indstillinge . Dette kan skyldes manglende validering af din alder.
 
-  <notification
-   
-   name="NotEnoughCurrency"
-   >
-[NAME] L$ [PRICE] Du har ikke nok L$ til dette.
-  </notification>
+Undersøg om du har den nyeste Second Life klient og gå venligst til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_KB">
+		Du kan ikke kræve dette land på grund af din nuværende indholdsrating indstilling..
+
+GÃ¥ venligst til &apos;Knowledge Base&apos; for yderligere information om indholdsrating.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk"
+	 ignoretext="Når land ikke kan kræves på grund af indholdsrating"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_Notify">
+		Du kan ikke kræve dette land på grund af din indholdsrating.
+	</notification>
+	<notification name="LandClaimAccessBlocked_Change">
+		Du kan ikke kræve dette land på grund af din nuværende indholdsrating indstilling..
+
+Du kan vælge &apos;Indstillinger&apos; for at hæve din indholdsrating nu og dermed få adgang. Du vil så få mulighed for at søge og få adgang til områder med indhold af typen [REGIONMATURITY]. Hvis du senere ønsker at skifte tilbage, kan du skifte tilbage i &apos;Indstillinger&apos;.
+    <usetemplate
+     name="okcancelignore"
+     yestext="Ændre præferencer"
+	 notext="Luk"
+	 ignoretext="Når land ikke kan kræves på grund af indholdsrating"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked">
+		Du kan ikke købe dette land på grund af din nuværende indholdsrating indstillinge . Dette kan skyldes manglende validering af din alder.
+
+Undersøg om du har den nyeste Second Life klient og gå venligst til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_KB">
+		Du kan ikke købe dette land på grund af din nuværende indholdsrating. 
+
+GÃ¥ til &apos;Knowledge Base&apos; for yderligere detaljer om indholdsrating.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="GÃ¥ til &apos;Knowledge Base&apos;"
+	 notext="Luk"
+	 ignoretext="Når land ikke kan købes på grund af indholdsrating"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_Notify">
+		Du kan ikke købe dette land på grund af din nuværende indholdsrating indstilling.
+	</notification>
+	<notification name="LandBuyAccessBlocked_Change">
+		Du kan ikke købe dette land på grund af din valgte inholdsrating.
+
+Du kan vælge &apos;Indstillinger&apos; for at hæve din indholdsrating nu og dermed få adgang. Du vil så få mulighed for at søge og få adgang til områder med indhold af typen [REGIONMATURITY]. Hvis du senere ønsker at skifte tilbage, kan du skifte tilbage i &apos;Indstillinger&apos;.
+    <usetemplate
+     name="okcancelignore"
+     yestext="Ændre præferencer"
+	 notext="Luk"
+	 ignoretext="Når land ikke kan købes på grund af indholdsrating"/>
+	</notification>
+	<notification name="UnableToLoadNotecardAsset">
+		Kunne ikke hente notecard indhold.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SetClassifiedMature">
+		Indeholder denne annonce &apos;Mature&apos; indhold?
+    <usetemplate
+     canceltext="Annullér"
+     name="yesnocancelbuttons"
+     notext="Nej"
+     yestext="Ja"/>
+	</notification>
+	<notification name="SetGroupMature">
+		Indeholder denne gruppe &apos;Mature&apos; indhold?
+    <usetemplate
+     canceltext="Annullér"
+     name="yesnocancelbuttons"
+     notext="Nej"
+     yestext="Ja"/>
+	</notification>
+	<notification label="Indholdsrating" name="HelpRegionMaturity">
+		Sætter indholdsrating for regionen, som den vises øverst på menu-bjælken i beboernes klient, og i tooltips på verdenskortet når cursoren placeres over denne region. Denne indstilling har også betydning for adgangen til regionen og for søgeresultater. Andre beboere må kun få adgang til regionen eller se regionen i søgeresultater hvis de har valgt samme eller højere indholdsrating i deres opsætning.
 
-  <notification
-   
-   name="HelpReportAbuseEmailLL"
-   >
-Brug dette værktøj for at rapportere brud på de almindelige bestemmelser og fællesskabs Standarder. Se:
+Det kan tage noget tid inden en ændring af indholdsrating er synligt på kortet.
+	</notification>
+	<notification name="HelpReportAbuseEmailLL">
+		Brug dette værktøj for at rapportere brud på de almindelige bestemmelser og fællesskabs Standarder. Se:
 
 http://secondlife.com/corporate/tos.php
 http://secondlife.com/corporate/cs.php
@@ -496,13 +512,9 @@ http://secondlife.com/corporate/cs.php
 Alle rapporterede brud på almindelige bestemmelser og fællesskabs Standarder bliver undersøgt og løst. Du kan følge løsningen på din anmeldselse på:
 
 http://secondlife.com/support/incidentreport.php
-  </notification>
-
-  <notification
-   
-   name="HelpReportAbuseContainsCopyright"
-   >
-Dear Resident,
+	</notification>
+	<notification name="HelpReportAbuseContainsCopyright">
+		Dear Resident,
 
 Du ser ud til at være ved at rapportere noget vedr. krænkelse af intellektuelle ejendomsrettigheder. Sørg for, at du rapporterer dette korrekt:
 
@@ -515,1268 +527,659 @@ Hvis du stadig ønsker at fortsætte med misbrugs processen, luk da venligst det
 Mange tak,
 
 Linden Lab
-  </notification>
-
-  <notification
-   
-   name="ConfirmClearCookies"
-   >
-Er du sikker på du vil slette alle cookies?
-  </notification>
-
-  <notification
-   
-   name="ChatterBoxSessionStartError"
-   >
-Ikke i stand til at start chat med [RECIPIENT].
+	</notification>
+	<notification name="ConfirmClearCookies">
+		Er du sikker på du vil slette alle cookies?
+	</notification>
+	<notification name="NewSkyPreset">
+		<form name="form">
+			<input name="message" type="text">
+				Ny forudindstilling
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="NewWaterPreset">
+		<form name="form">
+			<input name="message" type="text">
+				Ny forudindstilling
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="ChatterBoxSessionStartError">
+		Ikke i stand til at start chat med [RECIPIENT].
 [REASON]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   
-   name="Cannot_Purchase_an_Attachment"
-   >
-Ting kan ikke købes imens de er en del af tilbehør.
-  </notification>
-
-  <notification
-   
-   name="NewWaterPreset"
-   >
-    <form name="form">
-      <input name="message" type="text">
-Ny forudindstilling
-      </input>
-      <button
-       
-       
-       name="OK"
-       text="OK"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="NewSkyPreset"
-   >
-    <form name="form">
-      <input name="message" type="text">
-Ny forudindstilling
-      </input>
-      <button
-       
-       
-       name="OK"
-       text="OK"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="OfferTeleport"
-   >
-    <form name="form">
-      <input name="message" type="text">
-Mød mig i [REGION]
-      </input>
-      <button
-       
-       
-       name="OK"
-       text="OK"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="SystemMessageTip"
-   >
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="Cannot_Purchase_an_Attachment">
+		Ting kan ikke købes imens de er en del af tilbehør.
+	</notification>
+	<notification name="SystemMessageTip">
+		[MESSAGE]
+	</notification>
+	<notification name="Cancelled">
+		Annulléret
+	</notification>
+	<notification name="CancelledSit">
+		Annulléret sid
+	</notification>
+	<notification name="CancelledAttach">
+		Annulléreret vedhæft
+	</notification>
+	<notification name="ReplacedMissingWearable">
+		Erstattet manglende tøj/kropsdele med standard.
+	</notification>
+	<notification name="FriendOnline">
+		[FIRST] [LAST] er Online
+	</notification>
+	<notification name="FriendOffline">
+		[FIRST] [LAST] er Offline
+	</notification>
+	<notification name="AddSelfFriend">
+		Du kan ikke tilføje dig selv som ven.
+	</notification>
+	<notification name="UploadingAuctionSnapshot">
+		Uploader billeder fra verdenen og www...
+(Tager omkring 5 minutter.)
+	</notification>
+	<notification name="UploadPayment">
+		Du betalte L$[AMOUNT] for at uploade.
+	</notification>
+	<notification name="UploadWebSnapshotDone">
+		Billeder fra www er uploadet.
+	</notification>
+	<notification name="UploadSnapshotDone">
+		Billeder fra verdenen er uploadet
+	</notification>
+	<notification name="TerrainDownloaded">
+		Terrain.raw downloadet
+	</notification>
+	<notification name="GestureMissing">
+		Gestus [NAME] mangler i databasen.
+	</notification>
+	<notification name="UnableToLoadGesture">
+		Ikke muligt at indlæse gestus [NAME].
+Prøv venligst igen.
+	</notification>
+	<notification name="LandmarkMissing">
+		Landmærke mangler i databasen.
+	</notification>
+	<notification name="UnableToLoadLandmark">
+		Ikke muligt at indlæse landmærke.  Prøv venligst igen.
+	</notification>
+	<notification name="CapsKeyOn">
+		Du har slået store bogstaver til.
+Da det vil have betydning når du indtaster kodeordet, vil du højest sandsynlig slå dem fra.
+	</notification>
+	<notification name="NotecardMissing">
+		Note mangler i databasen.
+	</notification>
+	<notification name="NotecardNoPermissions">
+		Utilstrækkelige tilladelser til at se note.
+	</notification>
+	<notification name="RezItemNoPermissions">
+		Utilstrækkelige tilladelser til at danne genstanden.
+	</notification>
+	<notification name="UnableToLoadNotecard">
+		Ikke muligt at indlæse note.
+Prøv venligst igen.
+	</notification>
+	<notification name="ScriptMissing">
+		Script mangler i databasen.
+	</notification>
+	<notification name="ScriptNoPermissions">
+		Utilstrækkelige tilladelser til at se script.
+	</notification>
+	<notification name="UnableToLoadScript">
+		Ikke muligt at indlæse script.  Prøv venligst igen.
+	</notification>
+	<notification name="IncompleteInventory">
+		Det komplette indhold, du tilbyder, er ikke endnu tilgængelig lokalt. Prøv venligst at tilbyde tingene igen om lidt.
+	</notification>
+	<notification name="CannotModifyProtectedCategories">
+		Du kan ikke ændre beskyttede kategorier.
+	</notification>
+	<notification name="CannotRemoveProtectedCategories">
+		Du kan ikke fjerne beskyttede kategorier.
+	</notification>
+	<notification name="OfferedCard">
+		Du har tilbudt et visitkort til [FIRST] [LAST]
+	</notification>
+	<notification name="UnableToBuyWhileDownloading">
+		Ikke muligt at købe, imens genstandens data hentes.
+Prøv venligst igen.
+	</notification>
+	<notification name="UnableToLinkWhileDownloading">
+		Ikke muligt at lænke imens genstandens data hentes.
+Prøv venligst igen.
+	</notification>
+	<notification name="CannotBuyObjectsFromDifferentOwners">
+		Kan ikke købe genstande fra forskellige ejere på samme tid.
+Prøv venligst at vælge en enkelt genstand.
+	</notification>
+	<notification name="ObjectNotForSale">
+		Genstanden ser ikke ud til at være til salg.
+	</notification>
+	<notification name="EnteringGodMode">
+		Starter gud-tilstand, niveau [LEVEL]
+	</notification>
+	<notification name="LeavingGodMode">
+		Stopper gud-tilstand, niveau [LEVEL]
+	</notification>
+	<notification name="CopyFailed">
+		Kopiering lykkedes ikke fordi du ikke har nok tilladelser til at kopiere
+	</notification>
+	<notification name="InventoryAccepted">
+		[NAME] accepterede det du tilbød fra din beholdning.
+	</notification>
+	<notification name="InventoryDeclined">
+		[NAME] afviste det du tilbød fra din beholdning.
+	</notification>
+	<notification name="ObjectMessage">
+		[NAME]: [MESSAGE]
+	</notification>
+	<notification name="CallingCardAccepted">
+		Dit visitkort blev accepteret.
+	</notification>
+	<notification name="CallingCardDeclined">
+		Dit visitkort blev afvist.
+	</notification>
+	<notification name="TeleportToLandmark">
+		Nu hvor du er nået frem til hovedlandet, kan du teleportere til steder som &apos;[NAME]&apos; ved at klikke på Beholdning-knappen i nederste højre side af skærmen hvorefter du vælger Landmærke-mappen.
+Dobbeltklik på landmærket og klik på Teleportér, for at rejse derhen.
+	</notification>
+	<notification name="TeleportToPerson">
+		Nu hvor du har nået frem til hovedlandet, kan du kontakte indbyggere som &apos;[NAME]&apos; ved at klikke på Beholdning-knappen i nederste højre side af skærmen, hvorefter du vælger Visitkort-mappen.
+Dobbeltklik på kortet, klik på IM og skriv beskeden.
+	</notification>
+	<notification name="CantSelectLandFromMultipleRegions">
+		Kan ikke vælge land på tværs af grænser.
+Prøv at vælge mindre stykker land.
+	</notification>
+	<notification name="SearchWordBanned">
+		Visse ord er fjernet fra din søge-sætning på grund af at disse strider mod de generelle &apos;Community Standards&apos;.
+	</notification>
+	<notification name="NoContentToSearch">
+		Vælg venligst mindst en indholdstype for at søge (PG, Mature, or Adult).
+	</notification>
+	<notification name="GroupVote">
+		[NAME] har forslået at stemme for:
 [MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="Cancelled"
-   >
-Annulléret
-  </notification>
+		<form name="form">
+			<button name="VoteNow" text="Stem nu"/>
+			<button name="Later" text="Senere"/>
+		</form>
+	</notification>
+	<notification name="SystemMessage">
+		[MESSAGE]
+	</notification>
+	<notification name="EventNotification">
+		Besked om begivenhed:
 
-  <notification
-   
-   name="CancelledSit"
-   >
-Annulléret sid
-  </notification>
+[NAME]
+[DATE]
+		<form name="form">
+			<button name="Teleport" text="Teleportér"/>
+			<button name="Description" text="Beskrivelse"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="TransferObjectsHighlighted">
+		Alle genstande på denne grund, som vil blive overført til køberen af denne grund, er nu oplyst.
 
-  <notification
-   
-   name="CancelledAttach"
-   >
-Annulléreret vedhæft
-  </notification>
+* Træer og græs, der vil blive overført, er ikke fremhævet.
+		<form name="form">
+			<button name="Done" text="Færdig"/>
+		</form>
+	</notification>
+	<notification name="DeactivatedGesturesTrigger">
+		Deaktiverede bevægelser med samme udløser: [NAMES]
+	</notification>
+	<notification name="NoQuickTime">
+		Apple&apos;s QuickTime ser ikke ud til at være installeret på computeren.
+Hvis du vil se live transmitteret medie på grunde, der understøtter det, skal du gå ind på QuickTime-siden (http://www.apple.dk/quicktime) og installere QuickTime afspilleren.
+	</notification>
+	<notification name="OwnedObjectsReturned">
+		De genstande du ejer på det valgte stykke land er blevet returneret til din beholdning.
+	</notification>
+	<notification name="OtherObjectsReturned">
+		Genstandene på det valgte stykke land der er ejet af [FIRST] [LAST] er blevet returneret til hans eller hendes beholdning.
+	</notification>
+	<notification name="OtherObjectsReturned2">
+		Genstandene på det valgte stykke land der er ejet af beboeren &apos;[NAME]&apos; er blevet returneret til deres ejere.
+	</notification>
+	<notification name="GroupObjectsReturned">
+		Genstandene på det valgte stykke land, delt med gruppen [GROUPNAME], er blevet returneret til deres ejeres beholdninger.
+Genstande, som er dedikerede og som kan overføres, er blevet returneret til deres forrige ejere.
+Genstande, der ikke kan overføres og som er dedikeret til gruppen, er blevet slettet.
+	</notification>
+	<notification name="UnOwnedObjectsReturned">
+		Genstandene på det valgte stykke land, der IKKE er ejet af dig, er blevet returneret til deres ejere.
+	</notification>
+	<notification name="NotSafe">
+		Dette land har sat skade til (&apos;ikke sikker&apos;).
+Du kan komme til skade her. Hvis du dør, vil du blive teleporteret til din hjem-lokalitet.
+	</notification>
+	<notification name="NoFly">
+		Dette land har slået flyvning fra (&apos;ingen flyvning&apos;).
+Du kan ikke flyve her.
+	</notification>
+	<notification name="PushRestricted">
+		Dette land giver ikke mulighed for at &apos;skubbe&apos; andre, med mindre du ejer landet.
+	</notification>
+	<notification name="NoVoice">
+		Dette land har ikke mulighed for at bruge stemme.
+	</notification>
+	<notification name="NoBuild">
+		Dette land giver ikke mulighed for at bygge (&apos;byggeri forbudt&apos;).
+Du kan ikke skabe genstande her.
+	</notification>
+	<notification name="ScriptsStopped">
+		En administrator har midlertidig stoppet scripts i denne region.
+	</notification>
+	<notification name="ScriptsNotRunning">
+		Denne region kører ikke nogen scripts.
+	</notification>
+	<notification name="NoOutsideScripts">
+		Dette land har eksterne scripts slået fra
+(&apos;ingen eksterne scripts&apos;).
+Ingen scripts vil køre på nær dem, som tilhører ejeren af landet.
+	</notification>
+	<notification name="ClaimPublicLand">
+		Du kan kun gøre krav på offentlig land i den region, du befinder dig i.
+	</notification>
+	<notification name="RegionTPAccessBlocked">
+		Du har ikke adgang til denne region på grund af din valgte indholdsrating. Dette kan skyldes manglende validering af din alder eller at du ikke benytter den nyeste Second Life klient.
+
+Gå venligst til &apos;Knowledge Base&apos; for yderligere detaljer om adgang til områder med denne indholdsrating.
+	</notification>
+	<notification name="URBannedFromRegion">
+		Du er blokeret i denne region.
+	</notification>
+	<notification name="NoTeenGridAccess">
+		Du kan ikke tilslutte dig denne &apos;Teen&apos; region.
+	</notification>
+	<notification name="NoHelpIslandTP">
+		Du kan ikke teleportere tilbage til Help Island.
+Gå til &apos;Help Island Puclic&apos; for at prøve tutorial igen.
+	</notification>
+	<notification name="ImproperPaymentStatus">
+		Du har ikke de rette betalingsoplysninger til at komme ind i denne region.
+	</notification>
+	<notification name="MustGetAgeRegion">
+		Du skal være aldersgodkendt for at komme ind i denne region.
+	</notification>
+	<notification name="MustGetAgeParcel">
+		Du skal være aldersgodkendt for at komme ind på denne parcel.
+	</notification>
+	<notification name="NoDestRegion">
+		Destinations region ikke fundet.
+	</notification>
+	<notification name="NotAllowedInDest">
+		Du har ikke adgang til denne destination.
+	</notification>
+	<notification name="RegionParcelBan">
+		Kan ikke skifte til ny region via en blokeret parcel. Prøv en anden vej ind.
+	</notification>
+	<notification name="TelehubRedirect">
+		Du er blevet omdirigeret til en telehub.
+	</notification>
+	<notification name="CouldntTPCloser">
+		Kunne ikke teleportere nærmere til destination.
+	</notification>
+	<notification name="TPCancelled">
+		Teleport afbrudt.
+	</notification>
+	<notification name="FullRegionTryAgain">
+		Den region du prøver at komme ind i er fuld for øjeblikket.
+Prøv igen om lidt.
+	</notification>
+	<notification name="GeneralFailure">
+		Generel fejl.
+	</notification>
+	<notification name="RoutedWrongRegion">
+		Du blev sendt til en forkert region. Prøv igen.
+	</notification>
+	<notification name="NoValidAgentID">
+		Ikke en gyldig agent ID.
+	</notification>
+	<notification name="NoValidSession">
+		Ikke noget gyldig sessions-ID
+	</notification>
+	<notification name="NoValidCircuit">
+		Ingen gyldig kode for kredsløb.
+	</notification>
+	<notification name="NoValidTimestamp">
+		Ikke et gyldigt klokkeslæt.
+	</notification>
+	<notification name="NoPendingConnection">
+		Kunne ikke skabe fast forbindelse.
+	</notification>
+	<notification name="InternalUsherError">
+		Der opstod en intern fejl ved teleportering til din teleport destination.. Der kan være generelle problemer med Second Life lige nu.
+	</notification>
+	<notification name="NoGoodTPDestination">
+		Kunne ikke finde et egnet teleport sted i denne region.
+	</notification>
+	<notification name="InternalErrorRegionResolver">
+		Der opstod en intern fejl ved beregning af globale koordinater for din teleport forespørgsel. Der kan være generelle problemer med Second Life lige nu.
+	</notification>
+	<notification name="NoValidLanding">
+		Kunne ikke finde et gyldigt landingspunkt.
+	</notification>
+	<notification name="NoValidParcel">
+		No valid parcel could be found.
+	</notification>
+	<notification name="ObjectGiveItem">
+		En genstand med navnet [OBJECTFROMNAME], ejet af [FIRST] [LAST], har givet dig en/et [OBJECTTYPE] med navnet [OBJECTNAME].
+		<form name="form">
+			<button name="Keep" text="Behold"/>
+			<button name="Discard" text="Smid væk"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="ObjectGiveItemUnknownUser">
+		En genstand med navnet [OBJECTFROMNAME], ejet af (en ukendt bruger), har givet dig en/et [OBJECTTYPE] med navnet [OBJECTNAME].
+		<form name="form">
+			<button name="Keep" text="Behold"/>
+			<button name="Discard" text="Smid væk"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="UserGiveItem">
+		[NAME] har givet dig en/et [OBJECTTYPE] med navnet &apos;[OBJECTNAME]&apos;.
+		<form name="form">
+			<button name="Keep" text="Behold"/>
+			<button name="Discard" text="Smid væk"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="GodMessage">
+		[NAME]
+[MESSAGE]
+	</notification>
+	<notification name="JoinGroup">
+		[MESSAGE]
+		<form name="form">
+			<button name="Join" text="Indmeld"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Info" text="Information"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered">
+		[NAME] har tilbudt at teleportere dig til hans eller hendes lokalitet:
 
-  <notification
-   
-   name="ReplacedMissingWearable"
-   >
-Erstattet manglende tøj/kropsdele med standard.
-  </notification>
+[MESSAGE]
+		<form name="form">
+			<button name="Teleport" text="Teleportér"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="GotoURL">
+		[MESSAGE]
+[URL]
+		<form name="form">
+			<button name="Later" text="Senere"/>
+			<button name="GoNow..." text="GÃ¥ nu..."/>
+		</form>
+	</notification>
+	<notification name="OfferFriendship">
+		[NAME] tilbyder venskab.
 
-  <notification
-   
-   name="FriendOnline"
-   >
-[FIRST] [LAST] er Online
-  </notification>
+Som standard vil du kunne se andres onlinestatus.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+		</form>
+	</notification>
+	<notification name="FriendshipAccepted">
+		[NAME] accepterede dit tilbud om venskab.
+	</notification>
+	<notification name="FriendshipDeclined">
+		[NAME] afviste dit tilbud om venskab.
+	</notification>
+	<notification name="OfferCallingCard">
+		[FIRST] [LAST] tilbyder vedkommendes visitkort.
+Dette vil tilføje et bogmærke i din beholdning, så du hurtigt kan sende en personlig besked (IM) til denne beboer.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+		</form>
+	</notification>
+	<notification name="RegionRestartMinutes">
+		Regionen genstarter om [MINUTES] minutter.
+Hvis du bliver i denne region, vil du blive logget af.
+	</notification>
+	<notification name="RegionRestartSeconds">
+		Regionen genstarter om [SECONDS] sekunder.
+Hvis du bliver i denne region, vil du blive logget af.
+	</notification>
+	<notification name="LoadWebPage">
+		Indlæs internetside [URL]?
 
-  <notification
-   
-   name="FriendOffline"
-   >
-[FIRST] [LAST] er Offline
-  </notification>
+[MESSAGE]
 
-  <notification
-   
-   name="AddSelfFriend"
-   >
-Du kan ikke tilføje dig selv som ven.
-  </notification>
+Fra genstand: [OBJECTNAME], ejer: [NAME]?
+		<form name="form">
+			<button name="Gotopage" text="GÃ¥ til side"/>
+			<button name="Cancel" text="Afbryd"/>
+		</form>
+	</notification>
+	<notification name="FailedToFindWearableUnnamed">
+		Det lykkedes ikke at finde [TYPE] i databasen.
+	</notification>
+	<notification name="FailedToFindWearable">
+		Det lykkedes ikke at finde [TYPE] med navnet [DESC] i databasen.
+	</notification>
+	<notification name="InvalidWearable">
+		Den genstand du prøver at tage på benytter funktioner som din klient ikke kan forstå. Opdatér din version af Second Life for at tage genstanden på.
+	</notification>
+	<notification name="ScriptQuestion">
+		&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[NAME]&apos;, vil gerne:
+ [QUESTIONS]
+Er det iorden?
+		<form name="form">
+			<button name="Yes" text="Ja"/>
+			<button name="No" text="Nej"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="ScriptQuestionCaution">
+		&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[NAME]&apos;, vil gerne:
 
-  <notification
-   
-   name="UploadingAuctionSnapshot"
-   >
-Uploader billeder fra verdenen og www...
-(Tager omkring 5 minutter.)
-  </notification>
-
-  <notification
-   
-   name="UploadPayment"
-   >
-Du betalte L$[AMOUNT] for at uploade.
-  </notification>
-
-  <notification
-   
-   name="UploadWebSnapshotDone"
-   >
-Billeder fra www er uploadet.
-  </notification>
-
-  <notification
-   
-   name="UploadSnapshotDone"
-   >
-Billeder fra verdenen er uploadet
-  </notification>
-
-  <notification
-   
-   name="TerrainDownloaded"
-   >
-Terrain.raw downloadet
-  </notification>
-
-  <notification
-   
-   name="GestureMissing"
-   >
-Gestus [NAME] mangler i databasen.
-  </notification>
-
-  <notification
-   
-   name="UnableToLoadGesture"
-   >
-Ikke muligt at indlæse gestus [NAME].
-Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="LandmarkMissing"
-   >
-Landmærke mangler i databasen.
-  </notification>
-
-  <notification
-   
-   name="UnableToLoadLandmark"
-   >
-Ikke muligt at indlæse landmærke.  Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="CapsKeyOn"
-   >
-Du har slået store bogstaver til.
-Da det vil have betydning når du indtaster kodeordet, vil du højest sandsynlig slå dem fra.
-  </notification>
-
-  <notification
-   
-   name="NotecardMissing"
-   >
-Note mangler i databasen.
-  </notification>
-
-  <notification
-   
-   name="NotecardNoPermissions"
-   >
-Utilstrækkelige tilladelser til at se note.
-  </notification>
-
-  <notification
-   
-   name="RezItemNoPermissions"
-   >
-Utilstrækkelige tilladelser til at danne genstanden.
-  </notification>
-
-  <notification
-   
-   name="UnableToLoadNotecard"
-   >
-Ikke muligt at indlæse note.
-Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="ScriptMissing"
-   >
-Script mangler i databasen.
-  </notification>
-
-  <notification
-   
-   name="ScriptNoPermissions"
-   >
-Utilstrækkelige tilladelser til at se script.
-  </notification>
-
-  <notification
-   
-   name="UnableToLoadScript"
-   >
-Ikke muligt at indlæse script.  Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="IncompleteInventory"
-   >
-Det komplette indhold, du tilbyder, er ikke endnu tilgængelig lokalt. Prøv venligst at tilbyde tingene igen om lidt.
-  </notification>
-
-  <notification
-   
-   name="CannotModifyProtectedCategories"
-   >
-Du kan ikke ændre beskyttede kategorier.
-  </notification>
-
-  <notification
-   
-   name="CannotRemoveProtectedCategories"
-   >
-Du kan ikke fjerne beskyttede kategorier.
-  </notification>
-
-  <notification
-   
-   name="OfferedCard"
-   >
-Du har tilbudt et visitkort til [FIRST] [LAST]
-  </notification>
-
-  <notification
-   
-   name="OfferedFriendship"
-   >
-Du har tilbudt venskab til [FIRST] [LAST]
-  </notification>
-
-  <notification
-   
-   name="UnableToBuyWhileDownloading"
-   >
-Ikke muligt at købe, imens genstandens data hentes.
-Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="UnableToLinkWhileDownloading"
-   >
-Ikke muligt at lænke imens genstandens data hentes.
-Prøv venligst igen.
-  </notification>
-
-  <notification
-   
-   name="CannotBuyObjectsFromDifferentOwners"
-   >
-Kan ikke købe genstande fra forskellige ejere på samme tid.
-Prøv venligst at vælge en enkelt genstand.
-  </notification>
-
-  <notification
-   
-   name="ObjectNotForSale"
-   >
-Genstanden ser ikke ud til at være til salg.
-  </notification>
-
-  <notification
-   
-   name="EnteringGodMode"
-   >
-Starter gud-tilstand, niveau [LEVEL]
-  </notification>
-
-  <notification
-   
-   name="LeavingGodMode"
-   >
-Stopper gud-tilstand, niveau [LEVEL]
-  </notification>
-
-  <notification
-   
-   name="CopyFailed"
-   >
-Kopiering lykkedes ikke fordi du ikke har nok tilladelser til at kopiere
-  </notification>
-
-  <notification
-   
-   name="InventoryAccepted"
-   >
-[NAME] accepterede det du tilbød fra din beholdning.
-  </notification>
-
-  <notification
-   
-   name="InventoryDeclined"
-   >
-[NAME] afviste det du tilbød fra din beholdning.
-  </notification>
-
-  <notification
-   
-   name="ObjectMessage"
-   >
-[NAME]: [MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="CallingCardAccepted"
-   >
-Dit visitkort blev accepteret.
-  </notification>
-
-  <notification
-   
-   name="CallingCardDeclined"
-   >
-Dit visitkort blev afvist.
-  </notification>
-
-  <notification
-   
-   name="TeleportToLandmark"
-   >
-Nu hvor du er nået frem til hovedlandet, kan du teleportere til steder som &apos;[NAME]&apos; ved at klikke på Beholdning-knappen i nederste højre side af skærmen hvorefter du vælger Landmærke-mappen.
-Dobbeltklik på landmærket og klik på Teleportér, for at rejse derhen.
-  </notification>
-
-  <notification
-   
-   name="TeleportToPerson"
-   >
-Nu hvor du har nået frem til hovedlandet, kan du kontakte indbyggere som &apos;[NAME]&apos; ved at klikke på Beholdning-knappen i nederste højre side af skærmen, hvorefter du vælger Visitkort-mappen.
-Dobbeltklik på kortet, klik på IM og skriv beskeden.
-  </notification>
-
-  <notification
-   
-   name="CantSelectLandFromMultipleRegions"
-   >
-Kan ikke vælge land på tværs af grænser.
-Prøv at vælge mindre stykker land.
-  </notification>
-
-  <notification
-   
-   name="GroupVote"
-   >
-[NAME] har forslået at stemme for:
-[MESSAGE]
-    <form name="form">
-      <button
-       
-       name="VoteNow"
-       text="Stem nu"/>
-      <button
-       
-       name="Later"
-       text="Senere"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="SystemMessage"
-   >
-[MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="EventNotification"
-   >
-Besked om begivenhed:
-
-[NAME]
-[DATE]
-    <form name="form">
-      <button
-       
-       name="Teleport"
-       text="Teleportér"/>
-      <button
-       
-       name="Description"
-       text="Beskrivelse"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="TransferObjectsHighlighted"
-   >
-Alle genstande på denne grund, som vil blive overført til køberen af denne grund, er nu oplyst.
-
-* Træer og græs, der vil blive overført, er ikke fremhævet.
-    <form name="form">
-      <button
-       
-       name="Done"
-       text="Færdig"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="DeactivatedGesturesTrigger"
-   >
-Deaktiverede bevægelser med samme udløser: [NAMES]
-  </notification>
-
-  <notification
-   
-   name="NoQuickTime"
-   >
-Apple&apos;s QuickTime ser ikke ud til at være installeret på computeren.
-Hvis du vil se live transmitteret medie på grunde, der understøtter det, skal du gå ind på QuickTime-siden (http://www.apple.dk/quicktime) og installere QuickTime afspilleren.
-  </notification>
-
-  <notification
-   
-   name="OwnedObjectsReturned"
-   >
-De genstande du ejer på det valgte stykke land er blevet returneret til din beholdning.
-  </notification>
-
-  <notification
-   
-   name="OtherObjectsReturned"
-   >
-Genstandene på det valgte stykke land der er ejet af [FIRST] [LAST] er blevet returneret til hans eller hendes beholdning.
-  </notification>
-
-  <notification
-   
-   name="OtherObjectsReturned2"
-   >
-Genstandene på det valgte stykke land der er ejet af beboeren &apos;[NAME]&apos; er blevet returneret til deres ejere.
-  </notification>
-
-  <notification
-   
-   name="GroupObjectsReturned"
-   >
-Genstandene på det valgte stykke land, delt med gruppen [GROUPNAME], er blevet returneret til deres ejeres beholdninger.
-Genstande, som er dedikerede og som kan overføres, er blevet returneret til deres forrige ejere.
-Genstande, der ikke kan overføres og som er dedikeret til gruppen, er blevet slettet.
-  </notification>
-
-  <notification
-   
-   name="UnOwnedObjectsReturned"
-   >
-Genstandene på det valgte stykke land, der IKKE er ejet af dig, er blevet returneret til deres ejere.
-  </notification>
-
-  <notification
-   
-   name="NotSafe"
-   >
-Dette land har sat skade til (&apos;ikke sikker&apos;).
-Du kan komme til skade her. Hvis du dør, vil du blive teleporteret til din hjem-lokalitet.
-  </notification>
-
-  <notification
-   
-   name="NoFly"
-   >
-Dette land har slået flyvning fra (&apos;ingen flyvning&apos;).
-Du kan ikke flyve her.
-  </notification>
-
-  <notification
-   
-   name="PushRestricted"
-   >
-Dette land giver ikke mulighed for at &apos;skubbe&apos; andre, med mindre du ejer landet.
-  </notification>
-
-  <notification
-   
-   name="NoVoice"
-   >
-Dette land har ikke mulighed for at bruge stemme.
-  </notification>
-
-  <notification
-   
-   name="NoBuild"
-   >
-Dette land giver ikke mulighed for at bygge (&apos;byggeri forbudt&apos;).
-Du kan ikke skabe genstande her.
-  </notification>
-
-  <notification
-   
-   name="ScriptsStopped"
-   >
-En administrator har midlertidig stoppet scripts i denne region.
-  </notification>
-
-  <notification
-   
-   name="ScriptsNotRunning"
-   >
-Denne region kører ikke nogen scripts.
-  </notification>
-
-  <notification
-   
-   name="NoOutsideScripts"
-   >
-Dette land har eksterne scripts slået fra
-(&apos;ingen eksterne scripts&apos;).
-Ingen scripts vil køre på nær dem, som tilhører ejeren af landet.
-  </notification>
-
-  <notification
-   
-   name="ClaimPublicLand"
-   >
-Du kan kun gøre krav på offentlig land i den region, du befinder dig i.
-  </notification>
-
-  <notification
-   
-   name="ObjectGiveItem"
-   >
-En genstand med navnet [OBJECTFROMNAME], ejet af [FIRST] [LAST], har givet dig en/et [OBJECTTYPE] med navnet [OBJECTNAME].
-    <form name="form">
-      <button
-       
-       name="Keep"
-       text="Behold"/>
-      <button
-       
-       name="Discard"
-       text="Smid væk"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="ObjectGiveItemUnknownUser"
-   >
-En genstand med navnet [OBJECTFROMNAME], ejet af (en ukendt bruger), har givet dig en/et [OBJECTTYPE] med navnet [OBJECTNAME].
-    <form name="form">
-      <button
-       
-       name="Keep"
-       text="Behold"/>
-      <button
-       
-       name="Discard"
-       text="Smid væk"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="UserGiveItem"
-   >
-[NAME] har givet dig en/et [OBJECTTYPE] med navnet &apos;[OBJECTNAME]&apos;.
-    <form name="form">
-      <button
-       
-       name="Keep"
-       text="Behold"/>
-      <button
-       
-       name="Discard"
-       text="Smid væk"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="GodMessage"
-   >
-[NAME]
-[MESSAGE]
-  </notification>
-
-  <notification
-   
-   name="JoinGroup"
-   >
-[MESSAGE]
-    <form name="form">
-      <button
-       
-       name="Join"
-       text="Indmeld"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Info"
-       text="Information"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="TeleportOffered"
-   >
-[NAME] har tilbudt at teleportere dig til hans eller hendes lokalitet:
-
-[MESSAGE]
-    <form name="form">
-      <button
-       
-       name="Teleport"
-       text="Teleportér"/>
-      <button
-       
-       name="Cancel"
-       text="Annullér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="GotoURL"
-   >
-[MESSAGE]
-[URL]
-    <form name="form">
-      <button
-       
-       name="Later"
-       text="Senere"/>
-      <button
-       
-       name="GoNow..."
-       text="GÃ¥ nu..."/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="OfferFriendship"
-   >
-[NAME] tilbyder venskab.
-
-Som standard vil du kunne se andres onlinestatus.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="FriendshipAccepted"
-   >
-[NAME] accepterede dit tilbud om venskab.
-  </notification>
-
-  <notification
-   
-   name="FriendshipDeclined"
-   >
-[NAME] afviste dit tilbud om venskab.
-  </notification>
-
-  <notification
-   
-   name="OfferCallingCard"
-   >
-[FIRST] [LAST] tilbyder vedkommendes visitkort.
-Dette vil tilføje et bogmærke i din beholdning, så du hurtigt kan sende en personlig besked (IM) til denne beboer.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="RegionRestartMinutes"
-   
-   
-   >
-Regionen genstarter om [MINUTES] minutter.
-Hvis du bliver i denne region, vil du blive logget af.
-  </notification>
-
-  <notification
-   
-   name="RegionRestartSeconds"
-   
-   
-   >
-Regionen genstarter om [SECONDS] sekunder.
-Hvis du bliver i denne region, vil du blive logget af.
-  </notification>
-
-  <notification
-   
-   name="LoadWebPage"
-   >
-Indlæs internetside [URL]?
-
-[MESSAGE]
-
-Fra genstand: [OBJECTNAME], ejer: [NAME]?
-    <form name="form">
-      <button
-       
-       name="Gotopage"
-       text="GÃ¥ til side"/>
-      <button
-       
-       name="Cancel"
-       text="Afbryd"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="FailedToFindWearableUnnamed"
-   >
-Det lykkedes ikke at finde [TYPE] i databasen.
-  </notification>
-
-  <notification
-   
-   name="FailedToFindWearable"
-   >
-Det lykkedes ikke at finde [TYPE] med navnet [DESC] i databasen.
-  </notification>
-
-  <notification
-   
-   name="ScriptQuestion"
-   >
-&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[NAME]&apos;, vil gerne:
- [QUESTIONS]
-Er det iorden?
-    <form name="form">
-      <button
-       
-       name="Yes"
-       text="Ja"/>
-      <button
-       
-       name="No"
-       text="Nej"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="ScriptQuestionCaution"
-   >
-&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[NAME]&apos;, vil gerne:
-
-[QUESTIONS]
-Hvis du ikke har tillid til denne genstand og dens skaber, bør du afvise denne forespørgsel. For yderligere information klik på Detaljer-knappen.
+[QUESTIONS]
+Hvis du ikke har tillid til denne genstand og dens skaber, bør du afvise denne forespørgsel. For yderligere information klik på Detaljer-knappen.
 
 Imødekom denne forespørgsel?
-    <form name="form">
-      <button
-       
-       name="Grant"
-       text="Imødekom"/>
-      <button
-       
-       name="Deny"
-       text="Afvis"/>
-      <button
-       
-       name="Details"
-       text="Detaljer..."/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="ScriptDialog"
-   >
-[FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
+		<form name="form">
+			<button name="Grant" text="Imødekom"/>
+			<button name="Deny" text="Afvis"/>
+			<button name="Details" text="Detaljer..."/>
+		</form>
+	</notification>
+	<notification name="ScriptDialog">
+		[FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
-    <form name="form">
-      <button
-       
-       name="Ignore"
-       text="Ignorér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="ScriptDialogGroup"
-   >
-[GROUPNAME]&apos;s &apos;[TITLE]&apos;
+		<form name="form">
+			<button name="Ignore" text="Ignorér"/>
+		</form>
+	</notification>
+	<notification name="ScriptDialogGroup">
+		[GROUPNAME]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
-    <form name="form">
-      <button
-       
-       name="Ignore"
-       text="Ignorér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="FirstBalanceIncrease"
-   >
-Du har lige modtaget L$[AMOUNT].
+		<form name="form">
+			<button name="Ignore" text="Ignorér"/>
+		</form>
+	</notification>
+	<notification name="FirstBalanceIncrease">
+		Du har lige modtaget L$[AMOUNT].
 Genstande og andre brugere kan give dig L$.
 Din saldo er vist i øverste højre hjørne af skærmen.
-  </notification>
-
-  <notification
-   
-   name="FirstBalanceDecrease"
-   >
-Du har lige modtaget L$[AMOUNT].
+	</notification>
+	<notification name="FirstBalanceDecrease">
+		Du har lige modtaget L$[AMOUNT].
 Din saldo er vist i øverste højre hjørne af skærmen.
-  </notification>
-
-  <notification
-   
-   name="FirstSit"
-   >
-Du sidder.
+	</notification>
+	<notification name="FirstSit">
+		Du sidder.
 Brug piletasterne (eller AWSD) for at ændre hvilken vej du ser.
 Klik på &apos;Stå op&apos;-knappen for at rejse dig op.
-  </notification>
-
-  <notification
-   
-   name="FirstMap"
-   >
-Klik og træk for at flytte kortvisningen.
+	</notification>
+	<notification name="FirstMap">
+		Klik og træk for at flytte kortvisningen.
 Dobbelt-klik for at teleportere.
 Brug kontrollerne til højre for at finde ting og se forskellige baggrunde.
-  </notification>
-
-  <notification
-   
-   name="FirstBuild"
-   >
-Du kan bygge nye genstande i nogle områder af [SECOND_LIFE].
+	</notification>
+	<notification name="FirstBuild">
+		Du kan bygge nye genstande i nogle områder af [SECOND_LIFE].
 Brug værktøjet øverst til venstre for at bygge, og prøv at holde Ctrl eller Alt nede for hurtigt at skifte imellem værktøjerne.
 Tryk Esc for at stoppe med at bygge.
-  </notification>
-
-  <notification
-   
-   name="FirstLeftClickNoHit"
-   >
-Venstre-klik interagerer med specielle genstande.
+	</notification>
+	<notification name="FirstLeftClickNoHit">
+		Venstre-klik interagerer med specielle genstande.
 Hvis musemarkøren ændrer sig til en hånd, kan du interagere med genstanden.
 Højre-klik viser altid en menu med ting du kan gøre.
-  </notification>
-
-  <notification
-   
-   name="FirstTeleport"
-   >
-Du har lige teleporteret.
+	</notification>
+	<notification name="FirstTeleport">
+		Du har lige teleporteret.
 Du er ved info-standen nærmest ved din destination.
 Din destination er markeret med en stor rød lyskegle.
-  </notification>
-
-  <notification
-   
-   name="FirstOverrideKeys"
-   >
-Dine bevælgelsestaster bliver nu håndteret af et objekt.
+	</notification>
+	<notification name="FirstOverrideKeys">
+		Dine bevælgelsestaster bliver nu håndteret af et objekt.
 Brug piletasterne eller AWSD for at se, hvad de gør.
 Nogle genstande (som skydevåben) kræver at du går ind i musevisning for at bruge dem.
 Tryk på &apos;M&apos; for at gåre det.
-  </notification>
-
-  <notification
-   
-   name="FirstAppearance"
-   >
-Du tilretter dit udseende.
+	</notification>
+	<notification name="FirstAppearance">
+		Du tilretter dit udseende.
 For at rotere og zoome brug piletasterne.
 Når du er færdig, tryk på &apos;Gem alt&apos; for at gemme dit udseende og lukke.
 Du kan rette dit udseende så tit du vil.
-  </notification>
-
-  <notification
-   
-   name="FirstInventory"
-   >
-Dette er din beholdning, der indeholder objekter, noter, tøj og andre ting du ejer.
+	</notification>
+	<notification name="FirstInventory">
+		Dette er din beholdning, der indeholder objekter, noter, tøj og andre ting du ejer.
 * For at bære et objekt eller en mappe med tøj, træk den over på dig selv.
 * For at få et objekt frem i verdenen, træk den ud på jorden.
 * For at læse en note, dobbeltklik på den.
-  </notification>
-
-  <notification
-   
-   name="FirstSandbox"
-   >
-Dette er sandkasseområdet.
+	</notification>
+	<notification name="FirstSandbox">
+		Dette er sandkasseområdet.
 Genstande, der er skabt her, vil blive slettet efter du har forladt området. Sandkasser renses jævnligt. Se venligst informationen øverst på skærmen, lige ved siden af områdenavnet.
 
 Sandkasseområder er ikke almindelige. De er mærket med skilte.
-  </notification>
-
-  <notification
-   
-   name="FirstFlexible"
-   >
-Denne genstand er fleksibel.
+	</notification>
+	<notification name="FirstFlexible">
+		Denne genstand er fleksibel.
 Fleksible genstande er ikke fysiske og man kan gå igennem dem, indtil fleksibel-punktet ikke er afkrydset.
-  </notification>
-
-  <notification
-   
-   name="FirstDebugMenus"
-   >
-Du har sat avanceret menu til.
+	</notification>
+	<notification name="FirstDebugMenus">
+		Du har sat avanceret menu til.
 Denne menu indeholder funktioner brugbare for udviklere, der udbedrer fejl i Second Life.
-For at vise denne menu, skal man i Windows trykke Ctrl-Alt-D. PÃ¥ Mac tryk Cmd-Opt-Shift-D.
-  </notification>
-
-  <notification
-   
-   name="FirstSculptedPrim"
-   >
-Du retter en sculpted prim.
+For at vise denne menu, skal man i Windows trykke Ctrl-Alt-D. PÃ¥ Mac tryk &#8984;-Opt-Shift-D.
+	</notification>
+	<notification name="FirstSculptedPrim">
+		Du retter en sculpted prim.
 Sculpted prims kræver et specielt tekstur for at specificere deres form.
 Du kan finde eksempler på sculptede teksturer i din beholdning.
-  </notification>
-
-  <notification
-   
-   name="FirstMedia"
-   >
-Du er begyndt at afspille medie.  Medie kan sættes til automatisk af blive afspillet under Indstillinger, Lyd / Video. Vær opmærksom på, at der kan være en sikkerhedsrisiko for medie-steder, du ikke stoler på.
-  </notification>
-
-  <notification
-   
-   name="MaxListSelectMessage"
-   >
-Du må kun vælge op til [MAX_SELECT] genstande på denne liste.
-  </notification>
-
-  <notification
-   
-   name="VoiceInviteP2P"
-   >
-[NAME] inviterer dig til en stemme-chat.
+	</notification>
+	<notification name="FirstMedia">
+		Du er begyndt at afspille medie.  Medie kan sættes til automatisk af blive afspillet under Indstillinger, Lyd / Video. Vær opmærksom på, at der kan være en sikkerhedsrisiko for medie-steder, du ikke stoler på.
+	</notification>
+	<notification name="MaxListSelectMessage">
+		Du må kun vælge op til [MAX_SELECT] genstande på denne liste.
+	</notification>
+	<notification name="VoiceInviteP2P">
+		[NAME] inviterer dig til en stemme-chat.
 Klik for at acceptere at koble dig på samtalen eller Afvis for at afvise invitationen. Klik på Slå fra for at blokere denne opkalder.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="AutoUnmuteByIM"
-   >
-[FIRST] [LAST] har fået en personlig besked (IM) og er automatisk ikke blokeret mere.
-  </notification>
-
-  <notification
-   
-   name="AutoUnmuteByMoney"
-   >
-[FIRST] [LAST] har fået penge og er automatisk ikke blokeret mere.
-  </notification>
-
-  <notification
-   
-   name="AutoUnmuteByInventory"
-   >
-[FIRST] [LAST] har fået tilbudt genstande og er automatisk ikke blokeret mere.
-  </notification>
-
-  <notification
-   
-   name="VoiceInviteGroup"
-   >
-[NAME] har tilsluttet sig stemme-chat med gruppen [GROUP].
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="AutoUnmuteByIM">
+		[FIRST] [LAST] har fået en personlig besked (IM) og er automatisk ikke blokeret mere.
+	</notification>
+	<notification name="AutoUnmuteByMoney">
+		[FIRST] [LAST] har fået penge og er automatisk ikke blokeret mere.
+	</notification>
+	<notification name="AutoUnmuteByInventory">
+		[FIRST] [LAST] har fået tilbudt genstande og er automatisk ikke blokeret mere.
+	</notification>
+	<notification name="VoiceInviteGroup">
+		[NAME] har tilsluttet sig stemme-chat med gruppen [GROUP].
 Klik Acceptér for at slutte dig til samtalen eller Afvis for at afvise invitationen. Klik Slå fra for at blokere denne opkalder.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="VoiceInviteAdHoc"
-   >
-[NAME] har tilsluttet sig stemme-chat med en konference-chat.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="VoiceInviteAdHoc">
+		[NAME] har tilsluttet sig stemme-chat med en konference-chat.
 Klik Acceptér for at slutte dig til samtalen eller Afvis for at afvise invitationen. Klik Slå fra for at blokere denne opkalder.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Mute"
-       text="Blokér"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="InviteAdHoc"
-   >
-[NAME] inviterer dig til en konference-chat.
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
+	<notification name="InviteAdHoc">
+		[NAME] inviterer dig til en konference-chat.
 Klik Acceptér for at slutte dig til samtalen eller Afvis for at afvise invitationen. Klik Slå fra for at blokere denne opkalder.
-    <form name="form">
-      <button
-       
-       name="Accept"
-       text="Acceptér"/>
-      <button
-       
-       name="Decline"
-       text="Afvis"/>
-      <button
-       
-       name="Mute"
-       text="Blokeret"/>
-    </form>
-  </notification>
-
-  <notification
-   
-   name="VoiceChannelFull"
-   >
-Den stemme-chat, du prøver at tilslutte dig, [VOICE_CHANNEL_NAME], har nået maksiumum kapacitet. Prøv venligst igen senere.
-  </notification>
-
-  <notification
-   
-   name="ProximalVoiceChannelFull"
-   >
-Vi beklager.  Dette område har nået sin maksimale kapacitet for stemme-chat.  Prøv venligst at benytte stemme i et andet område.
-  </notification>
-
-  <notification
-   
-   name="VoiceChannelDisconnected"
-   >
-Du er blevet koblet af [VOICE_CHANNEL_NAME].  Du vil nu blive koblet op på en lokal stemme-chat.
-  </notification>
-
-  <notification
-   
-   name="VoiceChannelDisconnectedP2P"
-   >
-[VOICE_CHANNEL_NAME] har afsluttet opkaldet.  Du vil nu blive koblet op på en lokal stemme-chat.
-  </notification>
-
-  <notification
-   
-   name="P2PCallDeclined"
-   >
-[VOICE_CHANNEL_NAME] har afvist dit opkald.  Du vil nu blive koblet op på en lokal stemme-chat.
-  </notification>
-
-  <notification
-   
-   name="P2PCallNoAnswer"
-   >
-[VOICE_CHANNEL_NAME] har ikke mulighed for at besvare dit opkald.  Du vil nu blive koblet op på en lokal chat.
-  </notification>
-
-  <notification
-   
-   name="VoiceChannelJoinFailed"
-   >
-Det lykkedes ikke at koble op til [VOICE_CHANNEL_NAME]. Prøv venligst igen senere.
-  </notification>
-
-  <notification
-   
-   name="VoiceLoginRetry"
-   >
-Vi laver en stemmekanal til dig. Det kan tage op til et minut.
-  </notification>
-
-  <notification
-   
-   name="Cannot enter parcel: not a group member"
-   >
-Du kan ikke komme ind på området. Du er ikke medlem af den nødvendige gruppe.
-  </notification>
-
-  <notification
-   
-   name="Cannot enter parcel: banned"
-   >
-Du kan ikke komme ind på området. Du er blevet udelukket.
-  </notification>
-
-  <notification
-   
-   name="Cannot enter parcel: not on access list"
-   >
-Du kan ikke komme ind på området. Du er ikke på adgangslisten.
-  </notification>
-
-  <notification
-   
-   name="VoiceNotAllowed"
-   >
-Du har ikke tilladelse til at tilslutte dig stemme-chat på [VOICE_CHANNEL_NAME].
-  </notification>
-
-  <notification
-   
-   name="VoiceCallGenericError"
-   >
-En fejl er opstået under forsøget på at koble sig på stemme chatten [VOICE_CHANNEL_NAME].  Pråv venligst senere.
-  </notification>
-
-  <notification
-   
-   name="ServerVersionChanged"
-   >
-Det område, du er kommet ind på, kører en anden simulatorversion. Klik på denne besked for detaljer.
-  </notification>
-
-  <notification
-   
-   name="UnableToOpenCommandURL"
-   >
-Www-adressen, du har klikket på, kan ikke åbnes fra denne internetbrowser.
-  </notification>
+		<form name="form">
+			<button name="Accept" text="Acceptér"/>
+			<button name="Decline" text="Afvis"/>
+			<button name="Mute" text="Blokeret"/>
+		</form>
+	</notification>
+	<notification name="VoiceChannelFull">
+		Den stemme-chat, du prøver at tilslutte dig, [VOICE_CHANNEL_NAME], har nået maksiumum kapacitet. Prøv venligst igen senere.
+	</notification>
+	<notification name="ProximalVoiceChannelFull">
+		Vi beklager.  Dette område har nået sin maksimale kapacitet for stemme-chat.  Prøv venligst at benytte stemme i et andet område.
+	</notification>
+	<notification name="VoiceChannelDisconnected">
+		Du er blevet koblet af [VOICE_CHANNEL_NAME].  Du vil nu blive koblet op på en lokal stemme-chat.
+	</notification>
+	<notification name="VoiceChannelDisconnectedP2P">
+		[VOICE_CHANNEL_NAME] har afsluttet opkaldet.  Du vil nu blive koblet op på en lokal stemme-chat.
+	</notification>
+	<notification name="P2PCallDeclined">
+		[VOICE_CHANNEL_NAME] har afvist dit opkald.  Du vil nu blive koblet op på en lokal stemme-chat.
+	</notification>
+	<notification name="P2PCallNoAnswer">
+		[VOICE_CHANNEL_NAME] har ikke mulighed for at besvare dit opkald.  Du vil nu blive koblet op på en lokal chat.
+	</notification>
+	<notification name="VoiceChannelJoinFailed">
+		Det lykkedes ikke at koble op til [VOICE_CHANNEL_NAME]. Prøv venligst igen senere.
+	</notification>
+	<notification name="VoiceLoginRetry">
+		Vi laver en stemmekanal til dig. Det kan tage op til et minut.
+	</notification>
+	<notification name="Cannot enter parcel: not a group member">
+		Du kan ikke komme ind på området. Du er ikke medlem af den nødvendige gruppe.
+	</notification>
+	<notification name="Cannot enter parcel: banned">
+		Du kan ikke komme ind på området. Du er blevet udelukket.
+	</notification>
+	<notification name="Cannot enter parcel: not on access list">
+		Du kan ikke komme ind på området. Du er ikke på adgangslisten.
+	</notification>
+	<notification name="VoiceNotAllowed">
+		Du har ikke tilladelse til at tilslutte dig stemme-chat på [VOICE_CHANNEL_NAME].
+	</notification>
+	<notification name="VoiceCallGenericError">
+		En fejl er opstået under forsøget på at koble sig på stemme chatten [VOICE_CHANNEL_NAME].  Pråv venligst senere.
+	</notification>
+	<notification name="ServerVersionChanged">
+		Det område, du er kommet ind på, kører en anden simulatorversion. Klik på denne besked for detaljer.
+	</notification>
+	<notification name="UnableToOpenCommandURL">
+		Www-adressen, du har klikket på, kan ikke åbnes fra denne internetbrowser.
+	</notification>
 </notifications>
-
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 6c103f7e37..06a432bd3b 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -6,6 +6,9 @@
 	<global name="alwayschoose">
 		Diese Option immer auswählen
 	</global>
+	<global name="implicitclosebutton">
+		Schließen
+	</global>
   <template name="okbutton">
     <form>
       <button
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index d2a0193763..bf8988ca45 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -4,7 +4,8 @@
  layout="topleft"
  name="floater_aaa"
  save_rect="true"
- title="About [SECOND_LIFE_VIEWER]"
+ can_resize="true" 
+ title="About [APP_NAME]"
  width="470">
     <text_editor
      follows="left|top|right|bottom"
@@ -16,9 +17,6 @@
      top="25"
      width="458"
      word_wrap="true">
-  This is line 1a
-
-
-  This is line 4
+This is line 4
     </text_editor>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index ece0cf737f..6eb55fa57f 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -4,7 +4,7 @@
  layout="topleft"
  name="floater_about"
  save_rect="true"
- title="About [SECOND_LIFE_VIEWER]"
+ title="About [APP_NAME]"
  width="470">
     <floater.string
      name="you_are_at">
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index cb3388ccbc..9165e8db98 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -627,6 +627,7 @@ Go to World menu &gt; About Land or select another parcel to show its details.
              length="1"
              enabled="false"
              follows="left|top|right|bottom"
+             handle_edit_keys_directly="true" 
              height="115"
              layout="topleft"
              left_delta="0"
@@ -1993,7 +1994,7 @@ Options:
              layout="topleft"
              left_delta="0"
              name="limit_age_verified"
-             tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
+             tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
              top_pad="4"
              width="278" />
             <check_box
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index 777236504d..5e0e423128 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -341,6 +341,7 @@ supports [AMOUNT2] objects
      length="1"
      enabled="false"
      follows="top|right"
+     handle_edit_keys_directly="false" 
      height="237"
      layout="topleft"
      left="444"
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 5c4649276a..2e7f5e6c42 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -8,6 +8,10 @@
  name="incoming call"
  title="Unknown Person is calling"
  width="240">
+     <floater.string
+     name="anonymous">
+        anonymous
+    </floater.string>
     <floater.string
      name="VoiceInviteP2P">
         is calling.
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index 0a97a96ee3..60677ca0df 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -52,8 +52,8 @@
     <button
      height="20"
      font="SansSerifSmall"
-     label="Show on Map"
-     label_selected="Show on Map"
+     label="Map"
+     label_selected="Map"
      layout="topleft"
      left_pad="4"
      name="Show on Map"
diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/floater_postcard.xml
index 91c2a41891..8657663057 100644
--- a/indra/newview/skins/default/xui/en/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/en/floater_postcard.xml
@@ -12,7 +12,7 @@
  width="450">
     <floater.string
      name="default_subject">
-        Postcard from Second Life.
+        Postcard from [SECOND_LIFE].
     </floater.string>
     <floater.string
      name="default_message">
@@ -121,6 +121,7 @@
      left_delta="0"
      max_length="700"
      name="msg_form"
+     word_wrap="true" 
      top_pad="10"
      width="420">
         Type your message here.
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 2906b73af8..bacec627e1 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -53,6 +53,7 @@
          layout="topleft"
          name="general" />
         <panel
+		 class="panel_preference"
          filename="panel_preferences_graphics1.xml"
          label="Graphics"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index a463b2274d..2fd561f991 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  auto_tile="true"
- height="400"
+ height="600"
  layout="topleft"
  name="gesture_preview"
  width="280">
@@ -48,7 +48,7 @@
      name="desc_label"
      top="25"
      width="100">
-        Description:
+        Name (not working yet):
     </text>
     <line_editor
      follows="left|top"
@@ -66,21 +66,21 @@
      height="10"
      layout="topleft"
      left="10"
-     name="trigger_label"
-     top="54"
+     name="desc_label"
+     top_pad="10"
      width="100">
-        Trigger:
+        Description:
     </text>
     <line_editor
      follows="left|top"
-     height="20"
+     height="40"
      layout="topleft"
      left_delta="84"
-     max_length="31"
-     name="trigger_editor"
+     name="desc"
      top_delta="-4"
-     width="100" />
-    <text
+     width="180" />
+    <!--ACCORDION GOES HERE -->
+      <text
      type="string"
      length="1"
      follows="top|left"
@@ -88,22 +88,20 @@
      height="10"
      layout="topleft"
      left="10"
-     name="replace_text"
-     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!"
-     top="79"
-     width="200">
-        Replace with:
+     name="trigger_label"
+     top_pad="10"
+     width="100">
+        Chat:
     </text>
     <line_editor
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="84"
+     left_pad="5"
      max_length="31"
-     name="replace_editor"
-     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
+     name="trigger_editor"
      top_delta="-4"
-     width="130" />
+     width="135" />
     <text
      type="string"
      length="1"
@@ -113,15 +111,15 @@
      layout="topleft"
      left="10"
      name="key_label"
-     top="104"
+     top_pad="10"
      width="100">
-        Shortcut Key:
+        Keyboard:
     </text>
     <combo_box
      height="20"
      label="None"
      layout="topleft"
-     left_delta="84"
+     left_pad="5"
      name="modifier_combo"
      top_delta="-4"
      width="50" />
@@ -129,7 +127,7 @@
      height="20"
      label="None"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="key_combo"
      top_delta="0"
      width="45" />
@@ -141,32 +139,52 @@
      height="10"
      layout="topleft"
      left="10"
-     name="library_label"
-     top="135"
+     name="replace_text"
+     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!"
+     top_pad="10"
      width="100">
-        Library:
+        Replace:
     </text>
-    <text
-     type="string"
-     length="1"
+    <line_editor
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     max_length="31"
+     name="replace_editor"
+     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
+     top_delta="-4"
+     width="135" />
+
+    <!--ACCORDION GOES HERE -->
+    <scroll_list
+     follows="top|left"
+     height="110"
+     layout="topleft"
+     left="10"
+     name="step_list"
+     top_pad="10"
+     width="260" />
+    <button
      follows="top|left"
+     height="20"
      font="SansSerifSmall"
-     height="10"
+     label="Add"
      layout="topleft"
-     left_pad="75"
-     name="steps_label"
-     top_delta="0"
-     width="100">
-        Steps:
-    </text>
+     left_pad="-100"
+     name="add_btn"
+     top_pad="5"
+     width="100" />
+    
+    
     <scroll_list
      follows="top|left"
      height="110"
      layout="topleft"
      left="10"
      name="library_list"
-     top="150"
-     width="80">
+     top_pad="10"
+     width="260">
         <scroll_list.rows
          value="Animation" />
         <scroll_list.rows
@@ -176,54 +194,39 @@
         <scroll_list.rows
          value="Wait" />
     </scroll_list>
+
+    
+    
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
-     label="Add &gt;&gt;"
-     layout="topleft"
-     left_pad="14"
-     name="add_btn"
-     top_delta="0"
-     width="70" />
-    <button
-     follows="top|left"
-     height="20"
-     font="SansSerifSmall"
-     label="Up"
+     label="Preview"
      layout="topleft"
-     left_delta="0"
-     name="up_btn"
-     top_pad="10"
-     width="70" />
+     left="20"
+     name="preview_btn"
+     top_pad="50"
+     width="80" />
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
-     label="Down"
+     label="Save"
      layout="topleft"
-     left_delta="0"
-     name="down_btn"
-     top_pad="10"
-     width="70" />
+     left_pad="5"
+     name="save_btn"
+     top_delta="0"
+     width="80" />
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
-     label="Remove"
-     layout="topleft"
-     left_delta="0"
-     name="delete_btn"
-     top_pad="10"
-     width="70" />
-    <scroll_list
-     follows="top|left"
-     height="110"
+     label="Cancel (not working)"
      layout="topleft"
-     left="185"
-     name="step_list"
-     top="150"
-     width="85" />
+     left_pad="5"
+     name="save_btn"
+     top_delta="0"
+     width="80" />   
+
+
+
     <text
      type="string"
      length="1"
@@ -233,7 +236,7 @@
      layout="topleft"
      left="10"
      name="help_label"
-     top="270"
+     top_pad="10"
      width="200">
         All steps happen simultaneously, 
 unless you add wait steps.
@@ -244,7 +247,7 @@ unless you add wait steps.
      layout="topleft"
      left="10"
      name="options_text"
-     top="300"
+     top_pad="10"
      width="205" />
     <combo_box
      follows="top|left"
@@ -252,7 +255,7 @@ unless you add wait steps.
      layout="topleft"
      left_delta="10"
      name="animation_list"
-     top="320"
+     top_pad="10"
      width="100" />
     <combo_box
      follows="top|left"
@@ -278,7 +281,7 @@ unless you add wait steps.
      layout="topleft"
      left_pad="8"
      name="animation_trigger_type"
-     top_delta="0"
+     top="445"
      width="80">
         <radio_item
          height="16"
@@ -304,7 +307,7 @@ unless you add wait steps.
      layout="topleft"
      left="16"
      name="wait_anim_check"
-     top="315"
+     top="430"
      width="100" />
     <check_box
      follows="top|left"
@@ -324,6 +327,73 @@ unless you add wait steps.
      name="wait_time_editor"
      top_delta="0"
      width="50" />
+
+
+    
+    <!--accordion
+      layout="topleft"
+      left="2"
+      width="280"
+      top_pad="10"
+      height="600"
+      follows="all"
+      name="preview_gesture_shortcuts">
+     <accordion_tab
+      min_height="515"
+      title="Shortcuts"
+      name="preview_gesture_shortcuts">
+     <panel
+      class="preview_gesture_shortcuts"
+      filename="floater_preview_gesture_shortcuts"
+      name="preview_gesture_shortcuts" />
+     </accordion_tab>
+     <accordion_tab
+      min_height="380"
+      title="Group Roles"
+      name="group_roles_tab"
+      can_resize="false">
+     <panel
+      class="panel_group_roles"
+      filename="panel_group_roles.xml"
+      name="group_roles_tab_panel"/>
+     </accordion_tab>
+     <accordion_tab
+      min_height="530"
+      title="Group Notices"
+      name="group_notices_tab"
+      can_resize="false">
+     <panel
+      class="panel_group_notices"
+      filename="panel_group_notices.xml"
+      name="group_notices_tab_panel"/>
+     </accordion_tab>
+     <accordion_tab
+      min_height="270"
+      title="Group Land Money"
+      name="group_land_tab"
+      can_resize="false">
+     <panel
+      class="panel_group_land_money"
+      filename="panel_group_land_money.xml"
+      name="group_land_tab_panel"/>
+     </accordion_tab>
+     </accordion-->
+
+    
+    
+    <!--text
+     type="string"
+     length="1"
+     follows="top|left"
+     font="SansSerifSmall"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="library_label"
+     top_pad="10"
+     width="100">
+        Library:
+    </text>
     <check_box
      follows="top|left"
      height="20"
@@ -333,23 +403,5 @@ unless you add wait steps.
      name="active_check"
      tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys.  Gestures usually become inactive when there is a key binding conflict."
      top="365"
-     width="100" />
-    <button
-     follows="top|left"
-     height="20"
-     label="Preview"
-     layout="topleft"
-     left_delta="75"
-     name="preview_btn"
-     top_delta="2"
-     width="80" />
-    <button
-     follows="top|left"
-     height="20"
-     label="Save"
-     layout="topleft"
-     left_pad="10"
-     name="save_btn"
-     top_delta="0"
-     width="80" />
+     width="100" /-->
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index f8f1abd179..4595c9eeda 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -74,6 +74,7 @@
      left="4"
      max_length="65536"
      name="Notecard Editor"
+     handle_edit_keys_directly="true" 
      tab_group="1"
      top="46"
      width="392"
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 6585667c8b..54facbb659 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -49,7 +49,7 @@
      name="tos_heading"
      top_delta="-399"
      width="552">
-        Please read the following Terms of Service carefully. To continue logging in to Second Life,
+        Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE],
 you must accept the agreement.
     </text>
     <text_editor
@@ -64,6 +64,7 @@ you must accept the agreement.
      name="tos_text"
      top_pad="43"
      width="568"
+     handle_edit_keys_directly="true" 
      word_wrap="true">
         TOS_TEXT
     </text_editor>
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 6a022e8966..e46588dd71 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -359,8 +359,6 @@
          label="Landmarks"
          name="item1"
          value="None" />
-		 <combo_box.commit_callback
-		function="WMap.Landmark" />
     </combo_box>
     <icon
      color="0.5 0 0 1"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 4e3c0d0c40..642087baff 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -43,7 +43,7 @@
      layout="topleft"
      name="Help">
         <menu_item_call
-         label="Second Life Help"
+         label="[SECOND_LIFE] Help"
          layout="topleft"
          name="Second Life Help"
          shortcut="F1">
@@ -52,7 +52,7 @@
              parameter="help f1" />
         </menu_item_call>
         <menu_item_call
-         label="About Second Life"
+         label="About [APP_NAME]"
          layout="topleft"
          name="About Second Life">
             <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml
index 146d7d06fe..7e07a97016 100644
--- a/indra/newview/skins/default/xui/en/menu_picks.xml
+++ b/indra/newview/skins/default/xui/en/menu_picks.xml
@@ -25,7 +25,7 @@
          function="Pick.Teleport" />
     </menu_item_call>
     <menu_item_call
-     label="Show on Map"
+     label="Map"
      layout="topleft"
      name="pick_map">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_slurl.xml b/indra/newview/skins/default/xui/en/menu_slurl.xml
index d5d9d3c43d..ee37d49946 100644
--- a/indra/newview/skins/default/xui/en/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/en/menu_slurl.xml
@@ -27,7 +27,7 @@
          parameter="about" />
     </menu_item_call>
     <menu_item_call
-     label="Show on Map"
+     label="Map"
      layout="topleft"
      name="show_on_map">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3d2558ce5a..5e894e1773 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -138,7 +138,7 @@
         <menu_item_separator
          layout="topleft" />
         <menu_item_call
-         label="Quit Second Life"
+         label="Quit [APP_NAME]"
          layout="topleft"
          name="Quit"
          shortcut="control|Q">
@@ -449,7 +449,7 @@
      name="Help"
      tear_off="true">
         <menu_item_call
-         label="Second Life Help"
+         label="[SECOND_LIFE] Help"
          layout="topleft"
          name="Second Life Help"
          shortcut="F1">
@@ -496,7 +496,7 @@
         <menu_item_separator
              layout="topleft" />
         <menu_item_call
-         label="About Second Life"
+         label="About [APP_NAME]"
          layout="topleft"
          name="About Second Life">
             <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3083a7f689..8b0741524d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -102,7 +102,7 @@
    name="MissingAlert"
    label="Unknown Alert Message"
    type="alertmodal">
-Your version of Second Life does not know how to display the alert it just received.  Please verify that you have the latest Viewer installed.
+Your version of [APP_NAME] does not know how to display the alert it just received.  Please verify that you have the latest Viewer installed.
 
 Error details: The alert called &apos;[_NAME]&apos; was not found in notifications.xml.
     <usetemplate
@@ -154,7 +154,7 @@ No tutorial is currently available.
    icon="alertmodal.tga"
    name="BadInstallation"
    type="alertmodal">
- An error occurred while updating Second Life.  Please download the latest version of the Viewer. http://get.secondlife.com
+ An error occurred while updating [APP_NAME].  Please download the latest version of the Viewer. http://get.secondlife.com
     <usetemplate
      name="okbutton"
      yestext="Ok"/>
@@ -164,7 +164,7 @@ No tutorial is currently available.
    icon="alertmodal.tga"
    name="LoginFailedNoNetwork"
    type="alertmodal">
-Could not connect to the Second Life Grid.
+Could not connect to the [SECOND_LIFE_GRID].
 &apos;[DIAGNOSTIC]&apos;
 Make sure your Internet connection is working properly.
 	<usetemplate
@@ -331,7 +331,7 @@ Members cannot be removed from that role.
 The members must resign from the role themselves.
 Are you sure you want to continue?
     <usetemplate
-     ignoretext="When adding group members to the owner role"
+     ignoretext="Confirm before I add a new group Owner"
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
@@ -429,7 +429,7 @@ Selecting &quot;Show in Search&quot; will show:
    type="alertmodal">
 You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website.
 
-Go to the Second Life web site for more information on partnering?
+Go to the [SECOND_LIFE] web site for more information on partnering?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -519,7 +519,7 @@ Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NA
    icon="alertmodal.tga"
    name="ConfirmLandSaleToAnyoneChange"
    type="alertmodal">
-ATTENTION: Clicking &apos;sell to anyone&apos; makes your land available to the entire Second Life community, even those not in this region.
+ATTENTION: Clicking &apos;sell to anyone&apos; makes your land available to the entire [SECOND_LIFE] community, even those not in this region.
 
 The selected [LAND_SIZE] m² land is being set for sale.
 Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
@@ -765,7 +765,7 @@ Fill out your ad, then click &apos;Publish...&apos; to add it to the directory.
 You&apos;ll be asked for a price to pay when clicking Publish.
 Paying more makes your ad appear higher in the list, and also appear higher when people search for keywords.
     <usetemplate
-     ignoretext="When adding a new Classified"
+     ignoretext="How to create a new Classified ad"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -861,14 +861,14 @@ Would you like to disable all popups which can be skipped?
    icon="alertmodal.tga"
    name="CacheWillClear"
    type="alertmodal">
-Cache will be cleared after you restart [SECOND_LIFE].
+Cache will be cleared after you restart [APP_NAME].
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="CacheWillBeMoved"
    type="alertmodal">
-Cache will be moved after you restart [SECOND_LIFE].
+Cache will be moved after you restart [APP_NAME].
 Note: This will clear the cache.
   </notification>
 
@@ -876,14 +876,14 @@ Note: This will clear the cache.
    icon="alertmodal.tga"
    name="ChangeConnectionPort"
    type="alertmodal">
-Port settings take effect after you restart [SECOND_LIFE].
+Port settings take effect after you restart [APP_NAME].
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="ChangeSkin"
    type="alertmodal">
-The new skin will appear after you restart [SECOND_LIFE].
+The new skin will appear after you restart [APP_NAME].
   </notification>
 
   <notification
@@ -1020,7 +1020,7 @@ Unable to write file [[FILE]]
    icon="alertmodal.tga"
    name="UnsupportedHardware"
    type="alertmodal">
-Warning: Your system does not meet Second Life&apos;s minimum system requirements. If you continue using Second Life, you may experience poor performance. Unfortunately, we cannot provide technical support for unsupported system configurations.
+Warning: Your system does not meet [APP_NAME]&apos;s minimum system requirements. If you continue using [APP_NAME], you may experience poor performance. Unfortunately, the [SUPPORT_SITE] cannot provide technical support for unsupported system configurations.
 
 MINSPECS
 Do you wish to visit [_URL] for more information?
@@ -1029,7 +1029,7 @@ Do you wish to visit [_URL] for more information?
 			http://www.secondlife.com/corporate/sysreqs.php
     </url>
     <usetemplate
-     ignoretext="When detecting unsupported hardware"
+     ignoretext="My computer hardware is not supported"
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
@@ -1039,12 +1039,12 @@ Do you wish to visit [_URL] for more information?
    icon="alertmodal.tga"
    name="UnknownGPU"
    type="alertmodal">
-Your system contains a graphics card that is unknown to us at this time.
-This is often the case with new hardware we haven&apos;t had a chance to test.  Second Life will most likely run properly, but you may need to adjust your graphics settings to something more appropriate.
+Your system contains a graphics card that is unknown to [APP_NAME] at this time.
+This is often the case with new hardware that hasn&apos;t been tested yet with [APP_NAME].  [APP_NAME] will most likely run properly, but you may need to adjust your graphics settings to something more appropriate.
 (Edit menu &gt; Preferences &gt; Graphics).
     <form name="form">
       <ignore name="ignore"
-       text="When detecting an unknown graphics card"/>
+       text="My graphics card could not be identified"/>
     </form>
   </notification>
 
@@ -1052,9 +1052,8 @@ This is often the case with new hardware we haven&apos;t had a chance to test.
    icon="alertmodal.tga"
    name="DisplaySettingsNoShaders"
    type="alertmodal">
-[SECOND_LIFE] crashed while initializing graphics drivers.
-Graphics Quality will be set to low to avoid some common driver errors.
-This will disable some graphics features.
+[APP_NAME] crashed while initializing graphics drivers.
+Graphics Quality will be set to Low to avoid some common driver errors. This will disable some graphics features.
 We recommend updating your graphics card drivers.
 Graphics Quality can be raised in Preferences &gt; Graphics.
   </notification>
@@ -1388,7 +1387,7 @@ Unable to create output file: [FILE]
    icon="alertmodal.tga"
    name="DoNotSupportBulkAnimationUpload"
    type="alertmodal">
-We do not currently support bulk upload of animation files.
+[APP_NAME] does not currently support bulk upload of animation files.
   </notification>
 
   <notification
@@ -1507,15 +1506,15 @@ Could not teleport.
    icon="alertmodal.tga"
    name="invalid_tport"
    type="alertmodal">
-Problem encountered processing your teleport request. You may need to log back in before you can teleport. If you continue to get this message, please check the Tech Support FAQ at:
-www.secondlife.com/support
+Problem encountered processing your teleport request. You may need to log back in before you can teleport.
+If you continue to get this message, please check the [SUPPORT_SITE].
   </notification>
   <notification
    icon="alertmodal.tga"
    name="invalid_region_handoff"
    type="alertmodal">
-Problem encountered processing your region crossing. You may need to log back in before you can cross regions. If you continue to get this message, please check the Tech Support FAQ at:
-www.secondlife.com/support
+Problem encountered processing your region crossing. You may need to log back in before you can cross regions.
+If you continue to get this message, please check the [SUPPORT_SITE].
   </notification>
   <notification
    icon="alertmodal.tga"
@@ -1656,7 +1655,7 @@ Cannot find the region this land is in.
    icon="alertmodal.tga"
    name="CannotCloseFloaterBuyLand"
    type="alertmodal">
-You cannot close the Buy Land window until Second Life estimates the price of this transaction.
+You cannot close the Buy Land window until [APP_NAME] estimates the price of this transaction.
   </notification>
 
   <notification
@@ -1974,7 +1973,7 @@ and provide details about your network setup.
    type="alertmodal">
 You have been logged out of [SECOND_LIFE]:
             [MESSAGE]
-You can still look at existing IM and chat by clicking &apos;View IM &amp; Chat&apos;. Otherwise, click &apos;Quit&apos; to exit [SECOND_LIFE] immediately.
+You can still look at existing IM and chat by clicking &apos;View IM &amp; Chat&apos;. Otherwise, click &apos;Quit&apos; to exit [APP_NAME] immediately.
     <usetemplate
      name="okcancelbuttons"
      notext="Quit"
@@ -2332,10 +2331,10 @@ You may want to set a new home location.
    name="ClothingLoading"
    type="alertmodal">
 Your clothing is still downloading.
-You can use [SECOND_LIFE] normally and other users will see you correctly.
+You can use [SECOND_LIFE] normally and other people will see you correctly.
     <form name="form">
       <ignore name="ignore"
-       text="When clothing is taking a long time to download"/>
+       text="Clothing is taking a long time to download"/>
     </form>
   </notification>
 
@@ -2344,7 +2343,7 @@ You can use [SECOND_LIFE] normally and other users will see you correctly.
    name="FirstRun"
    type="alertmodal">
 
-[SECOND_LIFE] installation is complete.
+[APP_NAME] installation is complete.
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
 Return to www.secondlife.com to create a new account?
@@ -2358,9 +2357,9 @@ Return to www.secondlife.com to create a new account?
    icon="alertmodal.tga"
    name="LoginPacketNeverReceived"
    type="alertmodal">
-We&apos;re having trouble connecting. There may be a problem with your internet connection or the Second Life servers.
+We&apos;re having trouble connecting. There may be a problem with your Internet connection or the [SECOND_LIFE_GRID].
 
-You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home.
+You can either check your Internet connection and try again in a few minutes, click Help to view the [SUPPORT_SITE], or click Teleport to attempt to teleport home.
     <url option="1" name="url">
 
 			http://secondlife.com/support/
@@ -2591,9 +2590,9 @@ Finished download of raw terrain file to:
    icon="alertmodal.tga"
    name="DownloadWindowsMandatory"
    type="alertmodal">
-A new version of [SECOND_LIFE] is available.
+A new version of [APP_NAME] is available.
 [MESSAGE]
-You must download this update to use [SECOND_LIFE].
+You must download this update to use [APP_NAME].
     <usetemplate
      name="okcancelbuttons"
      notext="Quit"
@@ -2604,7 +2603,7 @@ You must download this update to use [SECOND_LIFE].
    icon="alertmodal.tga"
    name="DownloadWindows"
    type="alertmodal">
-An updated version of [SECOND_LIFE] is available.
+An updated version of [APP_NAME] is available.
 [MESSAGE]
 This update is not required, but we suggest you install it to improve performance and stability.
     <usetemplate
@@ -2617,7 +2616,7 @@ This update is not required, but we suggest you install it to improve performanc
    icon="alertmodal.tga"
    name="DownloadWindowsReleaseForDownload"
    type="alertmodal">
-An updated version of [SECOND_LIFE] is available.
+An updated version of [APP_NAME] is available.
 [MESSAGE]
 This update is not required, but we suggest you install it to improve performance and stability.
     <usetemplate
@@ -2669,9 +2668,9 @@ This update is not required, but we suggest you install it to improve performanc
    icon="alertmodal.tga"
    name="DownloadMacMandatory"
    type="alertmodal">
-A new version of [SECOND_LIFE] is available.
+A new version of [APP_NAME] is available.
 [MESSAGE]
-You must download this update to use [SECOND_LIFE].
+You must download this update to use [APP_NAME].
 
 Download to your Applications folder?
     <usetemplate
@@ -2684,7 +2683,7 @@ Download to your Applications folder?
    icon="alertmodal.tga"
    name="DownloadMac"
    type="alertmodal">
-An updated version of [SECOND_LIFE] is available.
+An updated version of [APP_NAME] is available.
 [MESSAGE]
 This update is not required, but we suggest you install it to improve performance and stability.
 
@@ -2699,7 +2698,7 @@ Download to your Applications folder?
    icon="alertmodal.tga"
    name="DownloadMacReleaseForDownload"
    type="alertmodal">
-An updated version of [SECOND_LIFE] is available.
+An updated version of [APP_NAME] is available.
 [MESSAGE]
 This update is not required, but we suggest you install it to improve performance and stability.
 
@@ -2717,7 +2716,7 @@ Download to your Applications folder?
 Deeding this object will cause the group to:
 * Receive L$ paid into the object
     <usetemplate
-     ignoretext="When deeding objects to groups"
+     ignoretext="Confirm before I deed an object to a group"
      name="okcancelignore"
      notext="Cancel"
      yestext="Deed"/>
@@ -2727,9 +2726,9 @@ Deeding this object will cause the group to:
    icon="alertmodal.tga"
    name="WebLaunchExternalTarget"
    type="alertmodal">
-Open your system Web browser to view this content?
+Do you want to open your Web browser to view this content?
     <usetemplate
-     ignoretext="When opening your system browser to view a Web page"
+     ignoretext="Launch my browser to view a web page"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -2739,9 +2738,9 @@ Open your system Web browser to view this content?
    icon="alertmodal.tga"
    name="WebLaunchJoinNow"
    type="alertmodal">
-Go to www.secondlife.com to manage your account?
+Go to secondlife.com to manage your account?
     <usetemplate
-     ignoretext="When launching web browser to manage your account"
+     ignoretext="Launch my browser to manage my account"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -2753,7 +2752,7 @@ Go to www.secondlife.com to manage your account?
    type="alertmodal">
 Visit the [SECOND_LIFE] Wiki and learn how to report bugs correctly.
     <usetemplate
-     ignoretext="When launching web browser to view the Bug Reporting 101 Wiki"
+     ignoretext="Launch my browser to learn how to report a Bug"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -2765,7 +2764,7 @@ Visit the [SECOND_LIFE] Wiki and learn how to report bugs correctly.
    type="alertmodal">
 Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
     <usetemplate
-     ignoretext="When launching web browser to view Security Issues Wiki"
+     ignoretext="Launch my browser to learn how to report a Security Issue"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -2777,7 +2776,7 @@ Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
    type="alertmodal">
 Visit the [SECOND_LIFE] QA Wiki.
     <usetemplate
-     ignoretext="When launching web browser to view the QA Wiki"
+     ignoretext="Launch my browser to view the QA Wiki"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -2789,7 +2788,7 @@ Visit the [SECOND_LIFE] QA Wiki.
    type="alertmodal">
 Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues.
     <usetemplate
-     ignoretext="When launching web browser to view the Public Issue Tracker"
+     ignoretext="Launch my browser to use the Public Issue Tracker"
      name="okcancelignore"
      notext="Cancel"
      yestext="Go to page"/>
@@ -2801,7 +2800,7 @@ Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and othe
    type="alertmodal">
 Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
     <usetemplate
-     ignoretext="When launching web browser to view Public Issue Tracker Wiki"
+     ignoretext="Launch my browser to view instructions for the Public Issue Tracker"
      name="okcancelignore"
      notext="Cancel"
      yestext="Go to page"/>
@@ -2813,7 +2812,7 @@ Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
    type="alertmodal">
 Go to the Official Linden Blog, for the latest news and information.
     <usetemplate
-     ignoretext="When launching web browser to view the blog"
+     ignoretext="Launch my browser to view the blog"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -2823,9 +2822,9 @@ Go to the Official Linden Blog, for the latest news and information.
    icon="alertmodal.tga"
    name="WebLaunchLSLGuide"
    type="alertmodal">
-Go to the Scripting Guide for scripting help?
+Do you want to open the Scripting Guide for help with scripting?
     <usetemplate
-     ignoretext="When launching web browser to view the Scripting Guide"
+     ignoretext="Launch my browser to view the Scripting Guide"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -2835,9 +2834,9 @@ Go to the Scripting Guide for scripting help?
    icon="alertmodal.tga"
    name="WebLaunchLSLWiki"
    type="alertmodal">
-Go to the LSL Portal for scripting help?
+Do you want to visit the LSL Portal for help with scripting?
     <usetemplate
-     ignoretext="When launching web browser to view the LSL Portal"
+     ignoretext="Launch my browser to view the LSL Portal"
      name="okcancelignore"
      notext="Cancel"
      yestext="Go to page"/>
@@ -2851,7 +2850,7 @@ Are you sure you want to return the selected objects to their owners? Transferab
 
 *WARNING* No-transfer deeded objects will be deleted!
     <usetemplate
-     ignoretext="When returning objects to their owners"
+     ignoretext="Confirm before I return objects to their owners"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -2943,10 +2942,10 @@ Cannot offer friendship at this time. Please try again in a moment.
    icon="alert.tga"
    name="BusyModeSet"
    type="alert">
-Busy mode set.
+Busy mode is set.
 Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
     <usetemplate
-     ignoretext="When setting busy mode"
+     ignoretext="I change my status to Busy mode"
      name="okignore"
      yestext="OK"/>
   </notification>
@@ -3096,7 +3095,7 @@ Join me in [REGION]
    type="alertmodal">
 Are you sure you want to teleport?
     <usetemplate
-     ignoretext="When teleporting from a landmark in inventory"
+     ignoretext="Confirm that I want to teleport to a landmark"
      name="okcancelignore"
      notext="Cancel"
      yestext="Teleport"/>
@@ -3108,7 +3107,7 @@ Are you sure you want to teleport?
    type="alertmodal">
 Teleport to [PICK]?
     <usetemplate
-     ignoretext="When teleporting from double-clicking a pick"
+     ignoretext="Confirm that I want to teleport to a location in Picks"
      name="okcancelignore"
      notext="Cancel"
      yestext="Teleport"/>
@@ -3318,7 +3317,7 @@ Go to the Knowledge Base for more information about maturity Ratings?
      name="okcancelignore"
      yestext="Go to Knowledge Base"
 	 notext="Close"
-	 ignoretext="When Region entry is blocked due to maturity Rating"/>
+	 ignoretext="I can&apos;t enter this Region, due to restrictions of the maturity Rating"/>
   </notification>
 
   <notification
@@ -3345,7 +3344,7 @@ You can click &apos;Change Preference&apos; to raise your maturity Rating prefer
        index="1"
        name="Cancel"
        text="Close"/>
-       <ignore name="ignore" text="When Region entry is blocked due to maturity Rating preference"/>
+       <ignore name="ignore" text="My chosen Rating preference prevents me from entering a Region"/>
     </form>
   </notification>
 
@@ -3375,7 +3374,7 @@ Go to the Knowledge Base for more information about maturity Ratings?
      name="okcancelignore"
      yestext="Go to Knowledge Base"
 	 notext="Close"
-	 ignoretext="When claiming land is blocked due to maturity Rating"/>
+	 ignoretext="I can&apos;t claim this Land, due to restrictions of the maturity Rating"/>
   </notification>
 
   <notification
@@ -3396,7 +3395,7 @@ You can click &apos;Change Preference&apos; to raise your maturity Rating prefer
      name="okcancelignore"
      yestext="Change Preference"
 	 notext="Close"
-	 ignoretext="When claiming land is blocked due to maturity Rating preference"/>
+	 ignoretext="My chosen Rating preference prevents me from claiming Land"/>
   </notification>
 
   <notification
@@ -3425,7 +3424,7 @@ Go to the Knowledge Base for more information about maturity Ratings?
      name="okcancelignore"
      yestext="Go to Knowledge Base"
 	 notext="Close"
-	 ignoretext="When a Land purchase is blocked due to maturity Rating"/>
+	 ignoretext="I can&apos;t buy this Land, due to restrictions of the maturity Rating"/>
   </notification>
 
   <notification
@@ -3446,7 +3445,7 @@ You can click &apos;Change Preference&apos; to raise your maturity Rating prefer
      name="okcancelignore"
      yestext="Change Preference"
 	 notext="Close"
-	 ignoretext="When a Land purchase is blocked due to maturity Rating preference"/>
+	 ignoretext="My chosen Rating preference prevents me from buying Land"/>
   </notification>
 
 	<notification
@@ -3969,7 +3968,7 @@ Default: off
    label="Voice Version Mismatch"
    name="VoiceVersionMismatch"
    type="alertmodal">
-This version of Second Life is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update Second Life.
+This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [APP_NAME].
   </notification>
 
   <notification
@@ -4158,7 +4157,7 @@ These items will be moved to your inventory, not copied.
 
 Move the inventory item(s)?
     <usetemplate
-     ignoretext="When moving no-copy inventory from objects"
+     ignoretext="Warn me before I move &apos;no-copy&apos; items from an object"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -4173,7 +4172,7 @@ Because this object is scripted, moving these items to your inventory may cause
 
 Move the inventory item(s)?
     <usetemplate
-     ignoretext="When moving no-copy inventory from scripted objects"
+     ignoretext="Warn me before I move &apos;no-copy&apos; items which might break a scripted object"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -4183,10 +4182,10 @@ Move the inventory item(s)?
    icon="alert.tga"
    name="ClickActionNotPayable"
    type="alert">
-Warning: The Pay Object click action has been set, but it will only work if a script is added with a money() event.
+Warning: The &apos;Pay object&apos; click action has been set, but it will only work if a script is added with a money() event.
     <form name="form">
       <ignore name="ignore"
-       text="When Setting &apos;Pay&apos; on objects without money() events"/>
+       text="I set the action &apos;Pay object&apos; when building an object without a money() script"/>
     </form>
   </notification>
 
@@ -4201,9 +4200,9 @@ There are no items in this object that you are allowed to copy.
    icon="alertmodal.tga"
    name="WebLaunchAccountHistory"
    type="alertmodal">
-Go to the Second Life web site to see your account history?
+Go to secondlife.com to see your account history?
     <usetemplate
-     ignoretext="When loading account history web page"
+     ignoretext="Launch my browser to see my account history"
      name="okcancelignore"
      notext="Cancel"
      yestext="Go to page"/>
@@ -4213,9 +4212,9 @@ Go to the Second Life web site to see your account history?
    icon="alertmodal.tga"
    name="ClickOpenF1Help"
    type="alertmodal">
-View Second Life help?
+Do you want to visit [SECOND_LIFE] help?
     <usetemplate
-     ignoretext="When visiting the Second Life Support Website."
+     ignoretext="Launch my browser to view Help/Support"
      name="okcancelignore"
      notext="Cancel"
      yestext="Go"/>
@@ -4227,7 +4226,7 @@ View Second Life help?
    type="alertmodal">
 Are you sure you want to quit?
     <usetemplate
-     ignoretext="When Quitting Second Life."
+     ignoretext="Confirm before I quit"
      name="okcancelignore"
      notext="Don&apos;t Quit"
      yestext="Quit"/>
@@ -4259,7 +4258,7 @@ As a service to residents and visitors, the owner of the region you are in has e
 The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant.
 (View covenants by going to the World menu and selecting About Land.)
 
-The resolution of this report applies only to this Region; Residents access to other areas of Second Life will not be affected by the outcome of this report. Only Linden Lab can restrict access to the entirety of Second Life.
+The resolution of this report applies only to this Region. Residents&apos; access to other areas of [SECOND_LIFE] will not be affected by the outcome of this report. Only Linden Lab can restrict access to the entirety of [SECOND_LIFE].
   </notification>
 
   <notification
@@ -4352,9 +4351,9 @@ Dear Resident,
 
 You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
 
-(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world.
+(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [SECOND_LIFE] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [SECOND_LIFE] Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the [SECOND_LIFE] world.
 
-(2) The DMCA or Content Removal Process. To request removal of content from Second Life, you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
+(2) The DMCA or Content Removal Process. To request removal of content from [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
 
 If you still wish to continue with the abuse process, please close this window and finish submitting your report.  You may need to select the specific category &apos;CopyBot or Permissions Exploit&apos;.
 
@@ -4381,7 +4380,7 @@ Do you want to replace it with the selected object?
     <form name="form">
       <ignore name="ignore"
        save_option="true"
-       text="When replacing existing attachments"/>
+       text="Replace an existing attachment with the selected item"/>
       <button
        default="true"
        ignore="Replace Automatically"
@@ -4407,7 +4406,7 @@ Would you like to leave Busy Mode before completing this transaction?
     <form name="form">
       <ignore name="ignore"
        save_option="true"
-       text="When paying a person or object in busy mode"/>
+       text="I am about to pay a person or object while I am in Busy mode"/>
       <button
        default="true"
        ignore="Always leave Busy Mode"
@@ -4428,7 +4427,7 @@ Would you like to leave Busy Mode before completing this transaction?
    type="alertmodal">
 Are you sure you want to permanently delete the contents of your Trash?
     <usetemplate
-     ignoretext="When emptying your inventory trash folder"
+     ignoretext="Confirm before I empty the inventory Trash folder"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -4438,7 +4437,7 @@ Are you sure you want to permanently delete the contents of your Trash?
    icon="alertmodal.tga"
    name="ConfirmClearBrowserCache"
    type="alertmodal">
-Are you sure you want to clear your browser cache?
+Delete your travel, web, and search history?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -4473,7 +4472,7 @@ Are you sure you want to clear your list of saved URLs?
    type="alertmodal">
 Are you sure you want to permanently delete the contents of your Lost And Found?
     <usetemplate
-     ignoretext="When emptying your inventory Lost And Found folder"
+     ignoretext="Confirm before I empty the inventory Lost And Found folder"
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
@@ -4486,10 +4485,10 @@ Are you sure you want to permanently delete the contents of your Lost And Found?
 The following SLurl has been copied to your clipboard:
  [SLURL]
 
-Put it in a web page to give others easy access to this location or try it out yourself by pasting it into the address bar of your web browser.
+Link to this from a web page to give others easy access to this location, or try it out yourself by pasting it into the address bar of any web browser.
     <form name="form">
       <ignore name="ignore"
-       text="When copying a SLurl to your clipboard"/>
+       text="SLurl is copied to my clipboard"/>
     </form>
   </notification>
 
@@ -4604,7 +4603,7 @@ Click &quot;Advanced Water&quot; to bring up an editor with more advanced settin
    icon="alertmodal.tga"
    name="HelpDayCycle"
    type="alertmodal">
-The Day Cycle Editor gives you control over the sky during Second Life&apos;s day/night cycle. This is the cycle that is used by the Basic Environment Editor&apos;s Time of Day slider.
+The Day Cycle Editor gives you control over the sky during [SECOND_LIFE]&apos;s day/night cycle. This is the cycle that is used by the Basic Environment Editor&apos;s Time of Day slider.
 
 The Day Cycle Editor works by setting keyframes. These are nodes (represented by the gray blips on the time graph) that have Sky Presets associated with them. As the Time of Day progresses, the WindLight sky &quot;animates&quot; as it interpolates between these keyframes.
 
@@ -4771,7 +4770,7 @@ Controls the speed of the clouds as they move in the Y direction.
    icon="alertmodal.tga"
    name="HelpClassicClouds"
    type="alertmodal">
-Check this box to enable rendering of Second Life&apos;s older classic clouds in addition to WindLight&apos;s clouds.
+Check this box to enable rendering of [SECOND_LIFE]&apos;s older classic clouds in addition to WindLight&apos;s clouds.
   </notification>
 
   <notification
@@ -4983,9 +4982,9 @@ Granting this request gives a script ongoing permission to take Linden dollars (
    icon="alertmodal.tga"
    name="AutoWearNewClothing"
    type="alertmodal">
-Automatically wear the clothing you create?
+Would you like to automatically wear the clothing you are about to create?
     <usetemplate
-     ignoretext="Automatically wear new clothing"
+     ignoretext="Wear the clothing I create while editing My Appearance"
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
@@ -4995,7 +4994,7 @@ Automatically wear the clothing you create?
    icon="alertmodal.tga"
    name="NotAgeVerified"
    type="alertmodal">
-You must be age-verified to visit this area.  Visit the Second Life website and verify your age?
+You must be age-verified to visit this area.  Do you want to go to the [SECOND_LIFE] website and verify your age?
 
 [_URL]
     <url option="0" name="url">
@@ -5003,7 +5002,7 @@ You must be age-verified to visit this area.  Visit the Second Life website and
 	    https://secondlife.com/account/verification.php
     </url>
     <usetemplate
-     ignoretext="Warn about lack of age verification"
+     ignoretext="I have not verified my age"
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
@@ -5013,7 +5012,7 @@ You must be age-verified to visit this area.  Visit the Second Life website and
    icon="alertmodal.tga"
    name="Cannot enter parcel: no payment info on file"
    type="alertmodal">
-You must have payment information on file to visit this area.  Visit the Second Life website and set this up?
+You must have payment information on file to visit this area.  Do you want to go to the [SECOND_LIFE] website and set this up?
 
 [_URL]
     <url option="0" name="url">
@@ -5021,7 +5020,7 @@ You must have payment information on file to visit this area.  Visit the Second
 			https://secondlife.com/account/
     </url>
     <usetemplate
-     ignoretext="Warn about lack of payment info"
+     ignoretext="I lack payment information on file"
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
@@ -5773,7 +5772,7 @@ How odd. The string [STRING_NAME] is missing from strings.xml
    icon="notify.tga"
    name="ObjectGiveItemUnknownUser"
    type="notify">
-    An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].
+    An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a [OBJECTTYPE] named [OBJECTNAME].
     <form name="form">
       <button
        index="0"
@@ -6008,7 +6007,7 @@ How odd. The string [STRING_NAME] is missing from strings.xml
    icon="notify.tga"
    name="InvalidWearable"
    type="notify">
-    The item you are trying to wear uses a feature that your viewer can&apos;t read. Please upgrade your version of Second Life to wear this item.
+    The item you are trying to wear uses a feature that your Viewer can&apos;t read. Please upgrade your version of [APP_NAME] to wear this item.
   </notification>
 
   <notification
@@ -6146,7 +6145,7 @@ How odd. The string [STRING_NAME] is missing from strings.xml
    icon="notify.tga"
    name="FirstTeleport"
    type="notify">
-    You can only teleport to certain areas in this region. The arrow points to your specific destination. Click to dismiss it.
+    You can only teleport to certain areas in this region. The arrow points to your specific destination. Click the arrow to dismiss it.
   </notification>
 
   <notification
@@ -6185,7 +6184,7 @@ When you are done, press &apos;Save All&apos;.
    type="notify">
    This is a sandbox area, and is meant to help Residents learn how to build.
 
-   Things you build here will be deleted after you leave, so don&apos;t forget to right-click and choose &apos;take&apos; to move your creation to your Inventory.
+   Things you build here will be deleted after you leave, so don&apos;t forget to right-click and choose &apos;Take&apos; to move your creation to your Inventory.
   </notification>
 
   <notification
@@ -6214,12 +6213,12 @@ When you are done, press &apos;Save All&apos;.
     You are editing a Sculpted prim. Sculpties require a special texture to define their shape.
   </notification>
 
-  <notification
+  <!--notification
    icon="notify.tga"
    name="FirstMedia"
    type="notify">
     You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
-  </notification>
+  </notification-->
 
   <notification
    icon="notifytip.tga"
@@ -6305,7 +6304,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
    name="VoiceInviteAdHoc"
    type="notify">
 [NAME] has joined a voice chat call with a conference chat.
-Click Accept to join the call or Decline to decline the invitation. Click Block to block this user.
+Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
     <unique>
       <context key="NAME"/>
     </unique>
@@ -6330,7 +6329,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
    name="InviteAdHoc"
    type="notify">
 [NAME] is inviting you to a conference chat.
-Click Accept to join the chat or Decline to decline the invitation. Click Block to block this user.
+Click Accept to join the chat or Decline to decline the invitation. Click Block to block this caller.
     <unique>
       <context key="NAME"/>
     </unique>
@@ -6516,9 +6515,9 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block
   </global>
 
   <global name="UnsupportedGLRequirements">
-You do not appear to have the proper hardware requirements for Second Life. Second Life requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
+You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
 
-If you continue to have problems, please visit: http://www.secondlife.com/support
+If you continue to have problems, please visit the [SUPPORT_SITE].
   </global>
 
   <global name="UnsupportedCPUAmount">
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 4f241664fb..b6d0678cfb 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -65,6 +65,7 @@
          width="70"
          top_delta="-10"
          min_width="70"
+         name="movement_panel"
          user_resize="false">
             <button
              follows="right"
@@ -100,6 +101,7 @@
          layout="topleft"
          min_height="28"
          min_width="150"
+         name="cam_panel"
          top_delta="-10"
          width="150">
             <split_button
@@ -113,6 +115,7 @@
                  image_unselected="camera_presets/camera_presets_arrow.png"
                  image_disabled_selected="camera_presets/camera_presets_arrow.png" 
                  image_disabled="camera_presets/camera_presets_arrow.png"
+                 name="camera_presets"
                  tool_tip="Camera Presets" 
                  />
                 <split_button.item
diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml
index 3acd8fae4b..fde795260e 100644
--- a/indra/newview/skins/default/xui/en/panel_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified.xml
@@ -84,7 +84,7 @@
     <button
      follows="left|top"
      height="20"
-     label="Show on Map"
+     label="Map"
      layout="topleft"
      left_pad="5"
      name="classified_map_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index b0f8052a9c..b336c86e95 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -73,7 +73,7 @@
                text_color="white"
                top="0"
                width="125">
-                  Second Life photo:
+                  [SECOND_LIFE] photo:
               </text>
               <texture_picker
                allow_no_texture="true"
@@ -149,7 +149,7 @@
        text_color="white"
        top_pad="10" 
        width="250">
-          Second Life description:
+          [SECOND_LIFE] description:
       </text>
       <text_editor
        type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 9fa2765e97..a38d7eee36 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -40,41 +40,6 @@ Hover your mouse over the options for more help.
      name="help_button"
      top="8"
      width="20" /> -->
-    <line_editor
-     follows="left|top"
-     font="SansSerifSmall"
-     prevalidate_callback="ascii"
-     halign="left"
-     height="16"
-     label="Type your new group name here"
-     layout="topleft"
-     left="10"
-     max_length="35"
-     name="group_name_editor"
-     top="10"
-     visible="false"
-     width="235" />
-    <name_box
-     follows="left|top"
-     height="16"
-     initial_value="(retrieving)"
-     layout="topleft"
-     left="10"
-     name="founder_name"
-     top="10"
-     width="100" />
-    <text
-     type="string"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_pad="10"
-     name="prepend_founded_by"
-     top_delta="0"
-     width="140">
-        , Founder
-    </text>
-    
     <text_editor
      type="string"
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index e90a57a375..be68187eaf 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -40,6 +40,37 @@
      follows="top|left|right"
      mouse_opaque="true" 
      name="group_name">(Loading...)</text>
+    <texture_picker
+     follows="left|top"
+     height="113"
+     label=""
+     layout="topleft"
+     left_delta="-10"
+     name="insignia"
+     tool_tip="Click to choose a picture"
+     top_pad="5"
+     width="100" />
+    <text
+     type="string"
+     follows="left|top"
+     height="16"
+     length="1"
+     layout="topleft"
+     left_pad="10"
+     name="prepend_founded_by"
+     top_delta="0"
+     width="140">
+      Founded by:
+    </text>
+    <name_box
+     follows="left|top"
+     height="16"
+     initial_value="(retrieving)"
+     layout="topleft"
+     left_delta="0"
+     name="founder_name"
+     top_pad="10"
+     width="140" />
     <button
      top="632"
      height="20"
@@ -69,20 +100,20 @@
      left="5"
      visible="false"
      width="65" />
-      <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="group_accordion">
+      <accordion layout="topleft" left="2" width="296" top="135" height="600" follows="all" name="panel_me_profile">
 		<accordion_tab min_height="515" title="Group General" name="group_general_tab">
         	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>
 		</accordion_tab>
-		<accordion_tab min_height="380" title="Group Roles" name="group_roles_tab" can_resize="false">
+		<accordion_tab min_height="380" title="Group Roles" name="group_roles_tab" expanded="False" can_resize="false">
         	<panel class="panel_group_roles" filename="panel_group_roles.xml" name="group_roles_tab_panel"/>
 		</accordion_tab>
-		<accordion_tab min_height="530" title="Group Notices" name="group_notices_tab" can_resize="false">
+		<accordion_tab min_height="530" title="Group Notices" name="group_notices_tab" expanded="False" can_resize="false">
 			<panel class="panel_group_notices" filename="panel_group_notices.xml" name="group_notices_tab_panel"/>
 		</accordion_tab>
-		<accordion_tab min_height="270" title="Group Land Money" name="group_land_tab" can_resize="false">
+		<accordion_tab min_height="270" title="Group Land Money" name="group_land_tab" expanded="False" can_resize="false">
 			<panel class="panel_group_land_money" filename="panel_group_land_money.xml" name="group_land_tab_panel"/>
 		</accordion_tab>
 	  </accordion>
 
 
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index d24d11039a..4d373fbf3a 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -87,8 +87,8 @@
     <button
      follows="top"
      height="20"
-     label="Show on Map"
-     label_selected="Show on Map"
+     label="Map"
+     label_selected="Map"
      layout="topleft"
      left="150"
      name="map_button"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 33592d289f..b4d2bbb194 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -143,7 +143,7 @@
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
-         label="Show on Map"
+         label="Map"
          layout="topleft"
          left_pad="2"
          name="show_on_map_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 0e87c621b9..060d84b2e4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -10,8 +10,14 @@
  name="advanced"
  top="1"
  width="517">
-
-
+    <panel.string
+     name="resolution_format">
+        [RES_X] x [RES_Y]
+    </panel.string>
+	<panel.string
+     name="aspect_ratio_text">
+        [NUM]:[DEN]
+    </panel.string>
            <check_box
      control_name="UseChatBubbles"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 0c01aec95d..ecfb0048a3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -9,14 +9,6 @@
  name="Display panel"
  top="1"
  width="517">
-    <panel.string
-     name="resolution_format">
-        [RES_X] x [RES_Y]
-    </panel.string>
-    <panel.string
-     name="aspect_ratio_text">
-        [NUM]:[DEN]
-    </panel.string>
     <text
      type="string"
      length="1"
@@ -39,63 +31,63 @@
      top_pad="4"
      width="175">
     </check_box>
-      <combo_box
+	<combo_box
 	 visiblity_control="WindowFullScreen"
-        allow_text_entry="false"
-	enabled="true"
-	layout="topleft"
-        height="18"
-	left_delta="220"
-	max_chars="20"
-	mouse_opaque="true"
-	name="windowsize combo"
-	top_delta="-1"
-	width="150">
-      <combo_box.item
-        type="string"
-	length="1"
-	enabled="true"
-	name="640x480"
-	value="640 x 480">
-		640x480
-	</combo_box.item>
-	<combo_box.item
-        type="string"
-	length="1"
-	enabled="true"
-	name="800x600"
-	value="800 x 600">
-		800x600 
-	</combo_box.item>
-	<combo_box.item
-        type="string"
-	length="1"
-	enabled="true"
-	name="720x480"
-	value="720 x 480">
-		720x480 (NTSC)
-	</combo_box.item>
-	<combo_box.item
-        type="string"
-	length="1"
-	enabled="true"
-	name="768x576"
-	value="768 x 576">
-		768x576 (PAL)
-	</combo_box.item>
-	<combo_box.item
-        type="string"
-	length="1"
-	enabled="true"
-	name="1024x768"
-	value="1024 x 768">
-		1024x768
-	</combo_box.item>
-        <combo_box.commit_callback
-        function="setControlFalse"
-	parameter="FullScreenAutoDetectAspectRatio" />
+	 allow_text_entry="false"
+	 enabled="true"
+	 layout="topleft"
+	 height="18"
+	 left_delta="220"
+	 max_chars="20"
+	 mouse_opaque="true"
+	 name="windowsize combo"
+	 top_delta="-1"
+	 width="150">
+		<combo_box.item
+		 type="string"
+	     length="1"
+	     enabled="true"
+	     name="640x480"
+	     value="640 x 480">
+		 640x480
+	    </combo_box.item>
+	    <combo_box.item
+	     type="string"
+	     length="1"
+	     enabled="true"
+	     name="800x600"
+	     value="800 x 600">
+		 800x600 
+	    </combo_box.item>
+	    <combo_box.item
+	     type="string"
+	     length="1"
+	     enabled="true"
+	     name="720x480"
+	     value="720 x 480">
+		 720x480 (NTSC)
+	    </combo_box.item>
+	    <combo_box.item
+	     type="string"
+	     length="1"
+	     enabled="true"
+	     name="768x576"
+	     value="768 x 576">
+		  768x576 (PAL)
+	    </combo_box.item>
+	    <combo_box.item
+	     type="string"
+	     length="1"
+	     enabled="true"
+	     name="1024x768"
+	     value="1024 x 768">
+		  1024x768
+	    </combo_box.item>
+	    <combo_box.commit_callback
+	     function="Pref.setControlFalse"
+	     parameter="FullScreenAutoDetectAspectRatio" />
  	</combo_box>
-           <text
+	<text
      type="string"
      length="1"
      follows="left|top"
@@ -134,7 +126,6 @@
      name="ui_scale_slider"
      top_delta="0"
      width="58" />
-
      <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 65db3cc7a1..5d0af26af5 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -64,7 +64,6 @@
      reserve_scroll_corner="true"
      opaque="true"
      width="255">
-      
      	<panel
      	 name="scroll_content_panel"
 	     follows="left|top|right"
@@ -73,7 +72,7 @@
 	     left="0"
      	 width="240"
 	     height="520">
-	          		
+
         <panel
 	     follows="left|top"
          height="125"
@@ -102,7 +101,7 @@
              name="title_sl_descr_text"
              text_color="white"
              top_delta="0"
-             value="Second Life:"
+             value="[SECOND_LIFE]:"
              width="140" />
             <text
              follows="left|top|right"
@@ -208,6 +207,60 @@
          value="Resident. No payment info on file."
          width="160"
          word_wrap="true" />
+		<spinner
+		 control_name="AFKTimeout"
+		 decimal_digits="0"
+		 follows="left|top"
+		 height="16"
+		 increment="1"
+		 initial_value="300"
+		 label="Away Timeout:"
+		 label_width="141"
+		 layout="topleft"
+		 left="10"
+		 max_val="600"
+		 min_val="30"
+		 name="afk_timeout_spinner"
+		 top_pad="10"
+		 width="202" />
+		<text
+		 type="string"
+		 length="1"
+		 follows="left|top"
+		 height="10"
+		 layout="topleft"
+		 left="220"
+         name="seconds_textbox"
+         top_delta="0"
+         width="128">
+          seconds
+		</text>
+		<text
+		 type="string"
+		 length="1"
+		 follows="left|top"
+		 height="10"
+		 layout="topleft"
+		 left="12"
+		 mouse_opaque="false"
+		 name="text_box3"
+		 top_pad="10"
+		 width="128">
+			Busy Mode Response:
+		</text>
+		<text_editor
+		 control_name="BusyModeResponse2"
+		 commit_on_focus_lost = "true"
+		 follows="left|top"
+		 height="70"
+		 layout="topleft"
+		 left_pad="8"
+		 name="busy_response"
+		 top_delta="0"
+		 width="330"
+		 word_wrap="true">
+			log_in_to_change
+		</text_editor>		 
         <text
          follows="left|top"
          font="SansSerifBold"
@@ -260,7 +313,7 @@
          left="10"
          name="online_me_status_text"
          text_color="white"
-         top_pad="20" 
+         top_pad="20"
          width="100">
              Status:
         </text>
@@ -308,10 +361,10 @@
          word_wrap="true">
             Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
         </text>
-        
- 
+
+
         </panel>
-        
+
     </scroll_container>
     <panel
      follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index 8265ab3227..8445b933bf 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -140,6 +140,7 @@
      max_length="65535"
      name="covenant_editor"
      top_delta="30"
+     handle_edit_keys_directly="true"
      width="193"
      word_wrap="true">
         There is no Covenant provided for this Estate.
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 1dafd50cdb..ee52184119 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -2,517 +2,529 @@
 <panel
  border="true"
  follows="top|left"
- height="950"
+ height="512"
+ name="EstateWrapper"
  label="Estate"
  layout="topleft"
- left="0"
- name="Estate"
- top="320"
  width="280">
-    <panel.string
-     name="email_unsupported">
-        Feature unsupported
-    </panel.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="32"
+  <scroll_container
+   follows="top|left|right|bottom"
+   height="508"
+   layout="topleft"
+   width="280">
+    <panel
+     follows="top|left"
+     height="950"
+     label="Estate"
      layout="topleft"
-     left="10"
-     name="estate_help_text"
-     top="14"
-     width="300">
+     name="Estate"
+     width="258">
+      <panel.string
+       name="email_unsupported">
+        Feature unsupported
+      </panel.string>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="32"
+       layout="topleft"
+       left="10"
+       name="estate_help_text"
+       top="14"
+       width="300">
         Changes to settings on this tab will affect all
-regions in the estate.
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="estate_text"
-     top_pad="2"
-     width="80">
+        regions in the estate.
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       font="SansSerif"
+       height="20"
+       layout="topleft"
+       left_delta="0"
+       name="estate_text"
+       top_pad="2"
+       width="80">
         Estate:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="estate_name"
-     top_delta="16"
-     width="150">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       font="SansSerif"
+       height="20"
+       layout="topleft"
+       left_delta="0"
+       name="estate_name"
+       top_delta="16"
+       width="150">
         (unknown)
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="owner_text"
-     top_pad="2"
-     width="80">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       font="SansSerif"
+       height="20"
+       layout="topleft"
+       left_delta="0"
+       name="owner_text"
+       top_pad="2"
+       width="80">
         Owner:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="estate_owner"
-     top_delta="16"
-     width="150">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       font="SansSerif"
+       height="20"
+       layout="topleft"
+       left_delta="0"
+       name="estate_owner"
+       top_delta="16"
+       width="150">
         (unknown)
-    </text>
-    <view_border
-     bevel_style="in"
-     follows="top|left"
-     height="290"
-     layout="topleft"
-     left_delta="-4"
-     top_pad="5"
-     width="250" />
-    <check_box
-     height="20"
-     label="Use Global Time"
-     layout="topleft"
-     left="12"
-     name="use_global_time_check"
-     top="132"
-     width="200" />
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_pad="20"
-     name="use_global_time_help"
-     top_delta="2"
-     width="18" />
-    <check_box
-     height="20"
-     label="Fixed Sun"
-     layout="topleft"
-     left="12"
-     name="fixed_sun_check"
-     top="152"
-     width="100" />
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_pad="120"
-     name="fixed_sun_help"
-     top_delta="2"
-     width="18" />
-    <icon
-     height="20"
-     image_name="icon_day_cycle.tga"
-     layout="topleft"
-     left="47"
-     name="daycycle"
-     top="177"
-     width="165" />
-    <slider
-     follows="left|top"
-     height="20"
-     increment="0.001"
-     label="Phase"
-     layout="topleft"
-     left="12"
-     max_val="30"
-     min_val="6"
-     name="sun_hour_slider"
-     show_text="false"
-     top="202"
-     width="200" />
-    <check_box
-     height="20"
-     label="Allow Public Access"
-     layout="topleft"
-     left_delta="0"
-     name="externally_visible_check"
-     top_pad="6"
-     width="200" />
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_pad="20"
-     name="externally_visible_help"
-     top_delta="2"
-     width="18" />
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     height="16"
-     layout="topleft"
-     left="32"
-     name="Only Allow"
-     top="250"
-     width="278">
+      </text>
+      <view_border
+       bevel_style="in"
+       follows="top|left"
+       height="290"
+       layout="topleft"
+       left_delta="-4"
+       top_pad="5"
+       width="250" />
+      <check_box
+       height="20"
+       label="Use Global Time"
+       layout="topleft"
+       left="12"
+       name="use_global_time_check"
+       top="132"
+       width="200" />
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_pad="20"
+       name="use_global_time_help"
+       top_delta="2"
+       width="18" />
+      <check_box
+       height="20"
+       label="Fixed Sun"
+       layout="topleft"
+       left="12"
+       name="fixed_sun_check"
+       top="152"
+       width="100" />
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_pad="120"
+       name="fixed_sun_help"
+       top_delta="2"
+       width="18" />
+      <icon
+       height="20"
+       image_name="icon_day_cycle.tga"
+       layout="topleft"
+       left="47"
+       name="daycycle"
+       top="177"
+       width="165" />
+      <slider
+       follows="left|top"
+       height="20"
+       increment="0.001"
+       label="Phase"
+       layout="topleft"
+       left="12"
+       max_val="30"
+       min_val="6"
+       name="sun_hour_slider"
+       show_text="false"
+       top="202"
+       width="200" />
+      <check_box
+       height="20"
+       label="Allow Public Access"
+       layout="topleft"
+       left_delta="0"
+       name="externally_visible_check"
+       top_pad="6"
+       width="200" />
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_pad="20"
+       name="externally_visible_help"
+       top_delta="2"
+       width="18" />
+      <text
+       type="string"
+       length="1"
+       follows="top|left"
+       height="16"
+       layout="topleft"
+       left="32"
+       name="Only Allow"
+       top="250"
+       width="278">
         Restrict Access To:
-    </text>
-    <check_box
-     follows="top|left"
-     height="16"
-     label="Residents with payment info on file"
-     layout="topleft"
-     left_delta="0"
-     name="limit_payment"
-     tool_tip="Ban unidentified residents."
-     top_pad="2"
-     width="278" />
-    <check_box
-     follows="top|left"
-     height="16"
-     label="Age-verified adults"
-     layout="topleft"
-     left_delta="0"
-     name="limit_age_verified"
-     tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
-     top_pad="2"
-     width="278" />
-    <check_box
-     height="20"
-     label="Allow Voice Chat"
-     layout="topleft"
-     left="12"
-     name="voice_chat_check"
-     top="304"
-     width="200" />
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_pad="20"
-     name="voice_chat_help"
-     top_delta="2"
-     width="18" />
-    <check_box
-     height="20"
-     label="Allow Direct Teleport"
-     layout="topleft"
-     left="12"
-     name="allow_direct_teleport"
-     top_pad="4"
-     width="80" />
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_pad="140"
-     name="allow_direct_teleport_help"
-     top_delta="2"
-     width="18" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="abuse_email_text"
-     top_pad="5"
-     width="180">
+      </text>
+      <check_box
+       follows="top|left"
+       height="16"
+       label="Residents with payment info on file"
+       layout="topleft"
+       left_delta="0"
+       name="limit_payment"
+       tool_tip="Ban unidentified residents."
+       top_pad="2"
+       width="278" />
+      <check_box
+       follows="top|left"
+       height="16"
+       label="Age-verified adults"
+       layout="topleft"
+       left_delta="0"
+       name="limit_age_verified"
+       tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
+       top_pad="2"
+       width="278" />
+      <check_box
+       height="20"
+       label="Allow Voice Chat"
+       layout="topleft"
+       left="12"
+       name="voice_chat_check"
+       top="304"
+       width="200" />
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_pad="20"
+       name="voice_chat_help"
+       top_delta="2"
+       width="18" />
+      <check_box
+       height="20"
+       label="Allow Direct Teleport"
+       layout="topleft"
+       left="12"
+       name="allow_direct_teleport"
+       top_pad="4"
+       width="80" />
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_pad="140"
+       name="allow_direct_teleport_help"
+       top_delta="2"
+       width="18" />
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="abuse_email_text"
+       top_pad="5"
+       width="180">
         Abuse email address:
-    </text>
-    <line_editor
-     follows="top|left"
-     height="19"
-     layout="topleft"
-     left="15"
-     name="abuse_email_address"
-     top_pad="5"
-     width="205" />
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_pad="12"
-     name="abuse_email_address_help"
-     top_dekta="0"
-     width="18" />
-    <button
-     enabled="false"
-     follows="left|top"
-     height="20"
-     label="Apply"
-     layout="topleft"
-     name="apply_btn"
-     right="250"
-     top_pad="4"
-     width="90" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Send Message To Estate..."
-     layout="topleft"
-     left="8"
-     name="message_estate_btn"
-     top_pad="5"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Kick User from Estate..."
-     layout="topleft"
-     left="8"
-     name="kick_user_from_estate_btn"
-     top_pad="5"
-     width="250" />
-    <text
-     type="string"
-     length="1"
-     top="490"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     name="estate_manager_label"
-     left="8"
-     width="200">
+      </text>
+      <line_editor
+       follows="top|left"
+       height="19"
+       layout="topleft"
+       left="15"
+       name="abuse_email_address"
+       top_pad="5"
+       width="205" />
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_pad="12"
+       name="abuse_email_address_help"
+       top_delta="0"
+       width="18" />
+      <button
+       enabled="false"
+       follows="left|top"
+       height="20"
+       label="Apply"
+       layout="topleft"
+       name="apply_btn"
+       right="250"
+       top_pad="4"
+       width="90" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Send Message To Estate..."
+       layout="topleft"
+       left="8"
+       name="message_estate_btn"
+       top_pad="5"
+       width="250" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Kick User from Estate..."
+       layout="topleft"
+       left="8"
+       name="kick_user_from_estate_btn"
+       top_pad="5"
+       width="250" />
+      <text
+       type="string"
+       length="1"
+       top="490"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       name="estate_manager_label"
+       left="8"
+       width="200">
         Estate Managers:
-    </text>
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_delta="232"
-     name="estate_manager_help"
-     top_delta="-1"
-     width="18" />
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="60"
-     layout="topleft"
-     left="8"
-     top_pad="5"
-     width="250" />
-    <name_list
-     follows="left|top"
-     height="60"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="estate_manager_name_list"
-     top_delta="0"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Add..."
-     layout="topleft"
-     left="8"
-     name="add_estate_manager_btn"
-     top_pad="5"
-     width="90" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Remove..."
-     layout="topleft"
-     name="remove_estate_manager_btn"
-     left_pad="70"
-     top_delta="0"
-     width="90" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="8"
-     name="allow_resident_label"
-     top_pad="5"
-     width="200">
+      </text>
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_delta="232"
+       name="estate_manager_help"
+       top_delta="-1"
+       width="18" />
+      <view_border
+       bevel_style="none"
+       follows="top|left"
+       height="60"
+       layout="topleft"
+       left="8"
+       top_pad="5"
+       width="250" />
+      <name_list
+       follows="left|top"
+       height="60"
+       layout="topleft"
+       left_delta="0"
+       multi_select="true"
+       name="estate_manager_name_list"
+       top_delta="0"
+       width="250" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Add..."
+       layout="topleft"
+       left="8"
+       name="add_estate_manager_btn"
+       top_pad="5"
+       width="90" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Remove..."
+       layout="topleft"
+       name="remove_estate_manager_btn"
+       left_pad="70"
+       top_delta="0"
+       width="90" />
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="8"
+       name="allow_resident_label"
+       top_pad="5"
+       width="200">
         Allowed Residents:
-    </text>
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_delta="232"
-     name="allow_resident_help"
-     top_delta="-1"
-     width="18" />
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="60"
-     layout="topleft"
-     left="8"
-     top_pad="5"
-     width="250" />
-    <name_list
-     follows="left|top"
-     height="60"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="allowed_avatar_name_list"
-     top_delta="0"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Add..."
-     layout="topleft"
-     left="8"
-     name="add_allowed_avatar_btn"
-     top_pad="5"
-     width="90" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Remove..."
-     layout="topleft"
-     name="remove_allowed_avatar_btn"
-     left_pad="70"
-     top_delta="0"
-     width="90" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="8"
-     name="allow_group_label"
-     top_pad="5"
-     width="200">
+      </text>
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_delta="232"
+       name="allow_resident_help"
+       top_delta="-1"
+       width="18" />
+      <view_border
+       bevel_style="none"
+       follows="top|left"
+       height="60"
+       layout="topleft"
+       left="8"
+       top_pad="5"
+       width="250" />
+      <name_list
+       follows="left|top"
+       height="60"
+       layout="topleft"
+       left_delta="0"
+       multi_select="true"
+       name="allowed_avatar_name_list"
+       top_delta="0"
+       width="250" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Add..."
+       layout="topleft"
+       left="8"
+       name="add_allowed_avatar_btn"
+       top_pad="5"
+       width="90" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Remove..."
+       layout="topleft"
+       name="remove_allowed_avatar_btn"
+       left_pad="70"
+       top_delta="0"
+       width="90" />
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="8"
+       name="allow_group_label"
+       top_pad="5"
+       width="200">
         Allowed Groups:
-    </text>
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_delta="232"
-     name="allow_group_help"
-     top_delta="-1"
-     width="18" />
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="60"
-     layout="topleft"
-     left="8"
-     top_pad="5"
-     width="250" />
-    <name_list
-     follows="left|top"
-     height="60"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="allowed_group_name_list"
-     top_delta="0"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Add..."
-     layout="topleft"
-     left="8"
-     name="add_allowed_group_btn"
-     top_pad="5"
-     width="90" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Remove..."
-     layout="topleft"
-     name="remove_allowed_group_btn"
-     left_pad="70"
-     top_delta="0"
-     width="90" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="8"
-     name="ban_resident_label"
-     top_pad="5"
-     width="200">
+      </text>
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_delta="232"
+       name="allow_group_help"
+       top_delta="-1"
+       width="18" />
+      <view_border
+       bevel_style="none"
+       follows="top|left"
+       height="60"
+       layout="topleft"
+       left="8"
+       top_pad="5"
+       width="250" />
+      <name_list
+       follows="left|top"
+       height="60"
+       layout="topleft"
+       left_delta="0"
+       multi_select="true"
+       name="allowed_group_name_list"
+       top_delta="0"
+       width="250" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Add..."
+       layout="topleft"
+       left="8"
+       name="add_allowed_group_btn"
+       top_pad="5"
+       width="90" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Remove..."
+       layout="topleft"
+       name="remove_allowed_group_btn"
+       left_pad="70"
+       top_delta="0"
+       width="90" />
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="8"
+       name="ban_resident_label"
+       top_pad="5"
+       width="200">
         Banned Residents:
-    </text>
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="18"
-     label="?"
-     layout="topleft"
-     left_delta="232"
-     name="ban_resident_help"
-     top_delta="-1"
-     width="18" />
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="60"
-     layout="topleft"
-     left="8"
-     top_pad="5"
-     width="250" />
-    <name_list
-     follows="left|top"
-     height="60"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="banned_avatar_name_list"
-     top_delta="0"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Add..."
-     layout="topleft"
-     left="8"
-     name="add_banned_avatar_btn"
-     top_pad="5"
-     width="90" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Remove..."
-     layout="topleft"
-     name="remove_banned_avatar_btn"
-     left_pad="70"
-     top_delta="0"
-     width="90" />
+      </text>
+      <button
+       follows="left|top"
+       font="SansSerifSmall"
+       height="18"
+       label="?"
+       layout="topleft"
+       left_delta="232"
+       name="ban_resident_help"
+       top_delta="-1"
+       width="18" />
+      <view_border
+       bevel_style="none"
+       follows="top|left"
+       height="60"
+       layout="topleft"
+       left="8"
+       top_pad="5"
+       width="250" />
+      <name_list
+       follows="left|top"
+       height="60"
+       layout="topleft"
+       left_delta="0"
+       multi_select="true"
+       name="banned_avatar_name_list"
+       top_delta="0"
+       width="250" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Add..."
+       layout="topleft"
+       left="8"
+       name="add_banned_avatar_btn"
+       top_pad="5"
+       width="90" />
+      <button
+       follows="left|top"
+       height="20"
+       label="Remove..."
+       layout="topleft"
+       name="remove_banned_avatar_btn"
+       left_pad="70"
+       top_delta="0"
+       width="90" />
+    </panel>
+  </scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index bf63bb0cb6..8e8fc9ef7f 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -2,333 +2,344 @@
 <panel
  border="true"
  follows="top|left"
- height="575"
+ height="512"
  label="Ground Textures"
  layout="topleft"
- left="0"
- name="Textures"
- top="320"
  width="280">
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
+  <scroll_container
+   follows="top|left|right|bottom"
+   height="508"
+   layout="topleft"
+   width="280">
+    <panel
+     follows="top|left"
+     height="575"
+     label="Ground Textures"
      layout="topleft"
-     left="10"
-     name="region_text_lbl"
-     top="10"
-     width="100">
+     name="Textures"
+     width="258">
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       font="SansSerif"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="region_text_lbl"
+       top="10"
+       width="100">
         Region:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="region_text"
-     top_delta="0"
-     width="200">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       font="SansSerif"
+       height="20"
+       layout="topleft"
+       left_delta="50"
+       name="region_text"
+       top_delta="0"
+       width="200">
         unknown
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="detail_texture_text"
-     top="36"
-     width="300">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="detail_texture_text"
+       top="36"
+       width="300">
         Terrain Textures
-(requires 512x512, 24 bit .tga files)
-    </text>
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_delta="0"
-     name="texture_detail_0"
-     top_delta="30"
-     width="100" />
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_pad="10"
-     name="texture_detail_1"
-     top_delta="0"
-     width="100" />
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left="10"
-     name="texture_detail_2"
-     top_delta="105"
-     width="100" />
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_pad="10"
-     name="texture_detail_3"
-     top_delta="0"
-     width="100" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl"
-     top="157"
-     width="65">
+        (requires 512x512, 24 bit .tga files)
+      </text>
+      <texture_picker
+       follows="left|top"
+       height="100"
+       layout="topleft"
+       left_delta="0"
+       name="texture_detail_0"
+       top_delta="30"
+       width="100" />
+      <texture_picker
+       follows="left|top"
+       height="100"
+       layout="topleft"
+       left_pad="10"
+       name="texture_detail_1"
+       top_delta="0"
+       width="100" />
+      <texture_picker
+       follows="left|top"
+       height="100"
+       layout="topleft"
+       left="10"
+       name="texture_detail_2"
+       top_delta="105"
+       width="100" />
+      <texture_picker
+       follows="left|top"
+       height="100"
+       layout="topleft"
+       left_pad="10"
+       name="texture_detail_3"
+       top_delta="0"
+       width="100" />
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="height_text_lbl"
+       top="157"
+       width="65">
         1 (Low)
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="45"
-     name="height_text_lbl2"
-     top_delta="0"
-     width="100">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left_pad="45"
+       name="height_text_lbl2"
+       top_delta="0"
+       width="100">
         2
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl3"
-     top_delta="105"
-     width="100">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="height_text_lbl3"
+       top_delta="105"
+       width="100">
         3
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl4"
-     top_delta="0"
-     width="100">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left_pad="10"
+       name="height_text_lbl4"
+       top_delta="0"
+       width="100">
         4 (High)
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl5"
-     top_delta="25"
-     width="300">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="height_text_lbl5"
+       top_delta="25"
+       width="300">
         Texture Elevation Ranges
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="51"
-     name="height_text_lbl6"
-     top_delta="20"
-     width="100">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="51"
+       name="height_text_lbl6"
+       top_delta="20"
+       width="100">
         Southwest
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl7"
-     top_delta="0"
-     width="100">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left_pad="10"
+       name="height_text_lbl7"
+       top_delta="0"
+       width="100">
         Northwest
-    </text>
-   <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Low"
-     label_width="37"
-     layout="topleft"
-     left="10"
-     max_val="500"
-     min_val="-500"
-     name="height_start_spin_0"
-     top_delta="20"
-     width="100" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Low"
-     label_width="37"
-     layout="topleft"
-     left_pad="10"
-     max_val="500"
-     min_val="-500"
-     name="height_start_spin_1"
-     top_delta="0"
-     width="100" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="High"
-     label_width="37"
-     layout="topleft"
-     left="10"
-     max_val="500"
-     min_val="-500"
-     name="height_range_spin_0"
-     top_delta="20"
-     width="100" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="High"
-     label_width="37"
-     layout="topleft"
-     left_pad="10"
-     max_val="500"
-     min_val="-500"
-     name="height_range_spin_1"
-     top_delta="0"
-     width="100" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="51"
-     name="height_text_lbl8"
-     top_delta="30"
-     width="100">
+      </text>
+      <spinner
+        follows="left|top"
+        height="20"
+        increment="0.5"
+        label="Low"
+        label_width="37"
+        layout="topleft"
+        left="10"
+        max_val="500"
+        min_val="-500"
+        name="height_start_spin_0"
+        top_delta="20"
+        width="100" />
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="Low"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_start_spin_1"
+       top_delta="0"
+       width="100" />
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="High"
+       label_width="37"
+       layout="topleft"
+       left="10"
+       max_val="500"
+       min_val="-500"
+       name="height_range_spin_0"
+       top_delta="20"
+       width="100" />
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="High"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_range_spin_1"
+       top_delta="0"
+       width="100" />
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="51"
+       name="height_text_lbl8"
+       top_delta="30"
+       width="100">
         Southeast
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl9"
-     top_delta="0"
-     width="100">
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left_pad="10"
+       name="height_text_lbl9"
+       top_delta="0"
+       width="100">
         Northeast
-    </text>
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Low"
-     label_width="37"
-     layout="topleft"
-     left="10"
-     max_val="500"
-     min_val="-500"
-     name="height_start_spin_2"
-     top_delta="20"
-     width="100" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Low"
-     label_width="37"
-     layout="topleft"
-     left_pad="10"
-     max_val="500"
-     min_val="-500"
-     name="height_start_spin_3"
-     top_delta="0"
-     width="100" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="High"
-     label_width="37"
-     layout="topleft"
-     left="10"
-     max_val="500"
-     min_val="-500"
-     name="height_range_spin_2"
-     top_delta="20"
-     width="100" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="High"
-     label_width="37"
-     layout="topleft"
-     left_pad="10"
-     max_val="500"
-     min_val="-500"
-     name="height_range_spin_3"
-     top_delta="0"
-     width="100" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl10"
-     top_delta="30"
-     width="270">
+      </text>
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="Low"
+       label_width="37"
+       layout="topleft"
+       left="10"
+       max_val="500"
+       min_val="-500"
+       name="height_start_spin_2"
+       top_delta="20"
+       width="100" />
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="Low"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_start_spin_3"
+       top_delta="0"
+       width="100" />
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="High"
+       label_width="37"
+       layout="topleft"
+       left="10"
+       max_val="500"
+       min_val="-500"
+       name="height_range_spin_2"
+       top_delta="20"
+       width="100" />
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="High"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_range_spin_3"
+       top_delta="0"
+       width="100" />
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="height_text_lbl10"
+       top_delta="30"
+       width="270">
         These values represent the blend range
-for the textures above.
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="height_text_lbl11"
-     top_delta="32"
-     width="270">
-         Measured in meters, the LOW value
-is the MAXIMUM height of Texture #1,
-and the HIGH value is the MINIMUM
-height of Texture #4.
-    </text>
-    
-    <button
-     enabled="false"
-     follows="left|bottom"
-     height="20"
-     label="Apply"
-     layout="topleft"
-     left="120"
-     name="apply_btn"
-     top_delta="60"
-     width="100" /> 
+        for the textures above.
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left_delta="0"
+       name="height_text_lbl11"
+       top_delta="32"
+       width="270">
+        Measured in meters, the LOW value
+        is the MAXIMUM height of Texture #1,
+        and the HIGH value is the MINIMUM
+        height of Texture #4.
+      </text>
+
+      <button
+       enabled="false"
+       follows="left|bottom"
+       height="20"
+       label="Apply"
+       layout="topleft"
+       left="120"
+       name="apply_btn"
+       top_delta="60"
+       width="100" />
+    </panel>
+  </scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 9fd075f79b..5738879c5a 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -44,6 +44,8 @@
      max_length="65536"
      name="Script Editor"
      width="492"
+     show_line_numbers="true" 
+     handle_edit_keys_directly="true" 
      word_wrap="true">
         Loading...
     </text_editor>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 82b7e02aeb..3ad5cbe018 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -224,7 +224,7 @@
      left_delta="1"
      name="search_editor"
      tab_group="1"
-     tool_tip="Search Second Life"
+     tool_tip="Search [SECOND_LIFE]"
      top_delta="4"
      width="78" />
     <button
@@ -240,7 +240,7 @@
      name="search_btn"
      picture_style="true"
      scale_image="false"
-     tool_tip="Search Second Life"
+     tool_tip="Search [SECOND_LIFE]"
      top_delta="-4"
      width="16" />
     <text
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3d4ac94044..655cf2b40f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -7,9 +7,9 @@
 
 	<!-- Default Args - these arguments will be replaced in all strings -->
 	<string name="SECOND_LIFE">Second Life</string>
-	<string name="SECOND_LIFE_VIEWER">Second Life</string>
-	<string name="SECOND_LIFE_GRID">Second Life</string>
-	<string name="SECOND_LIFE_SUPPORT">Second Life Support Portal</string>
+	<string name="APP_NAME">Second Life</string>
+	<string name="SECOND_LIFE_GRID">Second Life Grid</string>
+	<string name="SUPPORT_SITE">Second Life Support Portal</string>
 
 	<!-- starting up -->
 	<string name="StartupDetectingHardware">Detecting hardware...</string>
@@ -19,7 +19,7 @@
 	<string name="CacheNobody">(nobody)</string>
 	<string name="CacheNone">(none)</string>	
 	<!-- Login -->
-	<string name="LoginInProgress">Logging in. [SECOND_LIFE_VIEWER] may appear frozen.  Please wait.</string>
+	<string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
 	<string name="LoginInProgressNoFrozen">Logging in...</string>
 	<string name="LoginAuthenticating">Authenticating</string>
 	<string name="LoginMaintenance">Performing account maintenance...</string>
@@ -683,29 +683,29 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 Please see: http://wiki.secondlife.com/wiki/Client_parameters
 Error:
 	</string>
-	<string name="MBCmdLineUsg">[SECOND_LIFE] Command line usage:</string>
+	<string name="MBCmdLineUsg">[APP_NAME] Command line usage:</string>
 	<string name="MBUnableToAccessFile">
-		[SECOND_LIFE] is unable to access a file that it needs.
+		[APP_NAME] is unable to access a file that it needs.
 
 This can be because you somehow have multiple copies running, or your system incorrectly thinks a file is open.
 If this message persists, restart your computer and try again.
-If it continues to persist, you may need to completely uninstall [SECOND_LIFE] and reinstall it.
+If it continues to persist, you may need to completely uninstall [APP_NAME] and reinstall it.
 	</string>
 	<string name="MBFatalError">Fatal Error</string>
-	<string name="MBRequiresAltiVec"> [SECOND_LIFE] requires a processor with AltiVec (G4 or later).</string>
+	<string name="MBRequiresAltiVec"> [APP_NAME] requires a processor with AltiVec (G4 or later).</string>
 	<string name="MBAlreadyRunning">
-		[SECOND_LIFE] is already running.
+		[APP_NAME] is already running.
 Check your task bar for a minimized copy of the program.
 If this message persists, restart your computer.
 	</string>
 	<string name="MBFrozenCrashed">
-		[SECOND_LIFE] appears to have frozen or crashed on the previous run.
+		[APP_NAME] appears to have frozen or crashed on the previous run.
 Would you like to send a crash report?
 	</string>
 	<string name="MBAlert">Alert</string>
 	<string name="MBNoDirectX">
-		[SECOND_LIFE] is unable to detect DirectX 9.0b or greater.
-[SECOND_LIFE] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes.  While you can run [SECOND_LIFE] without it, we highly recommend running with DirectX 9.0b.
+		[APP_NAME] is unable to detect DirectX 9.0b or greater.
+[APP_NAME] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes.  While you can run [APP_NAME] without it, we highly recommend running with DirectX 9.0b.
 
 Do you wish to continue?
 	</string>
@@ -726,23 +726,23 @@ Running in window.
 	<string name="MBPixelFmtErr">Can't find suitable pixel format</string>
 	<string name="MBPixelFmtDescErr">Can't get pixel format description</string>
 	<string name="MBTrueColorWindow">
-		[SECOND_LIFE] requires True Color (32-bit) to run in a window.
+		[APP_NAME] requires True Color (32-bit) to run in a window.
 Please go to Control Panels &gt; Display &gt; Settings and set the screen to 32-bit color.
-Alternately, if you choose to run fullscreen, [SECOND_LIFE] will automatically adjust the screen each time it runs.
+Alternately, if you choose to run fullscreen, [APP_NAME] will automatically adjust the screen each time it runs.
 	</string>
 	<string name="MBAlpha">
-		[SECOND_LIFE] is unable to run because it can't get an 8 bit alpha channel.  Usually this is due to video card driver issues.
+		[APP_NAME] is unable to run because it can't get an 8 bit alpha channel.  Usually this is due to video card driver issues.
 Please make sure you have the latest video card drivers installed.
 Also be sure your monitor is set to True Color (32-bit) in Control Panels &gt; Display &gt; Settings.
-If you continue to receive this message, contact customer support.
+If you continue to receive this message, contact the [SUPPORT_SITE].
 	</string>
 	<string name="MBPixelFmtSetErr">Can't set pixel format</string>
 	<string name="MBGLContextErr">Can't create GL rendering context</string>
 	<string name="MBGLContextActErr">Can't activate GL rendering context</string>
 	<string name="MBVideoDrvErr">
-		[SECOND_LIFE] is unable to run because your video card drivers did not install properly, are out of date, or are for unsupported hardware. Please make sure you have the latest video card drivers and even if you do have the latest, try reinstalling them.
+		[APP_NAME] is unable to run because your video card drivers did not install properly, are out of date, or are for unsupported hardware. Please make sure you have the latest video card drivers and even if you do have the latest, try reinstalling them.
 
-If you continue to receive this message, contact customer support.
+If you continue to receive this message, contact the [SUPPORT_SITE].
 	</string>
 
 	<!-- Avatar Shape Information -->
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index 616dc1a1d4..e8f6b1319a 100644
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -2,21 +2,16 @@
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
-			Problem encountered processing your teleport request. You may
-need to log back in before you can teleport. If you continue
-to get this message, please check the Tech Support FAQ at:
-www.secondlife.com/support
+			Problem encountered processing your teleport request. You may need to log back in before you can teleport.
+If you continue to get this message, please check the [SUPPORT_SITE].
 		</message>
 		<message name="invalid_region_handoff">
-			Problem encountered processing your region crossing. You may
-need to log back in before you can cross regions. If you continue
-to get this message, please check the Tech Support FAQ at:
-www.secondlife.com/support.
+			Problem encountered processing your region crossing. You may need to log back in before you can cross regions.
+If you continue to get this message, please check the [SUPPORT_SITE].
 		</message>
 		<message name="blocked_tport">
 			Sorry, teleport is currently blocked. Try again in a moment.
-If you still cannot teleport, please log out and log back in to
-resolve the problem.
+If you still cannot teleport, please log out and log back in to resolve the problem.
 		</message>
 		<message name="nolandmark_tport">
 			Sorry, but system was unable to locate landmark destination.
@@ -29,27 +24,19 @@ Try again in a moment.
 			Sorry, you do not have access to that teleport destination.
 		</message>
 		<message name="missing_attach_tport">
-			Your attachments have not arrived yet. Try waiting for a few
-more seconds or log out and back in again before attempting
-to teleport.
+			Your attachments have not arrived yet. Try waiting for a few more seconds or log out and back in again before attempting to teleport.
 		</message>
 		<message name="too_many_uploads_tport">
-			The asset queue in this region is currently clogged so your teleport
-request will not be able to succeed in a timely manner. Please try again
-in a few minutes or go to a less busy area.
+			The asset queue in this region is currently clogged so your teleport request will not be able to succeed in a timely manner. Please try again in a few minutes or go to a less busy area.
 		</message>
 		<message name="expired_tport">
-			Sorry, but the system was unable to complete your teleport request
-in a timely fashion. Please try again in a few minutes.
+			Sorry, but the system was unable to complete your teleport request in a timely fashion. Please try again in a few minutes.
 		</message>
 		<message name="expired_region_handoff">
-			Sorry, but the system was unable to complete your region crossing
-in a timely fashion. Please try again in a few minutes.
+			Sorry, but the system was unable to complete your region crossing in a timely fashion. Please try again in a few minutes.
 		</message>
 		<message name="no_host">
-			Unable to find teleport destination. The destination may be
-temporarily unavailable or no longer exists. Please try again
-in a few minutes.
+			Unable to find teleport destination. The destination may be temporarily unavailable or no longer exists. Please try again in a few minutes.
 		</message>
 		<message name="no_inventory_host">
 			The inventory system is currently unavailable.
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
index 17e9a7beb2..26af76d8a3 100644
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <gesture_combo_box font="SansSerifSmall"
+           label="Gestures" 
            list_position="below"
            max_chars="20"
            follows="right|top">
@@ -26,5 +27,4 @@
   <gesture_combo_box.combo_editor name="Combo Text Entry"
                           select_on_focus="true"
                           font="SansSerifSmall" />
-  <gesture_combo_box.item label="Gestures" />
 </gesture_combo_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 89a88330c7..b249451247 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -29,6 +29,9 @@
                           image_disabled="Info_Off" />
   <add_landmark_button name="Add Landmark"
                           label=""
+                          hover_glow_amount="0.15"
+                          image_hover_selected="Favorite_Star_Over"
+                          image_hover_unselected="Favorite_Star_Over"
                           width="16"
                           height="16"
                           tool_tip="Add to My Landmarks"
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
index 4ad11c41da..48bc021e6d 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
@@ -9,17 +9,17 @@
   <up_button image_unselected="ScrollArrow_Up"
              image_selected="ScrollArrow_Up"
              scale_image="true" thickness="15"
-             hover_glow_amount="0.15"/>
+             hover_glow_amount="0.35"/>
   <down_button image_unselected="ScrollArrow_Down"
                image_selected="ScrollArrow_Down"
                scale_image="true" thickness="15"
-               hover_glow_amount="0.15"/>
+               hover_glow_amount="0.35"/>
   <left_button image_unselected="ScrollArrow_Left"
                image_selected="ScrollArrow_Left"
                scale_image="true" thickness="15"
-               hover_glow_amount="0.15"/>
+               hover_glow_amount="0.35"/>
   <right_button image_unselected="ScrollArrow_Right"
                image_selected="ScrollArrow_Right"
                scale_image="true" thickness="15"
-               hover_glow_amount="0.15"/>
+               hover_glow_amount="0.35"/>
 </scroll_bar>
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
index cb9ef04797..86356ff563 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <scroll_container color="black"
-                  opaque="false"/>
+                  opaque="false"
+                  min_auto_scroll_rate="120"
+                  max_auto_scroll_rate="500"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index 960c4e81e5..4f2261c953 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -9,14 +9,14 @@
   word_wrap="false" 
   ignore_tab="true"
   track_bottom="false" 
-  takes_non_scroll_clicks="true" 
   cursor_color="TextCursorColor"
   default_color="TextDefaultColor"
   text_color="TextFgColor"
   text_readonly_color="TextFgReadOnlyColor"
   bg_readonly_color="TextBgReadOnlyColor"
   bg_writeable_color="TextBgWriteableColor"
-  bg_focus_color="TextBgFocusColor">
+  bg_focus_color="TextBgFocusColor"
+  link_color="HTMLLinkColor">
   <simple_text_editor.border
     bevel_style="in"
     follows="all" />
diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml
index 527485e57d..da7753a7d7 100644
--- a/indra/newview/skins/default/xui/es/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/es/floater_joystick.xml
@@ -3,13 +3,14 @@
 	<check_box name="enable_joystick">
 		Activar el joystick:
 	</check_box>
-	<spinner label="Mapping: X" name="JoystickAxis1"/>
-	<spinner label="Mapping: Y" name="JoystickAxis2"/>
-	<spinner label="Mapping: Z" name="JoystickAxis0"/>
-	<spinner label="Mapping: arriba/abajo" name="JoystickAxis4"/>
-	<spinner label="Mapping: izq./der." name="JoystickAxis5"/>
-	<spinner label="Mapping: giro" name="JoystickAxis3"/>
-	<spinner label="Mapping: zoom" name="JoystickAxis6"/>
+	<text left="140" name="joystick_type" width="360"/>
+	<spinner label="Mapping: eje X" name="JoystickAxis1" label_width="118" width="161"/>
+	<spinner label="Mapping: eje Y" name="JoystickAxis2" label_width="105" width="148"/>
+	<spinner label="Mapping: eje Z" name="JoystickAxis0" label_width="95" width="138"/>
+	<spinner label="Mapping: arriba/abajo" name="JoystickAxis4" label_width="118" width="161"/>
+	<spinner label="Mapping: izq./der." name="JoystickAxis5" label_width="105" width="148"/>
+	<spinner label="Mapping: giro" name="JoystickAxis3" label_width="95" width="138"/>
+	<spinner label="Mapping: zoom" name="JoystickAxis6" label_width="118" width="161"/>
 	<check_box label="Zoom directo" name="ZoomDirect"/>
 	<check_box label="Cursor 3D" name="Cursor3D"/>
 	<check_box label="Nivel automático" name="AutoLeveling"/>
@@ -19,7 +20,7 @@
 	<check_box name="JoystickAvatarEnabled">
 		Avatar
 	</check_box>
-	<check_box name="JoystickBuildEnabled">
+	<check_box name="JoystickBuildEnabled" left="192">
 		Construir
 	</check_box>
 	<check_box name="JoystickFlycamEnabled">
@@ -34,7 +35,7 @@
 	<text name="ZScale">
 		Escala: Z
 	</text>
-	<text name="PitchScale">
+	<text name="PitchScale" left="3" width="115">
 		Escala: arriba/abajo
 	</text>
 	<text name="YawScale">
@@ -52,11 +53,11 @@
 	<text name="ZDeadZone">
 		Zona muerta Z
 	</text>
-	<text name="PitchDeadZone">
-		Zona muerta arriba/abajo
+	<text name="PitchDeadZone" left="3" width="115">
+		Zona muerta arri./aba.
 	</text>
-	<text name="YawDeadZone">
-		Zona muerta izq./der
+	<text name="YawDeadZone" left="3" width="115">
+		Zona muerta izq./der.
 	</text>
 	<text name="RollDeadZone">
 		Zona muerta giro
@@ -70,9 +71,9 @@
 	<text name="ZoomDeadZone">
 		Zona muerta zoom
 	</text>
-	<button label="Predeterminados del SpaceNavigator" name="SpaceNavigatorDefaults"/>
-	<button label="OK" label_selected="OK" name="ok_btn"/>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Predeterminados del SpaceNavigator" name="SpaceNavigatorDefaults" font="SansSerifSmall" left="330" width="210"/>
+	<button label="OK" label_selected="OK" name="ok_btn" left="330"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" left_delta="120"/>
 	<string name="JoystickMonitor">
 		Monitor del joystick
 	</string>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index 557123d4f8..28d47fce52 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -12,7 +12,7 @@
 	<menu_item_call label="Script nuevo" name="New Script"/>
 	<menu_item_call label="Nota nueva" name="New Note"/>
 	<menu_item_call label="Gesto nuevo" name="New Gesture"/>
-	<menu name="New Clothes">
+	<menu name="New Clothes" label="Nueva ropa">
 		<menu_item_call label="Camisa nueva" name="New Shirt"/>
 		<menu_item_call label="Pantalones nuevos" name="New Pants"/>
 		<menu_item_call label="Zapatos nuevos" name="New Shoes"/>
@@ -23,7 +23,7 @@
 		<menu_item_call label="Camiseta nueva" name="New Undershirt"/>
 		<menu_item_call label="Ropa interior nueva" name="New Underpants"/>
 	</menu>
-	<menu name="New Body Parts">
+	<menu name="New Body Parts" label="Nuevas partes del cuerpo">
 		<menu_item_call label="Forma nueva" name="New Shape"/>
 		<menu_item_call label="Piel nueva" name="New Skin"/>
 		<menu_item_call label="Pelo nuevo" name="New Hair"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index d7e480c653..f045c6fe9e 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -6,6 +6,9 @@
 	<global name="alwayschoose">
 		Elegir siempre esta opción
 	</global>
+	<global name="implicitclosebutton">
+		Cerrar
+	</global>
   <template name="okbutton">
     <form>
       <button
@@ -189,7 +192,7 @@ No podrá removérseles de ese rol, sino que deberán renunciar a él por sí mi
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="ClickPublishHelpLand">
-		Seleccionar &quot;Publicar en la web&quot;
+		Seleccionar &apos;Publicar en la web&apos;
 Marcando este ítem, se mostrará:
 - esta parcela en los resultados de la búsqueda
 - los objetos públicos de esta parcela
@@ -219,7 +222,7 @@ Marcando este ítem, se mostrará:
 		No puede hacer que esta parcela aparezca en la búsqueda, porque está situada en una región que lo prohíbe.
 	</notification>
 	<notification name="ClickPublishHelpAvatar">
-		Al seleccionar &quot;Mostrar en Buscar&quot; se mostrará:
+		Al seleccionar &apos;Mostrar en la búsqueda&apos; se mostrará:
 - mi perfil en los resultados de la búsqueda
 - un enlace a mi perfil en las páginas públicas de grupo
 	</notification>
@@ -928,7 +931,7 @@ Deberá reconfigurar el nombre y las opciones de la nueva parcela.
 El color de las parcelas indica el tipo de propietario.
 
 Verde = Su terreno
-Agua = Terreno de su&apos;s grupo&apos;s
+Agua = Terreno de sus grupos
 Rojo = Propiedad de otros
 Amarillo = En venta
 Morado = Para subasta
@@ -1196,13 +1199,13 @@ Por favor, selección sólo uno y reinténtelo.
 		No se han podido configurar las texturas de la región:
 La textura del terreno [TEXTURE_NUM] tiene una profundidad de bites inválida: [TEXTURE_BIT_DEPTH].
 
-Cambie la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulse de nuevo &quot;Aplicar&quot; .
+Cambie la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulse de nuevo &apos;Aplicar&apos; .
 	</notification>
 	<notification name="InvalidTerrainSize">
 		No se han podido configurar las texturas de la región:
 La textura del terreno [TEXTURE_NUM] es demasiado grande: [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
 
-Cambie la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulse de nuevo &quot;Aplicar&quot; .
+Cambie la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulse de nuevo &apos;Aplicar&apos; .
 	</notification>
 	<notification name="RawUploadStarted">
 		Ha empezado la subida. Dependiendo de la velocidad de su conexión, llevará unos dos minutos.
@@ -1537,7 +1540,7 @@ Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de C
 		Usted no está autorizado en esa región por su nivel de calificación..
 
 Puede pulsar &apos;Cambiar preferencia&apos; para aumentar su nivel de calificación y poder entrar. Desde ese momento, podrá buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quiere deshacer esta configuración, vaya a Editar &gt; Preferencias... &gt; General.
-	 <form>
+	 <form name="form">
       <button
        name="OK"
        text="Cambiar preferencia"/>
@@ -1545,7 +1548,7 @@ Puede pulsar &apos;Cambiar preferencia&apos; para aumentar su nivel de calificac
        default="true"
        name="Cancel"
        text="Cerrar"/>
-       <ignore text="Cuando la entrada a la región está bloqueada por la preferencia del nivel de calificación"/>
+       <ignore name="ignore" text="Cuando la entrada a la región está bloqueada por la preferencia del nivel de calificación"/>
     </form>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
@@ -1735,7 +1738,7 @@ Cuando está activada, los residentes sólo pueden ser empujados por sí mismos
 Por defecto: Off
 	</notification>
 	<notification label="Unir/Dividir parcelas" name="HelpParcelChanges">
-		Esta casilla determina si las parcelas que no son del propietario del estado pueden puede unirse o subdividirse.
+		Esta casilla determina si las parcelas que no son del propietario del estado pueden unirse o subdividirse.
 Si no se marca esta opción:
  * Sólo los propietarios o los administradores del estado pueden unir o dividir parcelas.
  * Sólo podrán unir o dividir las parcelas pertenecientes al propietario o a un grupo en el que tengan los poderes adecuados.
@@ -1860,7 +1863,7 @@ Por defecto: on
 		Esta casilla fija la posición del Sol en la posición del deslizable Fase, y detiene su movimiento.
 	</notification>
 	<notification label="Acceso público" name="HelpEstateExternallyVisible">
-		Esta casilla habilita a cualquier residente que esté en otro estado pueda entrar en éste sin tener que estar en una lista de acceso.
+		Esta casilla habilita que cualquier residente que esté en otro estado pueda entrar en éste sin tener que estar en una lista de acceso.
 
 Por defecto: on
 	</notification>
@@ -2162,7 +2165,7 @@ Núm. máx. de partículas: define el número máximo de partículas que podrá
 
 Calidad del procesamiento: define la resolución con que se renderiza el brillo.
 
-Detalle de la malla: define la cantidad de dettales o número de triángulos usados para renderizar algunos objetos. Cuanto más alto sea el valor, más detalle, pero más tiempo para renderizar.
+Detalle de la malla: define la cantidad de detalles o número de triángulos usados para renderizar algunos objetos. Cuanto más alto sea el valor, más detalle, pero más tiempo para renderizar.
 
 Detalles de la iluminación: determina que tipo de luces quiere usted que se rendericen.
 
@@ -2195,30 +2198,30 @@ Nivel de detalle del terreno: marca con cuánto detalle quiere ver la textura de
 	<notification name="EnvSettingsHelpButton">
 		Estas configuraciones ajustan la forma en que usted ve el medio ambiente localmente, en su ordenador. Su tarjeta gráfica debe admitir shaders de la atmósfera (&apos;atmospheric shaders&apos;) para poder acceder a esta configuración.
 
-Ajuste el deslizable &quot;Duración de un día&quot; para cambiar localmente, en su visor, las etapas del día.
+Ajuste el deslizable &apos;Duración de un día&apos; para cambiar localmente, en su visor, las etapas del día.
 
-Ajuste el deslizable &quot;Nubosidad&quot; para controlar cuántas nubes cubren el cielo.
+Ajuste el deslizable &apos;Nubosidad&apos; para controlar cuántas nubes cubren el cielo.
 
-Pulse un color en el selector de &quot;Color del agua&quot; para cambiar el color de la misma.
+Pulse un color en el selector de &apos;Color del agua&apos; para cambiar el color de la misma.
 
-Ajuste el deslizable &quot;Claridad del agua&quot; para controlar el nivel de claridad del agua bajo la superficie.
+Ajuste el deslizable &apos;Claridad del agua&apos; para controlar el nivel de claridad del agua bajo la superficie.
 
-Pulse &quot;Usar el horario del estado&quot; para devolver los valores del día al tiempo actual de la región y seguir a partir de él.
+Pulse &apos;Usar el horario del estado&apos; para devolver los valores del día al tiempo actual de la región y seguir a partir de él.
 
-Pulse &quot;Cielo avanzado&quot; para abrir un editor con configuraciones avanzadas para el cielo.
+Pulse &apos;Cielo avanzado&apos; para abrir un editor con configuraciones avanzadas para el cielo.
 
-Pulse &quot;Agua avanzada&quot; para abrir un editor con configuraciones avanzadas para el agua.
+Pulse &apos;Agua avanzada&apos; para abrir un editor con configuraciones avanzadas para el agua.
 	</notification>
 	<notification name="HelpDayCycle">
 		El Editor del ciclo del día le permite controlar el cielo de Second Life durante el ciclo día/noche. Este es el ciclo que usa el deslizable Duración de un día del Editor del entorno.
 
-El Editor del ciclo del día trabaja configurando fotogramas clave (&apos;keyframes&apos;): nodos (representados por los puntos grises en la línea del tiempo) cada uno de los cuales tiene asociado un Cielo definido. Según progresa la Duración de un día, el WindLight realiza la &quot;animación&quot; del cielo interpolándose entre esos fotogramas clave.
+El Editor del ciclo del día trabaja configurando fotogramas clave (&apos;keyframes&apos;): nodos (representados por los puntos grises en la línea del tiempo) cada uno de los cuales tiene asociado un Cielo definido. Según progresa la Duración de un día, el WindLight realiza la &apos;animación&apos; del cielo interpolándose entre esos fotogramas clave.
 
 La flecha amarilla sobre la línea del tiempo representa lo que usted ve actualmente, basándose en la Duración de un día. Púlsela y muévela para ver cómo cambia la animación del día. Puede añadir o borrar fotogramas clave pulsando los botones Añadir un punto o Quitar un punto, situados a la derecha de la línea del tiempo.
 
-Puede establecer la posición en el tiempo de cualquier fotograma clave moviéndolo a lo largo de la línea del tiempo, o configurando manualmente su valor por su valor manualmente en el recuadro Configuración del fotograma clave. También en ese recuadro podrá asociar el fotograma clave a un modelo predefinido de WindLight.
+Puede establecer la posición en el tiempo de cualquier fotograma clave moviéndolo a lo largo de la línea del tiempo, o configurando manualmente su valor en el recuadro Configuración del fotograma clave. También en ese recuadro podrá asociar el fotograma clave a un modelo predefinido de WindLight.
 
-La Duración del ciclo establece la duración total de un &quot;día&quot;. Marcar un valor bajo (por ejemplo, 2 min.) hará que las 24 horas de su línea del tiempo se animen ¡en sólo dos minutos reales! Una vez que esté satisfecho con su ciclo de la línea del tiempo y los fotogramas clave, utilice los botones Probar y Parar para obtener una vista previa de los resultados. Recuerde que también puede mover la flecha amarilla de encima de la línea del tiempo para ver el ciclo de la animación. El botón Usar el horario del estado sincronizará su ciclo de duración de un día con el ciclo del estado.
+La Duración del ciclo establece la duración total de un &apos;día&apos;. Marcar un valor bajo (por ejemplo, 2 min.) hará que las 24 horas de su línea del tiempo se animen ¡en sólo dos minutos reales! Una vez que esté satisfecho con su ciclo de la línea del tiempo y los fotogramas clave, utilice los botones Probar y Parar para obtener una vista previa de los resultados. Recuerde que también puede mover la flecha amarilla de encima de la línea del tiempo para ver el ciclo de la animación. El botón Usar el horario del estado sincronizará su ciclo de duración de un día con el ciclo del estado.
 
 Cuando todo esté a su gusto, puede guardar esos datos y cargarlos luego usando los botones Guardar este tipo de día y Cargar un tipo de día. Note que, por el momento, sólo podemos permitir un ciclo de un día.
 	</notification>
@@ -2235,13 +2238,13 @@ Cuando todo esté a su gusto, puede guardar esos datos y cargarlos luego usando
 		La Densidad de la bruma controla lo sombrío de la atmósfera, su neblina. Es eficaz para simular escenas con mucho humo o contaminantes, y también para simular niebla y llovizna.
 	</notification>
 	<notification name="HelpDensityMult">
-		La Densidad puede usarse para definir globalmente la &apos;pesadez&apos; de la atmósfera. Los ajustes bajos dan sensación de un &quot;aire limpio&quot;, y los altos de pesadez, de esmog.
+		La Densidad puede usarse para definir globalmente la &apos;pesadez&apos; de la atmósfera. Los ajustes bajos dan sensación de un &apos;aire limpio&apos;, y los altos de pesadez, de esmog.
 	</notification>
 	<notification name="HelpDistanceMult">
 		Ajusta a qué distancia se percibe el WindLight. El valor cero desactiva la influencia del WindLight en el terreno y los objetos. Los valores superiores a 1 simulan mayores distancias a las que afectan los efectos atmosféricos
 	</notification>
 	<notification name="HelpMaxAltitude">
-		La Altitud máx. ajusta hasta que altura el WindLight realiza sus cálculos para computar la iluminación atmosférica. En las últimas horas del día, es útil para ajustar la &quot;profundidad&quot; a la que aparece el Sol.
+		La Altitud máx. ajusta hasta que altura el WindLight realiza sus cálculos para computar la iluminación atmosférica. En las últimas horas del día, es útil para ajustar la &apos;profundidad&apos; a la que aparece el Sol.
 	</notification>
 	<notification name="HelpSunlightColor">
 		Ajusta en la escena la intensidad y el color de las luces directas.
@@ -2382,7 +2385,7 @@ Pero, vaya, diviértase si quiere.
 	</notification>
 	<notification name="AutoWearNewClothing">
 		¿Quiere vestirse automáticamente el ítem de ropa nueva que ha creado?
-		<usetemplate ignoretext="Vestirme automáticamente la ropa nueva" name="okcancelignore" notext="No" yestext="Sí"/>
+		<usetemplate ignoretext="Al vestirme automáticamente la ropa nueva" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="NotAgeVerified">
 		Para acceder a esta parcela, se debe haber verificado su edad.
@@ -2390,7 +2393,7 @@ Pero, vaya, diviértase si quiere.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php
+			https://secondlife.com/account/verification.php?lang=es
 		</url>
 		<usetemplate ignoretext="Advertir de la falta de la verificación de edad" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
@@ -2663,7 +2666,7 @@ Vaya a la &apos;Help Island Public&apos; (&apos;Isla Pública de Ayuda&apos;) pa
 	<notification name="ImproperPaymentStatus">
 		No tiene el estado de pago adecuado para entrar a esta región.
 	</notification>
-	<notification name="MustGetAgeRgion">
+	<notification name="MustGetAgeRegion">
 		Debe haber verificado su edad para entrar a esta región.
 	</notification>
 	<notification name="MustGetAgeParcel">
@@ -2944,7 +2947,7 @@ Los objetos flexibles no pueden ser materiales, y serán inmateriales hasta que
 	<notification name="FirstDebugMenus">
 		Ha activado el menú Avanzado.
 Contiene herramientas útiles para los desarrolladores que trabajan mejorando Second Life.
-Para pasar este menú a una ventana, pulse Ctrl-Alt-D. En un Mac, pulse Cmd-Opt-Shift-D.
+Para pasar este menú a una ventana, pulse Ctrl-Alt-D. En un Mac, pulse &#8984;-Opt-D.
 	</notification>
 	<notification name="FirstSculptedPrim">
 		Está editando un prim &apos;sculpted&apos;.
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
index 1e10ccf992..da9a820eb8 100644
--- a/indra/newview/skins/default/xui/es/role_actions.xml
+++ b/indra/newview/skins/default/xui/es/role_actions.xml
@@ -1,186 +1,199 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <role_actions>
 	<action_set
-	     description="Estas habilidades incluyen poderes de adicionar o remover miembros del grupo y permitir que nuevos miembros se junten sin una invitación."
+	     description="Estas capacidades incluyen poderes para añadir o quitar miembros del grupo, y para pemitir que se sumen nuevos miembros sin necesidad de invitación."
 	     name="Membership">
-		<action description="Invitar personas para este grupo"
-		     longdescription="Invite personas para este grupo usando el botón &apos;Invitar nueva persona...&apos; en Miembros &amp; pestaña Funciones &gt; subpestaña Miembros."
+		<action description="Invitar personas al grupo"
+		     longdescription="Invitar a personas al grupo usando el botón &apos;Invitar a un nuevo miembro&apos; en Miembros y Roles &gt; subpestaña Miembros."
 		     name="member invite" value="1" />
-		<action description="Expulsar a miembros de este grupo"
-		     longdescription="Expulse a miembros de este grupo usando el botón &apos;Expulsar del grupo&apos; en Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si usted no es un propietario, un miembro puede a expulsarlo del grupo si, y solamente si, él apenas tiene la función de todos y no otras funciones. Para remover miembros de funciones, necesita tener la habilidad &apos;Remover miembros de funciones&apos;."
+		<action description="Expulsar a miembros del grupo"
+		     longdescription="Expulsar a miembros del grupo usando el botón &apos;Expulsar del grupo&apos; en Miembros y Roles &gt; subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si usted no es un propietario, un miembro del grupo puede expulsarle sólo si tiene concedida tal capacidad específica. Para quitar capacidades a los miembros, usted debe tener la de &apos;Quitar capacidades a miembros&apos;."
 		     name="member eject"  value="2" />
 		<action
-		     description="Activar/desactivar &apos;Abrir registro&apos; y cambiar &apos;Tasa de suscripción&apos;"
-		     longdescription="Active/desactive &apos;Abrir registro&apos; para permitir que nuevos miembros se unan sin una invitación, y cambie &apos;Tasa de registro&apos; en la sección Preferencia de grupo de la pestaña General."
+		     description="Activar/desactivar &apos;Inscripción libre&apos; y cambiar &apos;Cuota de inscripción&apos;"
+		     longdescription="Activar/desactivar &apos;Inscripción libre&apos; para permitir o no que se unan sin invitación nuevos miembros, y cambiar la &apos;Cuota de inscripción&apos; en la sección Preferencias del grupo de la pestaña General."
 		     name="member options"  value="3" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de adicionar, remover y cambiar funciones del grupo; adicionar y remover miembros en funciones y designar habilidades a funciones."
+	     description="Estas habilidades incluyen el poder añadir, quitar y cambiar roles, asignarlos a  miembros, y darles capacidades."
 	     name="Roles">
-		<action description="Crear nuevas funciones"
-		     longdescription="Cree nuevas funciones en Miembros &amp; pestaña Funciones &gt; subpestaña Funciones."
+		<action description="Crear nuevos roles"
+		     longdescription="Crear nuevos roles en Miembros y Roles &gt; pestaña Roles &gt; botón Crear un rol nuevo."
 		     name="role create" value="4" />
-		<action description="Borrar funciones"
-		     longdescription="Borra funciones en Miembros &amp; pestaña Funciones &gt; subpestaña Funciones."
+		<action description="Borrar roles"
+		     longdescription="Borrar roles en Miembros y Roles &gt; pestaña Roles &gt; botón Eliminar el rol."
 		     name="role delete" value="5" />
-		<action description="Cambiar nombres de funciones, títulos y descripciones"
-		     longdescription="Cambie el nombre de funciones, títulos y descripciones en la parte inferior de Miembros &amp; pestaña Funciones &gt; subpestaña Funciones después de seleccionar una función."
+		<action description="Cambiar nombres de roles, títulos y descripciones"
+		     longdescription="Cambiar el nombre del rol que elija, su etiqueta y descripción en la parte media de la pestaña Miembros y Roles."
 		     name="role properties" value="6" />
-		<action description="Designar miembros para la función&apos;s del asignador"
-		     longdescription="Designe miembros para funciones en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Un miembro con este poder puede solamente adicionar miembros para la función que el asignador ya posee."
+		<action description="Designar miembros para el rol del asignador"
+		     longdescription="Designar miembros para un rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. Un miembro con este poder sólo puede asignar a otros el rol que él posee."
 		     name="role assign member limited" value="7" />
-		<action description="Designar miembros para cualquier función"
-		     longdescription="Designe miembros para cualquier función en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. *AVISO* Cualesquiera miembros en una función con esta habilidad pueden designar a sí propios--y cualesquiera otros miembros no propietarios--para funciones que tienen más poderes que las actuales, promocionándolos a poderes próximos al del propietario. Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+		<action description="Designar miembros para cualquier rol"
+		     longdescription="Designar miembros para cualquier rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrese de lo que está haciendo antes de otorgar esta capacidad."
 		     name="role assign member" value="8" />
-		<action description="Remover miembros de las funciones"
-		     longdescription="Remueva miembros de funciones en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Propietarios no pueden&apos; ser removidos."
+		<action description="Quitar capacidades a los miembros"
+		     longdescription="Quitar capacidades a los miembros en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. No se pueden quitar a los Propietarios."
 		     name="role remove member" value="9" />
-		<action description="Determinar y remover habilidades en función"
-		     longdescription="Designe y remueva habilidades en funciones en la sección habilidades permitidas de Miembros &amp; pestaña Funciones &gt; subpestaña Funciones. *AVISO* Cualesquiera miembros en una función con esta habilidad pueden designar a sí propios--y cualesquiera otros miembros no propietarios--todas las habilidades, promocionándolos a poderes próximos al del propietario. Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+		<action description="Añadir o quitar capacidades a los roles"
+		     longdescription="Añadir o quitar capacidades a los roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrese de lo que está haciendo antes de otorgar esta capacidad."
 		     name="role change actions" value="10" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes para modificar esta identidad de grupo, como cambiar la visibilidad pública, presentación y insignia."
+	     description="Estas capacidades incluyen poderes para modificar la identidad del grupo, como su visibilidad pública, su carta o su emblema."
 	     name="Group Identity">
 		<action
-		     description="Cambiar presentación, insignia, &apos;Publicar en la web&apos;, y cuales miembros están públicamente visibles en Informaciones del Grupo."
-		     longdescription="Cambie la presentación, insignia, &apos;Publicar en la web&apos; y cuales miembros están públicamente visibles en  Informaciones del grupo. Es hecho en la pestaña General."
+		     description="Cambiar la carta, emblema, &apos;Mostrar en la búsqueda&apos;, y qué miembros serán visibles en la información del grupo"
+		     longdescription="Cambiar la carta, emblema, &apos;Mostrar en la búsqueda&apos;, y qué miembros serán visibles en la información del grupo de la pestaña General."
 		     name="group change identity" value="11" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Vaya para la ventana Sobre el terreno, haga clic con el botón derecho en el terreno y seleccione &apos;Sobre el terreno...&apos; o haga clic en la información de la parcela en la barra del menú."
+	     description="Estas capacidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Vea el menú Mundo &gt; Acerca del terreno, o pulse con el botón derecho en el terreno y seleccione &apos;Acerca del terreno...&apos;, o pulse en la información de la parcela en la barra superior del menú."
 	     name="Parcel Management">
 		<action description="Transferir  y comprar terreno para el grupo"
-		     longdescription="Transfiere y compre terreno para el grupo. Es hecho en Sobre el terreno &gt; pestaña General."
+		     longdescription="Transferir y comprar terreno para el grupo. Se hace en Acerca del terreno &gt; pestaña General."
 		     name="land deed" value="12" />
-		<action description="Abandonar al terreno para Gobernador Linden"
-		     longdescription="Abandone al terreno para Gobernador Linden. *AVISO* Cualquier miembro en una función con esta habilidad puede  abandonar al terreno perteneciente al grupo en Sobre el terreno &gt; pestaña General, revirtiendo a la posesión Linden sin una venta! Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+		<action description="Abandonar al terreno a favor de Governor Linden"
+		     longdescription="Abandonar al terreno a favor de Governor Linden. *AVISO* Todos los miembros con esta capacidad pueden abandonar terreno perteneciente al grupo en Acerca del terreno &gt; pestaña General, devolviendo la posesión a Linden ¡gratuitamente! Asegúrese de lo que está haciendo antes de otorgar esta capacidad."
 		     name="land release" value="13" />
-		<action description="Definir terreno para información de venta"
-		     longdescription="Defina informaciones de venta para terreno. *AVISO* Cualquier miembro en una función con esta habilidad puede vender terrenos pertenecientes al grupo en Sobre el terreno &gt; pestaña General ¡cómo quiera! Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+		<action description="Vender terreno"
+		     longdescription="Vender terreno. *AVISO* Todos los miembros con esta capacidad pueden vender terreno perteneciente al grupo -¡en la forma en que quieran!- en Acerca del terreno &gt; pestaña General. Asegúrese de lo que está haciendo antes de otorgar esta capacidad."
 		     name="land set sale info" value="14" />
-		<action description="Subdividir y unir parcelas"
-		     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
+		<action description="Dividir y unir parcelas"
+		     longdescription="Dividir y unir parcelas. Se hace pulsando con el botón derecho en el terreno, &apos;Modificar el terreno&apos;, y dibujando en el terreno con el ratón lo que se quiere seleccionar. Para dividir, elija la parte que quiere separar y pulse &apos;Subdividir...&apos;. Para unir, seleccione dos o más parcelas contiguas y pulse &apos;Unir...&apos;. "
 		     name="land divide join" value="15" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes para cambiar el nombre de las parcelas y configuraciones de publicación, visibilidad de la búsqueda de directorio y punto de aterrizaje &amp; opciones de ruta de TP."
+	     description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración, así como si se muestra en Buscar y las opciones del punto de llegada y el de teleporte."
 	     name="Parcel Identity">
 		<action
-		     description="Activar/desactivar &apos;Exhibir en locales de encuentro&apos; y definir categoría"
-		     longdescription="Activar/desactivar &apos;Exhibir en locales de encuentro&apos; y configurar una categoría de parcela en Sobre el terreno &gt; pestaña Opciones."
+		     description="Activar/desactivar &apos;Mostrar en Buscar&apos; y el definir la categoría"
+		     longdescription="Activar/desactivar el &apos;Mostrar en Buscar&apos; y en que categoría se mostrará en Acerca del terreno &gt; pestaña Opciones."
 		     name="land find places" value="17" />
 		<action
-		     description="Cambiar nombre de la parcela, descripción, y configuraciones &apos;Publicar en la web&apos;"
-		     longdescription="Cambie el nombre de la parcela, descripción y configuraciones de &apos;Publicar en la web&apos;. Es hecho en Sobre el terreno &gt; pestaña Opciones."
+		     description="Cambiar el nombre de la parcela, la descripción, y la configuración de &apos;Mostrar en Buscar&apos;"
+		     longdescription="Cambiar el nombre y descripción de la parcela, y la configuración de &apos;Mostrar en Buscar&apos;. Se hace en Acerca del terreno &gt; pestaña Opciones."
 		     name="land change identity" value="18" />
-		<action description="Definir punto de aterrizaje y ruta de teletransporte"
-		     longdescription="En una parcela perteneciente al grupo, miembros en una función con esta habilidad pueden definir un punto de aterrizaje para especificar donde los teletransportes llegan y también definir la ruta del teletransporte para un mayor control. Es hecho en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Definir los puntos de llegada y teleporte"
+		     longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden precisar el punto de llegada o el de teleporte. Se hace en Acerca del terreno &gt; pestaña Opciones."
 		     name="land set landing point" value="19" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes que afectan opciones de parcela, como &apos;Crear objetos&apos;, &apos;Editar terreno&apos; y música &amp; configuraciones de multimedia."
+	     description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como &apos;Crear objetos&apos;, &apos;Editar el terreno&apos; y las configuraciones de la música y los media."
 	     name="Parcel Settings">
-		<action description="Cambiar música &amp; configuraciones de multimedia"
-		     longdescription="Cambie streaming de música y configuraciones de vídeo en Sobre el terreno &gt; pestaña Multimedia."
+		<action description="Cambiar música y configuraciones de los media"
+		     longdescription="Cambiar la música en streaming y las configuraciones de vídeo en Acerca del terreno &gt; pestaña Media."
 		     name="land change media" value="20" />
-		<action description="Activar/desactivar &apos;Editar terreno&apos;"
-		     longdescription="Active/desactive &apos;Editar terreno&apos;. *AVISO* Sobre el terreno &gt; pestaña Opciones &gt; Editar terreno permite a cualquiera alterar las formas de su terreno&apos;, sustituir y mover plantas Linden. Asegúrese de saber lo que está haciendo antes de designar esta habilidad. La edición de terreno es activada/desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Activar/desactivar &apos;Editar el terreno&apos;"
+		     longdescription="Activar/desactivar &apos;Editar el terreno&apos;. *AVISO* Acerca del terreno &gt; pestaña Opciones &gt; Editar el terreno, permite a cualquiera alterar la forma de su terreno y sustituir y mover plantas Linden. Asegúrese de lo que está haciendo antes de otorgar esta capacidad. La edición del terreno se activada/desactiva en Acerca del terreno &gt; pestaña Opciones."
 		     name="land edit" value="21" />
 		<action
-		     description="Activar/desactivar variados Sobre el Terreno &gt; Opciones de configuraciones"
-		     longdescription="Active/desactive &apos;Seguro (sin daño)&apos;, &apos;Volar&apos;, y permita a otros residentes: &apos;Crear objetos&apos;, &apos;Editar terreno&apos;, &apos;Crear puntos de referencia&apos;, y &apos;Ejecutar scripts&apos; en un terreno perteneciente al grupo en Sobre el terreno &gt; pestaña Opciones."
+		     description="Activar/desactivar varios ítems de Acerca del terreno &gt; Opciones"
+		     longdescription="Activar/desactivar en un terreno del grupo los ítems de Acerca del terreno &gt; pestaña Opciones: &apos;Seguro (sin daño)&apos;, &apos;Volar&apos;, y permitir a otros residentes: &apos;Crear objetos&apos;, &apos;Editar el terreno&apos;, &apos;Crear hitos&apos;, y &apos;Ejecutar scripts&apos;."
 		     name="land options" value="22" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes que permiten a miembros rebasar restricciones en parcelas pertenecientes al grupo."
+	     description="Estas capacidades incluyen poderes que permiten a los miembros rebasar las restricciones de parcelas pertenecientes al grupo."
 	     name="Parcel Powers">
-		<action description="Siempre permitir &apos;Editar terreno&apos;"
-		     longdescription="Miembros en una función con esta habilidad pueden editar terreno en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Permitir siempre &apos;Editar el terreno&apos;"
+		     longdescription="Quien tenga un rol con esta capacidad puede editar el terreno de una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones."
 		     name="land allow edit land" value="23" />
-		<action description="Siempre permitir &apos;Volar&apos;"
-		     longdescription="Miembros en una función con esta habilidad pueden volar sobre una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Permitir siempre &apos;Volar&apos;"
+		     longdescription="Quien tenga un rol con esta capacidad puede volar sobre una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones."
 		     name="land allow fly" value="24" />
-		<action description="Siempre permitir &apos;Crear objetos&apos;"
-		     longdescription="Miembros en una función con esta habilidad pueden crear objetos en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Permitir siempre &apos;Crear objetos&apos;"
+		     longdescription="Quien tenga un rol con esta capacidad puede crear objetos en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones."
 		     name="land allow create" value="25" />
-		<action description="Siempre permitir &apos;Crear punto de referencia&apos;"
-		     longdescription="Miembros en una función con esta habilidad pueden poner un punto de referencia en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+		<action description="Permitir siempre &apos;Crear hitos&apos;"
+		     longdescription="Quien tenga un rol con esta capacidad puede crear un hito en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones."
 		     name="land allow landmark" value="26" />
-		<action description="Permitir &apos;Colocar casa aquí&apos; en el terreno del grupo"
-		     longdescription="Miembros en una función con esta habilidad pueden usar el menú Mundo &gt; Definir hogar aquí en una parcela del grupo (definir terreno o transferir para este grupo)."
+		<action description="Permitir &apos;Fijar mi Base aquí&apos; en el terreno del grupo"
+		     longdescription="Quien tenga un rol con esta capacidad puede usar el menú Mundo &gt; Fijar mi Base aquí en una parcela transferida al grupo."
 		     name="land allow set home" value="28" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de permitir o restringir acceso a parcelas pertenecientes al grupo, incluyendo congelar y expulsar a residentes."
+	     description="Estas capacidades incluyen poderes para permitir o restringir el acceso a parcelas pertenecientes al grupo, incluyendo el congelar y expulsar a residentes."
 	     name="Parcel Access">
-		<action description="Administrar listas de acceso a la parcela"
-		     longdescription="Administre la lista de acceso a la parcela en Sobre el terreno &gt; pestaña Acceso."
+		<action description="Administrar las listas de acceso a la parcela"
+		     longdescription="Administre las listas de acceso a la parcela en Acerca del terreno &gt; pestaña Acceso."
 		     name="land manage allowed" value="29" />
-		<action description="Administrar lista de desterrados de la parcela"
-		     longdescription="Administre la lista de desterrados de la parcela en Sobre el terreno &gt; pestaña Desterrado."
+		<action description="Administrar la lista de residentes con el acceso prohibido"
+		     longdescription="Administrar la lista de residentes con el acceso prohibido a la parcela en Acerca del terreno &gt; pestaña Acceso."
 		     name="land manage banned" value="30" />
-		<action description="Cambiar configuraciones de parcela &apos;Vender pases...&apos;"
-		     longdescription="Cambie configuraciones de &apos;Vender pases...&apos; en Sobre el terreno &gt; pestaña Acceso."
+		<action description="Cambiar en las configuraciones de parcela el &apos;Vender pases a...&apos;"
+		     longdescription="Cambiar la configuración de &apos;Vender pases a...&apos; en Acerca del terreno &gt; pestaña Acceso."
 		     name="land manage passes" value="31" />
 		<action description="Expulsar y congelar residentes en las parcelas"
-		     longdescription="Miembros en una función con esta habilidad pueden lidiar con un residente indeseado en una parcela perteneciente al grupo haciendo clic con el botón derecho sobre él, Más &gt; y seleccionando &apos;Expulsar...&apos; o &apos;Congelar...&apos;."
+		     longdescription="Quien tenga un rol con esta capacidad puede actuar frente a un residente indeseado en una parcela del grupo pulsando con el botón derecho sobre él, Más &gt; y seleccionando &apos;Expulsar...&apos; o &apos;Congelar...&apos;."
 		     name="land admin" value="32" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de permitir a miembros devolver objetos y poner y mover plantas Linden. Útil para que miembros organicen el paisaje, pero debe ser usado con cuidado, debido a no ser posible deshacer la mudanza de los objetos."
+	     description="Estas capacidades incluyen poderes que permitan a los miembros devolver objetos y poner y mover plantas Linden. Es útil para que miembros organicen el paisaje, pero debe ser usado con cuidado, ya que no se pueden deshacer esos cambios en los objetos."
 	     name="Parcel Content">
 		<action description="Devolver objetos que pertenecen al grupo"
-		     longdescription="Devuelva objetos en parcelas pertenecientes al grupo que pertenecen al grupo en Sobre el terreno &gt; pestaña Objetos."
+		     longdescription="Devolver objetos pertenecientes al grupo en parcelas de su propiedad en Acerca del terreno &gt; pestaña Objetos."
 		     name="land return group owned" value="48" />
 		<action description="Devolver objetos definidos para el grupo"
-		     longdescription="Devuelva objetos en parcelas pertenecientes al grupo en Sobre el terreno &gt; pestaña Objetos."
+		     longdescription="Devuelva objetos en parcelas pertenecientes al grupo en Acerca del terreno &gt; pestaña Objetos."
 		     name="land return group set" value="33" />
 		<action description="Devolver objetos que no pertenecen al grupo"
-		     longdescription="Devuelva objetos en las parcelas pertenecientes a un grupo que está sin grupo en el Sobre el terreno &gt; pestaña Objetos."
+		     longdescription="Devuolver objetos que estén en una parcela del grupo y pertenezcan a alguien que no sea del grupo en Acerca del terreno &gt; pestaña Objetos."
 		     name="land return non group" value="34" />
-		<action description="Enjardinar usando plantas Linden"
-		     longdescription="La habilidad de enjardinar permite poner y mover árboles Linden, plantas y céspedes. Estos ítems pueden ser encontrados en la&apos;s Biblioteca de su inventario &gt; carpeta Objetos o pueden ser criados a través del botón Construir."
+		<action description="Modificar el paisaje usando plantas Linden"
+		     longdescription="La capacidad de modificar el paisaje permite poner y mover árboles Linden, plantas y arbustos. Estos ítems están en la &apos;s Biblioteca de su Inventario &gt; carpeta Objetos, o pueden crearse con el botón Construir."
 		     name="land gardening" value="35" />
 	</action_set>
 	<action_set
-	     description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
+	     description="Estas capacidades incluyen poderes para tranferir, modificar y vender objetos pertenecientes al grupo. Estos cambios se hacen en la pestaña General de la herramienta de edición. Para verlo, pulse en un objeto con el botón derecho y elija Editar. "
 	     name="Object Management">
-		<action description="Transferir objetos para el grupo"
-		     longdescription="Transfiere objetos para el grupo en Editar herramientas &gt; pestaña General."
+		<action description="Transferir objetos al grupo"
+		     longdescription="Transferir objetos al grupo en Editar &gt; pestaña General."
 		     name="object deed" value="36" />
-		<action description="Manipular (mover, copiar, modificar) objetos del grupo"
-		     longdescription="Manipule (mover,copiar, modificar) objetos pertenecientes al grupo en Editar Herramientas &gt; pestaña General."
+		<action description="Manipular (mover, copiar, y modificar) objetos del grupo"
+		     longdescription="Manipular (mover, copiar, y modificar) objetos pertenecientes al grupo en Editar &gt; pestaña General."
 		     name="object manipulate" value="38" />
-		<action description="Definir objetos pertenecientes al grupo para venta"
-		     longdescription="Defina objetos pertenecientes al grupo para venta en Editar Herramientas &gt; pestaña General."
+		<action description="Vender objetos pertenecientes al grupo"
+		     longdescription="Poner a la venta objetos pertenecientes al grupo para venta en Editar &gt; pestaña General."
 		     name="object set sale" value="39" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes que requieren que miembros paguen deudas y reciban dividendos del grupo, y  restringen acceso al historial de cuenta del grupo."
+	     description="Estas habilidades incluyen poderes para que los miembros paguen deudas del grupo o reciban sus dividendos, y para limitar el acceso al historial de la cuenta del grupo."
 	     name="Accounting">
-		<action description="Pagar débitos y reciber dividendos del grupo"
-		     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+		<action description="Pagar deudas y recibir dividendos del grupo"
+		     longdescription="Quien tenga un rol con esta capacidad, automáticamente pagará deudas del grupo y recibirá sus dividendos. Esto significa que recibirá una parte de las ventas de terreno de grupo, y que contribuirá a cosas como, por ejemplo, las cuotas por posesión de terreno. "
 		     name="accounting accountable" value="40" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de permitir enviar, recibir y ver avisos de grupo."
+	     description="Estas habilidades incluyen poderes para enviar, recibir y ver avisos de grupo."
 	     name="Notices">
 		<action description="Enviar aviso"
-		     longdescription="Miembros en una función con esta habilidad pueden enviar avisos en Informaciones de grupo &gt; pestaña Avisos."
+		     longdescription="Quien tenga un rol con esta capacidad puede enviar avisos en Información del grupo &gt; pestaña Avisos."
 		     name="notices send" value="42" />
-		<action description="Reciber nuevos avisos y ver los anteriores"
-		     longdescription="Miembros en una función con esta habilidad pueden recibir los nuevos avisos y ver los anteriores en Informaciones de grupo &gt; pestaña Avisos."
+		<action description="Recibir avisos nuevos y ver los anteriores"
+		     longdescription="Quien tenga un rol con esta capacidad puede recibir los avisos nuevos, y ver los anteriores en Información del grupo &gt; pestaña Avisos."
 		     name="notices receive" value="43" />
 	</action_set>
 	<action_set
-	     description="Estas habilidades incluyen poderes de permitir a miembros definir y votar en propuestas y ver historial de votación."
+	     description="Estas habilidades incluyen poderes para permitir a los miembros crear propuestas, votarlas, y ver el historial de votaciones."
 	     name="Proposals">
-		<action description="Crear propuesta"
-		     longdescription="Miembros en una función con esta habilidad pueden crear propuestas para que sean votadas en Informaciones de grupo &gt; pestaña Propuestas."
+		<action description="Hacer una propuesta"
+		     longdescription="Quien tenga un rol con esta capacidad puede crear propuestas para que sean votadas en Información del grupo &gt; pestaña Propuestas."
 		     name="proposal start" value="44" />
 		<action description="Votar en propuestas"
-		     longdescription="Miembros en una función con esta habilidad pueden votar en propuestas en Informaciones de grupo &gt; pestaña Propuestas."
+		     longdescription="Quien tenga un rol con esta capacidad puede votar las propuestas en Información del grupo &gt; pestaña Propuestas."
 		     name="proposal vote" value="45" />
 	</action_set>
+	<action_set
+	     description="Estas capacidades incluyen poderes para permitir o no el aceso a las sesiones de chat del grupo y al chat de voz del mismo." 
+	     name="Chat">
+		<action description="Abrir chat de grupo"
+		     longdescription="Quien tenga un rol con esta capacidad puede abrir sesiones de chat del grupo, tanto de texto como de voz."
+		     name="join group chat" value="16" />
+		<action description="Abrir chat de voz del grupo"
+		     longdescription="Quien tenga un rol con esta capacidad puede abrir sesiones de chat de voz del grupo. NOTA: para acceder al chat de voz debe tenerse la capacidad &apos;Abrir chat de grupo&apos;."
+		     name="join voice chat" value="27" />
+		<action description="Moderar el chat de grupo"
+		     longdescription="Quien tenga esta capacidad puede controlar el acceso y la participación en los chats de texto y de voz del grupo."
+		     name="moderate group chat" value="37" />
+	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 4793f6c661..96bf0ea865 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -55,6 +55,9 @@
 	<string name="LoginDownloadingClothing">
 		Descargando la ropa...
 	</string>
+	<string name="Quit">
+		Salir
+	</string>
 	<string name="AgentLostConnection">
 		Esta región puede estar teniendo problemas. Por favor, compruebe su conexión a internet.
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 30092a426f..7d2cdd8454 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -6,6 +6,9 @@
 	<global name="alwayschoose">
 		Toujours choisir cette option
 	</global>
+	<global name="implicitclosebutton">
+		Fermer
+	</global>
   <template name="okbutton">
     <form>
       <button
@@ -2877,7 +2880,7 @@ Les objets flexibles ne peuvent pas avoir de propriétés physiques et doivent r
 	<notification name="FirstDebugMenus">
 		Vous avez activé le menu Avancé.
 Ce menu contient des fonctionnalités utiles pour les développeurs qui travaillent sur Second Life.
-Pour activer/désactiver ce menu sous Windows, appuyez sur Ctrl-Alt-D. Sur un Mac, appuyez sur Cmd-Opt-Maj-D
+Pour activer/désactiver ce menu sous Windows, appuyez sur Ctrl-Alt-D. Sur un Mac, appuyez sur &#8984;-Opt-Maj-D
 	</notification>
 	<notification name="FirstSculptedPrim">
 		Vous êtes en train d&apos;éditer un sculptie.
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index a89ae9d803..3c79cd8829 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Costruisci" width="288">
 	<button label="" label_selected="" name="button focus" tool_tip="Focus"/>
 	<button label="" label_selected="" name="button move" tool_tip="Muoviti"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Modifica"/>
 	<button label="" label_selected="" name="button create" tool_tip="Crea"/>
 	<button label="" label_selected="" name="button land" tool_tip="Terra"/>
 	<check_box label="Zoom" name="radio zoom"/>
-	<check_box label="Guarda ruotando(Ctrl)" name="radio orbit"/>
+	<check_box label="Guarda ruotando (Ctrl)" name="radio orbit"/>
 	<check_box label="Guarda panoramicamente (Ctrl-Shift)" name="radio pan"/>
 	<check_box label="Muovi" name="radio move"/>
 	<check_box label="Alza (Ctrl)" name="radio lift"/>
@@ -17,9 +17,9 @@
 	<check_box label="Seleziona Texture" name="radio select face"/>
 	<check_box label="Modifica parti unite" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
-		Modalità regolo di precisione:
+		Modalità:
 	</text>
-	<combo_box name="combobox grid mode">
+	<combo_box name="combobox grid mode" left_delta="48">
 		<combo_item name="World">
 			Globale
 		</combo_item>
@@ -30,11 +30,11 @@
 			Riferito a
 		</combo_item>
 	</combo_box>
-	<check_box label="Ridimensiona simmetricamente" name="checkbox uniform"/>
-	<check_box label="Ridimensiona le Texture" name="checkbox stretch textures"/>
+	<check_box label="Ridimens. simmetricamente" name="checkbox uniform"/>
+	<check_box label="Ridimensiona le texture" name="checkbox stretch textures"/>
 	<check_box label="Usa righello" name="checkbox snap to grid"/>
 	<button label="Opzioni..." label_selected="Opzioni..." name="Options..."/>
-	<text name="text status">
+	<text name="text status" width="280">
 		Trascina per muovere, trascina+maiuscolo per copiare
 	</text>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
@@ -63,23 +63,24 @@
 	<check_box label="Uniforma" name="radio smooth"/>
 	<check_box label="Ondula" name="radio noise"/>
 	<check_box label="Ripristina" name="radio revert"/>
-	<button label="Applica" label_selected="Applica" name="button apply to selection" tool_tip="Modifica il terreno selezionato"/>
+	<button label="Applica" label_selected="Applica" name="button apply to selection" tool_tip="Modifica il terreno selezionato" left="146"/>
 	<text name="Bulldozer:">
 		Bulldozer:
 	</text>
 	<text name="Dozer Size:">
 		Grandezza
 	</text>
+	<volume_slider left="184" name="slider brush size" width="74" />
 	<text name="Strength:">
 		Potenza
 	</text>
-	<text name="obj_count">
+	<text name="obj_count" left="134">
 		Oggetti selezionati: [COUNT]
 	</text>
-	<text name="prim_count">
-		primitive: [COUNT]
+	<text name="prim_count" left="134">
+		primitivi: [COUNT]
 	</text>
-	<tab_container name="Object Info Tabs">
+	<tab_container name="Object Info Tabs" tab_max_width="150" tab_min_width="30" width="288">
 		<panel label="Generale" name="General">
 			<text name="Name:">
 				Nome:
@@ -121,7 +122,7 @@
 			<string name="text deed">
 				Cedi al gruppo
 			</string>
-			<button label="Cedi al gruppo..." label_selected="Cedi al gruppo..." name="button deed" tool_tip="Gli oggetti condivisi con il gruppo possono essere ceduti da un funzionario del gruppo."/>
+			<button left_delta="152" width="98" label="Cedi al gruppo..." label_selected="Cedi al gruppo..." name="button deed" tool_tip="Gli oggetti condivisi con il gruppo possono essere ceduti da un funzionario del gruppo."/>
 			<check_box label="Permetti a chiunque di spostare" name="checkbox allow everyone move"/>
 			<check_box label="Permetti a chiunque di copiare" name="checkbox allow everyone copy"/>
 			<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti che l&apos;oggetto sia visibile nella ricerca"/>
@@ -144,12 +145,12 @@
 				Il prossimo proprietario può:
 			</text>
 			<check_box label="Modificare" name="checkbox next owner can modify"/>
-			<check_box label="Copiare" name="checkbox next owner can copy"/>
-			<check_box label="Rivendere/Regalare" name="checkbox next owner can transfer"/>
-			<text name="label click action">
-				Se cliccato con il tasto sinistro del mouse
+			<check_box label="Copiare" name="checkbox next owner can copy" left_delta="80"/>
+			<check_box label="Rivendere/Regalare" name="checkbox next owner can transfer" left_delta="67"/>
+			<text name="label click action" width="220">
+				Se cliccato con il tasto sinistro del mouse:
 			</text>
-			<combo_box name="clickaction">
+			<combo_box name="clickaction" width="192">
 				<combo_item name="Touch/grab(default)">
 					Tocca/Afferra (default)
 				</combo_item>
@@ -176,7 +177,7 @@
 				B:
 			</text>
 			<text name="O:">
-				O;
+				O:
 			</text>
 			<text name="G:">
 				G:
@@ -206,7 +207,7 @@
 				Devi selezionare l&apos;intero oggetto per impostare i permessi.
 			</string>
 			<string name="Cost Default">
-				Prezzo:           L$
+				Prezzo:         L$
 			</string>
 			<string name="Cost Total">
 				Prezzo totale:  L$
@@ -351,7 +352,7 @@
 			</text>
 			<spinner label="X" name="Shear X"/>
 			<spinner label="Y" name="Shear Y"/>
-			<text name="advanced_cut">
+			<text name="advanced_cut" width="149">
 				Ritaglia il profilo Inizio e Fine
 			</text>
 			<text name="advanced_dimple">
@@ -398,29 +399,29 @@
 			</combo_box>
 		</panel>
 		<panel label="Caratteristiche" name="Features">
-			<text name="select_single">
+			<text name="select_single" width="280">
 				Seleziona solo un prim per modificarne le caratteristiche.
 			</text>
 			<text name="edit_object">
 				Modifica le caratteristiche dell&apos;oggetto:
 			</text>
 			<check_box label="Flessibilità" name="Flexible1D Checkbox Ctrl" tool_tip="Permette all&apos;oggetto di flettersi rispetto all&apos;asse Z. (solo lato client)"/>
-			<spinner label="Morbidezza" name="FlexNumSections"/>
-			<spinner label="Gravità" name="FlexGravity"/>
-			<spinner label="Elasticità" name="FlexFriction"/>
-			<spinner label="Sventolio" name="FlexWind"/>
-			<spinner label="Tensione" name="FlexTension"/>
-			<spinner label="Forza X" name="FlexForceX"/>
-			<spinner label="Forza Y" name="FlexForceY"/>
-			<spinner label="Forza Z" name="FlexForceZ"/>
+			<spinner label="Morbidezza" name="FlexNumSections" label_width="72" width="135"/>
+			<spinner label="Gravità" name="FlexGravity" label_width="72" width="135"/>
+			<spinner label="Elasticità" name="FlexFriction" label_width="72" width="135"/>
+			<spinner label="Sventolio" name="FlexWind" label_width="72" width="135"/>
+			<spinner label="Tensione" name="FlexTension" label_width="72" width="135"/>
+			<spinner label="Forza X" name="FlexForceX" label_width="72" width="135"/>
+			<spinner label="Forza Y" name="FlexForceY" label_width="72" width="135"/>
+			<spinner label="Forza Z" name="FlexForceZ" label_width="72" width="135"/>
 			<check_box label="Luce" name="Light Checkbox Ctrl" tool_tip="Imposta l&apos;oggetto come sorgente di luce"/>
 			<text name="label color">
 				Colore
 			</text>
 			<color_swatch label="" name="colorswatch" tool_tip="Clicca per aprire la tavolozza dei colori"/>
-			<spinner label="Intensità" name="Light Intensity"/>
-			<spinner label="Raggio" name="Light Radius"/>
-			<spinner label="Attenuazione" name="Light Falloff"/>
+			<spinner label="Intensità" name="Light Intensity" label_width="72" width="135"/>
+			<spinner label="Raggio" name="Light Radius" label_width="72" width="135"/>
+			<spinner label="Attenuazione" name="Light Falloff" label_width="72" width="135" />
 		</panel>
 		<panel label="Texture" name="Texture">
 			<texture_picker label="Texture" name="texture control" tool_tip="Clicca per scegliere un&apos;immagine"/>
@@ -431,11 +432,11 @@
 			<text name="glow label">
 				Bagliore
 			</text>
-			<check_box label="Massima luminosità" name="checkbox fullbright"/>
+			<check_box label="Massima &#10;luminosità" name="checkbox fullbright" bottom_delta="-21"/>
 			<text name="tex gen">
-				Applicazione della texture
+				Applicazione &#10;della texture
 			</text>
-			<combo_box name="combobox texgen">
+			<combo_box name="combobox texgen" bottom_delta="-38">
 				<combo_item name="Default">
 					Default
 				</combo_item>
@@ -443,10 +444,10 @@
 					Planare
 				</combo_item>
 			</combo_box>
-			<text name="label shininess">
+			<text name="label shininess" bottom="-120">
 				Brillantezza
 			</text>
-			<combo_box name="combobox shininess">
+			<combo_box name="combobox shininess" bottom_delta="-22">
 				<combo_item name="None">
 					Nessuna
 				</combo_item>
@@ -460,10 +461,10 @@
 					Alta
 				</combo_item>
 			</combo_box>
-			<text name="label bumpiness">
+			<text name="label bumpiness" bottom="-120">
 				Rilievo
 			</text>
-			<combo_box name="combobox bumpiness">
+			<combo_box name="combobox bumpiness" width="100" bottom_delta="-22">
 				<combo_item name="None">
 					Nessuna
 				</combo_item>
@@ -538,7 +539,9 @@
 			<text name="rpt">
 				Ripetizioni per metro
 			</text>
-			<button label="Applica" label_selected="Applica" name="button apply"/>
+			<spinner left="120" name="TexRot" width="60" />
+			<spinner left="120" name="rptctrl" width="60" />
+			<button label="Applica" label_selected="Applica" name="button apply" left_delta="72"/>
 			<text name="tex offset">
 				Offset
 			</text>
@@ -548,11 +551,12 @@
 				Allinea texture dei media
 (deve prima caricarsi)
 			</text>
-			<button label="Allinea" label_selected="Allinea" name="button align"/>
+			<button label="Allinea" label_selected="Allinea" name="button align" left="160"/>
 		</panel>
 		<panel label="Contenuto" name="Contents">
 			<button label="Nuovo Script" label_selected="Nuovo script..." name="button new script"/>
 			<button label="Permessi..." name="button permissions"/>
+			<panel name="ContentsInventory" width="272" />
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
@@ -560,24 +564,24 @@
 			Informazioni sul terreno
 		</text>
 		<text name="label_area_price">
-			Prezzo: [PRICE] L$ per [AREA] mq.
+			Prezzo: [PRICE] L$ per [AREA] m²
 		</text>
 		<text name="label_area">
-			Area: [AREA] mq.
+			Area: [AREA] m²
 		</text>
-		<button label="Informazioni sul terreno..." label_selected="Informazioni sul terreno..." name="button about land"/>
+		<button label="Informazioni sul terreno..." label_selected="Informazioni sul terreno..." name="button about land" width="156"/>
 		<check_box label="Mostra i proprietari" name="checkbox show owners" tool_tip="Colora i terreni in base ai loro proprietari"/>
-		<button label="?" label_selected="?" name="button show owners help"/>
+		<button label="?" label_selected="?" name="button show owners help" left_delta="120"/>
 		<text name="label_parcel_modify">
 			Modifica il terreno
 		</text>
-		<button label="Suddividi..." label_selected="Suddividi..." name="button subdivide land"/>
-		<button label="Unisci..." label_selected="Unisci..." name="button join land"/>
+		<button label="Suddividi..." label_selected="Suddividi..." name="button subdivide land" width="156"/>
+		<button label="Unisci..." label_selected="Unisci..." name="button join land" width="156"/>
 		<text name="label_parcel_trans">
 			Transazioni del territorio
 		</text>
-		<button label="Acquista il terreno..." label_selected="Acquista il terreno..." name="button buy land"/>
-		<button label="Abbandona il terreno..." label_selected="Abbandona il terreno..." name="button abandon land"/>
+		<button label="Acquista il terreno..." label_selected="Acquista il terreno..." name="button buy land" width="156"/>
+		<button label="Abbandona il terreno..." label_selected="Abbandona il terreno..." name="button abandon land" width="156"/>
 	</panel>
 	<string name="status_rotate">
 		Sposta le fasce colorate per ruotare l&apos;oggetto
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index a9edf6766e..9e54bc24a9 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -6,6 +6,9 @@
 	<global name="alwayschoose">
 		Scegli sempre questa opzione
 	</global>
+	<global name="implicitclosebutton">
+		Chiudi
+	</global>
   <template name="okbutton">
     <form>
       <button
@@ -2957,7 +2960,7 @@ Gli oggetti flessibili non possono essere fisici e devano essere fantasma fino a
 	<notification name="FirstDebugMenus">
 		Hai attivato il menu Avanzato.
 Questo menu contiene funzioni utili per gli sviluppatori per il debug di Second Life.
-Per attivare o disattivare questo menu su Windows premere Ctrl-Alt-D. Su Mac premere Cmd-Opt-Shift-D.
+Per attivare o disattivare questo menu su Windows premere Ctrl-Alt-D. Su Mac premere &#8984;-Opt-D.
 	</notification>
 	<notification name="FirstSculptedPrim">
 		Si sta modificando uno sculpted prim.
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index b33d883dc4..478bcfda18 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -6,6 +6,9 @@
 	<global name="alwayschoose">
 		常���オプションを�択
 	</global>
+	<global name="implicitclosebutton">
+		閉�る
+	</global>
   <template name="okbutton">
     <form>
       <button
@@ -3165,7 +3168,7 @@ Second Life をデ�ッグ�るデベロッパー����
 有用�機能��り��。
 ��メニューを切り替�る���
 Windows��Ctrl-Alt-Dを押���。
-Mac�場���Cmd-Opt-Shift-Dを押������。
+Mac�場���&#8984;-Opt-Shift-Dを押������。
 	</notification>
 	<notification name="FirstSculptedPrim">
 		スカルプトプリムを編集�����。
diff --git a/indra/newview/skins/default/xui/nl/menu_inventory.xml b/indra/newview/skins/default/xui/nl/menu_inventory.xml
index f406bcf6bc..6a514422b9 100644
--- a/indra/newview/skins/default/xui/nl/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/nl/menu_inventory.xml
@@ -12,7 +12,7 @@
 	<menu_item_call label="Nieuw script" name="New Script"/>
 	<menu_item_call label="Nieuwe notitie" name="New Note"/>
 	<menu_item_call label="Nieuw gebaar" name="New Gesture"/>
-	<menu name="New Clothes">
+	<menu name="New Clothes" label="Nieuwe Kleding">
 		<menu_item_call label="Nieuw shirt" name="New Shirt"/>
 		<menu_item_call label="Nieuwe broek" name="New Pants"/>
 		<menu_item_call label="Nieuwe schoenen" name="New Shoes"/>
@@ -23,7 +23,7 @@
 		<menu_item_call label="Nieuw onderhemd" name="New Undershirt"/>
 		<menu_item_call label="Nieuwe onderbroek" name="New Underpants"/>
 	</menu>
-	<menu name="New Body Parts">
+	<menu name="New Body Parts" label="Nieuwe Lichaamsdelen">
 		<menu_item_call label="Nieuwe postuur" name="New Shape"/>
 		<menu_item_call label="Nieuwe huid" name="New Skin"/>
 		<menu_item_call label="Nieuw haar" name="New Hair"/>
diff --git a/indra/newview/skins/default/xui/nl/notifications.xml b/indra/newview/skins/default/xui/nl/notifications.xml
index d6f13f1f33..4c64c93de3 100644
--- a/indra/newview/skins/default/xui/nl/notifications.xml
+++ b/indra/newview/skins/default/xui/nl/notifications.xml
@@ -6,6 +6,9 @@
 	<global name="alwayschoose">
 		Kies altijd deze optie
 	</global>
+	<global name="implicitclosebutton">
+		Sluiten
+	</global>
   <template name="okbutton">
     <form>
       <button
@@ -2953,7 +2956,7 @@ Flexibele objecten mogen niet fysiek zijn en moeten fantoom zijn tot de &apos;fl
 	<notification name="FirstDebugMenus">
 		U heeft het menu Geavanceerd geactiveerd.
 Dit menu bevat opties die handig zijn voor ontwikkelaars tijdens het debuggen van Second Life.
-Om dit menu in en uit te schakelen drukt u binnen Windows Ctrl-Alt-D. Met een Mac drukt u Cmd-Opt-Shift-D.
+Om dit menu in en uit te schakelen drukt u binnen Windows Ctrl-Alt-D. Met een Mac drukt u &#8984;-Opt-D.
 	</notification>
 	<notification name="FirstSculptedPrim">
 		U bent een sculpted prim aan het bewerken.
diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml
index 4b64586887..49e566080a 100644
--- a/indra/newview/skins/default/xui/nl/strings.xml
+++ b/indra/newview/skins/default/xui/nl/strings.xml
@@ -55,6 +55,9 @@
 	<string name="LoginDownloadingClothing">
 		Kleding downloaden...
 	</string>
+	<string name="Quit">
+		Afsluiten
+	</string>
 	<string name="AgentLostConnection">
 		Deze regio kan problemen ondervinden. Controleer alstublieft uw verbinding met het internet.
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
index c978da6d65..762b9f0f55 100755
--- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
@@ -42,7 +42,7 @@
 			<line_editor left_delta="45" name="redirecty" width="35" />
 			<spinner name="billable factor"/>
 			<text name="billable factor text">
-				Czynnik Płatnośći:
+				Czynnik Płatności:
 			</text>
 			<spinner name="land cost"/>
 			<text name="land cost text">
@@ -68,8 +68,8 @@
 			<text name="target_avatar_name">
 				(brak)
 			</text>
-			<button label="Usuń cel &apos;s skryptowane obiekty na innych posiadłościach" label_selected="Usuń cel &apos;s skryptowane obiekty na innych posiadłościach" name="Delete Target&apos;s Scripted Objects On Others Land" />
-			<button label="Usuń cel &apos;s skryptowane obiekty na jakichkolwiek posiadłościach" label_selected="Usuń cel &apos;s skryptowane obiekty na jakichkolwiek posiadłościach" name="Delete Target&apos;s Scripted Objects On *Any* Land" />
+			<button label="Usuń cel z oskryptowanych obiektów na innych posiadłościach" label_selected="Usuń cel &apos;s skryptowane obiekty na innych posiadłościach" name="Delete Target&apos;s Scripted Objects On Others Land" />
+			<button label="Usuń cel z oskryptowanych obiektów na jakichkolwiek posiadłościach" label_selected="Usuń cel &apos;s skryptowane obiekty na jakichkolwiek posiadłościach" name="Delete Target&apos;s Scripted Objects On *Any* Land" />
 			<button label="Usuń wszystkie cele i obiekty" label_selected="Usuń wszystkie cele i obiekty" name="Delete *ALL* Of Target&apos;s Objects" />
 			<button label="Główne Kolizje" label_selected="Główne Kolizje" name="Get Top Colliders" />
 			<button label="Główne Skrypty" label_selected="Główne Skrypty" name="Get Top Scripts" />
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 74f92ba1c0..84075b9db8 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -6,6 +6,9 @@
 	<global name="alwayschoose">
 		Pozwalaj na wybór tej opcji
 	</global>
+	<global name="implicitclosebutton">
+		Zamknij
+	</global>
   <template name="okbutton">
     <form>
       <button
@@ -2718,7 +2721,7 @@ Spróbuj ponowanie za kilka minut.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME] proponuje Ci teleportcjÄ™ do siebie:
+		[NAME] proponuje Ci teleportacjÄ™ do siebie:
 
 [MESSAGE]
 		<form name="form">
@@ -2899,8 +2902,8 @@ Obiekty elastyczne nie mogą być fizyczne i muszą być typu fantom.
 	</notification>
 	<notification name="FirstDebugMenus">
 		Zaawansowane menu zostało włączone.
-To menu zawiera funkcje użyteczne dla programistów analizujących Secon Life.
-To menu jest włączne przez Ctrl-Alt-D pod Windows. Mac używa Cmd-Opt-Shift-D.
+To menu zawiera funkcje użyteczne dla programistów analizujących Second Life.
+To menu jest aktywowane dzięki kombinacji klawiszy Ctrl-Alt-D (Windows) lub &#8984;-Opt-D (Mac).
 	</notification>
 	<notification name="FirstSculptedPrim">
 		Edytujesz sculpt.
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 5067f044e0..3ec2b45237 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -55,6 +55,9 @@
 	<string name="LoginDownloadingClothing">
 		�adowanie ubrania...
 	</string>
+	<string name="Quit">
+		Wyjdź
+	</string>
 	<string name="AgentLostConnection">
 		Ten region może mieć problemy. Sprawdź podłączenie do Internetu.
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 26c5f9debf..cc90b6d08f 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -6,6 +6,9 @@
 	<global name="alwayschoose">
 		Sempre escolher esta opção
 	</global>
+	<global name="implicitclosebutton">
+		Fechar
+	</global>
   <template name="okbutton">
     <form>
       <button
@@ -2118,7 +2121,7 @@ Coloque-a em uma página web para dar aos outros um fácil acesso a este local o
 		</form>
 	</notification>
 	<notification name="GraphicsPreferencesHelp">
-		Este painel controla o tamanho da janela, resolução e a qualidade dos gráficos do computador cliente. O Preferências &gt; Interface Gráfica permite escolher entre quatro níveis gráficos: Baixo, Médio, Alto e Ultra. Você também pode personalizar suas configurações de gráficos selecionando a opção Padrão e manipulando as seguintes definições:
+		Este painel controla o tamanho da janela, resolução e a qualidade dos gráficos do computador cliente. O Preferências &gt; Interface Gráfica permite escolher entre quatro níveis gráficos: Baixo, Médio, Alto e Ultra. Você também pode personalizar suas configurações de gráficos selecionando a opção Personalizar e manipulando as seguintes definições:
 
 Sombreamento: Ativar ou desativar vários tipos de sombreadores de pixel.
 
@@ -2910,7 +2913,7 @@ Objetos flexíveis não podem ser físicos e devem ser fantasmas até que a caix
 	<notification name="FirstDebugMenus">
 		Você ativou o menu Avançado.
 Este menu contém funcionalidades úteis para desenvolvedores debugarem o Second Life.
-Para mostrar esse menu no Windows pressione Ctrl-Alt-D. No Mac pressione Cmd-Opt-Shift-D.
+Para mostrar esse menu no Windows pressione Ctrl-Alt-D. No Mac pressione &#8984;-Opt-D.
 	</notification>
 	<notification name="FirstSculptedPrim">
 		Você está editando uma primitiva esculpida.
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index ec46c8b99c..621e99c9c5 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -3,7 +3,7 @@
 	<button label="?" name="GraphicsPreferencesHelpButton"/>
 	<check_box label="Execute Second Life em uma janela" name="windowed mode"/>
 	<text_editor bottom="-56" height="40" name="FullScreenInfo" width="480">
-		Se desmarcado, o visualizador irá exibir em tela inteira quando fizer o acesso.
+		Se desmarcado, o visualizador exibirá tela inteira quando fizer o acesso.
 	</text_editor>
 	<text name="WindowSizeLabel">
 		Tamanho da Janela:
@@ -56,7 +56,7 @@ rápido
 	<text name="QualityText2">
 		Qualidade
 	</text>
-	<check_box label="Padrão" left="395" name="CustomSettings"/>
+	<check_box label="Personalizar" left="395" name="CustomSettings"/>
 	<text name="ShadersText">
 		Sombreadores:
 	</text>
-- 
cgit v1.3


From af98aad98d43ec8b128ecac3089426d6ae6edc3f Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 26 Aug 2009 20:47:27 +0000
Subject: svn merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 ->
 viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455
 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558
 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568
 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601
 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632
 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682
 EXT-692 EXT-703 EXT-717

---
 indra/llui/llmenugl.cpp                            |  43 ++--
 indra/llui/llmenugl.h                              |   3 +
 indra/llui/llsearcheditor.h                        |   8 +
 indra/newview/CMakeLists.txt                       |   5 +
 indra/newview/app_settings/settings.xml            |  44 +++-
 indra/newview/llagent.cpp                          | 171 +--------------
 indra/newview/llagent.h                            |   7 +-
 indra/newview/llagentui.cpp                        | 179 ++++++++++++++++
 indra/newview/llagentui.h                          |  51 +++++
 indra/newview/llchannelmanager.cpp                 |  68 ++++--
 indra/newview/llchannelmanager.h                   |  35 ++--
 indra/newview/llchiclet.cpp                        |  94 +++++----
 indra/newview/llchiclet.h                          |  18 ++
 indra/newview/llclassifiedstatsresponder.cpp       |   1 -
 indra/newview/lldrawpoolalpha.cpp                  |   1 -
 indra/newview/lldrawpoolavatar.cpp                 |   1 -
 indra/newview/lldrawpoolbump.cpp                   |   1 -
 indra/newview/lldrawpoolsimple.cpp                 |   1 -
 indra/newview/lldrawpoolwlsky.cpp                  |   1 -
 indra/newview/llemote.cpp                          |   1 -
 indra/newview/llfavoritesbar.cpp                   |  90 ++++++--
 indra/newview/llfloatergroups.cpp                  |  13 +-
 indra/newview/llfloateropenobject.cpp              |   1 -
 indra/newview/llfloaterpostcard.cpp                |   3 +-
 indra/newview/llfloaterregioninfo.cpp              |   5 +-
 indra/newview/llfloaterreporter.cpp                |   7 +-
 indra/newview/llfloatersnapshot.cpp                |   5 +-
 indra/newview/llfloatertos.cpp                     |   1 -
 indra/newview/llfloatervoicedevicesettings.cpp     |   1 -
 indra/newview/llfolderview.cpp                     |   1 -
 indra/newview/llgroupactions.cpp                   |  36 ++++
 indra/newview/llgroupactions.h                     |  14 ++
 indra/newview/llgroupmgr.cpp                       |   2 +-
 indra/newview/llhudview.cpp                        |   1 -
 indra/newview/llimhandler.cpp                      | 127 ++++++++++++
 indra/newview/llimpanel.cpp                        |   2 +
 indra/newview/llimview.cpp                         | 132 ++++--------
 indra/newview/llimview.h                           |  15 +-
 indra/newview/lllandmarkactions.cpp                |  58 ++++--
 indra/newview/lllandmarkactions.h                  |  11 +-
 indra/newview/lllocationhistory.cpp                |  34 ++-
 indra/newview/lllocationhistory.h                  |   1 +
 indra/newview/lllocationinputctrl.cpp              |  90 ++++++--
 indra/newview/lllocationinputctrl.h                |  13 +-
 indra/newview/llmoveview.cpp                       |  33 ++-
 indra/newview/llmoveview.h                         |   1 +
 indra/newview/llnamebox.cpp                        |   1 -
 indra/newview/llnameeditor.cpp                     |   1 -
 indra/newview/llnamelistctrl.cpp                   |   1 -
 indra/newview/llnavigationbar.cpp                  |  86 ++++----
 indra/newview/llnavigationbar.h                    |   9 +-
 indra/newview/llnearbychat.cpp                     |  12 +-
 indra/newview/llnearbychathandler.cpp              |  22 +-
 indra/newview/llnearbychathandler.h                |   1 +
 indra/newview/llnotificationalerthandler.cpp       |   5 +-
 indra/newview/llnotificationgrouphandler.cpp       |  24 +--
 indra/newview/llnotificationhandler.h              |  23 ++-
 indra/newview/llnotificationmanager.cpp            |   3 +
 indra/newview/llpanelavatar.h                      |  10 +
 indra/newview/llpanelgroup.cpp                     |  21 +-
 indra/newview/llpanelgroupinvite.cpp               |  18 +-
 indra/newview/llpanelgrouplandmoney.cpp            |  13 +-
 indra/newview/llpanelgroupnotices.cpp              |  50 ++++-
 indra/newview/llpanelgroupnotices.h                |   2 +
 indra/newview/llpanelgrouproles.cpp                | 103 +++------
 indra/newview/llpanelgrouproles.h                  |  14 +-
 indra/newview/llpanelpeople.cpp                    |   1 -
 indra/newview/llpanelpick.cpp                      |  31 ++-
 indra/newview/llpanelpick.h                        |   7 +-
 indra/newview/llpanelpicks.cpp                     |   8 +
 indra/newview/llpanelpicks.h                       |   5 +
 indra/newview/llpanelplaceinfo.cpp                 |  51 ++++-
 indra/newview/llpanelplaceinfo.h                   |   5 +-
 indra/newview/llpanelplaces.cpp                    |  71 ++++---
 indra/newview/llpanelprofile.cpp                   |   3 +
 indra/newview/llpanelprofileview.cpp               |   5 +
 indra/newview/llpanelvolume.cpp                    |   1 -
 indra/newview/llscreenchannel.cpp                  |  49 ++---
 indra/newview/llscreenchannel.h                    |  25 ++-
 indra/newview/llsidetray.cpp                       |   5 +-
 indra/newview/llsidetraypanelcontainer.cpp         |   6 +-
 indra/newview/llsky.cpp                            |  15 --
 indra/newview/llslurl.cpp                          |  27 ++-
 indra/newview/llslurl.h                            |  12 +-
 indra/newview/llspatialpartition.cpp               |   1 -
 indra/newview/llstartup.cpp                        |   4 +-
 indra/newview/llstatusbar.cpp                      | 196 +-----------------
 indra/newview/llsyswellwindow.cpp                  |  13 +-
 indra/newview/llteleporthistory.cpp                |  13 +-
 indra/newview/llteleporthistory.h                  |   6 +-
 indra/newview/lltoast.cpp                          |   1 -
 indra/newview/lltoast.h                            |   2 -
 indra/newview/lltoastalertpanel.cpp                |  12 +-
 indra/newview/lltoastalertpanel.h                  |   3 +-
 indra/newview/lltoastimpanel.cpp                   |  94 +++++++++
 indra/newview/lltoastimpanel.h                     |  79 +++++++
 indra/newview/lltooldraganddrop.cpp                |   6 +-
 indra/newview/lltoolface.cpp                       |   1 -
 indra/newview/lltoolselectland.cpp                 |   1 -
 indra/newview/llviewerjointmesh.cpp                |   1 -
 indra/newview/llviewermessage.cpp                  |  29 ++-
 indra/newview/llviewerparcelmgr.cpp                |  33 ++-
 indra/newview/llviewerparcelmgr.h                  |  10 +-
 indra/newview/llviewertexturelist.cpp              |   1 -
 indra/newview/llviewerwindow.cpp                   |   3 +-
 indra/newview/llvlmanager.cpp                      |   1 -
 indra/newview/llvoground.cpp                       |   1 -
 indra/newview/llvotextbubble.cpp                   |   1 -
 indra/newview/llvovolume.cpp                       |   2 +-
 indra/newview/llvowater.cpp                        |   1 -
 indra/newview/llwind.cpp                           |   1 -
 indra/newview/llwlparammanager.cpp                 |   1 -
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../skins/default/xui/en/panel_edit_pick.xml       |   6 +-
 .../skins/default/xui/en/panel_edit_profile.xml    |   6 +-
 .../skins/default/xui/en/panel_group_general.xml   |  32 +--
 .../default/xui/en/panel_group_info_sidetray.xml   |  27 ++-
 .../skins/default/xui/en/panel_group_invite.xml    |   4 +
 .../default/xui/en/panel_group_land_money.xml      |   4 +-
 .../skins/default/xui/en/panel_group_notify.xml    |   2 +-
 .../skins/default/xui/en/panel_group_roles.xml     |  11 +-
 .../skins/default/xui/en/panel_instant_message.xml |  80 +++++++
 .../skins/default/xui/en/panel_navigation_bar.xml  |   4 +-
 indra/newview/skins/default/xui/en/panel_notes.xml | 230 +++++++++++----------
 .../newview/skins/default/xui/en/panel_people.xml  |  15 ++
 .../skins/default/xui/en/panel_pick_info.xml       |  41 +++-
 indra/newview/skins/default/xui/en/panel_picks.xml | 175 ++++++++--------
 .../skins/default/xui/en/panel_profile_view.xml    |  76 ++++---
 .../default/xui/en/panel_stand_stop_flying.xml     |   2 +
 .../skins/default/xui/en/panel_status_bar.xml      |  46 -----
 .../skins/default/xui/en/panel_sys_well_item.xml   |   1 +
 indra/newview/skins/default/xui/en/panel_toast.xml |   1 +
 indra/newview/skins/default/xui/en/strings.xml     |   5 +
 .../default/xui/en/widgets/location_input.xml      |   2 +
 134 files changed, 2165 insertions(+), 1299 deletions(-)
 create mode 100644 indra/newview/llagentui.cpp
 create mode 100644 indra/newview/llagentui.h
 create mode 100644 indra/newview/llimhandler.cpp
 create mode 100644 indra/newview/lltoastimpanel.cpp
 create mode 100644 indra/newview/lltoastimpanel.h
 create mode 100644 indra/newview/skins/default/xui/en/panel_instant_message.xml

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index b6c3ffc61c..4edae46f32 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1353,23 +1353,26 @@ void LLMenuItemBranchDownGL::openMenu( void )
 // set the hover status (called by it's menu)
 void LLMenuItemBranchDownGL::setHighlight( BOOL highlight )
 {
-	if (highlight == getHighlight()) return;
-
-	LLMenuGL* branch = getBranch();
-	if (!branch) return;
+ 	if (highlight == getHighlight())
+		return;
 
 	//NOTE: Purposely calling all the way to the base to bypass auto-open.
 	LLMenuItemGL::setHighlight(highlight);
+
+	LLMenuGL* branch = getBranch();
+	if (!branch)
+		return;
+	
 	if( !highlight)
 	{
-		if (getBranch()->getTornOff())
+		if (branch->getTornOff())
 		{
-			((LLFloater*)getBranch()->getParent())->setFocus(FALSE);
-			getBranch()->clearHoverItem();
+			((LLFloater*)branch->getParent())->setFocus(FALSE);
+			branch->clearHoverItem();
 		}
 		else
 		{
-			getBranch()->setVisible( FALSE );
+			branch->setVisible( FALSE );
 		}
 	}
 }
@@ -1638,6 +1641,7 @@ LLMenuGL::LLMenuGL(const LLMenuGL::Params& p)
 	mDropShadowed( p.drop_shadow ),
 	mHorizontalLayout( p.horizontal_layout ),
 	mScrollable(mHorizontalLayout ? FALSE : p.scrollable), // Scrolling is supported only for vertical layout
+	mMaxScrollableItems(p.max_scrollable_items),
 	mKeepFixedSize( p.keep_fixed_size ),
 	mLabel (p.label),
 	mLastMouseX(0),
@@ -1911,6 +1915,7 @@ void LLMenuGL::arrange( void )
 		item_list_t::iterator first_hidden_item_iter = mItems.end();
 		S32 height_before_first_visible_item = -1;
 		S32 visible_items_height = 0;
+		U32 scrollable_items_cnt = 0;
 		
 		if (mHorizontalLayout)
 		{
@@ -2005,12 +2010,16 @@ void LLMenuGL::arrange( void )
 						{
 							height_before_first_visible_item = height - (*item_iter)->getNominalHeight();
 							first_visible_item_iter = item_iter;
+							scrollable_items_cnt = 0;
 						}
 
-						if (-1 != height_before_first_visible_item && 0 == visible_items_height && height - height_before_first_visible_item > max_height - spillover_item_height * 2)
+						if (-1 != height_before_first_visible_item && 0 == visible_items_height &&
+						    (++scrollable_items_cnt > mMaxScrollableItems ||
+						     height - height_before_first_visible_item > max_height - spillover_item_height * 2 ))
 						{
 							first_hidden_item_iter = item_iter;
 							visible_items_height = height - height_before_first_visible_item - (*item_iter)->getNominalHeight();
+							scrollable_items_cnt--;
 						}
 					}
 				}
@@ -2020,16 +2029,16 @@ void LLMenuGL::arrange( void )
 			{
 				S32 max_items_height = max_height - spillover_item_height * 2;
 
+				if (visible_items_height == 0)
+					visible_items_height = height - height_before_first_visible_item;
+
 				// Fix mFirstVisibleItem value, if it doesn't allow to display all items, that can fit
-				if (visible_items_height < max_items_height)
+				if (visible_items_height < max_items_height && scrollable_items_cnt < mMaxScrollableItems)
 				{
-					if (visible_items_height == 0)
-					{
-						visible_items_height = height - height_before_first_visible_item;
-					}
-
 					item_list_t::iterator tmp_iter(first_visible_item_iter);
-					while (visible_items_height < max_items_height && first_visible_item_iter != mItems.begin())
+					while (visible_items_height < max_items_height &&
+					       scrollable_items_cnt < mMaxScrollableItems &&
+					       first_visible_item_iter != mItems.begin())
 					{
 						if ((*first_visible_item_iter)->getVisible())
 						{
@@ -2043,6 +2052,7 @@ void LLMenuGL::arrange( void )
 						{
 							visible_items_height += (*first_visible_item_iter)->getNominalHeight();
 							height_before_first_visible_item -= (*first_visible_item_iter)->getNominalHeight();
+							scrollable_items_cnt++;
 						}
 					}
 
@@ -2051,6 +2061,7 @@ void LLMenuGL::arrange( void )
 					{
 						visible_items_height -= (*first_visible_item_iter)->getNominalHeight();
 						height_before_first_visible_item += (*first_visible_item_iter)->getNominalHeight();
+						scrollable_items_cnt--;
 						first_visible_item_iter = tmp_iter;
 					}
 					if (!(*first_visible_item_iter)->getVisible())
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 2e7f61c2dd..44459a6c0e 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -382,6 +382,7 @@ public:
 										create_jump_keys,
 										keep_fixed_size,
 										scrollable;
+		Optional<U32>					max_scrollable_items;
 		Optional<LLUIColor>				bg_color;
 		Optional<S32>					shortcut_pad;
 
@@ -394,6 +395,7 @@ public:
 			create_jump_keys("create_jump_keys", false),
 			bg_color("bg_color",  LLUIColorTable::instance().getColor( "MenuDefaultBgColor" )),
 			scrollable("scrollable", false), 
+			max_scrollable_items("max_scrollable_items", U32_MAX),
 			shortcut_pad("shortcut_pad")
 		{
 			addSynonym(bg_visible, "opaque");
@@ -541,6 +543,7 @@ protected:
 	S32				mLastMouseY;
 	S32				mMouseVelX;
 	S32				mMouseVelY;
+	U32				mMaxScrollableItems;
 	BOOL			mHorizontalLayout;
 	BOOL			mScrollable;
 	BOOL			mKeepFixedSize;
diff --git a/indra/llui/llsearcheditor.h b/indra/llui/llsearcheditor.h
index 368b68baa3..cd2867b493 100644
--- a/indra/llui/llsearcheditor.h
+++ b/indra/llui/llsearcheditor.h
@@ -67,6 +67,8 @@ public:
 	virtual ~LLSearchEditor() {}
 
 	void setText(const LLStringExplicit &new_text) { mSearchEditor->setText(new_text); }
+	const std::string& getText() const		{ return mSearchEditor->getText(); }
+
 
 	// LLUICtrl interface
 	virtual void	setValue(const LLSD& value );
@@ -75,6 +77,12 @@ public:
 	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 	virtual void	clear();
 
+	void	setKeystrokeCallback(LLLineEditor::callback_t callback, void* user_data)
+	{
+		if(mSearchEditor)
+			mSearchEditor->setKeystrokeCallback(callback,user_data);
+	}
+
 private:
 	LLLineEditor* mSearchEditor;
 	LLButton* mSearchButton;
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d7eabf33c4..30904bd6c9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -73,6 +73,7 @@ set(viewer_SOURCE_FILES
     llagentdata.cpp
     llagentlanguage.cpp
     llagentpilot.cpp
+    llagentui.cpp
     llagentwearables.cpp
     llanimstatelabels.cpp
     llappviewer.cpp
@@ -235,6 +236,7 @@ set(viewer_SOURCE_FILES
     llhudrender.cpp
     llhudtext.cpp
     llhudview.cpp
+    llimhandler.cpp
     llimpanel.cpp
     llimview.cpp
     llimcontrolpanel.cpp
@@ -374,6 +376,7 @@ set(viewer_SOURCE_FILES
     lltoast.cpp
     lltoastalertpanel.cpp
     lltoastgroupnotifypanel.cpp
+    lltoastimpanel.cpp
     lltoastnotifypanel.cpp
     lltoastpanel.cpp
     lltoggleablemenu.cpp
@@ -518,6 +521,7 @@ set(viewer_HEADER_FILES
     llagentdata.h
     llagentlanguage.h
     llagentpilot.h
+    llagentui.h
     llagentwearables.h
     llanimstatelabels.h
     llappearance.h
@@ -824,6 +828,7 @@ set(viewer_HEADER_FILES
     lltoast.h
     lltoastalertpanel.h
     lltoastgroupnotifypanel.h
+    lltoastimpanel.h
     lltoastnotifypanel.h
     lltoastpanel.h
     lltoggleablemenu.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4e7b3e2f68..9835c5a4cf 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7243,17 +7243,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShowSearchBar</key>
-    <map>
-      <key>Comment</key>
-      <string>Show the Search Bar in the Status Overlay</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>ShowNetStats</key>
     <map>
       <key>Comment</key>
@@ -8153,6 +8142,17 @@
       <key>Value</key>
       <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
     </map>
+    <key>StartUpChannelUUID</key>
+    <map>
+      <key>Comment</key>
+      <string />
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>B56AF90D-6684-48E4-B1E4-722D3DEB2CB6</string>
+    </map>  
     <key>NearByChatChannelUUID</key>
     <map>
       <key>Comment</key>
@@ -8164,6 +8164,28 @@
       <key>Value</key>
       <string>E1158BD6-661C-4981-9DAD-4DCBFF062502</string>
     </map>  
+    <key>NotificationChannelUUID</key>
+    <map>
+      <key>Comment</key>
+      <string />
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>AEED3193-8709-4693-8558-7452CCA97AE5</string>
+    </map>  
+    <key>AlertChannelUUID</key>
+    <map>
+      <key>Comment</key>
+      <string />
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>F3E07BC8-A973-476D-8C7F-F3B7293975D1</string>
+    </map>  
     <key>UIImgWhiteUUID</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 4166d96219..ae30c1959c 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -104,6 +104,7 @@
 #include "llcapabilitylistener.h"
 
 #include "llnavigationbar.h" //to show/hide navigation bar when changing mouse look state
+#include "llagentui.h"
 
 using namespace LLVOAvatarDefines;
 
@@ -912,6 +913,8 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
 	mRegionsVisited.insert(handle);
 
 	LLSelectMgr::getInstance()->updateSelectionCenter();
+
+	LLFloaterMove::sUpdateFlyingStatus();
 }
 
 
@@ -936,42 +939,6 @@ LLHost LLAgent::getRegionHost() const
 	}
 }
 
-//-----------------------------------------------------------------------------
-// getSLURL()
-// returns empty() if getRegion() == NULL
-//-----------------------------------------------------------------------------
-std::string LLAgent::getSLURL() const
-{
-	return buildSLURL(true);
-}
-
-//-----------------------------------------------------------------------------
-// getUnescapedSLURL()
-// returns empty() if getRegion() == NULL
-//-----------------------------------------------------------------------------
-std::string LLAgent::getUnescapedSLURL() const
-{
-	return buildSLURL(false);
-}
-
-std::string LLAgent::buildSLURL(const bool escape) const
-{
-	std::string slurl;
-	LLViewerRegion *regionp = getRegion();
-	if (regionp)
-	{
-		LLVector3d agentPos = getPositionGlobal();
-		S32 x = llround( (F32)fmod( agentPos.mdV[VX], (F64)REGION_WIDTH_METERS ) );
-		S32 y = llround( (F32)fmod( agentPos.mdV[VY], (F64)REGION_WIDTH_METERS ) );
-		S32 z = llround( (F32)agentPos.mdV[VZ] );
-		if (escape)
-			slurl = LLSLURL::buildSLURL(regionp->getName(), x, y, z);
-		else
-			slurl = LLSLURL::buildUnescapedSLURL(regionp->getName(), x, y, z);
-	}
-	return slurl;
-}
-
 //-----------------------------------------------------------------------------
 // inPrelude()
 //-----------------------------------------------------------------------------
@@ -2854,6 +2821,8 @@ void LLAgent::endAnimationUpdateUI()
 
 		LLSideTray::getInstance()->setVisible(TRUE);
 
+		LLPanelStandStopFlying::getInstance()->setVisible(TRUE);
+
 		LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
 
 		LLFloaterCamera::toPrevModeIfInAvatarViewMode();
@@ -2946,6 +2915,8 @@ void LLAgent::endAnimationUpdateUI()
 
 		LLSideTray::getInstance()->setVisible(FALSE);
 
+		LLPanelStandStopFlying::getInstance()->setVisible(FALSE);
+
 		// clear out camera lag effect
 		mCameraLag.clearVec();
 
@@ -5062,14 +5033,7 @@ void LLAgent::handleMaturity(const LLSD& newvalue)
 
 //----------------------------------------------------------------------------
 
-void LLAgent::buildFullname(std::string& name) const
-{
-	if (mAvatarObject.notNull())
-	{
-		name = mAvatarObject->getFullname();
-	}
-}
-
+//*TODO remove, is not used anywhere as of August 20, 2009
 void LLAgent::buildFullnameAndTitle(std::string& name) const
 {
 	if (isGroupMember())
@@ -5223,97 +5187,6 @@ BOOL LLAgent::setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOO
 	return FALSE;
 }
 
-// utility to build a location string
-BOOL LLAgent::buildLocationString(std::string& str, ELocationFormat fmt)
-{
-	LLViewerRegion* region = getRegion();
-	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-
-	if (!region || !parcel)
-		return FALSE;
-
-	const LLVector3& agent_pos_region = getPositionAgent();
-	S32 pos_x = S32(agent_pos_region.mV[VX]);
-	S32 pos_y = S32(agent_pos_region.mV[VY]);
-	S32 pos_z = S32(agent_pos_region.mV[VZ]);
-
-	// Round the numbers based on the velocity
-	LLVector3 agent_velocity = getVelocity();
-	F32 velocity_mag_sq = agent_velocity.magVecSquared();
-
-	const F32 FLY_CUTOFF = 6.f;		// meters/sec
-	const F32 FLY_CUTOFF_SQ = FLY_CUTOFF * FLY_CUTOFF;
-	const F32 WALK_CUTOFF = 1.5f;	// meters/sec
-	const F32 WALK_CUTOFF_SQ = WALK_CUTOFF * WALK_CUTOFF;
-
-	if (velocity_mag_sq > FLY_CUTOFF_SQ)
-	{
-		pos_x -= pos_x % 4;
-		pos_y -= pos_y % 4;
-	}
-	else if (velocity_mag_sq > WALK_CUTOFF_SQ)
-	{
-		pos_x -= pos_x % 2;
-		pos_y -= pos_y % 2;
-	}
-
-	// create a defult name and description for the landmark
-	std::string parcel_name = LLViewerParcelMgr::getInstance()->getAgentParcelName();
-	std::string region_name = region->getName();
-	std::string buffer;
-	if( LLViewerParcelMgr::getInstance()->getAgentParcelName().empty() )
-	{
-		// the parcel doesn't have a name
-		switch (fmt)
-		{
-		case LOCATION_FORMAT_LANDMARK:
-			buffer = llformat("%.100s", region_name.c_str());
-			break;
-		case LOCATION_FORMAT_NORMAL:
-			buffer = llformat("%s", region_name.c_str());
-			break;
-		case LOCATION_FORMAT_WITHOUT_SIM:
-		case LOCATION_FORMAT_FULL:
-			buffer = llformat("%s (%d, %d, %d)",
-							  region_name.c_str(),
-						  pos_x, pos_y, pos_z);
-			break;
-		}
-	}
-	else
-	{
-		// the parcel has a name, so include it in the landmark name
-		switch (fmt)
-		{
-		case LOCATION_FORMAT_LANDMARK:
-			buffer = llformat("%.100s", parcel_name.c_str());
-			break;
-		case LOCATION_FORMAT_NORMAL:
-			buffer = llformat("%s, %s",
-							  region_name.c_str(),
-							  parcel_name.c_str());
-			break;
-		case LOCATION_FORMAT_WITHOUT_SIM:
-			buffer = llformat("%s, %s (%d, %d, %d)",
-									  region_name.c_str(),
-									  parcel_name.c_str(),
-									  pos_x, pos_y, pos_z);
-			break;
-		case LOCATION_FORMAT_FULL:
-			std::string sim_access_string = region->getSimAccessString();
-			buffer = llformat("%s, %s (%d, %d, %d)%s%s",
-							  region_name.c_str(),
-							  parcel_name.c_str(),
-							  pos_x, pos_y, pos_z,
-							  sim_access_string.empty() ? "" : " - ",
-							  sim_access_string.c_str());
-			break;
-		}
-	}
-	str = buffer;
-	return TRUE;
-}
-
 LLQuaternion LLAgent::getHeadRotation()
 {
 	if (mAvatarObject.isNull() || !mAvatarObject->mPelvisp || !mAvatarObject->mHeadp)
@@ -5475,30 +5348,6 @@ BOOL LLAgent::allowOperation(PermissionBit op,
 	return perm.allowOperationBy(op, agent_proxy, group_proxy);
 }
 
-
-void LLAgent::getName(std::string& name) const
-{
-	name.clear();
-
-	if (mAvatarObject.notNull())
-	{
-		LLNameValue *first_nv = mAvatarObject->getNVPair("FirstName");
-		LLNameValue *last_nv = mAvatarObject->getNVPair("LastName");
-		if (first_nv && last_nv)
-		{
-			name = first_nv->printData() + " " + last_nv->printData();
-		}
-		else
-		{
-			llwarns << "Agent is missing FirstName and/or LastName nv pair." << llendl;
-		}
-	}
-	else
-	{
-		name = gSavedSettings.getString("FirstName") + " " + gSavedSettings.getString("LastName");
-	}
-}
-
 const LLColor4 &LLAgent::getEffectColor()
 {
 	return mEffectColor;
@@ -6308,12 +6157,12 @@ void LLAgent::setTeleportState(ETeleportState state)
 	if (mTeleportState == TELEPORT_MOVING)
 	{
 		// We're outa here. Save "back" slurl.
-		mTeleportSourceSLURL = getSLURL();
+		mTeleportSourceSLURL = LLAgentUI::buildSLURL();
 	}
 	else if(mTeleportState == TELEPORT_ARRIVING)
 	{
 		// Let the interested parties know we've teleported.
-		LLViewerParcelMgr::getInstance()->onTeleportFinished();
+		LLViewerParcelMgr::getInstance()->onTeleportFinished(false, getPositionGlobal());
 	}
 }
 
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 3a8cf5fd97..9f71def63e 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -169,8 +169,7 @@ public:
 	// Name
 	//--------------------------------------------------------------------
 public:
-	void			getName(std::string& name) const;
-	void			buildFullname(std::string &name) const;
+	//*TODO remove, is not used as of August 20, 2009
 	void			buildFullnameAndTitle(std::string &name) const;
 
 	//--------------------------------------------------------------------
@@ -274,13 +273,9 @@ public:
 	void			setRegion(LLViewerRegion *regionp);
 	LLViewerRegion	*getRegion() const;
 	LLHost			getRegionHost() const;
-	std::string		getSLURL() const;
-	std::string		getUnescapedSLURL() const;
 	BOOL			inPrelude();
-	BOOL 			buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK); // Utility to build a location string
 private:
 	LLViewerRegion	*mRegionp;
-	std::string  	buildSLURL(const bool escape) const;
 
 	//--------------------------------------------------------------------
 	// History
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
new file mode 100644
index 0000000000..93d88bf3df
--- /dev/null
+++ b/indra/newview/llagentui.cpp
@@ -0,0 +1,179 @@
+/** 
+ * @file llagentui.cpp
+ * @brief Utility methods to process agent's data as slurl's etc. before displaying
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llagentui.h"
+
+// Library includes
+#include "llparcel.h"
+
+// Viewer includes
+#include "llagent.h"
+#include "llviewercontrol.h"
+#include "llviewerregion.h"
+#include "llviewerparcelmgr.h"
+#include "llvoavatarself.h"
+#include "llslurl.h"
+
+//static
+void LLAgentUI::buildName(std::string& name)
+{
+	name.clear();
+
+	LLVOAvatarSelf* avatar_object = gAgent.getAvatarObject();
+	if (avatar_object)
+	{
+		LLNameValue *first_nv = avatar_object->getNVPair("FirstName");
+		LLNameValue *last_nv = avatar_object->getNVPair("LastName");
+		if (first_nv && last_nv)
+		{
+			name = first_nv->printData() + " " + last_nv->printData();
+		}
+		else
+		{
+			llwarns << "Agent is missing FirstName and/or LastName nv pair." << llendl;
+		}
+	}
+	else
+	{
+		name = gSavedSettings.getString("FirstName") + " " + gSavedSettings.getString("LastName");
+	}
+}
+
+//static
+void LLAgentUI::buildFullname(std::string& name)
+{
+	if (gAgent.getAvatarObject()) name = gAgent.getAvatarObject()->getFullname();
+}
+
+//static
+std::string LLAgentUI::buildSLURL(const bool escaped /*= true*/)
+{
+	std::string slurl;
+	LLViewerRegion *regionp = gAgent.getRegion();
+	if (regionp)
+	{
+		LLVector3d agentPos = gAgent.getPositionGlobal();
+		slurl = LLSLURL::buildSLURLfromPosGlobal(regionp->getName(), agentPos, escaped);
+	}
+	return slurl;
+}
+
+BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat fmt,const LLVector3& agent_pos_region)
+{
+	LLViewerRegion* region = gAgent.getRegion();
+	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+
+	if (!region || !parcel) return FALSE;
+
+	S32 pos_x = S32(agent_pos_region.mV[VX]);
+	S32 pos_y = S32(agent_pos_region.mV[VY]);
+	S32 pos_z = S32(agent_pos_region.mV[VZ]);
+
+	// Round the numbers based on the velocity
+	F32 velocity_mag_sq = gAgent.getVelocity().magVecSquared();
+
+	const F32 FLY_CUTOFF = 6.f;		// meters/sec
+	const F32 FLY_CUTOFF_SQ = FLY_CUTOFF * FLY_CUTOFF;
+	const F32 WALK_CUTOFF = 1.5f;	// meters/sec
+	const F32 WALK_CUTOFF_SQ = WALK_CUTOFF * WALK_CUTOFF;
+
+	if (velocity_mag_sq > FLY_CUTOFF_SQ)
+	{
+		pos_x -= pos_x % 4;
+		pos_y -= pos_y % 4;
+	}
+	else if (velocity_mag_sq > WALK_CUTOFF_SQ)
+	{
+		pos_x -= pos_x % 2;
+		pos_y -= pos_y % 2;
+	}
+
+	// create a default name and description for the landmark
+	std::string parcel_name = LLViewerParcelMgr::getInstance()->getAgentParcelName();
+	std::string region_name = region->getName();
+	std::string buffer;
+	if( parcel_name.empty() )
+	{
+		// the parcel doesn't have a name
+		switch (fmt)
+		{
+		case LLAgent::LOCATION_FORMAT_LANDMARK:
+			buffer = llformat("%.100s", region_name.c_str());
+			break;
+		case LLAgent::LOCATION_FORMAT_NORMAL:
+			buffer = llformat("%s", region_name.c_str());
+			break;
+		case LLAgent::LOCATION_FORMAT_WITHOUT_SIM:
+		case LLAgent::LOCATION_FORMAT_FULL:
+			buffer = llformat("%s (%d, %d, %d)",
+				region_name.c_str(),
+				pos_x, pos_y, pos_z);
+			break;
+		}
+	}
+	else
+	{
+		// the parcel has a name, so include it in the landmark name
+		switch (fmt)
+		{
+		case LLAgent::LOCATION_FORMAT_LANDMARK:
+			buffer = llformat("%.100s", parcel_name.c_str());
+			break;
+		case LLAgent::LOCATION_FORMAT_NORMAL:
+			buffer = llformat("%s, %s", region_name.c_str(), parcel_name.c_str());
+			break;
+		case LLAgent::LOCATION_FORMAT_WITHOUT_SIM:
+			buffer = llformat("%s, %s (%d, %d, %d)",
+				region_name.c_str(),
+				parcel_name.c_str(),
+				pos_x, pos_y, pos_z);
+			break;
+		case LLAgent::LOCATION_FORMAT_FULL:
+			std::string sim_access_string = region->getSimAccessString();
+			buffer = llformat("%s, %s (%d, %d, %d)%s%s",
+				region_name.c_str(),
+				parcel_name.c_str(),
+				pos_x, pos_y, pos_z,
+				sim_access_string.empty() ? "" : " - ",
+				sim_access_string.c_str());
+			break;
+		}
+	}
+	str = buffer;
+	return TRUE;
+}
+BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat fmt)
+{
+	return buildLocationString(str,fmt, gAgent.getPositionAgent());
+}
diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h
new file mode 100644
index 0000000000..c3bc58d791
--- /dev/null
+++ b/indra/newview/llagentui.h
@@ -0,0 +1,51 @@
+/** 
+ * @file llagentui.h
+ * @brief Utility methods to process agent's data as slurl's etc. before displaying
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLAGENTUI_H
+#define LLAGENTUI_H
+
+#include "llagent.h"
+
+class LLAgentUI
+{
+public:
+	static void buildName(std::string& name);
+	static void buildFullname(std::string &name);
+
+	static std::string buildSLURL(const bool escaped = true);
+	//build location string using the current position of gAgent.
+	static BOOL buildLocationString(std::string& str, LLAgent::ELocationFormat fmt = LLAgent::LOCATION_FORMAT_LANDMARK);
+	//build location string using a region position of the avatar. 
+	static BOOL buildLocationString(std::string& str, LLAgent::ELocationFormat fmt,const LLVector3& agent_pos_region);
+};
+
+#endif //LLAGENTUI_H
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp
index 57ea6064a4..a8373491cf 100644
--- a/indra/newview/llchannelmanager.cpp
+++ b/indra/newview/llchannelmanager.cpp
@@ -36,6 +36,7 @@
 
 #include "llappviewer.h"
 #include "llviewercontrol.h"
+#include "llimview.h"
 
 #include <algorithm>
 
@@ -62,44 +63,66 @@ void LLChannelManager::onLoginCompleted()
 
 	for(std::vector<ChannelElem>::iterator it = mChannelList.begin(); it !=  mChannelList.end(); ++it)
 	{
+		if((*it).channel->getChannelID() == LLUUID(gSavedSettings.getString("NearByChatChannelUUID")))
+		{
+			continue;
+		}
+
 		if(!(*it).channel->getDisplayToastsAlways())
 		{
 			away_notifications +=(*it).channel->getNumberOfHiddenToasts();
 		}
 	}
 
+	// *TODO: calculate IM notifications
+	away_notifications += gIMMgr->getNumberOfUnreadIM();
+
 	if(!away_notifications)
 	{
-		LLScreenChannel::setStartUpToastShown();
+		onStartUpToastClose();
 		return;
 	}
 	
 	LLChannelManager::Params p;
-	p.id = LLUUID(STARTUP_CHANNEL_ID);
+	p.id = LLUUID(gSavedSettings.getString("StartUpChannelUUID"));
 	p.channel_right_bound = getRootView()->getRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); 
 	p.channel_width = gSavedSettings.getS32("NotifyBoxWidth");
 	mStartUpChannel = createChannel(p);
 
 	if(!mStartUpChannel)
+	{
+		onStartUpToastClose();
 		return;
+	}
 
-	static_cast<LLUICtrl*>(mStartUpChannel)->setCommitCallback(boost::bind(&LLChannelManager::removeStartUpChannel, this));
+	mStartUpChannel->setShowToasts(true);
+	static_cast<LLUICtrl*>(mStartUpChannel)->setCommitCallback(boost::bind(&LLChannelManager::onStartUpToastClose, this));
 	mStartUpChannel->createStartUpToast(away_notifications, gSavedSettings.getS32("ChannelBottomPanelMargin"), gSavedSettings.getS32("StartUpToastTime"));
 }
 
 //--------------------------------------------------------------------------
-void LLChannelManager::removeStartUpChannel()
+void LLChannelManager::onStartUpToastClose()
 {
-	if(!mStartUpChannel)
-		return;
+	if(mStartUpChannel)
+	{
+		mStartUpChannel->setVisible(FALSE);
+		mStartUpChannel->closeStartUpToast();
+		getRootView()->removeChild(mStartUpChannel);
+		removeChannelByID(LLUUID(gSavedSettings.getString("StartUpChannelUUID")));
+		delete mStartUpChannel;
+		mStartUpChannel = NULL;
+	}
 
-	mStartUpChannel->setVisible(FALSE);
-	mStartUpChannel->closeStartUpToast();
-	getRootView()->removeChild(mStartUpChannel);
-	delete mStartUpChannel;
-	mStartUpChannel = NULL;
+	// set StartUp Toast Flag
+	LLScreenChannel::setStartUpToastShown();
+
+	// allow all other channels to show incoming toasts
+	for(std::vector<ChannelElem>::iterator it = mChannelList.begin(); it !=  mChannelList.end(); ++it)
+	{
+		(*it).channel->setShowToasts(true);
+	}
 
-	//force NEARBY CHAT CHANNEL to repost all toasts if present
+	// force NEARBY CHAT CHANNEL to repost all toasts if present
 	LLScreenChannel* nearby_channel = getChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID")));
 	nearby_channel->loadStoredToastsToChannel();
 	nearby_channel->setCanStoreToasts(false);
@@ -122,7 +145,7 @@ LLScreenChannel* LLChannelManager::createChannel(LLChannelManager::Params& p)
 	if(new_channel)
 		return new_channel;
 
-	new_channel = new LLScreenChannel(); 
+	new_channel = new LLScreenChannel(p.id); 
 	getRootView()->addChild(new_channel);
 	new_channel->init(p.channel_right_bound - p.channel_width, p.channel_right_bound);
 	new_channel->setToastAlignment(p.align);
@@ -179,15 +202,26 @@ void LLChannelManager::reshape(S32 width, S32 height, BOOL called_from_parent)
 }
 
 //--------------------------------------------------------------------------
-
-LLScreenChannel* LLChannelManager::getStartUpChannel()
+void LLChannelManager::removeChannelByID(const LLUUID id)
 {
-	return mStartUpChannel;
+	std::vector<ChannelElem>::iterator it = find(mChannelList.begin(), mChannelList.end(), id); 
+	if(it != mChannelList.end())
+	{
+		mChannelList.erase(it);
+	}
 }
 
 //--------------------------------------------------------------------------
+void LLChannelManager::removeChannelByChiclet(const LLChiclet* chiclet)
+{
+	std::vector<ChannelElem>::iterator it = find(mChannelList.begin(), mChannelList.end(), chiclet); 
+	if(it != mChannelList.end())
+	{
+		mChannelList.erase(it);
+	}
+}
 
-
+//--------------------------------------------------------------------------
 
 
 
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index dbd2e0b422..e26c96b62e 100644
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@@ -44,9 +44,6 @@
 
 namespace LLNotificationsUI
 {
-
-#define STARTUP_CHANNEL_ID		"AEED3193-8709-4693-8558-7452CCA97AE5"
-
 /**
  * Manager for screen channels.
  * Responsible for instantiating and retrieving screen channels.
@@ -56,19 +53,16 @@ class LLChannelManager : public LLUICtrl, public LLSingleton<LLChannelManager>
 public:	
 	struct Params  : public LLInitParam::Block<Params, LLUICtrl::Params>
 	{
-		Optional<LLUUID>			id;
-		Optional<LLChiclet*>		chiclet;
-		Optional<S32>				channel_right_bound;
-		Optional<S32>				channel_width;
-		Optional<bool>				display_toasts_always;
-		Optional<EToastAlignment>	align;
-
-		Params():	id("id", LLUUID("")),
-					chiclet("chiclet", NULL), 
-					channel_right_bound("channel_right_bound", 0), 
-					channel_width("channel_width", 0), 
-					display_toasts_always("display_toasts_always", false),
-					align("align", NA_BOTTOM)
+		LLUUID			id;
+		LLChiclet*		chiclet;
+		S32				channel_right_bound;
+		S32				channel_width;
+		bool			display_toasts_always;
+		EToastAlignment	align;
+
+		Params():	id(LLUUID("")), chiclet(NULL), 
+					channel_right_bound(0), channel_width(0), 
+					display_toasts_always(false), align(NA_BOTTOM)
 		{}
 	};
 
@@ -104,7 +98,8 @@ public:
 
 	// On LoginCompleted - show StartUp toast
 	void onLoginCompleted();
-	void removeStartUpChannel();
+	// removes a channel intended for the startup toast and allows other channels to show their toasts
+	void onStartUpToastClose();
 
 	//TODO: make protected? in order to be shure that channels are created only by notification handlers
 	LLScreenChannel*	createChannel(LLChannelManager::Params& p);
@@ -112,9 +107,11 @@ public:
 	LLScreenChannel*	getChannelByID(const LLUUID id);
 	LLScreenChannel*	getChannelByChiclet(const LLChiclet* chiclet);
 
-	void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+	// remove channel methods
+	void	removeChannelByID(const LLUUID id);
+	void	removeChannelByChiclet(const LLChiclet* chiclet);
 
-	LLScreenChannel* getStartUpChannel();
+	void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
 private:
 
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index c844d70d89..6b4dfa73a4 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -55,6 +55,10 @@ static LLDefaultChildRegistry::Register<LLTalkButton> t2("chiclet_talk");
 static LLDefaultChildRegistry::Register<LLNotificationChiclet> t3("chiclet_notification");
 static LLDefaultChildRegistry::Register<LLIMChiclet> t4("chiclet_im");
 
+S32 LLNotificationChiclet::mUreadSystemNotifications = 0;
+S32 LLNotificationChiclet::mUreadIMNotifications = 0;
+
+
 boost::signals2::signal<LLChiclet* (const LLUUID&),
 		LLIMChiclet::CollectChicletCombiner<std::list<LLChiclet*> > >
 		LLIMChiclet::sFindChicletsSignal;
@@ -115,6 +119,12 @@ boost::signals2::connection LLNotificationChiclet::setClickCallback(
 	return mButton->setClickedCallback(cb);
 }
 
+void LLNotificationChiclet::updateUreadIMNotifications()
+{
+	mUreadIMNotifications = gIMMgr->getNumberOfUnreadIM();
+	setCounter(mUreadSystemNotifications + mUreadIMNotifications);
+}
+
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
@@ -269,6 +279,12 @@ void LLIMChiclet::setCounter(S32 counter)
 	}
 }
 
+void LLIMChiclet::onMouseDown()
+{
+	LLIMFloater::toggle(getSessionId());
+	setCounter(0);
+}
+
 LLRect LLIMChiclet::getRequiredRect()
 {
 	LLRect rect(0, 0, mAvatarCtrl->getRect().getWidth(), 0);
@@ -296,6 +312,38 @@ void LLIMChiclet::setShowCounter(bool show)
 	}
 }
 
+
+void LLIMChiclet::setSessionId(const LLUUID& session_id)
+{
+	LLChiclet::setSessionId(session_id);
+
+	//for a group chat session_id = group_id
+	LLFloaterIMPanel* im = LLIMMgr::getInstance()->findFloaterBySession(session_id);
+	if (!im) return; //should never happen
+	
+	EInstantMessage type = im->getDialogType();
+	if (type == IM_SESSION_INVITE || type == IM_SESSION_GROUP_START)
+	{
+		if (!gAgent.isInGroup(session_id)) return;
+
+		if (mGroupInsignia) {
+			LLGroupMgr* grp_mgr = LLGroupMgr::getInstance();
+			LLGroupMgrGroupData* group_data = grp_mgr->getGroupData(session_id);
+			if (group_data && group_data->mInsigniaID.notNull())
+			{
+				mGroupInsignia->setVisible(TRUE);
+				mGroupInsignia->setValue(group_data->mInsigniaID);
+			}
+			else
+			{
+				mID = session_id; //needed for LLGroupMgrObserver
+				grp_mgr->addObserver(this);
+				grp_mgr->sendGroupPropertiesRequest(session_id);
+			}
+		}
+	}	
+}
+
 void LLIMChiclet::setIMSessionName(const std::string& name)
 {
 	setToolTip(name);
@@ -311,48 +359,13 @@ void LLIMChiclet::setOtherParticipantId(const LLUUID& other_participant_id)
 	//all alive sessions have alive floater, haven't they?
 	llassert(floater);
 
-	//in case participant id is being replaced with different id for a group chat
-	if (mOtherParticipantId.notNull() && mOtherParticipantId != other_participant_id && 
-		mID.notNull() && mGroupInsignia->getValue().isUUID())
-	{
-		LLGroupMgr::getInstance()->removeObserver(this);
-	}
-
 	mOtherParticipantId = other_participant_id;
 
-	switch (floater->getDialogType())
+	if (mAvatarCtrl && floater->getDialogType() == IM_NOTHING_SPECIAL)
 	{
-		case IM_NOTHING_SPECIAL: 
-			if (mAvatarCtrl) {
-				mAvatarCtrl->setVisible(TRUE);
-				mAvatarCtrl->setValue(other_participant_id);
-			}
-			break;
-		case IM_SESSION_GROUP_START:
-			{
-				if (mGroupInsignia) {
-					LLGroupMgr* grp_mgr = LLGroupMgr::getInstance();
-					LLGroupMgrGroupData* group_data = grp_mgr->getGroupData(other_participant_id);
-					if (group_data && group_data->mInsigniaID.notNull())
-					{
-						mGroupInsignia->setVisible(TRUE);
-						mGroupInsignia->setValue(group_data->mInsigniaID);
-					}
-					else
-					{
-						mID = mOtherParticipantId; //needed for LLGroupMgrObserver
-						grp_mgr->addObserver(this);
-						grp_mgr->sendGroupPropertiesRequest(mOtherParticipantId);
-					}
-				}
-			}
-			
-			break;
-		default:
-			llwarning("Unsupported dialog type", 0); 
-			break;
+		mAvatarCtrl->setVisible(TRUE);
+		mAvatarCtrl->setValue(other_participant_id);
 	}
-
 }
 
 
@@ -363,7 +376,7 @@ void LLIMChiclet::changed(LLGroupChange gc)
 
 	if (GC_PROPERTIES == gc)
 	{
-		LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(mOtherParticipantId);
+		LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(getSessionId());
 		if (group_data && group_data->mInsigniaID.notNull())
 		{
 			mGroupInsignia->setVisible(TRUE);
@@ -395,8 +408,7 @@ void LLIMChiclet::updateMenuItems()
 
 BOOL LLIMChiclet::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	LLIMFloater::toggle(getSessionId());
-	setCounter(0);
+	onMouseDown();
 	return LLChiclet::handleMouseDown(x, y, mask);
 }
 
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index c83caf8ff9..b1e73c9d8d 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -256,6 +256,8 @@ public:
 
 	/*virtual*/ ~LLIMChiclet();
 
+	virtual void setSessionId(const LLUUID& session_id);
+
 	/*
 	 * Sets IM session name. This name will be displayed in chiclet tooltip.
 	*/
@@ -303,6 +305,14 @@ public:
 	*/
 	/*virtual*/ void draw();
 
+	/**
+	 * The action taken on mouse down event.
+	 * 
+	 * Made public so that it can be triggered from outside
+	 * (more specifically, from the Active IM window).
+	 */
+	void onMouseDown();
+
 	/*
 	 * Returns rect, required to display chiclet.
 	 * Width is the only valid value.
@@ -407,12 +417,20 @@ public:
 	// Notification Chiclet Window
 	void	setNotificationChicletWindow(LLFloater* wnd) { mNotificationChicletWindow = wnd; }
 
+	// methods for updating a number of unread System or IM notifications
+	void incUreadSystemNotifications() { setCounter(++mUreadSystemNotifications + mUreadIMNotifications); }
+	void decUreadSystemNotifications() { setCounter(--mUreadSystemNotifications + mUreadIMNotifications); }
+	void updateUreadIMNotifications();
+
 protected:
 	LLNotificationChiclet(const Params& p);
 	friend class LLUICtrlFactory;
 
 	LLFloater*	mNotificationChicletWindow;
 
+	static S32 mUreadSystemNotifications;
+	static S32 mUreadIMNotifications;
+
 protected:
 	LLButton* mButton;
 	LLChicletNotificationCounterCtrl* mCounterCtrl;
diff --git a/indra/newview/llclassifiedstatsresponder.cpp b/indra/newview/llclassifiedstatsresponder.cpp
index a218e2b4e5..ecd1879090 100644
--- a/indra/newview/llclassifiedstatsresponder.cpp
+++ b/indra/newview/llclassifiedstatsresponder.cpp
@@ -33,7 +33,6 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "llagent.h"
 #include "llclassifiedstatsresponder.h"
 
 #include "llpanelclassified.h"
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index de97e2406d..88f79fc1b9 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -42,7 +42,6 @@
 
 #include "llcubemap.h"
 #include "llsky.h"
-#include "llagent.h"
 #include "lldrawable.h"
 #include "llface.h"
 #include "llviewercamera.h"
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index a2d8c965ec..565f906a3b 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -38,7 +38,6 @@
 #include "llvoavatar.h"
 #include "m3math.h"
 
-#include "llagent.h"
 #include "lldrawable.h"
 #include "llface.h"
 #include "llsky.h"
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index 2cb4d5d6d5..331ba67d36 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -43,7 +43,6 @@
 #include "llglheaders.h"
 #include "llrender.h"
 
-#include "llagent.h"
 #include "llcubemap.h"
 #include "lldrawable.h"
 #include "llface.h"
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp
index d084bda2ea..331536fdca 100644
--- a/indra/newview/lldrawpoolsimple.cpp
+++ b/indra/newview/lldrawpoolsimple.cpp
@@ -35,7 +35,6 @@
 #include "lldrawpoolsimple.h"
 
 #include "llviewercamera.h"
-#include "llagent.h"
 #include "lldrawable.h"
 #include "llface.h"
 #include "llsky.h"
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp
index 9b52ddb73c..c14ca2473b 100644
--- a/indra/newview/lldrawpoolwlsky.cpp
+++ b/indra/newview/lldrawpoolwlsky.cpp
@@ -42,7 +42,6 @@
 #include "llwlparammanager.h"
 #include "llsky.h"
 #include "llvowlsky.h"
-#include "llagent.h"
 #include "llviewerregion.h"
 #include "llface.h"
 #include "llrender.h"
diff --git a/indra/newview/llemote.cpp b/indra/newview/llemote.cpp
index bacf3daf5a..c83846215e 100644
--- a/indra/newview/llemote.cpp
+++ b/indra/newview/llemote.cpp
@@ -39,7 +39,6 @@
 #include "llcharacter.h"
 #include "m3math.h"
 #include "llvoavatar.h"
-#include "llagent.h"
 
 //-----------------------------------------------------------------------------
 // Constants
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 9c1a7ecb04..70ee5d395e 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -38,6 +38,8 @@
 #include "llfloaterreg.h"
 #include "llfocusmgr.h"
 #include "llinventory.h"
+#include "lllandmarkactions.h"
+#include "lltrans.h"
 #include "lluictrlfactory.h"
 #include "llmenugl.h"
 
@@ -56,6 +58,71 @@
 
 static LLDefaultChildRegistry::Register<LLFavoritesBarCtrl> r("favorites_bar");
 
+const S32 DROP_DOWN_MENU_WIDTH = 250;
+
+/**
+ * This class is needed to override LLButton default handleToolTip function and
+ * show SLURL as button tooltip.
+ * *NOTE: dzaporozhan: This is a workaround. We could set tooltips for buttons
+ * in createButtons function but landmark data is not available when Favorites Bar is
+ * created. Thats why we are requesting landmark data after 
+ */
+class LLFavoriteLandmarkButton : public LLButton
+{
+public:
+
+	/**
+	 * Requests landmark data from server and shows landmark SLURL as tooltip.
+	 */
+	BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect)
+	{
+		if(LLUI::sShowXUINames)
+		{
+			return LLButton::handleToolTip(x, y, msg, sticky_rect);
+		}
+
+		if(!mLoaded)
+		{
+			LLVector3d g_pos;
+			if(LLLandmarkActions::getLandmarkGlobalPos(mLandmarkID, g_pos))
+			{
+				LLLandmarkActions::getSLURLfromPosGlobal(g_pos, 
+					boost::bind(&LLFavoriteLandmarkButton::landmarkNameCallback, this, _1), false);
+			}
+		}
+
+		msg = mSLURL;
+		return TRUE;
+	}
+
+	void landmarkNameCallback(const std::string& name)
+	{
+		mSLURL = name;
+		mLoaded = true;
+	}
+	
+	void setLandmarkID(const LLUUID& id){ mLandmarkID = id; }
+
+protected:
+
+	LLFavoriteLandmarkButton(const LLButton::Params& p)
+		: LLButton(p)
+		, mLandmarkID(LLUUID::null)
+		, mSLURL("(Loading...)")
+		, mLoaded(false)
+	{
+		static std::string loading_tooltip = LLTrans::getString("favorite_landmark_loading_tooltip");
+		mSLURL = loading_tooltip;
+	}
+
+	friend class LLUICtrlFactory;
+
+private:
+	LLUUID mLandmarkID;
+	std::string mSLURL;
+	bool mLoaded;
+};
+
 // updateButtons's helper
 struct LLFavoritesSort
 {
@@ -353,13 +420,15 @@ void LLFavoritesBarCtrl::createButtons(const LLInventoryModel::item_array_t &ite
 	{
 		LLInventoryItem* item = items.get(i);
 
-		LLButton* fav_btn = LLUICtrlFactory::defaultBuilder<LLButton>(buttonXMLNode, this, NULL);
+		LLFavoriteLandmarkButton* fav_btn = LLUICtrlFactory::defaultBuilder<LLFavoriteLandmarkButton>(buttonXMLNode, this, NULL);
 		if (NULL == fav_btn)
 		{
 			llwarns << "Unable to create button for landmark: " << item->getName() << llendl;
 			continue;
 		}
 
+		fav_btn->setLandmarkID(item->getUUID());
+		
 		// change only left and save bottom
 		fav_btn->setOrigin(curr_x, fav_btn->getRect().mBottom);
 		fav_btn->setFont(mFont);
@@ -413,6 +482,7 @@ void LLFavoritesBarCtrl::showDropDownMenu()
 		menu_p.can_tear_off(false);
 		menu_p.visible(false);
 		menu_p.scrollable(true);
+		menu_p.max_scrollable_items = 10;
 
 		LLToggleableMenu* menu = LLUICtrlFactory::create<LLToggleableMenu>(menu_p);
 
@@ -471,10 +541,8 @@ void LLFavoritesBarCtrl::showDropDownMenu()
 
 		menu->empty();
 
-		U32 max_width = 0;
-
-		// Menu will not be wider, than bar
-		S32 bar_width = getRect().getWidth();
+		U32 max_width = llmin(DROP_DOWN_MENU_WIDTH, getRect().getWidth());
+		U32 widest_item = 0;
 
 		for(S32 i = mFirstDropDownItem; i < count; i++)
 		{
@@ -489,12 +557,12 @@ void LLFavoritesBarCtrl::showDropDownMenu()
 			LLMenuItemCallGL *menu_item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
 			menu_item->setRightMouseDownCallback(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this,item->getUUID(),_1,_2,_3,_4));
 			// Check whether item name wider than menu
-			if ((S32) menu_item->getNominalWidth() > bar_width)
+			if (menu_item->getNominalWidth() > max_width)
 			{
 				S32 chars_total = item_name.length();
 				S32 chars_fitted = 1;
 				menu_item->setLabel(LLStringExplicit(""));
-				S32 label_space = bar_width - menu_item->getFont()->getWidth("...") -
+				S32 label_space = max_width - menu_item->getFont()->getWidth("...") -
 					menu_item->getNominalWidth(); // This returns width of menu item with empty label (pad pixels)
 
 				while (chars_fitted < chars_total && menu_item->getFont()->getWidth(item_name, 0, chars_fitted) < label_space)
@@ -505,21 +573,17 @@ void LLFavoritesBarCtrl::showDropDownMenu()
 
 				menu_item->setLabel(item_name.substr(0, chars_fitted) + "...");
 			}
-
-			max_width = llmax(max_width, menu_item->getNominalWidth());
+			widest_item = llmax(widest_item, menu_item->getNominalWidth());
 
 			menu->addChild(menu_item);
 		}
 
-		// Menu will not be wider, than bar
-		max_width = llmin((S32)max_width, bar_width);
-
 		menu->buildDrawLabels();
 		menu->updateParent(LLMenuGL::sMenuContainer);
 
 		menu->setButtonRect(mChevronRect, this);
 
-		LLMenuGL::showPopup(this, menu, getRect().getWidth() - max_width, 0);
+		LLMenuGL::showPopup(this, menu, getRect().getWidth() - widest_item, 0);
 	}
 }
 
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
index f49f854620..7a88612f1a 100644
--- a/indra/newview/llfloatergroups.cpp
+++ b/indra/newview/llfloatergroups.cpp
@@ -81,7 +81,18 @@ void LLFloaterGroupPicker::setPowersMask(U64 powers_mask)
 
 BOOL LLFloaterGroupPicker::postBuild()
 {
-	init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), mPowersMask);
+	LLScrollListCtrl* list_ctrl = getChild<LLScrollListCtrl>("group list");
+	init_group_list(list_ctrl, gAgent.getGroupID(), mPowersMask);
+	
+	// Remove group "none" from list. Group "none" is added in init_group_list(). 
+	// Some UI elements use group "none", we need to manually delete it here.
+	// Group "none" ID is LLUUID:null.
+	LLCtrlListInterface* group_list = list_ctrl->getListInterface();
+	if(group_list)
+	{
+		group_list->selectByValue(LLUUID::null);
+		group_list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
+	}
 
 	childSetAction("OK", onBtnOK, this);
 
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index ba23a58b37..aa82dc34b7 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -43,7 +43,6 @@
 #include "llbutton.h"
 #include "lltextbox.h"
 
-#include "llagent.h"			// for agent id
 #include "llalertdialog.h"
 #include "llinventorybridge.h"
 #include "llfloaterinventory.h"
diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp
index ac687ed3e9..a27070de39 100644
--- a/indra/newview/llfloaterpostcard.cpp
+++ b/indra/newview/llfloaterpostcard.cpp
@@ -64,6 +64,7 @@
 #include "llvfs.h"
 #include "llviewertexture.h"
 #include "llassetuploadresponders.h"
+#include "llagentui.h"
 
 #include <boost/regex.hpp>  //boost.regex lib
 
@@ -101,7 +102,7 @@ BOOL LLFloaterPostcard::postBuild()
 	childDisable("from_form");
 
 	std::string name_string;
-	gAgent.buildFullname(name_string);
+	LLAgentUI::buildFullname(name_string);
 	childSetValue("name_form", LLSD(name_string));
 
 	// For the first time a user focusess to .the msg box, all text will be selected.
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index a50bcaa098..10276ba36d 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -84,6 +84,7 @@
 #include "llviewerwindow.h"
 #include "llvlcomposition.h"
 #include "lltrans.h"
+#include "llagentui.h"
 
 #define ELAR_ENABLED 0 // Enable when server support is implemented
 
@@ -714,7 +715,7 @@ bool LLPanelRegionGeneralInfo::onMessageCommit(const LLSD& notification, const L
 	gAgent.getID().toString(buffer);
 	strings.push_back(buffer);
 	std::string name;
-	gAgent.buildFullname(name);
+	LLAgentUI::buildFullname(name);
 	strings.push_back(strings_t::value_type(name));
 	strings.push_back(strings_t::value_type(text));
 	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
@@ -2659,7 +2660,7 @@ bool LLPanelEstateInfo::onMessageCommit(const LLSD& notification, const LLSD& re
 	strings_t strings;
 	//integers_t integers;
 	std::string name;
-	gAgent.buildFullname(name);
+	LLAgentUI::buildFullname(name);
 	strings.push_back(strings_t::value_type(name));
 	strings.push_back(strings_t::value_type(text));
 	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index e2176350c9..818381b561 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -85,6 +85,7 @@
 #include "llviewernetwork.h"
 
 #include "llassetuploadresponders.h"
+#include "llagentui.h"
 
 const U32 INCLUDE_SCREENSHOT  = 0x01 << 0;
 
@@ -137,7 +138,7 @@ void LLFloaterReporter::processRegionInfo(LLMessageSystem* msg)
 // virtual
 BOOL LLFloaterReporter::postBuild()
 {
-	childSetText("abuse_location_edit", gAgent.getSLURL() );
+	childSetText("abuse_location_edit", LLAgentUI::buildSLURL());
 
 	enableControls(TRUE);
 
@@ -190,7 +191,7 @@ BOOL LLFloaterReporter::postBuild()
 	
 	// grab the user's name
 	std::string fullname;
-	gAgent.buildFullname(fullname);
+	LLAgentUI::buildFullname(fullname);
 	childSetText("reporter_field", fullname);
 	
 	center();
@@ -499,7 +500,7 @@ void LLFloaterReporter::showFromObject(const LLUUID& object_id)
 
 	// grab the user's name
 	std::string fullname;
-	gAgent.buildFullname(fullname);
+	LLAgentUI::buildFullname(fullname);
 	f->childSetText("reporter_field", fullname);
 
 	// Request info for this object
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 814395395c..dd73ebbd8f 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -59,6 +59,7 @@
 #include "lltoolfocus.h"
 #include "lltoolmgr.h"
 #include "llworld.h"
+#include "llagentui.h"
 
 // Linden library includes
 #include "llfontgl.h"
@@ -967,9 +968,9 @@ void LLSnapshotLivePreview::saveTexture()
 	{
 		LLVFile::writeFile(formatted->getData(), formatted->getDataSize(), gVFS, new_asset_id, LLAssetType::AT_TEXTURE);
 		std::string pos_string;
-		gAgent.buildLocationString(pos_string, LLAgent::LOCATION_FORMAT_FULL);
+		LLAgentUI::buildLocationString(pos_string, LLAgent::LOCATION_FORMAT_FULL);
 		std::string who_took_it;
-		gAgent.buildFullname(who_took_it);
+		LLAgentUI::buildFullname(who_took_it);
 		LLAssetStorage::LLStoreAssetCallback callback = NULL;
 		S32 expected_upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
 		void *userdata = NULL;
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
index f61d5cb077..c20b3f34b2 100644
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -35,7 +35,6 @@
 #include "llfloatertos.h"
 
 // viewer includes
-#include "llagent.h"
 #include "llappviewer.h"
 #include "llstartup.h"
 #include "llviewerstats.h"
diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp
index 37da4a6ba6..a7658d90e9 100644
--- a/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/indra/newview/llfloatervoicedevicesettings.cpp
@@ -36,7 +36,6 @@
 #include "llfloatervoicedevicesettings.h"
 
 // Viewer includes
-#include "llagent.h"
 #include "llbutton.h"
 #include "llcombobox.h"
 #include "llfocusmgr.h"
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index d1f0f94fa0..2a29566120 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -34,7 +34,6 @@
 
 #include "llfolderview.h"
 
-#include "llagent.h"
 #include "llcallbacklist.h"
 #include "llinventorybridge.h"
 #include "llinventoryclipboard.h" // *TODO: remove this once hack below gone.
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 7af77e2056..24e9615f0d 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -37,6 +37,7 @@
 
 #include "llagent.h"
 #include "llfloaterreg.h"
+#include "llgroupmgr.h"
 #include "llimview.h" // for gIMMgr
 #include "llsidetray.h"
 
@@ -162,6 +163,19 @@ void LLGroupActions::show(const LLUUID& group_id)
 	LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
 }
 
+void LLGroupActions::refresh_notices()
+{
+	if(!isGroupUIVisible())
+		return;
+
+	LLSD params;
+	params["group_id"] = LLUUID::null;
+	params["open_tab_name"] = "panel_group_info_sidetray";
+	params["action"] = "refresh_notices";
+
+	LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
+}
+
 //static 
 void LLGroupActions::refresh(const LLUUID& group_id)
 {
@@ -225,6 +239,28 @@ void LLGroupActions::startChat(const LLUUID& group_id)
 	}
 }
 
+// static
+bool LLGroupActions::isAvatarMemberOfGroup(const LLUUID& group_id, const LLUUID& avatar_id)
+{
+	if(group_id.isNull() || avatar_id.isNull())
+	{
+		return false;
+	}
+
+	LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(group_id);
+	if(!group_data)
+	{
+		return false;
+	}
+
+	if(group_data->mMembers.end() == group_data->mMembers.find(avatar_id))
+	{
+		return false;
+	}
+
+	return true;
+}
+
 //-- Private methods ----------------------------------------------------------
 
 // static
diff --git a/indra/newview/llgroupactions.h b/indra/newview/llgroupactions.h
index eb366bd779..9fe1da8af2 100644
--- a/indra/newview/llgroupactions.h
+++ b/indra/newview/llgroupactions.h
@@ -67,6 +67,11 @@ public:
 	 */
 	static void refresh(const LLUUID& group_id);
 
+	/**
+	 * Refresh group notices panel.
+	 */
+	static void refresh_notices();
+
 	/**
 	 * Refresh group information panel.
 	 */
@@ -81,6 +86,15 @@ public:
 	 * Start group instant messaging session.
 	 */
 	static void startChat(const LLUUID& group_id);
+
+	/**
+	 * Returns true if avatar is in group.
+	 *
+	 * Note that data about group members is loaded from server.
+	 * If data has not been loaded yet, function will return inaccurate result.
+	 * See LLGroupMgr::sendGroupMembersRequest
+	 */
+	static bool isAvatarMemberOfGroup(const LLUUID& group_id, const LLUUID& avatar_id);
 	
 private:
 	static bool onLeaveGroup(const LLSD& notification, const LLSD& response);
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 0ba1019765..5e50fad008 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -809,7 +809,7 @@ static void formatDateString(std::string &date_string)
 		std::string day = result[2];
 
 		// ISO 8601 date format
-		date_string = llformat("%04s-%02s-%02s", year.c_str(), month.c_str(), day.c_str());
+		date_string = llformat("%02s/%02s/%04s", month.c_str(), day.c_str(), year.c_str());
 	}
 }
 
diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp
index 6f22a68327..0a6938f4f8 100644
--- a/indra/newview/llhudview.cpp
+++ b/indra/newview/llhudview.cpp
@@ -39,7 +39,6 @@
 #include "llcoord.h"
 
 // viewer includes
-#include "llagent.h"
 #include "llcallingcard.h"
 #include "llviewercontrol.h"
 #include "llfloaterworldmap.h"
diff --git a/indra/newview/llimhandler.cpp b/indra/newview/llimhandler.cpp
new file mode 100644
index 0000000000..0262e40803
--- /dev/null
+++ b/indra/newview/llimhandler.cpp
@@ -0,0 +1,127 @@
+/** 
+ * @file llimhandler.cpp
+ * @brief Notification Handler Class for IM notifications
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+
+#include "llviewerprecompiledheaders.h" // must be first include
+
+#include "llnotificationhandler.h"
+
+#include "llbottomtray.h"
+#include "llviewercontrol.h"
+#include "lltoastimpanel.h"
+
+using namespace LLNotificationsUI;
+
+//--------------------------------------------------------------------------
+LLIMHandler::LLIMHandler()
+{
+	
+	// getting a Chiclet and creating params for a channel
+	LLBottomTray* tray = LLBottomTray::getInstance();
+	mChiclet = tray->getSysWell();
+
+	LLChannelManager::Params p;
+	// *TODO: createNotificationChannel method
+	p.id = LLUUID(gSavedSettings.getString("NotificationChannelUUID"));
+	p.channel_right_bound = tray->getRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); 
+	p.channel_width = gSavedSettings.getS32("NotifyBoxWidth");
+
+	// Getting a Channel for our notifications
+	mChannel = LLChannelManager::getInstance()->createChannel(p);
+
+}
+
+//--------------------------------------------------------------------------
+LLIMHandler::~LLIMHandler()
+{
+}
+
+//--------------------------------------------------------------------------
+void LLIMHandler::processNotification(const LLSD& notify)
+{
+	LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
+
+	if(!notification)
+		return;
+
+	if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change")
+	{
+		LLSD substitutions = notification->getSubstitutions();
+
+		LLToastIMPanel::Params im_p;
+		im_p.notification = notification;
+		im_p.avatar_id = substitutions["FROM_ID"].asUUID();
+		im_p.from = substitutions["FROM"].asString();
+		im_p.time = substitutions["TIME"].asString();
+		im_p.message = substitutions["MESSAGE"].asString();
+		im_p.session_id = substitutions["SESSION_ID"].asUUID();
+
+		LLToastIMPanel* im_box = new LLToastIMPanel(im_p);
+
+		LLToast::Params p;
+		p.id = notification->getID();
+		p.notification = notification;
+		p.panel = im_box;
+		p.can_be_stored = false;
+		p.on_toast_destroy = boost::bind(&LLIMHandler::onToastDestroy, this, _1);
+		mChannel->addToast(p);
+
+
+		static_cast<LLNotificationChiclet*>(mChiclet)->updateUreadIMNotifications();
+	}
+	else if (notify["sigtype"].asString() == "delete")
+	{
+		mChannel->killToastByNotificationID(notification->getID());
+	}
+}
+
+//--------------------------------------------------------------------------
+void LLIMHandler::onToastDestroy(LLToast* toast)
+{
+	toast->closeFloater();
+	static_cast<LLNotificationChiclet*>(mChiclet)->updateUreadIMNotifications();
+}
+
+//--------------------------------------------------------------------------
+void LLIMHandler::onChicletClick(void)
+{
+}
+
+//--------------------------------------------------------------------------
+void LLIMHandler::onChicletClose(void)
+{
+}
+
+//--------------------------------------------------------------------------
+
+
+
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 72e2bb02d5..8c24962897 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2235,6 +2235,8 @@ bool LLIMFloater::toggle(const LLUUID& session_id)
 	{
 		// ensure the list of messages is updated when floater is made visible
 		show(session_id);
+		// update number of unread notifications in the SysWell
+		LLBottomTray::getInstance()->getSysWell()->updateUreadIMNotifications();
 		return true;
 	}
 }
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index e3902bffa0..4cbf88f3da 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -72,6 +72,7 @@
 #include "lltrans.h"
 
 #include "llfirstuse.h"
+#include "llagentui.h"
 
 //
 // Globals
@@ -104,6 +105,8 @@ void toast_callback(const LLSD& msg){
 		args["MESSAGE"] = msg["message"];
 		args["TIME"] = msg["time"];
 		args["FROM"] = msg["from"];
+		args["FROM_ID"] = msg["from_id"];
+		args["SESSION_ID"] = msg["session_id"];
 
 		LLNotifications::instance().add("IMToast", args, LLSD(), boost::bind(&LLFloaterChatterBox::onOpen, LLFloaterChatterBox::getInstance(), msg["session_id"].asUUID()));
 	}
@@ -124,7 +127,7 @@ void LLIMModel::testMessages()
 
 	bot1_session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, bot1_id);
 	newSession(bot1_session_id, from, IM_NOTHING_SPECIAL, bot1_id);
-	addMessage(bot1_session_id, from, "Test Message: Hi from testerbot land!");
+	addMessage(bot1_session_id, from, bot1_id, "Test Message: Hi from testerbot land!");
 
 	LLUUID bot2_id;
 	std::string firstname[] = {"Roflcopter", "Joe"};
@@ -137,8 +140,8 @@ void LLIMModel::testMessages()
 	bot2_id.generate(from);
 	LLUUID bot2_session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, bot2_id);
 	newSession(bot2_session_id, from, IM_NOTHING_SPECIAL, bot2_id);
-	addMessage(bot2_session_id, from, "Test Message: Can I haz bear? ");
-	addMessage(bot2_session_id, from, "Test Message: OMGWTFBBQ.");
+	addMessage(bot2_session_id, from, bot2_id, "Test Message: Can I haz bear? ");
+	addMessage(bot2_session_id, from, bot2_id, "Test Message: OMGWTFBBQ.");
 }
 
 
@@ -218,7 +221,7 @@ bool LLIMModel::addToHistory(LLUUID session_id, std::string from, std::string ut
 }
 
 		
-bool LLIMModel::addMessage(LLUUID session_id, std::string from, std::string utf8_text) { 
+bool LLIMModel::addMessage(LLUUID session_id, std::string from, LLUUID from_id, std::string utf8_text) { 
 
 	LLIMSession* session = get_if_there(sSessionsMap, session_id, (LLIMSession*)NULL);
 
@@ -231,7 +234,7 @@ bool LLIMModel::addMessage(LLUUID session_id, std::string from, std::string utf8
 	addToHistory(session_id, from, utf8_text);
 
 	std::string agent_name;
-	gAgent.buildFullname(agent_name);
+	LLAgentUI::buildFullname(agent_name);
 	
 	session->mNumUnread++;
 
@@ -240,6 +243,9 @@ bool LLIMModel::addMessage(LLUUID session_id, std::string from, std::string utf8
 	arg["session_id"] = session_id;
 	arg["num_unread"] = session->mNumUnread;
 	arg["message"] = utf8_text;
+	arg["from"] = from;
+	arg["from_id"] = from_id;
+	arg["time"] = LLLogChat::timestamp(false);
 	mChangedSignal(arg);
 
 	return true;
@@ -264,7 +270,7 @@ const std::string& LLIMModel::getName(LLUUID session_id)
 void LLIMModel::sendTypingState(LLUUID session_id, LLUUID other_participant_id, BOOL typing) 
 {
 	std::string name;
-	gAgent.buildFullname(name);
+	LLAgentUI::buildFullname(name);
 
 	pack_instant_message(
 		gMessageSystem,
@@ -285,7 +291,7 @@ void LLIMModel::sendLeaveSession(LLUUID session_id, LLUUID other_participant_id)
 	if(session_id.notNull())
 	{
 		std::string name;
-		gAgent.buildFullname(name);
+		LLAgentUI::buildFullname(name);
 		pack_instant_message(
 			gMessageSystem,
 			gAgent.getID(),
@@ -310,7 +316,7 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
 {
 	std::string name;
 	bool sent = false;
-	gAgent.buildFullname(name);
+	LLAgentUI::buildFullname(name);
 
 	const LLRelationship* info = NULL;
 	info = LLAvatarTracker::instance().getBuddyInfo(other_participant_id);
@@ -377,13 +383,13 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
 	{
 		// Do we have to replace the /me's here?
 		std::string from;
-		gAgent.buildFullname(from);
+		LLAgentUI::buildFullname(from);
 		LLIMModel::instance().addToHistory(im_session_id, from, utf8_text);
 
 		//local echo for the legacy communicate panel
 		std::string history_echo;
 		std::string utf8_copy = utf8_text;
-		gAgent.buildFullname(history_echo);
+		LLAgentUI::buildFullname(history_echo);
 
 		// Look for IRC-style emotes here.
 
@@ -433,7 +439,7 @@ void session_starter_helper(
 	msg->addU32Fast(_PREHASH_Timestamp, NO_TIMESTAMP); // no timestamp necessary
 
 	std::string name;
-	gAgent.buildFullname(name);
+	LLAgentUI::buildFullname(name);
 
 	msg->addStringFast(_PREHASH_FromAgentName, name);
 	msg->addStringFast(_PREHASH_Message, LLStringUtil::null);
@@ -1231,7 +1237,7 @@ void LLIMMgr::addMessage(
 			//<< "*** position: " << position << std::endl;
 
 			floater->addHistoryLine(bonus_info.str(), LLUIColorTable::instance().getColor("SystemChatColor"));
-			LLIMModel::instance().addMessage(new_session_id, from, bonus_info.str());
+			LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, bonus_info.str());
 		}
 
 		make_ui_sound("UISndNewIncomingIMSession");
@@ -1251,7 +1257,7 @@ void LLIMMgr::addMessage(
 		floater->addHistoryLine(msg, color, true, other_participant_id, from); // Insert linked name to front of message
 	}
 
-	LLIMModel::instance().addMessage(new_session_id, from, msg);
+	LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg);
 
 	if( !LLFloaterReg::instanceVisible("communicate") && !floater->getVisible())
 	{
@@ -1311,6 +1317,19 @@ void LLIMMgr::notifyNewIM()
 	}
 }
 
+S32 LLIMMgr::getNumberOfUnreadIM()
+{
+	std::map<LLUUID, LLIMModel::LLIMSession*>::iterator it;
+	
+	S32 num = 0;
+	for(it = LLIMModel::sSessionsMap.begin(); it != LLIMModel::sSessionsMap.end(); ++it)
+	{
+		num += (*it).second->mNumUnread;
+	}
+
+	return num;
+}
+
 void LLIMMgr::clearNewIMNotification()
 {
 	mIMReceived = FALSE;
@@ -1356,44 +1375,9 @@ LLUUID LLIMMgr::addSession(
 	EInstantMessage dialog,
 	const LLUUID& other_participant_id)
 {
-	LLUUID session_id = computeSessionID(dialog, other_participant_id);
-
-	LLFloaterIMPanel* floater = findFloaterBySession(session_id);
-	if(!floater)
-	{
-		LLDynamicArray<LLUUID> ids;
-		ids.put(other_participant_id);
-
-		floater = createFloater(
-			session_id,
-			other_participant_id,
-			name,
-			ids,
-			dialog,
-			TRUE);
-
-		noteOfflineUsers(floater, ids);
-		//LLFloaterReg::showInstance("communicate", session_id);
-		// *NOTE: Is this right?  Or should we only do it for 
-		// dialog == IM_NOTHING_SPECIAL and some group types?
-
-		// Only warn for regular IMs - not group IMs
-		if( dialog == IM_NOTHING_SPECIAL )
-		{
-			noteMutedUsers(floater, ids);
-		}
-	}
-	else
-	{
-		// *TODO: Remove this?  Otherwise old communicate window opens on
-		// second initiation of IM session from People panel?
-		// floater->openFloater();
-	}
-	//mTabContainer->selectTabPanel(panel);
-	floater->setInputFocus(TRUE);
-	LLIMFloater::show(session_id);
-	notifyObserverSessionAdded(floater->getSessionID(), name, other_participant_id);
-	return floater->getSessionID();
+	LLDynamicArray<LLUUID> ids;
+	ids.put(other_participant_id);
+	return addSession(name, dialog, other_participant_id, ids);
 }
 
 // Adds a session using the given session_id.  If the session already exists 
@@ -1409,9 +1393,7 @@ LLUUID LLIMMgr::addSession(
 		return LLUUID::null;
 	}
 
-	LLUUID session_id = computeSessionID(
-		dialog,
-		other_participant_id);
+	LLUUID session_id = computeSessionID(dialog,other_participant_id);
 
 	LLFloaterIMPanel* floater = findFloaterBySession(session_id);
 	if(!floater)
@@ -1422,15 +1404,13 @@ LLUUID LLIMMgr::addSession(
 			session_id,
 			other_participant_id,
 			name,
-			ids,
 			dialog,
-			TRUE);
+			TRUE,
+			ids);
 
 		if ( !floater ) return LLUUID::null;
 
 		noteOfflineUsers(floater, ids);
-		// *BUG: Is this correct?  What do we want to spawn for group IMs?
-		// LLFloaterReg::showInstance("communicate", session_id);
 
 		// Only warn for regular IMs - not group IMs
 		if( dialog == IM_NOTHING_SPECIAL )
@@ -1440,10 +1420,13 @@ LLUUID LLIMMgr::addSession(
 	}
 	else
 	{
-		floater->openFloater();
+		// *TODO: Remove this?  Otherwise old communicate window opens on
+		// second initiation of IM session from People panel?
+		// floater->openFloater();
 	}
 	//mTabContainer->selectTabPanel(panel);
 	floater->setInputFocus(TRUE);
+	LLIMFloater::show(session_id);
 	notifyObserverSessionAdded(floater->getSessionID(), name, other_participant_id);
 	return floater->getSessionID();
 }
@@ -1772,35 +1755,8 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
 	const LLUUID& other_participant_id,
 	const std::string& session_label,
 	EInstantMessage dialog,
-	BOOL user_initiated)
-{
-	if (session_id.isNull())
-	{
-		llwarns << "Creating LLFloaterIMPanel with null session ID" << llendl;
-	}
-
-	llinfos << "LLIMMgr::createFloater: from " << other_participant_id 
-			<< " in session " << session_id << llendl;
-	std::vector<LLUUID> ids;
-	LLFloaterIMPanel* floater = new LLFloaterIMPanel(session_label,
-													 session_id,
-													 other_participant_id,
-													 ids,
-													 dialog);
-	LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END;
-	LLFloaterChatterBox::getInstance()->addFloater(floater, FALSE, i_pt);
-	mFloaters.insert(floater->getHandle());
-	LLIMModel::instance().newSession(session_id, session_label, dialog, other_participant_id);
-	return floater;
-}
-
-LLFloaterIMPanel* LLIMMgr::createFloater(
-	const LLUUID& session_id,
-	const LLUUID& other_participant_id,
-	const std::string& session_label,
-	const LLDynamicArray<LLUUID>& ids,
-	EInstantMessage dialog,
-	BOOL user_initiated)
+	BOOL user_initiated,
+	const LLDynamicArray<LLUUID>& ids)
 {
 	if (session_id.isNull())
 	{
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index b3b821f2ac..777d68978e 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -71,7 +71,7 @@ public:
 
 	bool newSession(LLUUID session_id, std::string name, EInstantMessage type, LLUUID other_participant_id);
 	std::list<LLSD> getMessages(LLUUID session_id, int start_index = 0);
-	bool addMessage(LLUUID session_id, std::string from, std::string utf8_text);
+	bool addMessage(LLUUID session_id, std::string from, LLUUID other_participant_id, std::string utf8_text);
 	bool addToHistory(LLUUID session_id, std::string from, std::string utf8_text); 
     //used to get the name of the session, for use as the title
     //currently just the other avatar name
@@ -189,6 +189,9 @@ public:
 	// IM received that you haven't seen yet
 	BOOL getIMReceived() const;
 
+	// Calc number of unread IMs
+	S32 getNumberOfUnreadIM();
+
 	// This method is used to go through all active sessions and
 	// disable all of them. This method is usally called when you are
 	// forced to log out or similar situations where you do not have a
@@ -231,14 +234,8 @@ private:
 									const LLUUID& target_id,
 									const std::string& name,
 									EInstantMessage dialog,
-									BOOL user_initiated = FALSE);
-
-	LLFloaterIMPanel* createFloater(const LLUUID& session_id,
-									const LLUUID& target_id,
-									const std::string& name,
-									const LLDynamicArray<LLUUID>& ids,
-									EInstantMessage dialog,
-									BOOL user_initiated = FALSE);
+									BOOL user_initiated = FALSE, 
+									const LLDynamicArray<LLUUID>& ids = LLDynamicArray<LLUUID>());
 
 	// This simple method just iterates through all of the ids, and
 	// prints a simple message if they are not online. Used to help
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp
index aa5432740c..2c56a70ced 100644
--- a/indra/newview/lllandmarkactions.cpp
+++ b/indra/newview/lllandmarkactions.cpp
@@ -50,6 +50,7 @@
 #include "llworldmap.h"
 #include "lllandmark.h"
 #include "llinventorymodel.h"
+#include "llagentui.h"
 
 // Returns true if the given inventory item is a landmark pointing to the current parcel.
 // Used to filter inventory items.
@@ -78,6 +79,8 @@ class LLFetchLandmarksByName : public LLInventoryCollectFunctor
 private:
 	std::string name;
 	BOOL use_substring;
+	//this member will be contain copy of founded items to keep the result unique
+	std::set<std::string> check_duplicate;
 
 public:
 LLFetchLandmarksByName(std::string &landmark_name, BOOL if_use_substring)
@@ -97,28 +100,35 @@ public:
 		if (!landmark) // the landmark not been loaded yet
 			return false;
 
+		bool acceptable = false;
 		std::string landmark_name = item->getName();
 		LLStringUtil::toLower(landmark_name);
 		if(use_substring)
 		{
-			if ( landmark_name.find( name ) != std::string::npos)
-				return true;
+			acceptable =  landmark_name.find( name ) != std::string::npos;
 		}
 		else
 		{
-			if ( landmark_name == name )
-				return true;
+			acceptable = landmark_name == name;
+		}
+		if(acceptable){
+			if(check_duplicate.find(landmark_name) != check_duplicate.end()){
+				// we have duplicated items in landmarks
+				acceptable = false;
+			}else{
+				check_duplicate.insert(landmark_name);
+			}
 		}
 
-		return false;
+		return acceptable;
 	}
 };
 
-LLInventoryModel::item_array_t LLLandmarkActions::fetchLandmarksByName(std::string& name, BOOL if_starts_with)
+LLInventoryModel::item_array_t LLLandmarkActions::fetchLandmarksByName(std::string& name, BOOL use_substring)
 {
 	LLInventoryModel::cat_array_t cats;
 	LLInventoryModel::item_array_t items;
-	LLFetchLandmarksByName fetchLandmarks(name, if_starts_with);
+	LLFetchLandmarksByName fetchLandmarks(name, use_substring);
 	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
 			cats,
 			items,
@@ -135,6 +145,27 @@ bool LLLandmarkActions::landmarkAlreadyExists()
 	return !items.empty();
 }
 
+
+LLViewerInventoryItem* LLLandmarkActions::findLandmarkForAgentParcel()
+{
+	// Determine whether there are landmarks pointing to the current parcel.
+	LLInventoryModel::cat_array_t cats;
+	LLInventoryModel::item_array_t items;
+	LLIsAgentParcelLandmark is_current_parcel_landmark;
+	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
+		cats,
+		items,
+		LLInventoryModel::EXCLUDE_TRASH,
+		is_current_parcel_landmark);
+
+	if(items.empty())
+	{
+		return NULL;
+	}
+
+	return items[0];
+}
+
 bool LLLandmarkActions::canCreateLandmarkHere()
 {
 	LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
@@ -187,21 +218,20 @@ void LLLandmarkActions::createLandmarkHere()
 {
 	std::string landmark_name, landmark_desc;
 
-	gAgent.buildLocationString(landmark_name, LLAgent::LOCATION_FORMAT_LANDMARK);
-	gAgent.buildLocationString(landmark_desc, LLAgent::LOCATION_FORMAT_FULL);
+	LLAgentUI::buildLocationString(landmark_name, LLAgent::LOCATION_FORMAT_LANDMARK);
+	LLAgentUI::buildLocationString(landmark_desc, LLAgent::LOCATION_FORMAT_FULL);
 	LLUUID folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
 
 	createLandmarkHere(landmark_name, landmark_desc, folder_id);
 }
 
-void LLLandmarkActions::getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_callback_t cb)
+void LLLandmarkActions::getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_callback_t cb, bool escaped /* = true */)
 {
 	std::string sim_name;
 	bool gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal(global_pos, sim_name);
 	if (gotSimName)
 	{
-		std::string slurl = LLSLURL::buildSLURLfromPosGlobal(sim_name, global_pos);
-
+		std::string slurl = LLSLURL::buildSLURLfromPosGlobal(sim_name, global_pos, escaped);
 		cb(slurl);
 
 		return;
@@ -213,6 +243,7 @@ void LLLandmarkActions::getSLURLfromPosGlobal(const LLVector3d& global_pos, slur
 		LLWorldMap::url_callback_t url_cb = boost::bind(&LLLandmarkActions::onRegionResponse,
 														cb,
 														global_pos,
+														escaped,
 														_1, _2, _3, _4);
 
 		LLWorldMap::getInstance()->sendHandleRegionRequest(new_region_handle, url_cb, std::string("unused"), false);
@@ -221,6 +252,7 @@ void LLLandmarkActions::getSLURLfromPosGlobal(const LLVector3d& global_pos, slur
 
 void LLLandmarkActions::onRegionResponse(slurl_callback_t cb,
 										 const LLVector3d& global_pos,
+										 bool escaped,
 										 U64 region_handle,
 										 const std::string& url,
 										 const LLUUID& snapshot_id,
@@ -231,7 +263,7 @@ void LLLandmarkActions::onRegionResponse(slurl_callback_t cb,
 	bool gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal(global_pos, sim_name);
 	if (gotSimName)
 	{
-		slurl = LLSLURL::buildSLURLfromPosGlobal(sim_name, global_pos);
+		slurl = LLSLURL::buildSLURLfromPosGlobal(sim_name, global_pos, escaped);
 	}
 	else
 	{
diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h
index 3c2a0a5522..c74072c0f4 100644
--- a/indra/newview/lllandmarkactions.h
+++ b/indra/newview/lllandmarkactions.h
@@ -52,6 +52,14 @@ public:
 	 */
 	static bool landmarkAlreadyExists();
 
+	/**
+	 * @brief Searches landmark for parcel agent is currently in.
+	 * @return Returns landmark for agent parcel or NULL.
+	 * 
+	 * *TODO: dzaporozhan: There can be many landmarks for single parcel.
+	 */
+	static LLViewerInventoryItem* findLandmarkForAgentParcel();
+
 	/**
 	 * @brief Checks whether agent has rights to create landmark for current parcel.
 	 */
@@ -80,7 +88,7 @@ public:
 	/**
 	 * @brief Creates SLURL for given global position.
 	 */
-	static void getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_callback_t cb);
+	static void getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_callback_t cb, bool escaped = true);
 
     /**
      * @brief Gets landmark global position specified by inventory LLUUID.
@@ -98,6 +106,7 @@ private:
 
 	static void onRegionResponse(slurl_callback_t cb,
 								 const LLVector3d& global_pos,
+								 bool escaped,
 								 U64 region_handle,
 								 const std::string& url,
 								 const LLUUID& snapshot_id,
diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp
index 03d6953521..c83cde9d83 100644
--- a/indra/newview/lllocationhistory.cpp
+++ b/indra/newview/lllocationhistory.cpp
@@ -49,8 +49,15 @@ void LLLocationHistory::addItem(const std::string & item, const std::string & to
 	static LLUICachedControl<S32> max_items("LocationHistoryMaxSize", 100);
 
 	// check if this item doesn't duplicate any existing one
-	if (touchItem(item)) {
-		return;
+	std::vector<std::string>::iterator item_iter = std::find_if(mItems.begin(), mItems.end(),
+			boost::bind(&LLLocationHistory::equalByRegionParcel,this,_1,item));
+	if(item_iter != mItems.end()){
+	/*replace duplicate.
+	 * If an item's region and item's parcel are  equal.
+	 */
+		mToolTips.erase(*item_iter);
+		mItems.erase(item_iter);	
+		
 	}
 
 	mItems.push_back(item);
@@ -65,6 +72,21 @@ void LLLocationHistory::addItem(const std::string & item, const std::string & to
 	}
 }
 
+/**
+ * check if the history item is equal.
+ * @return  true - if region name and parcel is equal.  
+ */
+bool LLLocationHistory::equalByRegionParcel(const std::string& item, const std::string& newItem){
+
+	
+	S32 itemIndex = item.find('(');
+	S32 newItemIndex = newItem.find('(');
+	
+	std::string region_parcel  = item.substr(0,itemIndex);
+	std::string new_region_parcel  = newItem.substr(0,newItemIndex);
+	
+	return region_parcel == new_region_parcel;
+}
 bool LLLocationHistory::touchItem(const std::string & item) {
 	bool result = false;
 	std::vector<std::string>::iterator item_iter = std::find(mItems.begin(), mItems.end(), item);
@@ -135,7 +157,13 @@ void LLLocationHistory::save() const
 	}
 
 	for (location_list_t::const_iterator it = mItems.begin(); it != mItems.end(); ++it)
-		file << (*it) << delimiter << mToolTips.find(*it)->second << std::endl;
+	{
+		std::string tooltip =  getToolTip(*it);
+		if(!tooltip.empty())
+		{
+			file << (*it) << delimiter << tooltip << std::endl;
+		}
+	}
 
 	file.close();
 }
diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h
index 67eabcdaca..060a6b2fe8 100644
--- a/indra/newview/lllocationhistory.h
+++ b/indra/newview/lllocationhistory.h
@@ -65,6 +65,7 @@ public:
 	void					dump() const;
 
 private:
+	bool equalByRegionParcel(const std::string& item, const  std::string& item_to_add);
 	const static char delimiter;
 	std::vector<std::string>			mItems;
 	std::map<std::string, std::string>	mToolTips;
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 63a40e40a0..1542c7483a 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -40,6 +40,7 @@
 #include "llfocusmgr.h"
 #include "llmenugl.h"
 #include "llstring.h"
+#include "lltrans.h"
 #include "lluictrlfactory.h"
 
 // newview includes
@@ -56,6 +57,8 @@
 #include "llviewercontrol.h"
 #include "llviewermenu.h"
 #include "llurllineeditorctrl.h"
+#include "llagentui.h"
+
 //============================================================================
 /*
  * "ADD LANDMARK" BUTTON UPDATING LOGIC
@@ -151,6 +154,8 @@ static LLDefaultChildRegistry::Register<LLLocationInputCtrl> r("location_input")
 LLLocationInputCtrl::Params::Params()
 :	add_landmark_image_enabled("add_landmark_image_enabled"),
 	add_landmark_image_disabled("add_landmark_image_disabled"),
+	add_landmark_image_hover("add_landmark_image_hover"),
+	add_landmark_image_selected("add_landmark_image_selected"),
 	add_landmark_button("add_landmark_button"),
 	add_landmark_hpad("add_landmark_hpad", 0),
 	info_button("info_button")
@@ -162,7 +167,9 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mAddLandmarkHPad(p.add_landmark_hpad),
 	mInfoBtn(NULL),
 	mLocationContextMenu(NULL),
-	mAddLandmarkBtn(NULL)
+	mAddLandmarkBtn(NULL),
+	mLandmarkImageOn(NULL),
+	mLandmarkImageOff(NULL)
 {
 	// Lets replace default LLLineEditor with LLLocationLineEditor
 	// to make needed escaping while copying and cutting url
@@ -198,16 +205,27 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 
 	// "Add landmark" button.
 	LLButton::Params al_params = p.add_landmark_button;
+
+	// Image for unselected state will be set in updateAddLandmarkButton(),
+	// it will be either mLandmarkOn or mLandmarkOff
 	if (p.add_landmark_image_enabled())
 	{
-		al_params.image_unselected = p.add_landmark_image_enabled;
-		al_params.image_selected = p.add_landmark_image_enabled;
+		mLandmarkImageOn = p.add_landmark_image_enabled;
 	}
 	if (p.add_landmark_image_disabled())
 	{
-		al_params.image_disabled = p.add_landmark_image_disabled;
-		al_params.image_disabled_selected = p.add_landmark_image_disabled;
+		mLandmarkImageOff = p.add_landmark_image_disabled;
+	}
+
+	if(p.add_landmark_image_selected)
+	{
+		al_params.image_selected = p.add_landmark_image_selected;
+	}
+	if (p.add_landmark_image_hover())
+	{
+		al_params.image_hover_unselected = p.add_landmark_image_hover;
 	}
+
 	al_params.click_callback.function(boost::bind(&LLLocationInputCtrl::onAddLandmarkButtonClicked, this));
 	mAddLandmarkBtn = LLUICtrlFactory::create<LLButton>(al_params);
 	enableAddLandmarkButton(true);
@@ -233,7 +251,7 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	// - Make the "Add landmark" button updated when either current parcel gets changed
 	//   or a landmark gets created or removed from the inventory.
 	// - Update the location string on parcel change.
-	mParcelMgrConnection = LLViewerParcelMgr::getInstance()->setAgentParcelChangedCallback(
+	mParcelMgrConnection = LLViewerParcelMgr::getInstance()->addAgentParcelChangedCallback(
 		boost::bind(&LLLocationInputCtrl::onAgentParcelChange, this));
 
 	mLocationHistoryConnection = LLLocationHistory::getInstance()->setLoadedCallback(
@@ -243,6 +261,9 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mAddLandmarkObserver	= new LLAddLandmarkObserver(this);
 	gInventory.addObserver(mRemoveLandmarkObserver);
 	gInventory.addObserver(mAddLandmarkObserver);
+
+	mAddLandmarkTooltip = LLTrans::getString("location_ctrl_add_landmark");
+	mEditLandmarkTooltip = LLTrans::getString("location_ctrl_edit_landmark");
 }
 
 LLLocationInputCtrl::~LLLocationInputCtrl()
@@ -389,7 +410,21 @@ void LLLocationInputCtrl::onInfoButtonClicked()
 
 void LLLocationInputCtrl::onAddLandmarkButtonClicked()
 {
-	LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
+	LLViewerInventoryItem* landmark = LLLandmarkActions::findLandmarkForAgentParcel();
+	
+	// Landmark exists, open it for preview and edit
+	if(landmark && landmark->getUUID().notNull())
+	{
+		LLSD key;
+		key["type"] = "landmark";
+		key["id"] = landmark->getUUID();
+
+		LLSideTray::getInstance()->showPanel("panel_places", key);
+	}
+	else
+	{
+		LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark"));
+	}
 }
 
 void LLLocationInputCtrl::onAgentParcelChange()
@@ -414,11 +449,14 @@ void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data)
 	rebuildLocationHistory(filter);
 
 	//Let's add landmarks to the top of the list if any
-	LLInventoryModel::item_array_t landmark_items = LLLandmarkActions::fetchLandmarksByName(filter, TRUE);
-
-	for(U32 i=0; i < landmark_items.size(); i++)
+	if( filter.size() !=0 )
 	{
-		mList->addSimpleElement(landmark_items[i]->getName(), ADD_TOP);
+		LLInventoryModel::item_array_t landmark_items = LLLandmarkActions::fetchLandmarksByName(filter, TRUE);
+
+		for(U32 i=0; i < landmark_items.size(); i++)
+		{
+			mList->addSimpleElement(landmark_items[i]->getName(), ADD_TOP);
+		}
 	}
 	mList->mouseOverHighlightNthItem(-1); // Clear highlight on the last selected item.
 }
@@ -459,9 +497,7 @@ void LLLocationInputCtrl::refreshLocation()
 	LLAgent::ELocationFormat format =  (gSavedSettings.getBOOL("ShowCoordinatesOption") ? 
 			LLAgent::LOCATION_FORMAT_WITHOUT_SIM: LLAgent::LOCATION_FORMAT_NORMAL);
 
-	if (!gAgent.buildLocationString(location_name,format))
-		location_name = "Unknown";
-
+	if (!LLAgentUI::buildLocationString(location_name, format)) location_name = "Unknown";
 	setText(location_name);
 }
 
@@ -499,15 +535,32 @@ void LLLocationInputCtrl::focusTextEntry()
 
 void LLLocationInputCtrl::enableAddLandmarkButton(bool val)
 {
-	// Enable/disable the button.
-	mAddLandmarkBtn->setEnabled(val);
+	// We don't want to disable the button because it should be click able at any time, 
+	// instead switch images.
+	LLUIImage* img = val ? mLandmarkImageOn : mLandmarkImageOff;
+	if(img)
+	{
+		mAddLandmarkBtn->setImageUnselected(img);
+	}
 }
 
 // Change the "Add landmark" button image
 // depending on whether current parcel has been landmarked.
 void LLLocationInputCtrl::updateAddLandmarkButton()
 {
-	enableAddLandmarkButton(!LLLandmarkActions::landmarkAlreadyExists());
+	bool landmark_exists = LLLandmarkActions::landmarkAlreadyExists();
+	enableAddLandmarkButton(!landmark_exists);
+
+	std::string tooltip;
+	if(landmark_exists)
+	{
+		tooltip = mEditLandmarkTooltip;
+	}
+	else
+	{
+		tooltip = mAddLandmarkTooltip;
+	}
+	mAddLandmarkBtn->setToolTip(tooltip);
 }
 
 void LLLocationInputCtrl::updateContextMenu(){
@@ -554,7 +607,8 @@ void LLLocationInputCtrl::changeLocationPresentation()
 	if(mTextEntry && !mTextEntry->hasSelection() && 
 		!LLSLURL::isSLURL(mTextEntry->getText()))
 	{
-		mTextEntry->setText(gAgent.getUnescapedSLURL());
+		//needs unescaped one
+		mTextEntry->setText(LLAgentUI::buildSLURL(false));
 		mTextEntry->selectAll();
 	}	
 }
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index 1b26a07d83..d967df8257 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -59,7 +59,9 @@ public:
 	:	public LLInitParam::Block<Params, LLComboBox::Params>
 	{
 		Optional<LLUIImage*>				add_landmark_image_enabled,
-											add_landmark_image_disabled;
+											add_landmark_image_disabled,
+											add_landmark_image_hover,
+											add_landmark_image_selected;
 		Optional<S32>						add_landmark_hpad;
 		Optional<LLButton::Params>			add_landmark_button,
 											info_button;
@@ -93,6 +95,10 @@ private:
 	virtual ~LLLocationInputCtrl();
 
 	void					focusTextEntry();
+	/**
+	 * Changes the "Add landmark" button image
+	 * depending on whether current parcel has been landmarked.
+	 */
 	void					enableAddLandmarkButton(bool val);
 	void					refresh();
 	void					refreshLocation();
@@ -124,6 +130,11 @@ private:
 
 	boost::signals2::connection	mParcelMgrConnection;
 	boost::signals2::connection	mLocationHistoryConnection;
+	LLUIImage* mLandmarkImageOn;
+	LLUIImage* mLandmarkImageOff;
+
+	std::string mAddLandmarkTooltip;
+	std::string mEditLandmarkTooltip;
 };
 
 #endif
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 92b1ecfd16..11c8b03f7f 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -36,6 +36,7 @@
 
 // Library includes
 #include "indra_constants.h"
+#include "llparcel.h"
 
 // Viewer includes
 
@@ -51,6 +52,8 @@
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
 #include "llselectmgr.h" 
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
 
 //
 // Constants
@@ -137,6 +140,8 @@ BOOL LLFloaterMove::postBuild()
 
 	initMovementMode();
 
+	LLViewerParcelMgr::getInstance()->addAgentParcelChangedCallback(LLFloaterMove::sUpdateFlyingStatus);
+
 	return TRUE;
 }
 
@@ -385,6 +390,15 @@ void LLFloaterMove::updatePosition()
 	}
 	setOrigin(x, y);
 }
+
+//static
+void LLFloaterMove::sUpdateFlyingStatus()
+{
+	LLFloaterMove *floater = LLFloaterReg::findTypedInstance<LLFloaterMove>("moveview");
+	if (floater) floater->mModeControlButtonMap[MM_FLY]->setEnabled(gAgent.canFly());
+	
+}
+
 void LLFloaterMove::showModeButtons(BOOL bShow)
 {
 	if (mModeActionsPanel->getVisible() == bShow)
@@ -421,6 +435,8 @@ void LLFloaterMove::enableInstance(BOOL bEnable)
 void LLFloaterMove::onOpen(const LLSD& key)
 {
 	updatePosition();
+
+	sUpdateFlyingStatus();
 }
 
 void LLFloaterMove::showQuickTips(const EMovementMode mode)
@@ -476,11 +492,12 @@ inline LLPanelStandStopFlying* LLPanelStandStopFlying::getInstance()
 void LLPanelStandStopFlying::setStandStopFlyingMode(EStandStopFlyingMode mode)
 {
 	LLPanelStandStopFlying* panel = getInstance();
-	panel->setVisible(TRUE);
 
-	BOOL standVisible = SSFM_STAND == mode;
-	panel->mStandButton->setVisible(standVisible);
-	panel->mStopFlyingButton->setVisible(!standVisible);
+	panel->mStandButton->setVisible(SSFM_STAND == mode);
+	panel->mStopFlyingButton->setVisible(SSFM_STOP_FLYING == mode);
+
+	//visibility of it should be updated after updating visibility of the buttons
+	panel->setVisible(TRUE);
 }
 
 //static
@@ -505,11 +522,12 @@ BOOL LLPanelStandStopFlying::postBuild()
 	mStandButton = getChild<LLButton>("stand_btn");
 	mStandButton->setCommitCallback(boost::bind(&LLPanelStandStopFlying::onStandButtonClick, this));
 	mStandButton->setCommitCallback(boost::bind(&LLFloaterMove::enableInstance, TRUE));
+	mStandButton->setVisible(FALSE);
 	
 	mStopFlyingButton = getChild<LLButton>("stop_fly_btn");
 	mStopFlyingButton->setCommitCallback(boost::bind(&LLFloaterMove::setFlyingMode, FALSE));
 	mStopFlyingButton->setCommitCallback(boost::bind(&LLPanelStandStopFlying::onStopFlyingButtonClick, this));
-
+	mStopFlyingButton->setVisible(FALSE);
 	
 	return TRUE;
 }
@@ -517,6 +535,11 @@ BOOL LLPanelStandStopFlying::postBuild()
 //virtual
 void LLPanelStandStopFlying::setVisible(BOOL visible)
 {
+	//we dont need to show the panel if these buttons are not activated
+	if (visible && !mStandButton->getVisible() && !mStopFlyingButton->getVisible()) visible = false;
+
+	if (gAgent.getCameraMode() == CAMERA_MODE_MOUSELOOK) visible = false;
+
 	if (visible)
 	{
 		updatePosition();
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index fd9cf9f4c1..6e6af9b693 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -67,6 +67,7 @@ public:
 	// let update its position in each frame
 	/*virtual*/ void draw(){updatePosition(); LLFloater::draw();}
 
+	static void sUpdateFlyingStatus();
 
 protected:
 	void turnLeft();
diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp
index 56648d3218..2f4a266198 100644
--- a/indra/newview/llnamebox.cpp
+++ b/indra/newview/llnamebox.cpp
@@ -41,7 +41,6 @@
 #include "lluuid.h"
 
 #include "llcachename.h"
-#include "llagent.h"
 
 // statics
 std::set<LLNameBox*> LLNameBox::sInstances;
diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp
index ccb33c770a..65601da7da 100644
--- a/indra/newview/llnameeditor.cpp
+++ b/indra/newview/llnameeditor.cpp
@@ -34,7 +34,6 @@
  
 #include "llnameeditor.h"
 #include "llcachename.h"
-#include "llagent.h"
 
 #include "llfontgl.h"
 
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 087fdda14a..1b82c2dc18 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -37,7 +37,6 @@
 #include "llnamelistctrl.h"
 
 #include "llcachename.h"
-#include "llagent.h"
 #include "llinventory.h"
 #include "llscrolllistitem.h"
 #include "llscrolllistcell.h"
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 713c44d366..7cb0456e8a 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -40,6 +40,7 @@
 #include <llmenugl.h>
 
 #include "llagent.h"
+#include "llviewerregion.h"
 #include "lllocationhistory.h"
 #include "lllocationinputctrl.h"
 #include "llteleporthistory.h"
@@ -57,6 +58,7 @@
 #include "lllandmarkactions.h"
 
 #include "llfavoritesbar.h"
+#include "llagentui.h"
 
 //-- LLTeleportHistoryMenuItem -----------------------------------------------
 
@@ -180,19 +182,15 @@ LLNavigationBar::LLNavigationBar()
 	mBtnHome(NULL),
 	mCmbLocation(NULL),
 	mLeSearch(NULL),
-	mPurgeTPHistoryItems(false),
-	mUpdateTypedLocationHistory(false)
+	mPurgeTPHistoryItems(false)
 {
 	setIsChrome(TRUE);
 	
-	mParcelMgrConnection = LLViewerParcelMgr::getInstance()->setAgentParcelChangedCallback(
-			boost::bind(&LLNavigationBar::onTeleportFinished, this));
+	mParcelMgrConnection = LLViewerParcelMgr::getInstance()->setTeleportFinishedCallback(
+			boost::bind(&LLNavigationBar::onTeleportFinished, this, _1));
 
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_navigation_bar.xml");
 
-	// navigation bar can never get a tab
-	setFocusRoot(FALSE);
-
 	// set a listener function for LoginComplete event
 	LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLNavigationBar::handleLoginComplete, this));
 
@@ -314,19 +312,18 @@ void LLNavigationBar::onLocationSelection()
 	}
 	else
 	{
+		//If it is not slurl let's look for landmarks
 		LLInventoryModel::item_array_t landmark_items = LLLandmarkActions::fetchLandmarksByName(typed_location, FALSE);
 		if ( !landmark_items.empty() )
 		{
-			mUpdateTypedLocationHistory = true;
 			gAgent.teleportViaLandmark(landmark_items[0]->getAssetUUID());
 			return;
 		}
-		else
-		{
-			region_name = extractLocalCoordsFromRegName(typed_location, &x, &y, &z);
-			if (region_name != typed_location)
-				local_coords.set(x, y, z);
-		}
+		//No landmark match, check if it is a region name
+		region_name = parseLocation(typed_location, &x, &y, &z);
+		if (region_name != typed_location)
+			local_coords.set(x, y, z);
+
 		// Treat it as region name.
 		// region_name = typed_location;
 	}
@@ -339,31 +336,30 @@ void LLNavigationBar::onLocationSelection()
 	LLWorldMap::getInstance()->sendNamedRegionRequest(region_name, cb, std::string("unused"), false);
 }
 
-void LLNavigationBar::onTeleportFinished()
+void LLNavigationBar::onTeleportFinished(const LLVector3d& global_agent_pos)
 {
+	// Location is valid. Add it to the typed locations history.
+	LLLocationHistory* lh = LLLocationHistory::getInstance();
 
-	if (mUpdateTypedLocationHistory) {
-		LLLocationHistory* lh = LLLocationHistory::getInstance();
-
-		// Location is valid. Add it to the typed locations history.
-		// If user has typed text this variable will contain -1.
-		if (mCmbLocation->getCurrentIndex() != -1) {
-			lh->touchItem(mCmbLocation->getSelectedItemLabel());
-		} else {
-			std::string region_name;
-			std::string url = gAgent.getSLURL();
-			S32 x = 0, y = 0, z = 0;
-
-			if (LLSLURL::isSLURL(url)) {
-				LLURLSimString::parse(LLSLURL::stripProtocol(url), &region_name, &x, &y, &z);
-				appendLocalCoordsToRegName(&region_name, x, y, z);
-				lh->addItem(region_name, url);
-			}
-		}
-
-		lh->save();
-		mUpdateTypedLocationHistory = false;
+	std::string location;
+	/*NOTE:
+	 * We can't use gAgent.getPositionAgent() in case of local teleport to build location.
+	 * At this moment gAgent.getPositionAgent() contains previous coordinates.
+	 * according to EXT-65 agent position is being reseted on each frame.  
+	 */
+	LLAgentUI::buildLocationString(location, LLAgent::LOCATION_FORMAT_WITHOUT_SIM,
+			gAgent.getPosAgentFromGlobal(global_agent_pos));
+	
+	//Touch it, if it is at list already, add new location otherwise
+	if ( !lh->touchItem(location) ) {
+		std::string tooltip = LLSLURL::buildSLURLfromPosGlobal(
+				gAgent.getRegion()->getName(), global_agent_pos, false);
+		
+		lh->addItem(location, tooltip);
 	}
+	llinfos << "Saving after on teleport finish" << llendl;
+	lh->save();
+
 }
 
 void LLNavigationBar::onTeleportHistoryChanged()
@@ -436,7 +432,6 @@ void LLNavigationBar::onRegionNameResponse(
 	LLVector3d region_pos = from_region_handle(region_handle);
 	LLVector3d global_pos = region_pos + (LLVector3d) local_coords;
 	
-	mUpdateTypedLocationHistory = true;
 	llinfos << "Teleporting to: " << global_pos  << llendl;
 	gAgent.teleportViaLocation(global_pos);
 }
@@ -475,12 +470,7 @@ void LLNavigationBar::invokeSearch(std::string search_text)
 	LLFloaterReg::showInstance("search", LLSD().insert("panel", "all").insert("id", LLSD(search_text)));
 }
 
-void LLNavigationBar::appendLocalCoordsToRegName(std::string* reg_name, S32 x, S32 y, S32 z) {
-	std::string fmt = *reg_name + " (%d, %d, %d)";
-	*reg_name = llformat(fmt.c_str(), x, y, z);
-}
-
-std::string LLNavigationBar::extractLocalCoordsFromRegName(const std::string & reg_name, S32* x, S32* y, S32* z) {
+std::string LLNavigationBar::parseLocation(const std::string & location, S32* x, S32* y, S32* z) {
 	/*
 	 * This regular expression extracts numbers from the following string
 	 * construct: "(num1, num2, num3)", where num1, num2 and num3 are decimal
@@ -489,7 +479,7 @@ std::string LLNavigationBar::extractLocalCoordsFromRegName(const std::string & r
 	const boost::regex re("\\s*\\((\\d+),\\s*(\\d+),\\s*(\\d+)\\)\\s*");
 
 	boost::smatch m;
-	if (boost::regex_search(reg_name, m, re)) {
+	if (boost::regex_search(location, m, re)) {
 		// string representations of parsed by regex++ numbers
 		std::string xstr(m[1].first, m[1].second);
 		std::string ystr(m[2].first, m[2].second);
@@ -498,13 +488,15 @@ std::string LLNavigationBar::extractLocalCoordsFromRegName(const std::string & r
 		*x = atoi(xstr.c_str());
 		*y = atoi(ystr.c_str());
 		*z = atoi(zstr.c_str());
-
-		return boost::regex_replace(reg_name, re, "");
+		//erase commas in coordinates
+		std::string region_parcel = boost::regex_replace(location, re, "");
+		// cut region name
+		return region_parcel.substr(0, region_parcel.find_first_of(','));
 	}
 
 	*x = *y = *z = 0;
 
-	return reg_name;
+	return location;
 }
 
 void LLNavigationBar::clearHistoryCache()
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index eeaec4e668..6932847854 100644
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -70,8 +70,10 @@ private:
 	void showTeleportHistoryMenu();
 	void invokeSearch(std::string search_text);
 
-	static void appendLocalCoordsToRegName(std::string* reg_name, S32 x, S32 y, S32 z);
-	static std::string extractLocalCoordsFromRegName(const std::string & reg_name, S32* x, S32* y, S32* z);
+	/**
+	 * Get region name and local coordinates from typed location
+	 */
+	static std::string parseLocation(const std::string & location, S32* x, S32* y, S32* z);
 
 	// callbacks
 	void onTeleportHistoryMenuItemClicked(const LLSD& userdata);
@@ -84,7 +86,7 @@ private:
 	void onLocationSelection();
 	void onLocationPrearrange(const LLSD& data);
 	void onSearchCommit();
-	void onTeleportFinished();
+	void onTeleportFinished(const LLVector3d& global_agent_pos);
 	void onRegionNameResponse(
 			std::string typed_location,
 			std::string region_name,
@@ -104,7 +106,6 @@ private:
 	LLRect						mDefaultFpRect;
 	boost::signals2::connection	mParcelMgrConnection;
 	bool						mPurgeTPHistoryItems;
-	bool						mUpdateTypedLocationHistory;
 };
 
 #endif
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index da9f50a2bc..3856a86da0 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -211,7 +211,17 @@ void nearbychat_add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, cons
 		edit->appendStyledText(start_line, false, prepend_newline, LLStyleMap::instance().lookup(chat.mFromID,chat.mURL));
 		prepend_newline = false;
 	}
-	edit->appendColoredText(line, false, prepend_newline, color);
+
+	S32 font_size = gSavedSettings.getS32("ChatFontSize");
+
+	std::string font_name = "";
+
+	if (0 == font_size)
+		font_name = "small";
+	else if (2 == font_size)
+		font_name = "sansserifbig";
+
+	edit->appendColoredText(line, false, prepend_newline, color, font_name);
 }
 
 
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 8124d4b36a..a1912655a3 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -97,20 +97,15 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 	LLToast::Params p;
 	p.id = id;
 	p.panel = item;
-	p.on_mouse_enter = boost::bind(&LLNearbyChatHandler::onToastDestroy, this, _1);
+	p.on_toast_destroy = boost::bind(&LLNearbyChatHandler::onToastDestroy, this, _1);
+	p.on_mouse_enter = boost::bind(&LLNearbyChatHandler::removeNearbyToastsAndShowChat, this);
 	mChannel->addToast(p);	
 }
 
 void LLNearbyChatHandler::onToastDestroy(LLToast* toast)
 {
-	//TODO: what should be done to toasts here? may be htey are to be destroyed?
-	//toast->hide();
-	if(mChannel)
-		mChannel->removeToastsFromChannel();
-	else if(toast)
-		toast->hide();
-
-	LLFloaterReg::showTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
+	if(toast)
+		toast->closeFloater();
 }
 
 void LLNearbyChatHandler::onChicletClick(void)
@@ -118,7 +113,16 @@ void LLNearbyChatHandler::onChicletClick(void)
 }
 void LLNearbyChatHandler::onChicletClose(void)
 {
+}
 
+void LLNearbyChatHandler::removeNearbyToastsAndShowChat()
+{
+	/*
+	if(mChannel)
+		mChannel->removeToastsFromChannel();
+	
+	LLFloaterReg::showTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
+	*/
 }
 
 }
diff --git a/indra/newview/llnearbychathandler.h b/indra/newview/llnearbychathandler.h
index 53436a92b0..8fcd03689d 100644
--- a/indra/newview/llnearbychathandler.h
+++ b/indra/newview/llnearbychathandler.h
@@ -51,6 +51,7 @@ public:
 	virtual void onChicletClose(void);
 
 protected:
+	void removeNearbyToastsAndShowChat();
 };
 
 }
diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
index f485152d3a..bd6c6b2308 100644
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/indra/newview/llnotificationalerthandler.cpp
@@ -49,7 +49,7 @@ LLAlertHandler::LLAlertHandler(e_notification_type type, const LLSD& id) : mIsMo
 
 	LLBottomTray* tray = LLBottomTray::getInstance();
 	LLChannelManager::Params p;
-	p.id = LLUUID(ALERT_CHANNEL_ID);
+	p.id = LLUUID(gSavedSettings.getString("AlertChannelUUID"));
 	p.channel_right_bound = tray->getRect().getWidth() / 2;
 	p.channel_width = 0;
 	p.display_toasts_always = true;
@@ -58,6 +58,7 @@ LLAlertHandler::LLAlertHandler(e_notification_type type, const LLSD& id) : mIsMo
 	// Getting a Channel for our notifications
 	mChannel = LLChannelManager::getInstance()->createChannel(p);
 	mChannel->setFollows(FOLLOWS_BOTTOM | FOLLOWS_TOP); 
+	mChannel->setShowToasts(true);
 }
 
 //--------------------------------------------------------------------------
@@ -98,7 +99,7 @@ void LLAlertHandler::processNotification(const LLSD& notify)
 
 void LLAlertHandler::onToastDestroy(LLToast* toast)
 {
-	toast->close();
+	toast->closeFloater();
 }
 
 //--------------------------------------------------------------------------
diff --git a/indra/newview/llnotificationgrouphandler.cpp b/indra/newview/llnotificationgrouphandler.cpp
index 9a6a041c35..31753efec9 100644
--- a/indra/newview/llnotificationgrouphandler.cpp
+++ b/indra/newview/llnotificationgrouphandler.cpp
@@ -34,8 +34,8 @@
 
 #include "llnotificationhandler.h"
 #include "lltoastgroupnotifypanel.h"
-#include "llagent.h"
 #include "llbottomtray.h"
+#include "llgroupactions.h"
 #include "llviewercontrol.h"
 #include "llfloaterreg.h"
 #include "llsyswellwindow.h"
@@ -51,7 +51,7 @@ LLGroupHandler::LLGroupHandler(e_notification_type type, const LLSD& id)
 	LLBottomTray* tray = LLBottomTray::getInstance();
 	mChiclet = tray->getSysWell();
 	LLChannelManager::Params p;
-	p.chiclet = mChiclet;
+	p.id = LLUUID(gSavedSettings.getString("NotificationChannelUUID"));
 	p.channel_right_bound = tray->getRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin");
 	p.channel_width = gSavedSettings.getS32("NotifyBoxWidth");
 
@@ -77,7 +77,10 @@ void LLGroupHandler::processNotification(const LLSD& notify)
 		p.panel = notify_box;
 		p.on_toast_destroy = boost::bind(&LLGroupHandler::onToastDestroy, this, _1);
 		mChannel->addToast(p);
-		mChiclet->setCounter(mChiclet->getCounter() + 1);
+		static_cast<LLNotificationChiclet*>(mChiclet)->incUreadSystemNotifications();
+		
+		LLGroupActions::refresh_notices();
+
 	}
 	else if (notify["sigtype"].asString() == "delete")
 	{
@@ -88,7 +91,7 @@ void LLGroupHandler::processNotification(const LLSD& notify)
 //--------------------------------------------------------------------------
 void LLGroupHandler::onToastDestroy(LLToast* toast)
 {
-	mChiclet->setCounter(mChiclet->getCounter() - 1);
+	static_cast<LLNotificationChiclet*>(mChiclet)->decUreadSystemNotifications();
 
 	LLToastPanel* panel = dynamic_cast<LLToastPanel*>(toast->getPanel());
 	LLFloaterReg::getTypedInstance<LLSysWellWindow>("syswell_window")->removeItemByID(panel->getID());
@@ -97,7 +100,7 @@ void LLGroupHandler::onToastDestroy(LLToast* toast)
 	if(toast->hasFocus())
 		mChannel->setHovering(false);
 
-	toast->close();
+	toast->closeFloater();
 }
 
 //--------------------------------------------------------------------------
@@ -113,14 +116,3 @@ void LLGroupHandler::onChicletClose(void)
 //--------------------------------------------------------------------------
 
 
-//--------------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------------
-
diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index 2e5fdd9ed5..6982ab7096 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -42,9 +42,6 @@
 
 namespace LLNotificationsUI
 {
-// ID for channel that displays Alert Notifications
-#define ALERT_CHANNEL_ID	"F3E07BC8-A973-476D-8C7F-F3B7293975D1"
-
 // ENotificationType enumerates all possible types of notifications that could be met
 // 
 typedef enum e_notification_type
@@ -117,6 +114,25 @@ public:
 	virtual void processChat(const LLChat& chat_msg)=0;
 };
 
+/**
+ * Handler for IM notifications.
+ * It manages life time of tip and script notices.
+ */
+class LLIMHandler : public LLSysHandler
+{
+public:
+	LLIMHandler();
+	virtual ~LLIMHandler();
+
+	// base interface functions
+	virtual void processNotification(const LLSD& notify);
+	virtual void onToastDestroy(LLToast* toast);
+	virtual void onChicletClick(void);
+	virtual void onChicletClose(void);
+
+protected:
+};
+
 /**
  * Handler for system informational notices.
  * It manages life time of tip and script notices.
@@ -135,6 +151,7 @@ public:
 
 	// own handlers
 	void onStoreToast(LLPanel* info_panel, LLUUID id);
+	void onRejectToast(LLToast::Params p);
 protected:
 };
 
diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index 3eda0d0d14..31266fdecf 100644
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -62,18 +62,21 @@ void LLNotificationManager::init()
 	LLNotificationChannel::buildChannel("Group Notifications", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "groupnotify"));
 	LLNotificationChannel::buildChannel("Alerts", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alert"));
 	LLNotificationChannel::buildChannel("AlertModal", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alertmodal"));
+	LLNotificationChannel::buildChannel("IM Notifications", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "notifytoast"));
   
 	LLNotifications::instance().getChannel("Notifications")->connectChanged(boost::bind(&LLNotificationManager::onNotification, this, _1));
 	LLNotifications::instance().getChannel("NotificationTips")->connectChanged(boost::bind(&LLNotificationManager::onNotification, this, _1));
 	LLNotifications::instance().getChannel("Group Notifications")->connectChanged(boost::bind(&LLNotificationManager::onNotification, this, _1));
 	LLNotifications::instance().getChannel("Alerts")->connectChanged(boost::bind(&LLNotificationManager::onNotification, this, _1));
 	LLNotifications::instance().getChannel("AlertModal")->connectChanged(boost::bind(&LLNotificationManager::onNotification, this, _1));
+	LLNotifications::instance().getChannel("IM Notifications")->connectChanged(boost::bind(&LLNotificationManager::onNotification, this, _1));
 
 	mNotifyHandlers["notify"] = boost::shared_ptr<LLEventHandler>(new LLInfoHandler(NT_NOTIFY, LLSD()));
 	mNotifyHandlers["notifytip"] =  mNotifyHandlers["notify"];
 	mNotifyHandlers["groupnotify"] = boost::shared_ptr<LLEventHandler>(new LLGroupHandler(NT_GROUPNOTIFY, LLSD()));
 	mNotifyHandlers["alert"] = boost::shared_ptr<LLEventHandler>(new LLAlertHandler(NT_ALERT, LLSD()));
 	mNotifyHandlers["alertmodal"] = mNotifyHandlers["alert"];
+	mNotifyHandlers["notifytoast"] = boost::shared_ptr<LLEventHandler>(new LLIMHandler());
 	
 	mNotifyHandlers["nearbychat"] = boost::shared_ptr<LLEventHandler>(new LLNearbyChatHandler(NT_NEARBYCHAT, LLSD()));
 }
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index a6cf2a2d27..51bd619901 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -74,6 +74,16 @@ public:
 	 */
 	virtual void onOpen(const LLSD& key);
 
+	/**
+	 * Profile tabs should close any opened panels here.
+	 *
+	 * Called from LLPanelProfile::onOpen() before opening new profile.
+	 * See LLPanelpicks::onClose for example. LLPanelPicks closes picture info panel
+	 * before new profile is displayed, otherwise new profile will 
+	 * be hidden behind picture info panel.
+	 */
+	virtual void onClose() {}
+
 	/**
 	 * Resets controls visibility, state, etc.
 	 */
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index a7c05af50b..2e87f0b65b 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -33,7 +33,6 @@
 
 #include "llpanelgroup.h"
 
-#include "llagent.h"
 #include "llbutton.h"
 #include "lltabcontainer.h"
 #include "lltextbox.h"
@@ -116,6 +115,9 @@ LLPanelGroup::~LLPanelGroup()
 
 void LLPanelGroup::onOpen(const LLSD& key)
 {
+	if(!key.has("group_id"))
+		return;
+	
 	LLUUID group_id = key["group_id"];
 	if(!key.has("action"))
 	{
@@ -127,7 +129,7 @@ void LLPanelGroup::onOpen(const LLSD& key)
 
 	if(str_action == "refresh")
 	{
-		if(mID == group_id)
+		if(mID == group_id || group_id == LLUUID::null)
 			refreshData();
 	}
 	else if(str_action == "close")
@@ -138,6 +140,12 @@ void LLPanelGroup::onOpen(const LLSD& key)
 	{
 		setGroupID(LLUUID::null);
 	}
+	else if(str_action == "refresh_notices")
+	{
+		LLPanelGroupNotices* panel_notices = findChild<LLPanelGroupNotices>("group_notices_tab_panel");
+		if(panel_notices)
+			panel_notices->refreshNotices();
+	}
 
 }
 
@@ -314,6 +322,15 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
 	}
 	else
 	{
+		if(!tab_general->getDisplayChildren())
+			tab_general->changeOpenClose(tab_general->getDisplayChildren());
+		if(!tab_roles->getDisplayChildren())
+			tab_roles->changeOpenClose(tab_roles->getDisplayChildren());
+		if(!tab_notices->getDisplayChildren())
+			tab_notices->changeOpenClose(tab_notices->getDisplayChildren());
+		if(!tab_land->getDisplayChildren())
+			tab_land->changeOpenClose(tab_land->getDisplayChildren());
+		
 		tab_roles->canOpenClose(true);
 		tab_notices->canOpenClose(true);
 		tab_land->canOpenClose(true);
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index 1e6eb8ed44..c5eaa34204 100644
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -37,6 +37,7 @@
 #include "llfloateravatarpicker.h"
 #include "llbutton.h"
 #include "llcombobox.h"
+#include "llgroupactions.h"
 #include "llgroupmgr.h"
 #include "llnamelistctrl.h"
 #include "llscrolllistitem.h"
@@ -80,6 +81,7 @@ public:
  	LLButton		*mRemoveButton;
 	LLTextBox		*mGroupName;
 	std::string		mOwnerWarning;
+	std::string		mAlreadyInGroup;
 	bool		mConfirmedOwnerInvite;
 
 	void (*mCloseCallback)(void* data);
@@ -167,16 +169,29 @@ void LLPanelGroupInvite::impl::submitInvitations()
 		}
 	}
 
+	bool already_in_group = false;
 	//loop over the users
 	std::vector<LLScrollListItem*> items = mInvitees->getAllData();
 	for (std::vector<LLScrollListItem*>::iterator iter = items.begin();
 		 iter != items.end(); ++iter)
 	{
 		LLScrollListItem* item = *iter;
+		if(LLGroupActions::isAvatarMemberOfGroup(mGroupID, item->getUUID()))
+		{
+			already_in_group = true;
+			continue;
+		}
 		role_member_pairs[item->getUUID()] = role_id;
 	}
-
+	
 	LLGroupMgr::getInstance()->sendGroupMemberInvites(mGroupID, role_member_pairs);
+	
+	if(already_in_group)
+	{
+		LLSD msg;
+		msg["MESSAGE"] = mAlreadyInGroup;
+		LLNotifications::instance().add("GenericAlert", msg);
+	}
 
 	//then close
 	(*mCloseCallback)(mCloseCallbackUserData);
@@ -550,6 +565,7 @@ BOOL LLPanelGroupInvite::postBuild()
 	}
 
 	mImplementation->mOwnerWarning = getString("confirm_invite_owner_str");
+	mImplementation->mAlreadyInGroup = getString("already_in_group");
 
 	update();
 	
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index 8caa7d85eb..e40fa19bb6 100644
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -1515,16 +1515,15 @@ void LLPanelGroupLandMoney::setGroupID(const LLUUID& id)
 		mImplementationp->mGroupOverLimitIconp->setVisible(FALSE);
 	}
 
-	if ( !can_view )
+	if ( mImplementationp->mGroupParcelsp )
 	{
-		if ( mImplementationp->mGroupParcelsp )
-		{
-			mImplementationp->mGroupParcelsp->setCommentText(
-							mImplementationp->mCantViewParcelsText);
-			mImplementationp->mGroupParcelsp->setEnabled(FALSE);
-		}
+		mImplementationp->mGroupParcelsp->setEnabled(can_view);
 	}
 
+	if ( !can_view && mImplementationp->mGroupParcelsp )
+	{
+		mImplementationp->mGroupParcelsp->setEnabled(FALSE);
+	}
 
 
 	LLButton* earlierp, *laterp;
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 56042f6bff..0ce85818dd 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -41,6 +41,7 @@
 #include "llinventorymodel.h"
 #include "llfloaterinventory.h"
 #include "llagent.h"
+#include "llagentui.h"
 #include "lltooldraganddrop.h"
 
 #include "lllineeditor.h"
@@ -379,13 +380,38 @@ void LLPanelGroupNotices::onClickSendMessage(void* data)
 			self->mCreateMessage->getText(),
 			self->mInventoryItem);
 
+
+	//instantly add new notice. actual notice will be added after ferreshNotices call
+	LLUUID id = LLUUID::generateNewID();
+	std::string subj = self->mCreateSubject->getText();
+	std::string name ;
+	LLAgentUI::buildFullname(name);
+	U32 timestamp = 0;
+
+	LLSD row;
+	row["id"] = id;
+	
+	row["columns"][0]["column"] = "icon";
+
+	row["columns"][1]["column"] = "subject";
+	row["columns"][1]["value"] = subj;
+
+	row["columns"][2]["column"] = "from";
+	row["columns"][2]["value"] = name;
+
+	row["columns"][3]["column"] = "date";
+	row["columns"][3]["value"] = build_notice_date(timestamp);
+
+	row["columns"][4]["column"] = "sort";
+	row["columns"][4]["value"] = llformat( "%u", timestamp);
+
+	self->mNoticesList->addElement(row, ADD_BOTTOM);
+
 	self->mCreateMessage->clear();
 	self->mCreateSubject->clear();
 	onClickRemoveAttachment(data);
 
 	self->arrangeNoticeView(VIEW_PAST_NOTICE);
-	onClickRefreshNotices(self);
-
 }
 
 //static 
@@ -407,6 +433,26 @@ void LLPanelGroupNotices::onClickNewMessage(void* data)
 	self->mNoticesList->deselectAllItems(TRUE); // TRUE == don't commit on chnage
 }
 
+void LLPanelGroupNotices::refreshNotices()
+{
+	onClickRefreshNotices(this);
+	/*
+	lldebugs << "LLPanelGroupNotices::onClickGetPastNotices" << llendl;
+	
+	mNoticesList->deleteAllItems();
+
+	LLMessageSystem* msg = gMessageSystem;
+	msg->newMessage("GroupNoticesListRequest");
+	msg->nextBlock("AgentData");
+	msg->addUUID("AgentID",gAgent.getID());
+	msg->addUUID("SessionID",gAgent.getSessionID());
+	msg->nextBlock("Data");
+	msg->addUUID("GroupID",self->mGroupID);
+	gAgent.sendReliableMessage();
+	*/
+	
+}
+
 void LLPanelGroupNotices::onClickRefreshNotices(void* data)
 {
 	lldebugs << "LLPanelGroupNotices::onClickGetPastNotices" << llendl;
diff --git a/indra/newview/llpanelgroupnotices.h b/indra/newview/llpanelgroupnotices.h
index c41a5f501b..4bda38c897 100644
--- a/indra/newview/llpanelgroupnotices.h
+++ b/indra/newview/llpanelgroupnotices.h
@@ -69,6 +69,8 @@ public:
 					const std::string& inventory_name,
 					LLOfferInfo* inventory_offer);
 
+	void refreshNotices();
+
 	virtual void setGroupID(const LLUUID& id);
 
 private:
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index ab614fea53..4618b49df4 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -49,6 +49,7 @@
 #include "lltabcontainer.h"
 #include "lltextbox.h"
 #include "lltexteditor.h"
+#include "llsearcheditor.h"
 #include "llviewertexturelist.h"
 #include "llviewerwindow.h"
 #include "llfocusmgr.h"
@@ -464,9 +465,7 @@ LLPanelGroupSubTab::LLPanelGroupSubTab()
 :	LLPanelGroupTab(),
 	mHeader(NULL),
 	mFooter(NULL),
-	mSearchLineEditor(NULL),
-	mSearchButton(NULL),
-	mShowAllButton(NULL)
+	mSearchEditor(NULL)
 {
 }
 
@@ -478,22 +477,14 @@ BOOL LLPanelGroupSubTab::postBuild()
 {
 	// Hook up the search widgets.
 	bool recurse = true;
-	mSearchLineEditor = getChild<LLLineEditor>("search_text", recurse);
+	mSearchEditor = getChild<LLSearchEditor>("filter_input", recurse);
 
-	if (!mSearchLineEditor) return FALSE;
-	mSearchLineEditor->setKeystrokeCallback(onSearchKeystroke, this);
-
-	mSearchButton = getChild<LLButton>("search_button", recurse);
-
-	if (!mSearchButton) return FALSE;
-	mSearchButton->setClickedCallback(onClickSearch, this);
-	mSearchButton->setEnabled(FALSE);
+	if (!mSearchEditor) 
+		return FALSE;
 
-	mShowAllButton = getChild<LLButton>("show_all_button", recurse);
+	mSearchEditor->setCommitCallback(boost::bind(&LLPanelGroupSubTab::onClickSearch, this));
+	mSearchEditor->setKeystrokeCallback(onSearchKeystroke, this);
 
-	if (!mShowAllButton) return FALSE;
-	mShowAllButton->setClickedCallback(onClickShowAll, this);
-	mShowAllButton->setEnabled(FALSE);
 	
 	// Get icons for later use.
 	mActionIcons.clear();
@@ -516,63 +507,35 @@ BOOL LLPanelGroupSubTab::postBuild()
 	return LLPanelGroupTab::postBuild();
 }
 
-// static
-void LLPanelGroupSubTab::onSearchKeystroke(LLLineEditor* caller, void* user_data)
-{
-	LLPanelGroupSubTab* self = static_cast<LLPanelGroupSubTab*>(user_data);
-	self->handleSearchKeystroke(caller);
-}
-
-void LLPanelGroupSubTab::handleSearchKeystroke(LLLineEditor* caller)
+void LLPanelGroupSubTab::setGroupID(const LLUUID& id)
 {
-	if (caller->getText().size())
-	{
-		setDefaultBtn( mSearchButton );
-		mSearchButton->setEnabled(TRUE);
-	}
-	else
+	LLPanelGroupTab::setGroupID(id);
+	if(mSearchEditor)
 	{
-		setDefaultBtn( NULL );
-		mSearchButton->setEnabled(FALSE);
+		mSearchEditor->clear();
+		setSearchFilter("");
 	}
 }
 
-// static 
-void LLPanelGroupSubTab::onClickSearch(void* user_data)
+// static
+void LLPanelGroupSubTab::onSearchKeystroke(LLLineEditor* caller, void* user_data)
 {
 	LLPanelGroupSubTab* self = static_cast<LLPanelGroupSubTab*>(user_data);
-	self->handleClickSearch();
-}
- 
-void LLPanelGroupSubTab::handleClickSearch()
-{
-	lldebugs << "LLPanelGroupSubTab::handleClickSearch()" << llendl;
-
-	if (0 == mSearchLineEditor->getText().size())
-	{
-		// No search text.  (This shouldn't happen... the search button should have been disabled).
-		llwarns << "handleClickSearch with no search text!" << llendl;
-		mSearchButton->setEnabled(FALSE);
-		return;
-	}
+	self->handleSearchKeystroke(caller);
 
-	setSearchFilter( mSearchLineEditor->getText() );
-	mShowAllButton->setEnabled(TRUE);
 }
 
-// static
-void LLPanelGroupSubTab::onClickShowAll(void* user_data)
+void LLPanelGroupSubTab::handleSearchKeystroke(LLLineEditor* caller)
 {
-	LLPanelGroupSubTab* self = static_cast<LLPanelGroupSubTab*>(user_data);
-	self->handleClickShowAll();
+	setSearchFilter( caller->getText() );
 }
 
-void LLPanelGroupSubTab::handleClickShowAll()
+// static 
+void LLPanelGroupSubTab::onClickSearch()
 {
-	lldebugs << "LLPanelGroupSubTab::handleClickShowAll()" << llendl;
-	setSearchFilter( LLStringUtil::null );
-	mShowAllButton->setEnabled(FALSE);
+	setSearchFilter( mSearchEditor->getText() );
 }
+ 
 
 void LLPanelGroupSubTab::setSearchFilter(const std::string& filter)
 {
@@ -892,6 +855,12 @@ BOOL LLPanelGroupMembersSubTab::postBuildSubTab(LLView* root)
 	return TRUE;
 }
 
+void LLPanelGroupMembersSubTab::setGroupID(const LLUUID& id)
+{
+	LLPanelGroupSubTab::setGroupID(id);
+
+}
+
 
 // static
 void LLPanelGroupMembersSubTab::onMemberSelect(LLUICtrl* ctrl, void* user_data)
@@ -2583,19 +2552,15 @@ void LLPanelGroupRoles::setGroupID(const LLUUID& id)
 	if(group_members_tab) group_members_tab->setGroupID(id);
 	if(group_roles_tab) group_roles_tab->setGroupID(id);
 	if(group_actions_tab) group_actions_tab->setGroupID(id);
-	
-	activate();
 
-	if (!mSubTabContainer) return ;
+	LLButton* button = getChild<LLButton>("member_invite");
+	if ( button )
+		button->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_INVITE));
 
-	// Hook up each sub-tabs callback and widgets.
-	for (S32 i = 0; i < mSubTabContainer->getTabCount(); ++i)
-	{
-		LLPanel* panel = mSubTabContainer->getPanelByIndex(i);
-		LLPanelGroupSubTab* subtabp = dynamic_cast<LLPanelGroupSubTab*>(panel);
-		if (subtabp)
-			subtabp->postBuildSubTab(this);
-	}
+	if(mSubTabContainer)
+		mSubTabContainer->selectTab(0);
+
+	activate();
 }
 
 
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h
index 9519263bba..2a0f31fa0f 100644
--- a/indra/newview/llpanelgrouproles.h
+++ b/indra/newview/llpanelgrouproles.h
@@ -43,6 +43,7 @@ class LLPanelGroupActionsSubTab;
 class LLScrollListCtrl;
 class LLScrollListItem;
 class LLTextEditor;
+class LLSearchEditor;
 
 // Forward declare for friend usage.
 //virtual BOOL LLPanelGroupSubTab::postBuildSubTab(LLView*);
@@ -113,10 +114,7 @@ public:
 	static void onSearchKeystroke(LLLineEditor* caller, void* user_data);
 	void handleSearchKeystroke(LLLineEditor* caller);
 
-	static void onClickSearch(void*);
-	void handleClickSearch();
-	static void onClickShowAll(void*);
-	void handleClickShowAll();
+	void onClickSearch();
 
 	virtual void setSearchFilter( const std::string& filter );
 
@@ -144,13 +142,13 @@ public:
 									BOOL is_owner_role);
 
 	void setFooterEnabled(BOOL enable);
+
+	virtual void setGroupID(const LLUUID& id);
 protected:
 	LLPanel* mHeader;
 	LLPanel* mFooter;
 
-	LLLineEditor*	mSearchLineEditor;
-	LLButton*		mSearchButton;
-	LLButton*		mShowAllButton;
+	LLSearchEditor*	mSearchEditor;
 
 	std::string mSearchFilter;
 
@@ -196,6 +194,8 @@ public:
 
 	virtual void draw();
 
+	virtual void setGroupID(const LLUUID& id);
+
 protected:
 	typedef std::map<LLUUID, LLRoleMemberChangeType> role_change_data_map_t;
 	typedef std::map<LLUUID, role_change_data_map_t*> member_role_changes_map_t;
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 8770abcee3..698f442d7c 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -373,7 +373,6 @@ BOOL LLPanelPeople::postBuild()
 	buttonSetAction("call_btn",			boost::bind(&LLPanelPeople::onCallButtonClicked,		this));
 	buttonSetAction("teleport_btn",		boost::bind(&LLPanelPeople::onTeleportButtonClicked,	this));
 	buttonSetAction("share_btn",		boost::bind(&LLPanelPeople::onShareButtonClicked,		this));
-	buttonSetAction("more_btn",			boost::bind(&LLPanelPeople::onMoreButtonClicked,		this));
 
 	getChild<LLPanel>(NEARBY_TAB_NAME)->childSetAction("nearby_view_sort_btn",boost::bind(&LLPanelPeople::onNearbyViewSortButtonClicked,		this));
 	getChild<LLPanel>(RECENT_TAB_NAME)->childSetAction("recent_viewsort_btn",boost::bind(&LLPanelPeople::onRecentViewSortButtonClicked,		this));
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index cda1a9e7e7..f7ca54c732 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -66,7 +66,7 @@
 
 
 LLPanelPick::LLPanelPick(BOOL edit_mode/* = FALSE */)
-:	LLPanel(), LLAvatarPropertiesObserver(),
+:	LLPanel(), LLAvatarPropertiesObserver(), LLRemoteParcelInfoObserver(),
 	mEditMode(edit_mode),
 	mSnapshotCtrl(NULL),
 	mPickId(LLUUID::null),
@@ -111,6 +111,8 @@ void LLPanelPick::reset()
 	mDataReceived = FALSE;
 
 	mPosGlobal.clearVec();
+
+	childSetValue("maturity", "");
 }
 
 BOOL LLPanelPick::postBuild()
@@ -211,6 +213,12 @@ void LLPanelPick::createNewPick()
 	init(pick_data);
 	mDataReceived = TRUE;
 	LLAvatarPropertiesProcessor::instance().removeObserver(mCreatorId, this);
+
+	if (!mEditMode) 
+	{
+		LLRemoteParcelInfoProcessor::getInstance()->addObserver(pick_data->parcel_id, this);
+		LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(pick_data->parcel_id);
+	}
 }
 
 
@@ -450,3 +458,24 @@ void LLPanelPick::showOnMap(const LLVector3d& position)
 	LLFloaterWorldMap::getInstance()->trackLocation(position);
 	LLFloaterReg::showInstance("world_map", "center");
 }
+
+void LLPanelPick::processParcelInfo(const LLParcelData& parcel_data)
+{
+	if (mEditMode) return;
+
+	// HACK: Flag 0x2 == adult region,
+	// Flag 0x1 == mature region, otherwise assume PG
+	std::string rating_icon = "icon_event.tga";
+	if (parcel_data.flags & 0x2)
+	{
+		rating_icon = "icon_event_adult.tga";
+	}
+	else if (parcel_data.flags & 0x1)
+	{
+		rating_icon = "icon_event_mature.tga";
+	}
+	
+	childSetValue("maturity", rating_icon);
+
+	//*NOTE we don't removeObserver(...) ourselves cause LLRemoveParcelProcessor does it for us
+}
diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h
index 15b0d6c541..2cd4706dfe 100644
--- a/indra/newview/llpanelpick.h
+++ b/indra/newview/llpanelpick.h
@@ -38,12 +38,13 @@
 #define LL_LLPANELPICK_H
 
 #include "llpanel.h"
+#include "llremoteparcelrequest.h"
 
 class LLTextureCtrl;
 class LLMessageSystem;
 class LLAvatarPropertiesObserver;
 
-class LLPanelPick : public LLPanel, public LLAvatarPropertiesObserver
+class LLPanelPick : public LLPanel, public LLAvatarPropertiesObserver, LLRemoteParcelInfoObserver
 {
 	LOG_CLASS(LLPanelPick);
 public:
@@ -79,6 +80,10 @@ public:
 	static void teleport(const LLVector3d& position);
 	static void showOnMap(const LLVector3d& position);
 
+	//This stuff we got from LLRemoteParcelObserver, in the last two we intentionally do nothing
+	/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);
+	/*virtual*/ void setParcelID(const LLUUID& parcel_id) {};
+	/*virtual*/ void setErrorStatus(U32 status, const std::string& reason) {};
 
 protected:
 
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 45a00b7fd2..973afae73b 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -593,3 +593,11 @@ void LLPickItem::processProperties(void *data, EAvatarProcessorType type)
 	LLAvatarPropertiesProcessor::instance().removeObserver(mCreatorID, this);
 }
 
+void LLPanelPicks::onClose()
+{
+	// Toggle off Pick Info panel if it is visible.
+	if(mPickPanel && mPickPanel->getVisible())
+	{
+		getProfilePanel()->togglePanel(mPickPanel);
+	}
+}
diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
index e0e7f69532..da7bc32ab1 100644
--- a/indra/newview/llpanelpicks.h
+++ b/indra/newview/llpanelpicks.h
@@ -83,6 +83,11 @@ public:
 	// parent panels failed to work (picks related code was in me profile panel)
 	void setProfilePanel(LLPanelProfile* profile_panel);
 
+	/**
+	 * Closes LLPanelPick if it is visible.
+	 */
+	/*virtual*/ void onClose();
+
 private:
 	void onClickDelete();
 	void onClickTeleport();
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index c8e0a53764..a01977c9b5 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -98,6 +98,10 @@ BOOL LLPanelPlaceInfo::postBuild()
 	mDescEditor = getChild<LLTextEditor>("description");
 	mRating = getChild<LLIconCtrl>("maturity");
 
+	mRegionInfoDrillIn = getChild<LLButton>("region_info_drill_in");
+	mMediaDrillIn = getChild<LLButton>("media_drill_in");
+	mMediaDrillIn->setClickedCallback(boost::bind(&LLPanelPlaceInfo::toggleMediaPanel, this, TRUE));
+
 	mOwner = getChild<LLTextBox>("owner");
 	mCreator = getChild<LLTextBox>("creator");
 	mCreated = getChild<LLTextBox>("created");
@@ -241,13 +245,18 @@ void LLPanelPlaceInfo::setParcelID(const LLUUID& parcel_id)
 }
 
 void LLPanelPlaceInfo::setInfoType(INFO_TYPE type)
-{	
-	bool is_landmark_info_type = type == LANDMARK;
+{
 	LLPanel* landmark_info_panel = getChild<LLPanel>("landmark_info_panel");
-	if (landmark_info_panel)
-	{
-		landmark_info_panel->setVisible(is_landmark_info_type);
-	}
+	LLPanel* landmark_edit_panel = getChild<LLPanel>("landmark_edit_panel");
+
+	bool is_info_type_agent = type == AGENT;
+	bool is_info_type_landmark = type == LANDMARK;
+
+	landmark_info_panel->setVisible(is_info_type_landmark);
+	landmark_edit_panel->setVisible(is_info_type_landmark || type == CREATE_LANDMARK);
+
+	mRegionInfoDrillIn->setVisible(is_info_type_agent);
+	mMediaDrillIn->setVisible(is_info_type_agent);
 
 	switch(type)
 	{
@@ -255,6 +264,7 @@ void LLPanelPlaceInfo::setInfoType(INFO_TYPE type)
 			mCurrentTitle = getString("title_create_landmark");
 		break;
 
+		case AGENT:
 		case PLACE:
 			mCurrentTitle = getString("title_place");
 
@@ -366,6 +376,11 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data)
 	}
 	mRating->setValue(rating_icon);
 
+	//update for_sale banner, here we should use DFQ_FOR_SALE instead of PF_FOR_SALE
+	//because we deal with remote parcel response format
+	bool isForSale = (parcel_data.flags & DFQ_FOR_SALE)? TRUE : FALSE;
+	getChild<LLIconCtrl>("icon_for_sale")->setVisible(isForSale);
+	
 	// Just use given region position for display
 	S32 region_x = llround(mPosRegion.mV[0]);
 	S32 region_y = llround(mPosRegion.mV[1]);
@@ -436,8 +451,28 @@ void LLPanelPlaceInfo::displayAgentParcelInfo()
 		return;
 
 	LLParcelData parcel_data;
+
+	// HACK: Converting sim access flags to the format
+	// returned by remote parcel response.
+	switch(region->getSimAccess())
+	{
+	case SIM_ACCESS_MATURE:
+		parcel_data.flags = 0x1;
+
+	case SIM_ACCESS_ADULT:
+		parcel_data.flags = 0x2;
+
+	default:
+		parcel_data.flags = 0;
+	}
+	
+	// Adding "For Sale" flag in remote parcel response format.
+	if (parcel->getForSale())
+	{
+		parcel_data.flags |= DFQ_FOR_SALE;
+	}
+	
 	parcel_data.desc = parcel->getDesc();
-	parcel_data.flags = region->getSimAccess();
 	parcel_data.name = parcel->getName();
 	parcel_data.sim_name = gAgent.getRegion()->getName();
 	parcel_data.snapshot_id = parcel->getSnapshotID();
@@ -446,6 +481,8 @@ void LLPanelPlaceInfo::displayAgentParcelInfo()
 	parcel_data.global_y = global_pos.mdV[1];
 	parcel_data.global_z = global_pos.mdV[2];
 
+	
+
 	processParcelInfo(parcel_data);
 }
 
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index 71c268c6c4..77ce2c6619 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -55,9 +55,10 @@ class LLPanelPlaceInfo : public LLPanel, LLRemoteParcelInfoObserver
 public:
 	enum INFO_TYPE
 	{
+		AGENT,
 		CREATE_LANDMARK,
-		PLACE,
 		LANDMARK,
+		PLACE,
 		TELEPORT_HISTORY
 	};
 
@@ -133,6 +134,8 @@ private:
 	LLTextBox*			mParcelName;
 	LLTextEditor*		mDescEditor;
 	LLIconCtrl*			mRating;
+	LLButton*			mRegionInfoDrillIn;
+	LLButton*			mMediaDrillIn;
 	LLTextBox*			mOwner;
 	LLTextBox*			mCreator;
 	LLTextBox*			mCreated;
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index cf91972e8b..a712c9b9cf 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -55,6 +55,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 
+static const S32 LANDMARK_FOLDERS_MENU_WIDTH = 250;
 static const std::string AGENT_INFO_TYPE			= "agent";
 static const std::string CREATE_LANDMARK_INFO_TYPE	= "create_landmark";
 static const std::string LANDMARK_INFO_TYPE			= "landmark";
@@ -84,7 +85,7 @@ LLPanelPlaces::LLPanelPlaces()
 {
 	gInventory.addObserver(this);
 
-	LLViewerParcelMgr::getInstance()->setAgentParcelChangedCallback(
+	LLViewerParcelMgr::getInstance()->addAgentParcelChangedCallback(
 			boost::bind(&LLPanelPlaces::onAgentParcelChange, this));
 
 	//LLUICtrlFactory::getInstance()->buildPanel(this, "panel_places.xml"); // Called from LLRegisterPanelClass::defaultPanelClassBuilder()
@@ -174,7 +175,7 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 
 	if (mPlaceInfoType == AGENT_INFO_TYPE)
 	{
-		mPlaceInfo->setInfoType(LLPanelPlaceInfo::PLACE);
+		mPlaceInfo->setInfoType(LLPanelPlaceInfo::AGENT);
 		mPlaceInfo->displayAgentParcelInfo();
 		
 		mPosGlobal = gAgent.getPositionGlobal();
@@ -218,12 +219,12 @@ void LLPanelPlaces::onOpen(const LLSD& key)
 		const LLTeleportHistory::slurl_list_t& hist_items =
 			LLTeleportHistory::getInstance()->getItems();
 
-		LLVector3d pos_global = hist_items[index].mGlobalPos;
+		mPosGlobal = hist_items[index].mGlobalPos;
 
 		mPlaceInfo->setInfoType(LLPanelPlaceInfo::TELEPORT_HISTORY);
-		mPlaceInfo->displayParcelInfo(get_pos_local_from_global(pos_global),
+		mPlaceInfo->displayParcelInfo(get_pos_local_from_global(mPosGlobal),
 									  hist_items[index].mRegionID,
-									  pos_global);
+									  mPosGlobal);
 	}
 	
 
@@ -312,7 +313,9 @@ void LLPanelPlaces::onTeleportButtonClicked()
 			payload["asset_id"] = mItem->getAssetUUID();
 			LLNotifications::instance().add("TeleportFromLandmark", LLSD(), payload);
 		}
-		else if (mPlaceInfoType == AGENT_INFO_TYPE || mPlaceInfoType == REMOTE_PLACE_INFO_TYPE)
+		else if (mPlaceInfoType == AGENT_INFO_TYPE ||
+				 mPlaceInfoType == REMOTE_PLACE_INFO_TYPE ||
+				 mPlaceInfoType == TELEPORT_HISTORY_INFO_TYPE)
 		{
 			LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
 			if (!mPosGlobal.isExactlyZero() && worldmap_instance)
@@ -341,7 +344,8 @@ void LLPanelPlaces::onShowOnMapButtonClicked()
 
 		if (mPlaceInfoType == AGENT_INFO_TYPE ||
 			mPlaceInfoType == CREATE_LANDMARK_INFO_TYPE ||
-			mPlaceInfoType == REMOTE_PLACE_INFO_TYPE)
+			mPlaceInfoType == REMOTE_PLACE_INFO_TYPE ||
+			mPlaceInfoType == TELEPORT_HISTORY_INFO_TYPE)
 		{
 			if (!mPosGlobal.isExactlyZero())
 			{
@@ -374,16 +378,22 @@ void LLPanelPlaces::onShowOnMapButtonClicked()
 
 void LLPanelPlaces::onOverflowButtonClicked()
 {
-	bool is_agent_place_info_visible = mPlaceInfoType == AGENT_INFO_TYPE;
-	bool is_landmark_info_visible = mPlaceInfoType == LANDMARK_INFO_TYPE;
-
 	LLToggleableMenu* menu;
 
-	if (is_agent_place_info_visible && mPlaceMenu != NULL)
+	bool is_agent_place_info_visible = mPlaceInfoType == AGENT_INFO_TYPE;
+
+	if ((is_agent_place_info_visible ||
+		 mPlaceInfoType == "remote_place" ||
+		 mPlaceInfoType == "teleport_history") && mPlaceMenu != NULL)
 	{
 		menu = mPlaceMenu;
+		
+		// Enable adding a landmark only for agent current parcel and if
+		// there is no landmark already pointing to that parcel in agent's inventory.
+		menu->getChild<LLMenuItemCallGL>("landmark")->setEnabled(is_agent_place_info_visible &&
+																 !LLLandmarkActions::landmarkAlreadyExists());
 	}
-	else if (is_landmark_info_visible && mLandmarkMenu != NULL)
+	else if (mPlaceInfoType == LANDMARK_INFO_TYPE && mLandmarkMenu != NULL)
 	{
 		menu = mLandmarkMenu;
 
@@ -446,17 +456,24 @@ void LLPanelPlaces::onCreateLandmarkButtonClicked(const LLUUID& folder_id)
 		return;
 
 	mPlaceInfo->createLandmark(folder_id);
-
-	onBackButtonClicked();
-	LLSideTray::getInstance()->collapseSideBar();
 }
 
 void LLPanelPlaces::onBackButtonClicked()
 {
-	togglePlaceInfoPanel(FALSE);
+	if (!mPlaceInfo)
+		return;
+	
+	if (mPlaceInfo->isMediaPanelVisible())
+	{
+		toggleMediaPanel();
+	}
+	else
+	{
+		togglePlaceInfoPanel(FALSE);
 
-	// Resetting mPlaceInfoType when Place Info panel is closed.
-	mPlaceInfoType = LLStringUtil::null;
+		// Resetting mPlaceInfoType when Place Info panel is closed.
+		mPlaceInfoType = LLStringUtil::null;
+	}
 
 	updateVerbs();
 }
@@ -578,6 +595,14 @@ void LLPanelPlaces::updateVerbs()
 									 !mPosGlobal.isExactlyZero() &&
 									 !LLViewerParcelMgr::getInstance()->inAgentParcel(mPosGlobal));
 		}
+		else if (is_create_landmark_visible)
+		{
+			// Enable "Create Landmark" only if there is no landmark
+			// for the current parcel.
+			bool no_landmark = !LLLandmarkActions::landmarkAlreadyExists();
+			mCreateLandmarkBtn->setEnabled(no_landmark);
+			mFolderMenuBtn->setEnabled(no_landmark);
+		}
 		else if (mPlaceInfoType == LANDMARK_INFO_TYPE || mPlaceInfoType == REMOTE_PLACE_INFO_TYPE)
 		{
 			mTeleportBtn->setEnabled(TRUE);
@@ -600,6 +625,7 @@ void LLPanelPlaces::showLandmarkFoldersMenu()
 		menu_p.can_tear_off(false);
 		menu_p.visible(false);
 		menu_p.scrollable(true);
+		menu_p.max_scrollable_items = 10;
 
 		LLToggleableMenu* menu = LLUICtrlFactory::create<LLToggleableMenu>(menu_p);
 
@@ -666,7 +692,6 @@ void LLPanelPlaces::showLandmarkFoldersMenu()
 	mLandmarkFoldersCache = folders;
 
 	menu->empty();
-	U32 max_width = 0;
 
 	// Menu width must not exceed the root view limits,
 	// so we assume the space between the left edge of
@@ -674,6 +699,7 @@ void LLPanelPlaces::showLandmarkFoldersMenu()
 	LLRect screen_btn_rect;
 	localRectToScreen(btn_rect, &screen_btn_rect);
 	S32 free_space = screen_btn_rect.mRight;
+	U32 max_width = llmin(LANDMARK_FOLDERS_MENU_WIDTH, free_space);
 
 	for(folder_vec_t::const_iterator it = mLandmarkFoldersCache.begin(); it != mLandmarkFoldersCache.end(); it++)
 	{
@@ -687,13 +713,14 @@ void LLPanelPlaces::showLandmarkFoldersMenu()
 
 		LLMenuItemCallGL *menu_item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
 
+		// *TODO: Use a separate method for menu width calculation.
 		// Check whether item name wider than menu
-		if ((S32) menu_item->getNominalWidth() > free_space)
+		if (menu_item->getNominalWidth() > max_width)
 		{
 			S32 chars_total = item_name.length();
 			S32 chars_fitted = 1;
 			menu_item->setLabel(LLStringExplicit(""));
-			S32 label_space = free_space - menu_item->getFont()->getWidth("...") -
+			S32 label_space = max_width - menu_item->getFont()->getWidth("...") -
 				menu_item->getNominalWidth(); // This returns width of menu item with empty label (pad pixels)
 
 			while (chars_fitted < chars_total && menu_item->getFont()->getWidth(item_name, 0, chars_fitted) < label_space)
@@ -705,8 +732,6 @@ void LLPanelPlaces::showLandmarkFoldersMenu()
 			menu_item->setLabel(item_name.substr(0, chars_fitted) + "...");
 		}
 
-		max_width = llmax(max_width, menu_item->getNominalWidth());
-
 		menu->addChild(menu_item);
 	}
 
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 0af996fac0..2895a68683 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -95,6 +95,8 @@ void LLPanelProfile::onOpen(const LLSD& key)
 {
 	if (key.has("open_tab_name"))
 	{
+		getTabContainer()[PANEL_PICKS]->onClose();
+
 		// onOpen from selected panel will be called from onTabSelected callback
 		getTabCtrl()->selectTabByName(key["open_tab_name"]);
 	}
@@ -139,6 +141,7 @@ void LLPanelProfile::togglePanel(LLPanel* panel)
 	else 
 	{
 		this->setAllChildrenVisible(TRUE);
+		panel->setVisible(FALSE);
 		if (panel->getParent() == this) 
 		{
 			removeChild(panel);
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 1235340f57..18184a6476 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -41,6 +41,7 @@
 static LLRegisterPanelClassWrapper<LLPanelProfileView> t_panel_target_profile("panel_profile_view");
 
 static std::string PANEL_NOTES = "panel_notes";
+static const std::string PANEL_PROFILE = "panel_profile";
 
 LLPanelProfileView::LLPanelProfileView()
 :	LLPanelProfile()
@@ -72,6 +73,10 @@ BOOL LLPanelProfileView::postBuild()
 	LLPanelProfile::postBuild();
 
 	getTabContainer()[PANEL_NOTES] = getChild<LLPanelAvatarNotes>(PANEL_NOTES);
+	
+	//*TODO remove this, according to style guide we don't use status combobox
+	getTabContainer()[PANEL_PROFILE]->childSetVisible("online_me_status_text", FALSE);
+	getTabContainer()[PANEL_PROFILE]->childSetVisible("status_combo", FALSE);
 
 	childSetCommitCallback("back",boost::bind(&LLPanelProfileView::onBackBtnClick,this),NULL);
 	
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 1e44a294b0..ce16b95bc0 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -49,7 +49,6 @@
 #include "material_codes.h"
 
 // project includes
-#include "llagent.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llcolorswatch.h"
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 50110da70c..68996673be 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -49,15 +49,14 @@ using namespace LLNotificationsUI;
 bool LLScreenChannel::mWasStartUpToastShown = false;
 
 //--------------------------------------------------------------------------
-LLScreenChannel::LLScreenChannel(): mOverflowToastPanel(NULL), 
-									mStartUpToastPanel(NULL),
-									mToastAlignment(NA_BOTTOM), 
-									mCanStoreToasts(true),
-									mHiddenToastsNum(0),
-									mOverflowToastHidden(false),
-									mIsHovering(false),
-									mControlHovering(false)
+LLScreenChannel::LLScreenChannel(LLUUID& id):	mOverflowToastPanel(NULL), mStartUpToastPanel(NULL),
+												mToastAlignment(NA_BOTTOM), mCanStoreToasts(true),
+												mHiddenToastsNum(0), mOverflowToastHidden(false),
+												mIsHovering(false), mControlHovering(false),
+												mShowToasts(false)
 {	
+	mID = id;
+
 	setFollows(FOLLOWS_RIGHT | FOLLOWS_BOTTOM | FOLLOWS_TOP);  
 
 	mOverflowFormatString = LLTrans::getString("OverflowInfoChannelString");
@@ -89,22 +88,11 @@ void LLScreenChannel::reshape(S32 width, S32 height, BOOL called_from_parent)
 //--------------------------------------------------------------------------
 void LLScreenChannel::addToast(LLToast::Params p)
 {
-	bool isSysWellWndShown = LLFloaterReg::getInstance("syswell_window")->getVisible();
-	// we show toast in the following cases:
-	//	- the StartUp Toast is already hidden and the SysWell's window is hidden
-	//  - the SysWell's window is shown, but notification is a tip. We can't store it, so we show it
-	//	- the channel is intended for displaying of toasts always, e.g. alerts
-	bool show_toast = (mWasStartUpToastShown && !isSysWellWndShown) || (isSysWellWndShown && p.is_tip) || mDisplayToastsAlways;
-	bool store_toast = !show_toast && !p.is_tip && mCanStoreToasts;
-
-	// if we can't show or store a toast, then do nothing, just send ignore to a notification 
-	if(!show_toast && !store_toast)
+	bool store_toast = !mShowToasts && p.can_be_stored && mCanStoreToasts;
+
+	if(!mShowToasts && !store_toast)
 	{
-		if(p.notification)
-		{
-			p.notification->setIgnored(TRUE);
-			p.notification->respond(p.notification->getResponseTemplate());
-		}
+		mOnRejectToast(p);
 		return;
 	}
 
@@ -112,14 +100,13 @@ void LLScreenChannel::addToast(LLToast::Params p)
 
 	mOverflowToastHidden = false;
 	
-	getRootView()->addChild(new_toast_elem.toast);
 	new_toast_elem.toast->setOnFadeCallback(boost::bind(&LLScreenChannel::onToastFade, this, new_toast_elem.toast));
 	if(mControlHovering)
 	{
 		new_toast_elem.toast->setOnToastHoverCallback(boost::bind(&LLScreenChannel::onToastHover, this, _1, _2));
 	}
 	
-	if(show_toast)
+	if(mShowToasts)
 	{
 		mToastList.push_back(new_toast_elem);
 		showToasts();
@@ -393,7 +380,6 @@ void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
 	mOverflowToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
 	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastMargin"), getRect().getWidth(), toast_rect.getHeight());	
 	mOverflowToastPanel->setRect(toast_rect);
-	getRootView()->addChild(mOverflowToastPanel);
 
 	text_box->setValue(text);
 	text_box->setVisible(TRUE);
@@ -406,7 +392,6 @@ void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
 void LLScreenChannel::onOverflowToastHide()
 {
 	mOverflowToastHidden = true;
-	// *TODO: check whether it is needed: closeOverflowToastPanel();	
 }
 
 //--------------------------------------------------------------------------
@@ -414,7 +399,7 @@ void LLScreenChannel::closeOverflowToastPanel()
 {
 	if(mOverflowToastPanel != NULL)
 	{
-		mOverflowToastPanel->close();
+		mOverflowToastPanel->closeFloater();
 		mOverflowToastPanel = NULL;
 	}
 }
@@ -453,7 +438,6 @@ void LLScreenChannel::createStartUpToast(S32 notif_num, S32 bottom, F32 timer)
 	mStartUpToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
 	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastMargin"), getRect().getWidth(), toast_rect.getHeight());	
 	mStartUpToastPanel->setRect(toast_rect);
-	getRootView()->addChild(mStartUpToastPanel);
 
 	text_box->setValue(text);
 	text_box->setVisible(TRUE);
@@ -479,8 +463,7 @@ void LLScreenChannel::closeStartUpToast()
 {
 	if(mStartUpToastPanel != NULL)
 	{
-		LLScreenChannel::setStartUpToastShown();
-		mStartUpToastPanel->close();
+		mStartUpToastPanel->closeFloater();
 		mStartUpToastPanel = NULL;
 	}
 }
@@ -499,8 +482,8 @@ void LLScreenChannel::removeToastsFromChannel()
 	hideToastsFromScreen();
 	for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end(); it++)
 	{
-		(*it).toast->close();
-		//toast->mOnToastDestroy(toast, LLSD()); //TODO: check OnToastDestroy handler for chat
+		// *TODO: ivestigate mOnToastDestroy callback - change name or/and place
+		(*it).toast->mOnToastDestroy((*it).toast);
 	}
 	mToastList.clear();
 }
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index 0845c32ee5..746580b574 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -56,7 +56,7 @@ class LLScreenChannel : public LLUICtrl
 {
 	friend class LLChannelManager;
 public:
-	LLScreenChannel();
+	LLScreenChannel(LLUUID& id);
 	virtual ~LLScreenChannel();
 
 	// Channel's outfit-functions
@@ -96,11 +96,11 @@ public:
 
 	// Channel's behavior-functions
 	// set whether a channel will control hovering inside itself or not
-	void		setControlHovering(bool control) { mControlHovering = control; }
+	void setControlHovering(bool control) { mControlHovering = control; }
 	// set Hovering flag for a channel
-	void		setHovering(bool hovering) { mIsHovering = hovering; }
+	void setHovering(bool hovering) { mIsHovering = hovering; }
 	// set whether a channel will store faded toasts or not
-	void		setCanStoreToasts(bool store) { mCanStoreToasts = store; }
+	void setCanStoreToasts(bool store) { mCanStoreToasts = store; }
 	// tell all channels that the StartUp toast was shown and allow them showing of toasts
 	static void	setStartUpToastShown() { mWasStartUpToastShown = true; }
 	// get StartUp Toast's state
@@ -109,13 +109,20 @@ public:
 	void setDisplayToastsAlways(bool display_toasts) { mDisplayToastsAlways = display_toasts; }
 	// get mode for dislaying of toasts
 	bool getDisplayToastsAlways() { return mDisplayToastsAlways; }
+	// tell a channel to show toasts or not
+	void setShowToasts(bool show) { mShowToasts = show; }
+	// determine whether channel shows toasts or not
+	bool getShowToasts() { return mShowToasts; }
 
 	// Channel's other interface functions functions
 	// get number of hidden notifications from a channel
 	S32		getNumberOfHiddenToasts() { return mHiddenToastsNum;}
 	// update number of notifications in the StartUp Toast
 	void	updateStartUpString(S32 num);
+	// get toast allignment preset for a channel
 	e_notification_toast_alignment getToastAlignment() {return mToastAlignment;}
+	// get ID of a channel
+	LLUUID	getChannelID() { return mID; }
 
 	// Channel's callbacks
 	// callback for storing of faded toasts
@@ -123,6 +130,11 @@ public:
 	typedef boost::signals2::signal<void (LLPanel* info_panel, const LLUUID id)> store_tost_signal_t;
 	store_tost_signal_t mOnStoreToast;	
 	boost::signals2::connection setOnStoreToastCallback(store_tost_callback_t cb) { return mOnStoreToast.connect(cb); }
+	// callback for discarding of a rejected toast
+	typedef boost::function<void (LLToast::Params p)> reject_tost_callback_t;
+	typedef boost::signals2::signal<void (LLToast::Params p)> reject_tost_signal_t;
+	reject_tost_signal_t mOnRejectToast;	
+	boost::signals2::connection setOnRejectToastCallback(reject_tost_callback_t cb) { return mOnRejectToast.connect(cb); }
 
 private:
 	struct ToastElem
@@ -179,6 +191,8 @@ private:
 	bool		mCanStoreToasts;
 	bool		mDisplayToastsAlways;
 	bool		mOverflowToastHidden;
+	// controls whether a channel shows toasts or not
+	bool		mShowToasts;
 	// 
 	e_notification_toast_alignment	mToastAlignment;
 
@@ -190,6 +204,9 @@ private:
 	// attributes for the StartUp Toast	
 	LLToast* mStartUpToastPanel;
 
+	// channel's ID
+	LLUUID	mID;
+
 	std::vector<ToastElem>		mToastList;
 	std::vector<ToastElem>		mStoredToastList;
 	std::map<LLToast*, bool>	mToastEventStack;
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 2e005834b5..5e5608460c 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -110,12 +110,15 @@ bool	LLSideTray::instanceCreated	()
 }
 
 LLSideTrayTab::LLSideTrayTab(const Params& params):mMainPanel(0)
-												
 {
 	mImagePath = params.image_path;
 	mTabTitle = params.tab_title;
 	mDescription = params.description;
+
+	// Necessary for focus movement among child controls
+	setFocusRoot(TRUE);
 }
+
 LLSideTrayTab::~LLSideTrayTab()
 {
 }
diff --git a/indra/newview/llsidetraypanelcontainer.cpp b/indra/newview/llsidetraypanelcontainer.cpp
index 21061a802a..3024492ab9 100644
--- a/indra/newview/llsidetraypanelcontainer.cpp
+++ b/indra/newview/llsidetraypanelcontainer.cpp
@@ -85,5 +85,9 @@ BOOL LLSideTrayPanelContainer::handleKeyHere(KEY key, MASK mask)
 {
 	// No key press handling code for Panel Container - this disables
 	// Tab Container's Alt + Left/Right Button tab switching.
-	return TRUE;
+	
+	// Let default handler process key presses, don't simply return TRUE or FALSE
+	// as this may brake some functionality as it did with Copy/Paste for 
+	// text_editor (ticket EXT-642).
+	return LLPanel::handleKeyHere(key, mask);
 }
diff --git a/indra/newview/llsky.cpp b/indra/newview/llsky.cpp
index b779aa0f83..a49b07c5d9 100644
--- a/indra/newview/llsky.cpp
+++ b/indra/newview/llsky.cpp
@@ -52,7 +52,6 @@
 #include "llviewerobject.h"
 #include "llviewercamera.h"
 #include "pipeline.h"
-#include "llagent.h"
 #include "lldrawpool.h"
 
 #include "llvosky.h"
@@ -422,20 +421,6 @@ void LLSky::updateFog(const F32 distance)
 
 void LLSky::updateCull()
 {
-	/*if (mVOSkyp.notNull() && mVOSkyp->mDrawable.notNull())
-	{
-		gPipeline.markVisible(mVOSkyp->mDrawable);
-	}
-	else
-	{
-		llinfos << "No sky drawable!" << llendl;
-	}*/
-
-	/*if (mVOGroundp.notNull() && mVOGroundp->mDrawable.notNull())
-	{
-		gPipeline.markVisible(mVOGroundp->mDrawable);
-	}*/
-
 	// *TODO: do culling for wl sky properly -Brad
 }
 
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index f6c4710d60..836fe9729d 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -114,15 +114,19 @@ std::string LLSLURL::buildUnescapedSLURL(const std::string& regionname, S32 x, S
 
 // static
 std::string LLSLURL::buildSLURLfromPosGlobal(const std::string& regionname,
-											 const LLVector3d& global_pos)
+											 const LLVector3d& global_pos,
+											 bool escaped /*= true*/)
 {
-	F32 region_x = (F32)fmod(global_pos.mdV[VX], (F64)REGION_WIDTH_METERS);
-	F32 region_y = (F32)fmod(global_pos.mdV[VY], (F64)REGION_WIDTH_METERS);
-
-	return buildSLURL(regionname,
-					  llround(region_x),
-					  llround(region_y),
-					  llround((F32)global_pos.mdV[VZ]));
+	S32 x, y, z;
+	globalPosToXYZ(global_pos, x, y, z);
+	if(escaped)
+	{
+		return buildSLURL(regionname, x, y, z);
+	}
+	else
+	{
+		return buildUnescapedSLURL(regionname, x, y, z);
+	}
 }
 
 // static
@@ -132,3 +136,10 @@ bool LLSLURL::matchPrefix(const std::string& url, const std::string& prefix)
 	LLStringUtil::toLower(test_prefix);
 	return test_prefix == prefix;
 }
+
+void LLSLURL::globalPosToXYZ(const LLVector3d& pos, S32& x, S32& y, S32& z)
+{
+	x = llround((F32)fmod(pos.mdV[VX], (F64)REGION_WIDTH_METERS));
+	y = llround((F32)fmod(pos.mdV[VY], (F64)REGION_WIDTH_METERS));
+	z = llround((F32)pos.mdV[VZ]);
+}
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h
index cb1b8cca9e..8af2bdfb83 100644
--- a/indra/newview/llslurl.h
+++ b/indra/newview/llslurl.h
@@ -79,17 +79,25 @@ public:
 	static std::string buildUnescapedSLURL(const std::string& regionname, S32 x, S32 y, S32 z);
 
 	/**
-	 * builds SLURL from global position escaping result url.
+	 * builds SLURL from global position. Returns escaped or unescaped url.
+	 * Returns escaped url by default.
 	 */
 	static std::string buildSLURLfromPosGlobal(const std::string& regionname,
-											   const LLVector3d& global_pos);
+											   const LLVector3d& global_pos,
+											   bool escaped = true);
 	/**
 	 * Strip protocol part from the URL.
 	 */
 	static std::string stripProtocol(const std::string& url);
 
+	/**
+	 * Convert global position to X, Y Z
+	 */
+	static void globalPosToXYZ(const LLVector3d& pos, S32& x, S32& y, S32& z);
+
 private:
 	static bool matchPrefix(const std::string& url, const std::string& prefix);
+
 };
 
 #endif
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index c2fce08ae4..dea9af0657 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -41,7 +41,6 @@
 #include "llviewercamera.h"
 #include "llface.h"
 #include "llviewercontrol.h"
-#include "llagent.h"
 #include "llviewerregion.h"
 #include "llcamera.h"
 #include "pipeline.h"
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index bcaf5f2947..2975053289 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1003,6 +1003,8 @@ bool idle_startup()
 		
 		// Load URL History File
 		LLURLHistory::loadFile("url_history.xml");
+		// Load location history 
+		LLLocationHistory::getInstance()->load();
 
 		//-------------------------------------------------
 		// Handle startup progress screen
@@ -2571,7 +2573,7 @@ bool idle_startup()
 		// reset timers now that we are running "logged in" logic
 		LLFastTimer::reset();
 
-		LLLocationHistory::getInstance()->load();
+		
 
 		return TRUE;
 	}
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 8a5de61280..b3a820080f 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -43,7 +43,6 @@
 #include "llfloaterchat.h"
 #include "llfloaterdirectory.h"		// to spawn search
 #include "llfloaterlagmeter.h"
-#include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterscriptdebug.h"
 #include "llhudicon.h"
@@ -70,7 +69,6 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerthrottle.h"
 #include "lluictrlfactory.h"
-#include "llvoiceclient.h"	// for gVoiceClient
 
 #include "lltoolmgr.h"
 #include "llfocusmgr.h"
@@ -112,12 +110,6 @@ const S32 TEXT_HEIGHT = 18;
 
 static void onClickBuyCurrency(void*);
 static void onClickHealth(void*);
-static void onClickFly(void*);
-static void onClickPush(void*);
-static void onClickVoice(void*);
-static void onClickBuild(void*);
-static void onClickScripts(void*);
-static void onClickBuyLand(void*);
 static void onClickScriptDebug(void*);
 
 std::vector<std::string> LLStatusBar::sDays;
@@ -160,19 +152,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 
 	childSetAction("scriptout", onClickScriptDebug, this);
 	childSetAction("health", onClickHealth, this);
-	childSetAction("no_fly", onClickFly, this);
-	childSetAction("buyland", onClickBuyLand, this );
-	childSetAction("no_build", onClickBuild, this );
-	childSetAction("no_scripts", onClickScripts, this );
-	childSetAction("restrictpush", onClickPush, this );
-	childSetAction("status_no_voice", onClickVoice, this );
-
-	childSetCommitCallback("search_editor", onCommitSearch, this);
-	childSetAction("search_btn", onClickSearch, this);
-
-	childSetVisible("search_editor", gSavedSettings.getBOOL("ShowSearchBar"));
-	childSetVisible("search_btn", gSavedSettings.getBOOL("ShowSearchBar"));
-	childSetVisible("menubar_search_bevel_bg", gSavedSettings.getBOOL("ShowSearchBar"));
 
 	// Adding Net Stat Graph
 	S32 x = getRect().getWidth() - 2;
@@ -331,8 +310,8 @@ void LLStatusBar::refresh()
 		childSetVisible("scriptout", false);
 	}
 
-	if ((region && region->getAllowDamage()) ||
-		(parcel && parcel->getAllowDamage()) )
+	if (gAgent.getCameraMode() == CAMERA_MODE_MOUSELOOK &&
+		((region && region->getAllowDamage()) || (parcel && parcel->getAllowDamage())))
 	{
 		// set visibility based on flashing
 		if( mHealthTimer->hasExpired() )
@@ -364,116 +343,6 @@ void LLStatusBar::refresh()
 		mTextHealth->setVisible(FALSE);
 	}
 
-	if ((region && region->getBlockFly()) ||
-		(parcel && !parcel->getAllowFly()) )
-	{
-		// No Fly Zone
-		childGetRect( "no_fly", buttonRect );
-		childSetVisible( "no_fly", true );
-		r.setOriginAndSize( x, y, buttonRect.getWidth(), buttonRect.getHeight());
-		childSetRect( "no_fly", r );
-		x += buttonRect.getWidth();
-	}
-	else
-	{
-		// Fly Zone
-		childSetVisible("no_fly", false);
-	}
-
-	BOOL no_build = parcel && !parcel->getAllowModify();
-	if (no_build)
-	{
-		childSetVisible("no_build", TRUE);
-		childGetRect( "no_build", buttonRect );
-		// No Build Zone
-		r.setOriginAndSize( x, y, buttonRect.getWidth(), buttonRect.getHeight());
-		childSetRect( "no_build", r );
-		x += buttonRect.getWidth();
-	}
-	else
-	{
-		childSetVisible("no_build", FALSE);
-	}
-
-	BOOL no_scripts = FALSE;
-	if((region
-		&& ((region->getRegionFlags() & REGION_FLAGS_SKIP_SCRIPTS)
-		|| (region->getRegionFlags() & REGION_FLAGS_ESTATE_SKIP_SCRIPTS)))
-		|| (parcel && !parcel->getAllowOtherScripts()))
-	{
-		no_scripts = TRUE;
-	}
-	if (no_scripts)
-	{
-		// No scripts
-		childSetVisible("no_scripts", TRUE);
-		childGetRect( "no_scripts", buttonRect );
-		r.setOriginAndSize( x, y, buttonRect.getWidth(), buttonRect.getHeight());
-		childSetRect( "no_scripts", r );
-		x += buttonRect.getWidth();
-	}
-	else
-	{
-		// Yes scripts
-		childSetVisible("no_scripts", FALSE);
-	}
-
-	BOOL no_region_push = (region && region->getRestrictPushObject());
-	BOOL no_push = no_region_push || (parcel && parcel->getRestrictPushObject());
-	if (no_push)
-	{
-		childSetVisible("restrictpush", TRUE);
-		childGetRect( "restrictpush", buttonRect );
-		r.setOriginAndSize( x, y, buttonRect.getWidth(), buttonRect.getHeight());
-		childSetRect( "restrictpush", r );
-		x += buttonRect.getWidth();
-	}
-	else
-	{
-		childSetVisible("restrictpush", FALSE);
-	}
-
-	BOOL have_voice = parcel && parcel->getParcelFlagAllowVoice(); 
-	if (have_voice)
-	{
-		childSetVisible("status_no_voice", FALSE);
-	}
-	else
-	{
-		childSetVisible("status_no_voice", TRUE);
-		childGetRect( "status_no_voice", buttonRect );
-		r.setOriginAndSize( x, y, buttonRect.getWidth(), buttonRect.getHeight());
-		childSetRect( "status_no_voice", r );
-		x += buttonRect.getWidth();
-	}
-
-	BOOL canBuyLand = parcel
-		&& !parcel->isPublic()
-		&& LLViewerParcelMgr::getInstance()->canAgentBuyParcel(parcel, false);
-	childSetVisible("buyland", canBuyLand);
-	if (canBuyLand)
-	{
-		//HACK: layout tweak until this is all xml
-		x += 9;
-		childGetRect( "buyland", buttonRect );
-		r.setOriginAndSize( x, y, buttonRect.getWidth(), buttonRect.getHeight());
-		childSetRect( "buyland", r );
-		x += buttonRect.getWidth();
-	}
-
-	bool search_visible = gSavedSettings.getBOOL("ShowSearchBar");
-	
-	// Set search bar visibility
-
-	if (gAgent.getCameraMode() != CAMERA_MODE_MOUSELOOK)
-	{
-		// don't monkey with search visibility in mouselook - it will be set
-		// with setVisibleForMouselook() below
-		childSetVisible("search_editor", search_visible);
-		childSetVisible("search_btn", search_visible);
-		childSetVisible("menubar_search_bevel_bg", search_visible);
-	}
-	
 	mSGBandwidth->setVisible(net_stats_visible);
 	mSGPacketLoss->setVisible(net_stats_visible);
 	childSetEnabled("stat_btn", net_stats_visible);
@@ -483,9 +352,6 @@ void LLStatusBar::setVisibleForMouselook(bool visible)
 {
 	mTextTime->setVisible(visible);
 	mBtnBuyCurrency->setVisible(visible);
-	childSetVisible("search_editor", visible);
-	childSetVisible("search_btn", visible);
-	childSetVisible("menubar_search_bevel_bg", visible);
 	mSGBandwidth->setVisible(visible);
 	mSGPacketLoss->setVisible(visible);
 	setBackgroundVisible(visible);
@@ -635,49 +501,6 @@ static void onClickScriptDebug(void*)
 	LLFloaterScriptDebug::show(LLUUID::null);
 }
 
-static void onClickFly(void* )
-{
-	LLNotifications::instance().add("NoFly");
-}
-
-static void onClickPush(void* )
-{
-	LLNotifications::instance().add("PushRestricted");
-}
-
-static void onClickVoice(void* )
-{
-	LLNotifications::instance().add("NoVoice");
-}
-
-static void onClickBuild(void*)
-{
-	LLNotifications::instance().add("NoBuild");
-}
-
-static void onClickScripts(void*)
-{
-	LLViewerRegion* region = gAgent.getRegion();
-	if(region && region->getRegionFlags() & REGION_FLAGS_ESTATE_SKIP_SCRIPTS)
-	{
-		LLNotifications::instance().add("ScriptsStopped");
-	}
-	else if(region && region->getRegionFlags() & REGION_FLAGS_SKIP_SCRIPTS)
-	{
-		LLNotifications::instance().add("ScriptsNotRunning");
-	}
-	else
-	{
-		LLNotifications::instance().add("NoOutsideScripts");
-	}
-}
-
-static void onClickBuyLand(void*)
-{
-	LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
-	LLViewerParcelMgr::getInstance()->startBuyLand();
-}
-
 // sets the static variables necessary for the date
 void LLStatusBar::setupDate()
 {
@@ -783,21 +606,6 @@ void LLStatusBar::onMainMenuRightClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask
 	handleRightMouseUp(x, y, mask);
 }
 
-// static
-void LLStatusBar::onCommitSearch(LLUICtrl*, void* data)
-{
-	// committing is the same as clicking "search"
-	onClickSearch(data);
-}
-
-// static
-void LLStatusBar::onClickSearch(void* data)
-{
-	LLStatusBar* self = (LLStatusBar*)data;
-	std::string search_text = self->childGetText("search_editor");
-	LLFloaterReg::showInstance("search", LLSD().insert("panel", "all").insert("id", LLSD(search_text)));
-}
-
 // static
 void LLStatusBar::onClickStatGraph(void* data)
 {
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index a26b1c14af..2bbb5a2767 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -131,7 +131,8 @@ void LLSysWellWindow::removeItemByID(const LLUUID& id)
 void LLSysWellWindow::onItemClick(LLSysWellItem* item)
 {
 	LLUUID id = item->getID();
-	mChannel->loadStoredToastByIDToChannel(id);
+	if(mChannel)
+		mChannel->loadStoredToastByIDToChannel(id);
 }
 
 //---------------------------------------------------------------------------------
@@ -139,7 +140,8 @@ void LLSysWellWindow::onItemClose(LLSysWellItem* item)
 {
 	LLUUID id = item->getID();
 	removeItemByID(id);
-	mChannel->killToastByNotificationID(id);
+	if(mChannel)
+		mChannel->killToastByNotificationID(id);
 }
 
 //---------------------------------------------------------------------------------
@@ -154,10 +156,15 @@ void LLSysWellWindow::setVisible(BOOL visible)
 	// on Show adjust position of SysWell chiclet's window
 	if(visible)
 	{
-		mChannel->removeAndStoreAllVisibleToasts();
+		if(mChannel)
+			mChannel->removeAndStoreAllVisibleToasts();
+
 		adjustWindowPosition();	// *TODO: won't be necessary after docking is realized
 	}
 
+	if(mChannel)
+		mChannel->setShowToasts(!visible);
+
 	LLFloater::setVisible(visible);
 }
 
diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp
index 9754568f56..5235dc9358 100644
--- a/indra/newview/llteleporthistory.cpp
+++ b/indra/newview/llteleporthistory.cpp
@@ -43,6 +43,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "llworldmap.h"
+#include "llagentui.h"
 
 //////////////////////////////////////////////////////////////////////////////
 // LLTeleportHistoryItem
@@ -74,7 +75,7 @@ LLTeleportHistory::LLTeleportHistory():
 	mGotInitialUpdate(false)
 {
 	mTeleportFinishedConn = LLViewerParcelMgr::getInstance()->
-		setTeleportFinishedCallback(boost::bind(&LLTeleportHistory::updateCurrentLocation, this));
+		setTeleportFinishedCallback(boost::bind(&LLTeleportHistory::updateCurrentLocation, this, _1));
 	mTeleportFailedConn = LLViewerParcelMgr::getInstance()->
 		setTeleportFailedCallback(boost::bind(&LLTeleportHistory::onTeleportFailed, this));
 }
@@ -118,7 +119,7 @@ void LLTeleportHistory::onTeleportFailed()
 	}
 }
 
-void LLTeleportHistory::updateCurrentLocation()
+void LLTeleportHistory::updateCurrentLocation(const LLVector3d& new_pos)
 {
 	if (mRequestedItem != -1) // teleport within the history in progress?
 	{
@@ -149,7 +150,7 @@ void LLTeleportHistory::updateCurrentLocation()
 			return;
 		}
 		mItems[mCurrentItem].mTitle = getCurrentLocationTitle();
-		mItems[mCurrentItem].mGlobalPos	= gAgent.getPositionGlobal();
+		mItems[mCurrentItem].mGlobalPos	= new_pos;
 		mItems[mCurrentItem].mRegionID = gAgent.getRegion()->getRegionID();
 	}
 
@@ -184,10 +185,7 @@ void LLTeleportHistory::purgeItems()
 std::string LLTeleportHistory::getCurrentLocationTitle()
 {
 	std::string location_name;
-
-	if (!gAgent.buildLocationString(location_name, LLAgent::LOCATION_FORMAT_NORMAL))
-		location_name = "Unknown";
-
+	if (!LLAgentUI::buildLocationString(location_name, LLAgent::LOCATION_FORMAT_NORMAL)) location_name = "Unknown";
 	return location_name;
 }
 
@@ -201,6 +199,7 @@ void LLTeleportHistory::dump() const
 		line << ((i == mCurrentItem) ? " * " : "   ");
 		line << i << ": " << mItems[i].mTitle;
 		line << " REGION_ID: " << mItems[i].mRegionID;
+		line << ", pos: " << mItems[i].mGlobalPos;
 		llinfos << line.str() << llendl;
 	}
 }
diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h
index 775b21e24c..060534635d 100644
--- a/indra/newview/llteleporthistory.h
+++ b/indra/newview/llteleporthistory.h
@@ -147,6 +147,10 @@ private:
 	/**
 	 * Update current location.
 	 * 
+	 * @param new_pos Current agent global position. After local teleports we
+	 *                cannot rely on gAgent.getPositionGlobal(),
+	 *                so the new position gets passed explicitly.
+	 * 
 	 * Called when a teleport finishes.
 	 * Called via callback set on the LLViewerParcelMgr "teleport finished" signal.
 	 *
@@ -158,7 +162,7 @@ private:
 	 * @see mRequestedItem
 	 * @see mGotInitialUpdate
 	 */
-	void					updateCurrentLocation();
+	void					updateCurrentLocation(const LLVector3d& new_pos);
 	
 	/**
 	 * Invokes the "history changed" callback(s).
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 07f802cf54..85814a98c9 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -225,7 +225,6 @@ void LLToast::onMouseEnter(S32 x, S32 y, MASK mask)
 {
 	mOnToastHover(this, MOUSE_ENTER);
 
-	setVisibleAndFrontmost();
 	setBackgroundOpaque(TRUE);
 	if(mCanFade)
 	{
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index f1a9f2ec46..969f3fd1cb 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -107,8 +107,6 @@ public:
 	//
 	void stopTimer() { mTimer.stop(); }
 	//
-	void close() { die(); }
-	//
 	virtual void draw();
 	//
 	virtual void setVisible(BOOL show);
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
index 69c384835d..4309f56710 100644
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@@ -66,8 +66,7 @@ static const S32 HPAD = 25;
 static const S32 BTN_HPAD = 8;
 
 LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal)
-	  : LLFloater(LLSD()),
-		LLToastPanel(notification),
+	  : LLToastPanel(notification),
 		mDefaultOption( 0 ),
 		mCheck(NULL),
 		mCaution(notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH),
@@ -304,8 +303,8 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 		setCheckBox(LLNotifications::instance().getGlobalString("alwayschoose"), ignore_label);
 	}
 
-	gFloaterView->adjustToFitScreen(this, FALSE);
- 	LLFloater::setFocus(TRUE);
+	// *TODO: check necessity of this code
+	//gFloaterView->adjustToFitScreen(this, FALSE);
 	if (mLineEditor)
 	{
 		mLineEditor->setFocus(TRUE);
@@ -368,9 +367,13 @@ LLToastAlertPanel::~LLToastAlertPanel()
 
 BOOL LLToastAlertPanel::hasTitleBar() const
 {
+	// *TODO: check necessity of this code
+	/*
 	return (getCurrentTitle() != "" && getCurrentTitle() != " ")	// has title
 			|| isMinimizeable()
 			|| isCloseable();
+	*/
+	return false;
 }
 
 BOOL LLToastAlertPanel::handleKeyHere(KEY key, MASK mask )
@@ -455,7 +458,6 @@ void LLToastAlertPanel::onButtonPressed( const LLSD& data, S32 button )
 	}
 
 	mNotification->respond(response); // new notification reponse
-	closeFloater(); // deletes self
 }
 
 void LLToastAlertPanel::onClickIgnore(LLUICtrl* ctrl)
diff --git a/indra/newview/lltoastalertpanel.h b/indra/newview/lltoastalertpanel.h
index 543c14d404..af0c9a9ddd 100644
--- a/indra/newview/lltoastalertpanel.h
+++ b/indra/newview/lltoastalertpanel.h
@@ -52,8 +52,7 @@ class LLLineEditor;
  */
 
 class LLToastAlertPanel
-	: public LLToastPanel,
-	  public LLFloater
+	: public LLToastPanel
 {
 public:
 	typedef bool (*display_callback_t)(S32 modal);
diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp
new file mode 100644
index 0000000000..e41181c9e1
--- /dev/null
+++ b/indra/newview/lltoastimpanel.cpp
@@ -0,0 +1,94 @@
+/**
+ * @file lltoastimpanel.cpp
+ * @brief Panel for IM toasts.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "lltoastimpanel.h"
+#include "llimpanel.h"
+
+const S32 LLToastIMPanel::MAX_MESSAGE_HEIGHT	= 50;
+const S32 LLToastIMPanel::CAPTION_HEIGHT		= 30;
+const S32 LLToastIMPanel::TOP_PAD 				= 5;
+
+//--------------------------------------------------------------------------
+LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) :	LLToastPanel(p.notification),
+															mAvatar(NULL), mUserName(NULL),
+															mTime(NULL), mMessage(NULL),
+															mReplyBtn(NULL)
+{
+	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_instant_message.xml");
+
+	mAvatar = getChild<LLAvatarIconCtrl>("avatar");
+	mUserName = getChild<LLTextBox>("user_name");
+	mTime = getChild<LLTextBox>("time_box");
+	mMessage = getChild<LLTextBox>("message");
+	mReplyBtn = getChild<LLButton>("reply");	
+
+	mMessage->setValue(p.message);
+	mAvatar->setValue(p.avatar_id);
+	mUserName->setValue(p.from);
+	mTime->setValue(p.time);
+	mSessionID = p.session_id;
+
+	mReplyBtn->setClickedCallback(boost::bind(&LLToastIMPanel::onClickReplyBtn, this));
+
+	snapToMessageHeight();
+}
+
+//--------------------------------------------------------------------------
+LLToastIMPanel::~LLToastIMPanel()
+{
+}
+
+//--------------------------------------------------------------------------
+void LLToastIMPanel::snapToMessageHeight()
+{
+	S32 required_text_height = mMessage->getTextPixelHeight();
+	S32 text_height = llmin(required_text_height, MAX_MESSAGE_HEIGHT);
+	LLRect text_rect = mMessage->getRect();
+	LLRect btn_rect = mReplyBtn->getRect();
+
+
+	mMessage->reshape( text_rect.getWidth(), text_height, TRUE);
+	mMessage->setValue(mMessage->getText());
+
+	S32 panel_height = CAPTION_HEIGHT + text_height + btn_rect.getHeight() + TOP_PAD*5;
+	reshape( getRect().getWidth(), panel_height, TRUE);
+}
+
+//--------------------------------------------------------------------------
+void LLToastIMPanel::onClickReplyBtn()
+{
+	LLIMFloater::toggle(mSessionID);
+}
+
+//--------------------------------------------------------------------------
+
diff --git a/indra/newview/lltoastimpanel.h b/indra/newview/lltoastimpanel.h
new file mode 100644
index 0000000000..7f5d6eca1d
--- /dev/null
+++ b/indra/newview/lltoastimpanel.h
@@ -0,0 +1,79 @@
+/**
+ * @file lltoastimpanel.h
+ * @brief Panel for IM toasts.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLTOASTIMPANEL_H_
+#define LLTOASTIMPANEL_H_
+
+
+#include "lltoastpanel.h"
+#include "lltextbox.h"
+#include "llbutton.h"
+#include "llavatariconctrl.h"
+
+
+class LLToastIMPanel: public LLToastPanel 
+{
+public:
+	struct Params :	public LLInitParam::Block<Params>
+	{
+		LLNotificationPtr	notification;
+		LLUUID				avatar_id;
+		LLUUID				session_id;
+		std::string			from;
+		std::string			time;
+		std::string			message;
+
+		Params() {}
+	};
+
+	LLToastIMPanel(LLToastIMPanel::Params &p);
+	virtual ~LLToastIMPanel();
+
+private:
+	static const S32 MAX_MESSAGE_HEIGHT;
+	static const S32 CAPTION_HEIGHT;
+	static const S32 TOP_PAD;
+
+	void onClickReplyBtn();
+	void snapToMessageHeight();
+
+	LLUUID				mSessionID;
+	LLAvatarIconCtrl*	mAvatar;
+	LLTextBox*			mUserName;
+	LLTextBox*			mTime;
+	LLTextBox*			mMessage;
+	LLButton*			mReplyBtn;
+};
+
+#endif // LLTOASTIMPANEL_H_
+
+
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 70fa2f715b..b5dd34df15 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -72,7 +72,7 @@
 #include "object_flags.h"
 #include "llimview.h"
 #include "llrootview.h"
-
+#include "llagentui.h"
 
 // MAX ITEMS is based on (sizeof(uuid)+2) * count must be < MTUBYTES
 // or 18 * count < 1200 => count < 1200/18 => 66. I've cut it down a
@@ -1563,7 +1563,7 @@ void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent,
 {
 	if(!item) return;
 	std::string name;
-	gAgent.buildFullname(name);
+	LLAgentUI::buildFullname(name);
 	LLUUID transaction_id;
 	transaction_id.generate();
 	const S32 BUCKET_SIZE = sizeof(U8) + UUID_BYTES;
@@ -1762,7 +1762,7 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
 	else
 	{
 		std::string name;
-		gAgent.buildFullname(name);
+		LLAgentUI::buildFullname(name);
 		LLUUID transaction_id;
 		transaction_id.generate();
 		S32 bucket_size = (sizeof(U8) + UUID_BYTES) * (count + 1);
diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp
index b335d7125a..1d78dc5019 100644
--- a/indra/newview/lltoolface.cpp
+++ b/indra/newview/lltoolface.cpp
@@ -40,7 +40,6 @@
 #include "v3math.h"
 
 // Viewer includes
-#include "llagent.h"
 #include "llviewercontrol.h"
 #include "llselectmgr.h"
 #include "llviewerobject.h"
diff --git a/indra/newview/lltoolselectland.cpp b/indra/newview/lltoolselectland.cpp
index 07c996a84f..5c8b08db3b 100644
--- a/indra/newview/lltoolselectland.cpp
+++ b/indra/newview/lltoolselectland.cpp
@@ -38,7 +38,6 @@
 #include "llparcel.h"
 
 // Viewer includes
-#include "llagent.h"
 #include "llviewercontrol.h"
 #include "llfloatertools.h"
 #include "llselectmgr.h"
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
index 8fbb59bc74..28f883312a 100644
--- a/indra/newview/llviewerjointmesh.cpp
+++ b/indra/newview/llviewerjointmesh.cpp
@@ -39,7 +39,6 @@
 #include "llfasttimer.h"
 #include "llrender.h"
 
-#include "llagent.h"
 #include "llapr.h"
 #include "llbox.h"
 #include "lldrawable.h"
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index d83f3d9207..7303605915 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -101,6 +101,7 @@
 #include "llnotify.h"
 #include "llpanelgrouplandmoney.h"
 #include "llselectmgr.h"
+#include "llsidetray.h"
 #include "llstartup.h"
 #include "llsky.h"
 #include "llstatenums.h"
@@ -136,6 +137,7 @@
 #include "llviewerdisplay.h"
 #include "llkeythrottle.h"
 #include "llgroupactions.h"
+#include "llagentui.h"
 
 #include <boost/tokenizer.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -902,12 +904,17 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 				break;
 			  case LLAssetType::AT_LANDMARK:
 			  	{
-					// *TODO: Embed a link to the Places panel so that user can edit the landmark right away.
 					LLInventoryCategory* parent_folder = gInventory.getCategory(item->getParentUUID());
 					LLSD args;
 					args["LANDMARK_NAME"] = item->getName();
 					args["FOLDER_NAME"] = std::string(parent_folder ? parent_folder->getName() : "unnkown");
 					LLNotifications::instance().add("LandmarkCreated", args);
+					
+					// Open new landmark for editing in Places panel.
+					LLSD key;
+					key["type"] = "landmark";
+					key["id"] = item->getUUID();
+					LLSideTray::getInstance()->showPanel("panel_places", key);
 			  	}
 				break;
 			  case LLAssetType::AT_TEXTURE:
@@ -1079,7 +1086,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 	msg->addUUIDFast(_PREHASH_ID, mTransactionID);
 	msg->addU32Fast(_PREHASH_Timestamp, NO_TIMESTAMP); // no timestamp necessary
 	std::string name;
-	gAgent.buildFullname(name);
+	LLAgentUI::buildFullname(name);
 	msg->addStringFast(_PREHASH_FromAgentName, name);
 	msg->addStringFast(_PREHASH_Message, ""); 
 	msg->addU32Fast(_PREHASH_ParentEstateID, 0);
@@ -1526,7 +1533,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				// if there is not a panel for this conversation (i.e. it is a new IM conversation
 				// initiated by the other party) then...
 				std::string my_name;
-				gAgent.buildFullname(my_name);
+				LLAgentUI::buildFullname(my_name);
 				std::string response = gSavedPerAccountSettings.getString("BusyModeResponse2");
 				pack_instant_message(
 					gMessageSystem,
@@ -2131,7 +2138,7 @@ void busy_message (LLMessageSystem* msg, LLUUID from_id)
 	if (gAgent.getBusy())
 	{
 		std::string my_name;
-		gAgent.buildFullname(my_name);
+		LLAgentUI::buildFullname(my_name);
 		std::string response = gSavedPerAccountSettings.getString("BusyModeResponse2");
 		pack_instant_message(
 			gMessageSystem,
@@ -4735,7 +4742,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 	// so we'll reuse the same namespace for both throttle types.
 	std::string throttle_name = owner_name;
 	std::string self_name;
-	gAgent.getName( self_name );
+	LLAgentUI::buildName( self_name );
 	if( owner_name == self_name )
 	{
 		throttle_name = taskid.getString();
@@ -5040,9 +5047,6 @@ void process_teleport_local(LLMessageSystem *msg,void**)
 		gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
 	}
 
-	// Let the interested parties know we've teleported.
-	LLViewerParcelMgr::getInstance()->onTeleportFinished();
-
 	// Sim tells us whether the new position is off the ground
 	if (teleport_flags & TELEPORT_FLAGS_IS_FLYING)
 	{
@@ -5063,6 +5067,11 @@ void process_teleport_local(LLMessageSystem *msg,void**)
 	gAgent.updateCamera();
 
 	send_agent_update(TRUE, TRUE);
+
+	// Let the interested parties know we've teleported.
+	// Vadim *HACK: Agent position seems to get reset (to render position?)
+	//              on each frame, so we have to pass the new position manually.
+	LLViewerParcelMgr::getInstance()->onTeleportFinished(true, gAgent.getPosGlobalFromAgent(pos));
 }
 
 void send_simple_im(const LLUUID& to_id,
@@ -5071,7 +5080,7 @@ void send_simple_im(const LLUUID& to_id,
 					const LLUUID& id)
 {
 	std::string my_name;
-	gAgent.buildFullname(my_name);
+	LLAgentUI::buildFullname(my_name);
 	send_improved_im(to_id,
 					 my_name,
 					 message,
@@ -5092,7 +5101,7 @@ void send_group_notice(const LLUUID& group_id,
 	// This will mean converting the item to a binary bucket,
 	// and the subject/message into a single field.
 	std::string my_name;
-	gAgent.buildFullname(my_name);
+	LLAgentUI::buildFullname(my_name);
 
 	// Combine subject + message into a single string.
 	std::ostringstream subject_and_message;
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 8497a45466..9dafc4b9f5 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1530,7 +1530,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 			if (instance->mTeleportInProgress)
 			{
 				instance->mTeleportInProgress = FALSE;
-				instance->mTeleportFinishedSignal();
+				instance->mTeleportFinishedSignal(gAgent.getPositionGlobal());
 			}
 		}
 	}
@@ -2398,12 +2398,19 @@ LLViewerTexture* LLViewerParcelMgr::getPassImage() const
 	return sPassImage;
 }
 
-boost::signals2::connection LLViewerParcelMgr::setAgentParcelChangedCallback(parcel_changed_callback_t cb)
+boost::signals2::connection LLViewerParcelMgr::addAgentParcelChangedCallback(parcel_changed_callback_t cb)
 {
 	return mAgentParcelChangedSignal.connect(cb);
 }
-
-boost::signals2::connection LLViewerParcelMgr::setTeleportFinishedCallback(parcel_changed_callback_t cb)
+/*
+ * Set finish teleport callback. You can use it to observe all  teleport events.
+ * NOTE:
+ * After local( in one region) teleports we
+ *  cannot rely on gAgent.getPositionGlobal(),
+ *  so the new position gets passed explicitly.
+ *  Use args of this callback to get global position of avatar after teleport event.
+ */
+boost::signals2::connection LLViewerParcelMgr::setTeleportFinishedCallback(teleport_finished_callback_t cb)
 {
 	return mTeleportFinishedSignal.connect(cb);
 }
@@ -2416,12 +2423,22 @@ boost::signals2::connection LLViewerParcelMgr::setTeleportFailedCallback(parcel_
 /* Ok, we're notified that teleport has been finished.
  * We should now propagate the notification via mTeleportFinishedSignal
  * to all interested parties.
- * However the agent parcel data has not been updated yet.
- * Let's wait for the update and then emit the signal.
  */
-void LLViewerParcelMgr::onTeleportFinished()
+void LLViewerParcelMgr::onTeleportFinished(bool local, const LLVector3d& new_pos)
 {
-	mTeleportInProgress = TRUE;
+	if (local)
+	{
+		// Local teleport. We already have the agent parcel data.
+		// Emit the signal immediately.
+		getInstance()->mTeleportFinishedSignal(new_pos);
+	}
+	else
+	{
+		// Non-local teleport.
+		// The agent parcel data has not been updated yet.
+		// Let's wait for the update and then emit the signal.
+		mTeleportInProgress = TRUE;
+	}
 }
 
 void LLViewerParcelMgr::onTeleportFailed()
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index 427ed4a6f2..917f28fd29 100644
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -82,6 +82,8 @@ class LLViewerParcelMgr : public LLSingleton<LLViewerParcelMgr>
 {
 
 public:
+	typedef boost::function<void (const LLVector3d&)> teleport_finished_callback_t;
+	typedef boost::signals2::signal<void (const LLVector3d&)> teleport_finished_signal_t;
 	typedef boost::function<void()> parcel_changed_callback_t;
 	typedef boost::signals2::signal<void()> parcel_changed_signal_t;
 
@@ -262,10 +264,10 @@ public:
 	// the agent is banned or not in the allowed group
 	BOOL isCollisionBanned();
 
-	boost::signals2::connection setAgentParcelChangedCallback(parcel_changed_callback_t cb);
-	boost::signals2::connection setTeleportFinishedCallback(parcel_changed_callback_t cb);
+	boost::signals2::connection addAgentParcelChangedCallback(parcel_changed_callback_t cb);
+	boost::signals2::connection setTeleportFinishedCallback(teleport_finished_callback_t cb);
 	boost::signals2::connection setTeleportFailedCallback(parcel_changed_callback_t cb);
-	void onTeleportFinished();
+	void onTeleportFinished(bool local, const LLVector3d& new_pos);
 	void onTeleportFailed();
 
 	static BOOL isParcelOwnedByAgent(const LLParcel* parcelp, U64 group_proxy_power);
@@ -316,7 +318,7 @@ private:
 	LLDynamicArray<LLParcelObserver*> mObservers;
 
 	BOOL						mTeleportInProgress;
-	parcel_changed_signal_t		mTeleportFinishedSignal;
+	teleport_finished_signal_t	mTeleportFinishedSignal;
 	parcel_changed_signal_t		mTeleportFailedSignal;
 	parcel_changed_signal_t		mAgentParcelChangedSignal;
 
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 83442dc2bb..1b926e2db6 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -53,7 +53,6 @@
 #include "llxmltree.h"
 #include "message.h"
 
-#include "llagent.h"
 #include "lltexturecache.h"
 #include "lltexturefetch.h"
 #include "llviewercontrol.h"
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 74ed5b12fe..01756a0d82 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -186,6 +186,7 @@
 #include "llpostprocess.h"
 #include "llbottomtray.h"
 #include "llnearbychatbar.h"
+#include "llagentui.h"
 
 #include "llnotificationmanager.h"
 
@@ -1105,7 +1106,7 @@ BOOL LLViewerWindow::handlePaint(LLWindow *window,  S32 x,  S32 y, S32 width,  S
 		FillRect(hdc, &wnd_rect, CreateSolidBrush(RGB(255, 255, 255)));
 
 		std::string name_str;
-		gAgent.getName(name_str);
+		LLAgentUI::buildName(name_str);
 
 		std::string temp_str;
 		temp_str = llformat( "%s FPS %3.1f Phy FPS %2.1f Time Dil %1.3f",		/* Flawfinder: ignore */
diff --git a/indra/newview/llvlmanager.cpp b/indra/newview/llvlmanager.cpp
index 177093c4d1..07ef262668 100644
--- a/indra/newview/llvlmanager.cpp
+++ b/indra/newview/llvlmanager.cpp
@@ -40,7 +40,6 @@
 #include "patch_dct.h"
 #include "llviewerregion.h"
 #include "llframetimer.h"
-#include "llagent.h"
 #include "llsurface.h"
 
 LLVLManager gVLManager;
diff --git a/indra/newview/llvoground.cpp b/indra/newview/llvoground.cpp
index fe19e18151..ac2484ddfd 100644
--- a/indra/newview/llvoground.cpp
+++ b/indra/newview/llvoground.cpp
@@ -37,7 +37,6 @@
 
 #include "llviewercontrol.h"
 
-#include "llagent.h"
 #include "lldrawable.h"
 #include "llface.h"
 #include "llsky.h"
diff --git a/indra/newview/llvotextbubble.cpp b/indra/newview/llvotextbubble.cpp
index 9871965458..f5094c025e 100644
--- a/indra/newview/llvotextbubble.cpp
+++ b/indra/newview/llvotextbubble.cpp
@@ -39,7 +39,6 @@
 #include "llprimitive.h"
 #include "llrendersphere.h"
 
-#include "llagent.h"
 #include "llbox.h"
 #include "lldrawable.h"
 #include "llface.h"
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index f7a16571d1..6a209ecabf 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -47,7 +47,7 @@
 #include "material_codes.h"
 #include "message.h"
 #include "object_flags.h"
-#include "llagent.h"
+#include "llagentconstants.h"
 #include "lldrawable.h"
 #include "lldrawpoolbump.h"
 #include "llface.h"
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp
index 332c9dd952..e2357957ab 100644
--- a/indra/newview/llvowater.cpp
+++ b/indra/newview/llvowater.cpp
@@ -37,7 +37,6 @@
 #include "imageids.h"
 #include "llviewercontrol.h"
 
-#include "llagent.h"
 #include "lldrawable.h"
 #include "lldrawpoolwater.h"
 #include "llface.h"
diff --git a/indra/newview/llwind.cpp b/indra/newview/llwind.cpp
index ae98bead98..cbee4ddae1 100644
--- a/indra/newview/llwind.cpp
+++ b/indra/newview/llwind.cpp
@@ -49,7 +49,6 @@
 // viewer
 #include "noise.h"
 #include "v4color.h"
-#include "llagent.h"
 #include "llworld.h"
 
 
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index ae476c88c9..7d9d0a6191 100644
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -52,7 +52,6 @@
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
 #include "lldrawpoolwater.h"
-#include "llagent.h"
 #include "llviewerregion.h"
 
 #include "llwlparamset.h"
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index ad208806b7..29492ebbdf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -381,6 +381,7 @@
   <texture name="icon_groupnoticeinventory.tga"/>
   <texture name="icon_lock.tga"/>
   <texture name="icon_place.tga"/>
+  <texture name="icon_place_for_sale.tga"/>
   <texture name="icon_popular.tga"/>
   <texture name="icon_top_pick.tga"/>
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index a74f560753..28cb3bc551 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -19,7 +19,7 @@
      left="10"
      name="title"
      text_color="white"
-     top="0"
+     top="17"
      width="250">
         Edit Pick
     </text>
@@ -28,11 +28,11 @@
      bg_alpha_color="DkGray2"
      width="280"
      follows="left|right|top|bottom"
-     height="570"
+     height="560"
      layout="topleft"
      left="10"
      right="-10"
-     top="30">
+     top_pad="5">
         <panel
          follows="left|top|right"
          height="150"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index b336c86e95..c870e24e59 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -13,8 +13,8 @@
  top="10"
  width="305">
     <text     
-     top="0" 
-     left="9" 
+     top="16" 
+     left="11" 
      height="20" 
      follows="left|top"
      font="SansSerifHugeBold" 
@@ -28,7 +28,7 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      follows="left|top|right|bottom"  
-     height="620"
+     height="604"
      layout="topleft"
      left="9"
      name="data_panel" 
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index a38d7eee36..2243df951e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="500"
+ height="470"
  label="General"
  class="panel_group_general"
  layout="topleft"
@@ -43,39 +43,17 @@ Hover your mouse over the options for more help.
     <text_editor
      type="string"
      follows="left|top"
-     left="10"
+     left="95"
      height="75"
      hide_scrollbar="true"
      layout="topleft"
      max_length="511"
      name="charter"
-     top_pad="4"
-     width="260"
+     top="30"
+     width="170"
      word_wrap="true">
         Group Charter
     </text_editor>
-    <!--<button
-     follows="left|top"
-     height="20"
-     font="SansSerifSmall"
-     label="Join (L$0)"
-     label_selected="Join (L$0)"
-     layout="topleft"
-     left="10"
-     name="join_button"
-     top_pad="10"
-     width="85" />
-    <button
-     follows="left|top"
-     height="20"
-     font="SansSerifSmall"
-     label="Details"
-     label_selected="Detailed View"
-     layout="topleft"
-     left_delta="0"
-     name="info_button"
-     top_delta="0"
-     width="85" /> -->
     <text
       follows="left|top"
      type="string"
@@ -83,7 +61,7 @@ Hover your mouse over the options for more help.
      tool_tip="Owners are shown in bold."
      height="16"
      layout="topleft"
-     left_delta="0"
+     left="5"
      name="text_owners_and_visible_members"
      top_pad="10"
      width="270">
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index be68187eaf..65d1e3c3a7 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -16,26 +16,25 @@
      name="want_apply_text">
         Do you want to apply these changes?
     </panel.string>
-
-	<button 
+    
+    <button 
      layout="topleft" 
      name="back" 
-     left="5" 
-     top="5" 
-     width="20" 
-     height="20" 
+     right="-9" 
+     top="0" 
+     width="25" 
+     height="25" 
      label=""
      follows="top|left"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
-     image_overlay="navbar_back.tga"/>
+     image_overlay="BackArrow_Off"
+     tab_stop="false" />
     <text 
      layout="topleft" 
-     top="5" 
-     left_pad="15" 
-     width="200" 
+     top="0" 
+     left="10" 
+     width="250" 
      height="20" 
-     font="SansSerifBold" 
+     font="SansSerifHugeBold" 
      text_color="white" 
      follows="top|left|right"
      mouse_opaque="true" 
@@ -100,7 +99,7 @@
      left="5"
      visible="false"
      width="65" />
-      <accordion layout="topleft" left="2" width="296" top="135" height="600" follows="all" name="panel_me_profile">
+      <accordion layout="topleft" left="2" width="296" top="135" height="600" follows="all" name="group_accordion">
 		<accordion_tab min_height="515" title="Group General" name="group_general_tab">
         	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>
 		</accordion_tab>
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index 43457ddd61..68b30faa1c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -15,6 +15,10 @@
      name="loading">
         (loading...)
     </panel.string>
+    <panel.string
+     name="already_in_group">
+        Some avatars are already in group and were not invited.
+    </panel.string>
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 4d373fbf3a..069cf1d7bd 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="490"
+ height="410"
  label="Land &amp; L$"
  layout="topleft"
  left="1"
@@ -59,7 +59,7 @@
      heading_height="14"
      height="100"
      layout="topleft"
-     left_delta="0"
+     left="5"
      name="group_parcel_list"
      top_pad="10"
      width="265">
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index a39a681f83..8ebf1b69a7 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -9,7 +9,7 @@
 			top="5"  left="5" mouse_opaque="true" name="group_icon"/>
 		<text type="string" length="1" follows="left|top|right|bottom"
 			font="SansSerifBigBold" height="20" layout="topleft" left="60" name="title"
-			text_color="GroupNotifyTextColor" top="20" width="300">
+			text_color="GroupNotifyTextColor" top="20" width="275" use_ellipses="true">
 			Sender Name / Group Name
         </text>
 	</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 37c332b2b7..9ae165cbb9 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -193,7 +193,7 @@ clicking on their names.
          height="20"
          follows="left|top|right"
          max_length="250"
-         label="Filter Roles"
+         label="Filter People"
          name="filter_input"
          font="SansSerif"
          background_image="TextField_Search_Off"
@@ -326,7 +326,7 @@ including the Everyone and Owner Roles.
             height="20"
             follows="left|top|right"
             max_length="250"
-            label="Filter People"
+            label="Filter Roles"
             name="filter_input"
             font="SansSerif"
             background_image="TextField_Search_Off"
@@ -507,7 +507,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         </panel>
     </tab_container>
     <panel
-     height="50"
+     height="170"
      layout="topleft"
      follows="left|top"
      left="10"
@@ -540,7 +540,6 @@ things in this group. There&apos;s a broad variety of Abilities.
         </text>
         <scroll_list
          draw_stripes="false"
-         enabled="false"
          follows="left|top"
          height="150"
          layout="topleft"
@@ -559,7 +558,6 @@ things in this group. There&apos;s a broad variety of Abilities.
         </scroll_list>
         <scroll_list
          draw_stripes="false"
-         enabled="false"
          height="150"
          layout="topleft"
          follows="left|top"
@@ -686,7 +684,6 @@ things in this group. There&apos;s a broad variety of Abilities.
         </text>
         <name_list
          draw_stripes="false"
-         enabled="false"
          height="150"
          layout="topleft"
          left="0"
@@ -783,7 +780,6 @@ things in this group. There&apos;s a broad variety of Abilities.
             Members with Ability
         </text>
         <scroll_list
-         enabled="false"
          height="150"
          layout="topleft"
          left="0"
@@ -791,7 +787,6 @@ things in this group. There&apos;s a broad variety of Abilities.
          top="90"
          width="130" />
         <name_list
-         enabled="false"
          height="150"
          layout="topleft"
          left_pad="5"
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
new file mode 100644
index 0000000000..169fde7b47
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bevel_style="in"
+ bg_alpha_color="0.3 0.3 0.3 0"
+ height="140"
+ label="im_panel"
+ layout="topleft"
+ left="0"
+ name="im_panel"
+ top="0"
+ width="350">
+    <panel
+     background_visible="true"
+     bevel_style="in"
+     bg_alpha_color="black"
+     follows="top"
+     height="30"
+     label="im_header"
+     layout="topleft"
+     left="5"
+     name="im_header"
+     top="5"
+     width="340">
+        <avatar_icon
+         follows="right"
+         height="20"
+         image_name="icon_avatar_online.tga"
+         layout="topleft"
+         left="5"
+         mouse_opaque="true"
+         name="avatar"
+         top="5"
+         width="20" />
+        <text
+         follows="left|right"
+         font="SansSerifBigBold"
+         height="20"
+         layout="topleft"
+         left_pad="10"
+         name="user_name"
+         text_color="white"
+         top="5"
+         value="Darth Vader"
+         width="250" />
+        <text
+         follows="right"
+         font="SansSerifBig"
+         height="20"
+         layout="topleft"
+         left_pad="10"
+         name="time_box"
+         text_color="white"
+         top="5"
+         value="23:30"
+         width="50" />
+    </panel>
+    <text
+     follows="left|bottom|right"
+     height="60"
+     layout="topleft"
+     left="10"
+     name="message"
+     text_color="white"
+     top="40"
+     use_ellipses="true"
+     value="MESSAGE"
+     width="330"
+     word_wrap="true" />
+    <button
+     follows="bottom"
+     font="SansSerifBigBold"
+     height="25"
+     label="reply"
+     layout="topleft"
+     left="120"
+     name="reply"
+     top="110"
+     width="110" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index f821dcd839..dee911a45d 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -116,12 +116,12 @@
 	     follows="right|top"
 	     halign="right"
 	     height="22"
-	     label="Search All"
+	     label="Search"
 	     layout="topleft"
 	     left_pad="7"
 	     mouse_opaque="false"
 	     name="search_input"
-	     tool_tip="Search All"
+	     tool_tip="Search"
 	     top_delta="0"
 	     width="200" />        
 	</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 188f405e13..12badfccf0 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -9,114 +9,136 @@
  name="panel_notes"
  top="0"
  width="285">
-    <scroll_container
-     color="DkGray2"
-     follows="left|top|right|bottom"
-     height="350"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
+     follows="all"
      layout="topleft"
-     left="2"
-     name="profile_scroll"
-     opaque="true"
+     left="0"
      top="0"
-     width="284">
-      <panel
-		 height="350"
-		 layout="topleft"
-		 name="profile_scroll_panel"
-		 top="0"
-		 width="284">
-        <text
-         follows="left|top"
-         font="SansSerifBold"
-         height="16"
+     height="420"
+     width="285"
+     border_size="0">
+        <panel
+         name="notes_stack"
+         follows="all"
          layout="topleft"
-         left="10"
-         name="status_message"
-         text_color="white"
          top="0"
-         value="My private notes:"
-         width="230" />
-        <text_editor
-         follows="left|top"
-         height="200"
-         hide_scrollbar="true"
-         layout="topleft"
-         left="10"
-         max_length="1000"
-         name="notes_edit"
-         text_color="black"
-         top_pad="10"
-         width="255"
-         word_wrap="true" />
-        <text
-         follows="left|top"
-         font="SansSerifBold"
-         height="16"
-         layout="topleft"
-         left="10"
-         name="status_message2"
-         text_color="white"
-         top_pad="10"
-         value="Let this person:"
-         width="225" />
-        <check_box
-         enabled="false"
-         height="20"
-         label="See my online status"
-         layout="topleft"
-         left="20"
-         name="status_check"
-         top_pad="0"
-         width="230" />
-        <check_box
-         enabled="false"
-         height="20"
-         label="See me on the map"
-         layout="topleft"
-         left="20"
-         name="map_check"
-         top_pad="0"
-         width="230" />
-        <check_box
-         enabled="false"
-         height="20"
-         label="Edit, delete or take my objects"
-         layout="topleft"
-         left="20"
-         name="objects_check"
-         top_pad="0"
-         width="230" />
-      </panel>
-    </scroll_container>
-    <panel
-     follows="bottom|left"
-     height="30"
-     layout="topleft"
-     left="10"
-     name="notes_buttons_panel"
-     top_pad="5"
-     width="280">
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Teleport"
-         layout="topleft"
          left="0"
-         name="teleport_btn"
-         top="0"
-         width="75" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Map"
+         height="390"
+         width="285">
+            <scroll_container
+             color="DkGray2"
+             follows="left|top|right|bottom"
+             height="390"
+             layout="topleft"
+             left="0"
+             name="profile_scroll"
+             opaque="true"
+             top="0"
+             width="285">
+              <panel
+                 height="350"
+                 layout="topleft"
+                 name="profile_scroll_panel"
+                 top="0"
+                 left="0"
+                 width="240">
+                <text
+                 follows="left|top"
+                 font="SansSerifBold"
+                 height="16"
+                 layout="topleft"
+                 left="10"
+                 name="status_message"
+                 text_color="white"
+                 top="0"
+                 value="My private notes:"
+                 width="230" />
+                <text_editor
+                 follows="left|top"
+                 height="200"
+                 hide_scrollbar="true"
+                 layout="topleft"
+                 left="10"
+                 max_length="1000"
+                 name="notes_edit"
+                 text_color="black"
+                 top_pad="10"
+                 width="235"
+                 word_wrap="true" />
+                <text
+                 follows="left|top"
+                 font="SansSerifBold"
+                 height="16"
+                 layout="topleft"
+                 left="10"
+                 name="status_message2"
+                 text_color="white"
+                 top_pad="10"
+                 value="Let this person:"
+                 width="225" />
+                <check_box
+                 enabled="false"
+                 height="20"
+                 label="See my online status"
+                 layout="topleft"
+                 left="20"
+                 name="status_check"
+                 top_pad="0"
+                 width="230" />
+                <check_box
+                 enabled="false"
+                 height="20"
+                 label="See me on the map"
+                 layout="topleft"
+                 left="20"
+                 name="map_check"
+                 top_pad="0"
+                 width="230" />
+                <check_box
+                 enabled="false"
+                 height="20"
+                 label="Edit, delete or take my objects"
+                 layout="topleft"
+                 left="20"
+                 name="objects_check"
+                 top_pad="0"
+                 width="230" />
+              </panel>
+            </scroll_container>
+        </panel>
+        <panel
+         follows="bottom"
+         height="30"
          layout="topleft"
-         name="show_on_map_btn"
-         top="0"
-         left_pad="5"
-         width="85" />
-    </panel>
+         left="10"
+         name="notes_buttons_panel"
+         top_pad="5"
+         width="280"
+         auto_resize="false">
+            <button
+             enabled="false"
+             follows="bottom|left"
+             font="SansSerifSmallBold"
+             height="25"
+             label="Teleport"
+             layout="topleft"
+             left="0"
+             name="teleport_btn"
+             top="0"
+             width="75" />
+            <button
+             enabled="false"
+             follows="bottom|left"
+             font="SansSerifSmallBold"
+             height="25"
+             label="Map"
+             layout="topleft"
+             name="show_on_map_btn"
+             top="0"
+             left_pad="5"
+             width="85" />
+        </panel>
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index a62d2a5cdb..fce31a2c68 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -102,6 +102,7 @@
                  left="20"
                  name="nearby_view_sort_btn"
                  picture_style="true"
+                 tool_tip="Change sort and view of Residents list"
                  top="7"
                  width="18" />
             </panel>
@@ -195,6 +196,7 @@
                  left="20"
                  name="friends_viewsort_btn"
                  picture_style="true"
+                 tool_tip="Change sort and view of Friends list"
                  top="7"
                  width="18" />
                 <button
@@ -207,6 +209,7 @@
                  left_pad="5"
                  name="add_btn"
                  picture_style="true"
+                 tool_tip="Offer friendship to a resident"
                  top_delta="0"
                  width="18" />
                 <button
@@ -219,6 +222,7 @@
                  left_pad="180"
                  name="del_btn"
                  picture_style="true"
+                 tool_tip="Remove selected person from your Friends list"
                  top_delta="0"
                  width="18" />
             </panel>
@@ -262,6 +266,7 @@
                  left="20"
                  name="gear_btn"
                  picture_style="true"
+                 tool_tip="Change sort and view of Groups list"
                  top="7"
                  width="18" />
                 <button
@@ -274,6 +279,7 @@
                  left_pad="5"
                  name="plus_btn"
                  picture_style="true"
+                 tool_tip="Join group/Create new group"
                  top_delta="0"
                  width="18" />
                 <button
@@ -287,6 +293,7 @@
                  left_pad="24"
                  name="activate_btn"
                  picture_style="true"
+                 tool_tip="Activate selected group"
                  top_delta="5"
                  width="10" />
                 <button
@@ -299,6 +306,7 @@
                  left_pad="146"
                  name="minus_btn"
                  picture_style="true"
+                 tool_tip="Leave selected group"
                  top_delta="-5"
                  width="18" />
             </panel>
@@ -341,6 +349,7 @@
                  left="20"
                  name="recent_viewsort_btn"
                  picture_style="true"
+                 tool_tip="Change sort and view of Residents list"
                  top="7"
                  width="18" />
             </panel>
@@ -372,6 +381,7 @@
              label="Profile"
              layout="topleft"
              name="view_profile_btn"
+             tool_tip="Show picture, groups, and other residents information"
              width="65" />
         </layout_panel>
         <layout_panel
@@ -391,6 +401,7 @@
              label="Add Friend"
              layout="topleft"
              name="add_friend_btn"
+             tool_tip="Add selected resident to your Friends List"
              width="85" />
         </layout_panel>
         <layout_panel
@@ -408,6 +419,7 @@
              label="Group Profile"
              layout="topleft"
              name="group_info_btn"
+             tool_tip="Show group information"
              width="80" />
         </layout_panel>
         <layout_panel
@@ -426,6 +438,7 @@
              label="Chat"
              layout="topleft"
              name="chat_btn"
+             tool_tip="Open chat session"
              width="45" />
         </layout_panel>
         <layout_panel
@@ -444,6 +457,7 @@
              label="IM"
              layout="topleft"
              name="im_btn"
+             tool_tip="Open instant message session"
              width="35" />
         </layout_panel>
         <layout_panel
@@ -482,6 +496,7 @@
              label="Teleport"
              layout="topleft"
              name="teleport_btn"
+             tool_tip="Offer teleport"
              width="65" />
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index b4d2bbb194..c8bde77a94 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="in"
  follows="left|top|right|bottom"
- height="625"
+ height="480"
  layout="topleft"
  left="0"
  name="panel_pick_info"
@@ -16,29 +16,41 @@
      left="10"
      name="title"
      text_color="white"
-     top="5"
+     top="16"
      value="Pick Info"
      width="150" />
     <button
      follows="top|right"
-     height="20"
+     height="25"
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back_btn"
      picture_style="true"
-     right="-20"
-     top="7"
-     width="20" />
+     right="-11"
+     top="16"
+     width="25" 
+     tab_stop="false" />
+  
+    <scroll_container
+     color="DkGray2"
+     follows="left|top|right|bottom"
+     height="400"
+     layout="topleft"
+     left="0"
+     name="pick_info_scroll"
+     opaque="true"
+     reserve_scroll_corner="true"
+     width="265">
     <panel
      background_visible="true"
      bg_alpha_color="DkGray2"
-     follows="left|right|top|bottom"
+     follows="left|right|top"
      height="550"
      layout="topleft"
      left="0"
-     min_height="300"
-     top="30"
-     width="265">
+     min_height="550"
+     top_pad="0"
+     width="263">
         <texture_picker
          enabled="false"
          follows="left|top|right"
@@ -110,7 +122,16 @@
          text_color="white"
          valign="center"
          value="[loading...]" />
+        <icon
+         follows="top|left"
+         height="15"
+         image_name=""
+         layout="topleft"
+         mouse_opaque="true"
+         name="maturity"
+         width="15" />
     </panel>
+    </scroll_container>
     <panel
      follows="left|right|bottom"
      height="30"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 47cfd8e129..ff161cc2ab 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -8,92 +8,105 @@
  name="panel_picks"
  top="0"
  width="285">
-    <scroll_container
-     color="DkGray2"
-     follows="left|top|right|bottom"
-     height="350"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
+     follows="all"
      layout="topleft"
-     left="2"
-     name="profile_scroll"
-     opaque="true"
+     left="0"
      top="0"
-     width="284">
-        <panel
-         height="115"
+     height="420"
+     width="284"
+     border_size="0">
+        <scroll_container
+         color="DkGray2"
+         follows="left|top|right|bottom"
+         height="350"
          layout="topleft"
-         left="0"
-         name="back_panel"
+         left="2"
+         name="profile_scroll"
+         opaque="true"
          top="0"
-         width="284" />
-    </scroll_container>
-    <panel
-     background_visible="true"
-     bevel_style="none"
-     enabled="false"
-     follows="left|right|bottom"
-     height="30"
-     label="bottom_panel"
-     layout="topleft"
-     name="edit_panel"
-     top_pad="5"
-     width="284">
-        <button
+         width="284">
+            <panel
+             height="115"
+             layout="topleft"
+             left="0"
+             name="back_panel"
+             top="0"
+             width="284" />
+        </scroll_container>
+        <panel
+         background_visible="true"
+         bevel_style="none"
          enabled="false"
-         follows="bottom|left"
-         font="SansSerifBigBold"
-         height="18"
-         image_selected="OptionsMenu_Press"
-         image_unselected="OptionsMenu_Off"
-         layout="topleft"
-         left="10"
-         name="gear_menu_btn"
-         picture_style="true"
-         top="5"
-         width="18" />
-        <button
-         follows="bottom|left"
-         font="SansSerifBigBold"
-         height="18"
-         image_disabled="AddItem_Off"
-         image_disabled_selected="AddItem_Press"
-         image_selected="AddItem_Press"
-         image_unselected="AddItem_Off"
+         auto_resize="false"
+         follows="bottom"
+         height="30"
+         label="bottom_panel"
          layout="topleft"
-         left="35"
-         name="new_btn"
-         picture_style="true"
-         tool_tip="Create New Pick at Current Location"
-         top="5"
-         width="18" />
-        <button
-         follows="bottom|right"
-         font="SansSerifBigBold"
-         height="18"
-         image_disabled="TrashItem_Off"
-         image_disabled_selected="TrashItem_Press"
-         image_selected="TrashItem_Press"
-         image_unselected="TrashItem_Off"
-         layout="topleft"
-         name="trash_btn"
-         picture_style="true"
-         right="-10"
-         top="5"
-         width="18" />
-    </panel>
-    <panel
-     follows="bottom|left"
-     height="30"
-     layout="topleft"
-     name="buttons_cucks"
-     width="284">
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Map"
+         name="edit_panel"
+         top_pad="5"
+         width="284">
+            <button
+             enabled="false"
+             follows="bottom|left"
+             font="SansSerifBigBold"
+             height="18"
+             image_selected="OptionsMenu_Press"
+             image_unselected="OptionsMenu_Off"
+             layout="topleft"
+             left="10"
+             name="gear_menu_btn"
+             picture_style="true"
+             top="5"
+             width="18" />
+            <button
+             follows="bottom|left"
+             font="SansSerifBigBold"
+             height="18"
+             image_disabled="AddItem_Off"
+             image_disabled_selected="AddItem_Press"
+             image_selected="AddItem_Press"
+             image_unselected="AddItem_Off"
+             layout="topleft"
+             left="35"
+             name="new_btn"
+             picture_style="true"
+             tool_tip="Create New Pick at Current Location"
+             top="5"
+             width="18" />
+            <button
+             follows="bottom|right"
+             font="SansSerifBigBold"
+             height="18"
+             image_disabled="TrashItem_Off"
+             image_disabled_selected="TrashItem_Press"
+             image_selected="TrashItem_Press"
+             image_unselected="TrashItem_Off"
+             layout="topleft"
+             name="trash_btn"
+             picture_style="true"
+             right="-10"
+             top="5"
+             width="18" />
+        </panel>
+        <panel
+         follows="bottom"
+         height="30"
+         auto_resize="false"
          layout="topleft"
-         name="show_on_map_btn"
-         width="85" />
-    </panel>
+         name="buttons_cucks"
+         width="284">
+            <button
+             enabled="false"
+             follows="bottom|left"
+             font="SansSerifSmallBold"
+             height="25"
+             label="Map"
+             layout="topleft"
+             name="show_on_map_btn"
+             width="85" />
+        </panel>
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 6d7cabc5c0..e710774232 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -40,33 +40,53 @@
      tab_stop="false"
      top="0"
      width="25" />
-    <tab_container
-     follows="left|top|right|bottom"
-     height="420"
-     layout="topleft"
-     left="10"
-     name="tabs"
-     tab_min_width="75"
-     tab_position="top"
-     top_pad="15"
-     width="285">
-        <panel
-         class="panel_profile"
-         filename="panel_profile.xml"
-         label="Profile"
-         layout="topleft"
-         name="panel_profile" />
-        <panel
-         class="panel_picks"
-         filename="panel_picks.xml"
-         label="Picks"
-         layout="topleft"
-         name="panel_picks" />
-        <panel
-         class="panel_notes"
-         filename="panel_notes.xml"
-         label="Notes &amp; Privacy"
+        <layout_stack
+         name="layout_stack"
+         orientation="vertical"
          layout="topleft"
-         name="panel_notes" />
-    </tab_container>
+         follows="all"
+         left="0"
+         top="50"
+         height="500"
+         width="305" 
+         border_size="0">
+            <panel
+             name="stack_panel"
+             follows="all"
+             layout="topleft"
+             top="0"
+             left="0"
+             height="500"
+             width="305">
+            <tab_container
+             follows="all"
+             height="500"
+             layout="topleft"
+             left="10"
+             name="tabs"
+             tab_min_width="75"
+             tab_position="top"
+             top="0"
+             width="280">
+                <panel
+                 class="panel_profile"
+                 filename="panel_profile.xml"
+                 label="Profile"
+                 layout="topleft"
+                 name="panel_profile" />
+                <panel
+                 class="panel_picks"
+                 filename="panel_picks.xml"
+                 label="Picks"
+                 layout="topleft"
+                 name="panel_picks" />
+                <panel
+                 class="panel_notes"
+                 filename="panel_notes.xml"
+                 label="Notes &amp; Privacy"
+                 layout="topleft"
+                 name="panel_notes" />
+            </tab_container>
+        </panel>
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index 445c9cc288..4d91a544c3 100644
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -15,6 +15,7 @@
      name="stand_btn"
      tool_tip="Click here to stand up."
      top="2"
+     visible="false"
      width="115" />
     <button
      follows="left|bottom"
@@ -24,5 +25,6 @@
      name="stop_fly_btn"
      tool_tip="Stop Flying"
      top="2"
+     visible="false"
      width="115" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 3ad5cbe018..f597211ec9 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -197,52 +197,6 @@
      top_delta="-3"
      visible="false"
      width="16" />
-    <button
-     follows="right|bottom"
-     height="16"
-     image_disabled="sm_rounded_corners_simple.tga"
-     image_disabled_selected="sm_rounded_corners_simple.tga"
-     image_hover_selected="sm_rounded_corners_simple.tga"
-     image_hover_unselected="sm_rounded_corners_simple.tga"
-     image_selected="sm_rounded_corners_simple.tga"
-     image_unselected="sm_rounded_corners_simple.tga"
-     layout="topleft"
-     left_pad="313"
-     mouse_opaque="false"
-     name="menubar_search_bevel_bg"
-     picture_style="true"
-     top_delta="0"
-     width="94" />
-    <line_editor
-     bevel_style="none"
-     border_style="line"
-     commit_on_focus_lost="false"
-     follows="right|bottom"
-     height="11"
-     label="Search"
-     layout="topleft"
-     left_delta="1"
-     name="search_editor"
-     tab_group="1"
-     tool_tip="Search [SECOND_LIFE]"
-     top_delta="4"
-     width="78" />
-    <button
-     follows="right|bottom"
-     font="SansSerifSmall"
-     height="16"
-     image_disabled="status_search_btn.png"
-     image_disabled_selected="status_search_btn_pressed.png"
-     image_selected="status_search_btn_pressed.png"
-     image_unselected="status_search_btn.png"
-     layout="topleft"
-     left_delta="78"
-     name="search_btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Search [SECOND_LIFE]"
-     top_delta="-4"
-     width="16" />
     <text
      enabled="false"
      follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
index 3c49ce311a..3ac15fe550 100644
--- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -54,6 +54,7 @@
     name="close_btn" 
     mouse_opaque="true"
     label=""
+    tab_stop="false"
     image_unselected="toast_hide_btn.tga" 
     image_disabled="toast_hide_btn.tga"
     image_selected="toast_hide_btn.tga" 
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index f7d8cf948e..441caffa28 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -62,6 +62,7 @@
     mouse_opaque="true" 
     name="hide_btn" 
     label="" 
+    tab_stop="false"
     image_unselected="toast_hide_btn.tga" 
     image_disabled="toast_hide_btn.tga"
     image_selected="toast_hide_btn.tga" 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 655cf2b40f..df328118a2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -937,6 +937,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     <string name="tight skirt">tight skirt</string>	
 	<string name="wrinkles">wrinkles</string>	
 	
+    <!-- Favorites Bar -->
+    <string name="location_ctrl_add_landmark">Add to My Landmarks</string>
+    <string name="location_ctrl_edit_landmark">Edit My Landmark</string>
+    <string name="favorite_landmark_loading_tooltip">(Loading...)</string>
+	
 	<!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [SECOND_LIFE_VIEWER] Update
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index b249451247..8f4d0edf95 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -9,6 +9,8 @@
 <location_input font="SansSerifSmall"
                 add_landmark_image_enabled="Favorite_Star_Active"
                 add_landmark_image_disabled="Favorite_Star_Off"
+                add_landmark_image_hover="Favorite_Star_Over"
+                add_landmark_image_selected="Favorite_Star_Press"
                 add_landmark_hpad="2"
                 allow_text_entry="true"
                 list_position="below"
-- 
cgit v1.3


From 51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 28 Aug 2009 22:30:09 +0000
Subject: svn merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480
 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 ->
 viewer-2.0.0-3 * EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707
 EXT-708 EXT-726 EXT-737

---
 indra/llui/lltabcontainer.cpp                      | 46 ++++++++++++++--------
 indra/newview/app_settings/settings.xml            |  4 +-
 indra/newview/llagent.h                            |  7 ----
 indra/newview/llagentui.cpp                        | 20 +++++-----
 indra/newview/llagentui.h                          | 14 +++++--
 indra/newview/llfloatersnapshot.cpp                |  2 +-
 indra/newview/llimview.cpp                         | 17 +++++++-
 indra/newview/llimview.h                           |  1 +
 indra/newview/lllandmarkactions.cpp                |  4 +-
 indra/newview/lllocationinputctrl.cpp              |  5 +--
 indra/newview/llnavigationbar.cpp                  | 13 +++++-
 indra/newview/llpanelgroup.cpp                     |  8 ++--
 indra/newview/llpanelgroup.h                       |  2 +
 indra/newview/llpanelgroupgeneral.cpp              | 26 ++++++------
 indra/newview/llpanelgroupgeneral.h                |  2 +
 indra/newview/llsidetray.cpp                       | 29 ++++++++++++--
 indra/newview/llsidetray.h                         |  6 ++-
 indra/newview/llteleporthistory.cpp                | 26 +++++-------
 indra/newview/llteleporthistory.h                  | 20 +++++++---
 indra/newview/lltexturectrl.cpp                    |  4 ++
 .../skins/default/xui/en/panel_group_general.xml   |  8 ++--
 .../default/xui/en/panel_group_info_sidetray.xml   |  8 ++--
 22 files changed, 177 insertions(+), 95 deletions(-)

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index ee36318107..e379954b4f 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -820,20 +820,29 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	// Tab panel
 	S32 tab_panel_top;
 	S32 tab_panel_bottom;
-	if( getTabPosition() == LLTabContainer::TOP )
+	if (!getTabsHidden()) 
 	{
-		S32 tab_height = mIsVertical ? BTN_HEIGHT : tabcntr_tab_height;
-		tab_panel_top = getRect().getHeight() - getTopBorderHeight() - (tab_height - tabcntr_button_panel_overlap);	
-		tab_panel_bottom = LLPANEL_BORDER_WIDTH;
+		if( getTabPosition() == LLTabContainer::TOP )
+		{
+			S32 tab_height = mIsVertical ? BTN_HEIGHT : tabcntr_tab_height;
+			tab_panel_top = getRect().getHeight() - getTopBorderHeight() - (tab_height - tabcntr_button_panel_overlap);	
+			tab_panel_bottom = LLPANEL_BORDER_WIDTH;
+		}
+		else
+		{
+			tab_panel_top = getRect().getHeight() - getTopBorderHeight();
+			tab_panel_bottom = (tabcntr_tab_height - tabcntr_button_panel_overlap);  // Run to the edge, covering up the border
+		}
 	}
 	else
 	{
-		tab_panel_top = getRect().getHeight() - getTopBorderHeight();
-		tab_panel_bottom = (tabcntr_tab_height - tabcntr_button_panel_overlap);  // Run to the edge, covering up the border
+		//Scip tab button space if they are invisible(EXT - 576)
+		tab_panel_top = getRect().getHeight();
+		tab_panel_bottom = LLPANEL_BORDER_WIDTH;
 	}
-	
+
 	LLRect tab_panel_rect;
-	if (mIsVertical)
+	if (!getTabsHidden() && mIsVertical)
 	{
 		tab_panel_rect = LLRect(mMinTabWidth + (LLPANEL_BORDER_WIDTH * 2) + tabcntrv_pad, 
 								getRect().getHeight() - LLPANEL_BORDER_WIDTH,
@@ -967,16 +976,21 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 	LLTabTuple* tuple = new LLTabTuple( this, child, btn, textbox );
 	insertTuple( tuple, insertion_point );
 
-	if (textbox)
-	{
-		textbox->setSaveToXML(false);
-		addChild( textbox, 0 );
-	}
-	if (btn)
+	//Don't add button and textbox if tab buttons are invisible(EXT - 576)
+	if (!getTabsHidden())
 	{
-		btn->setSaveToXML(false);
-		addChild( btn, 0 );
+		if (textbox)
+		{
+			textbox->setSaveToXML(false);
+			addChild( textbox, 0 );
+		}
+		if (btn)
+		{
+			btn->setSaveToXML(false);
+			addChild( btn, 0 );
+		}
 	}
+
 	if (child)
 	{
 		LLUICtrl::addChild(child, 1);
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4e64b8662c..4e2f836606 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6866,7 +6866,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShowCrosshairs</key>
+    <key>ShowCoordinatesOption</key>
     <map>
       <key>Comment</key>
       <string>Show Coordinates in  Location Input Field</string>
@@ -6877,7 +6877,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShowCoordinatesOption</key>
+    <key>ShowCrosshairs</key>
     <map>
       <key>Comment</key>
       <string>Display crosshairs when in mouselook mode</string>
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 9f71def63e..5ca630f8d1 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -263,13 +263,6 @@ private:
 	// Region
 	//--------------------------------------------------------------------
 public:
-	enum ELocationFormat
-	{
-		LOCATION_FORMAT_NORMAL,
-		LOCATION_FORMAT_LANDMARK,
-		LOCATION_FORMAT_WITHOUT_SIM,
-		LOCATION_FORMAT_FULL,
-	};
 	void			setRegion(LLViewerRegion *regionp);
 	LLViewerRegion	*getRegion() const;
 	LLHost			getRegionHost() const;
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index 93d88bf3df..1a69f1d975 100644
--- a/indra/newview/llagentui.cpp
+++ b/indra/newview/llagentui.cpp
@@ -89,7 +89,7 @@ std::string LLAgentUI::buildSLURL(const bool escaped /*= true*/)
 	return slurl;
 }
 
-BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat fmt,const LLVector3& agent_pos_region)
+BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region)
 {
 	LLViewerRegion* region = gAgent.getRegion();
 	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
@@ -128,14 +128,14 @@ BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat f
 		// the parcel doesn't have a name
 		switch (fmt)
 		{
-		case LLAgent::LOCATION_FORMAT_LANDMARK:
+		case LOCATION_FORMAT_LANDMARK:
 			buffer = llformat("%.100s", region_name.c_str());
 			break;
-		case LLAgent::LOCATION_FORMAT_NORMAL:
+		case LOCATION_FORMAT_NORMAL:
 			buffer = llformat("%s", region_name.c_str());
 			break;
-		case LLAgent::LOCATION_FORMAT_WITHOUT_SIM:
-		case LLAgent::LOCATION_FORMAT_FULL:
+		case LOCATION_FORMAT_WITHOUT_SIM:
+		case LOCATION_FORMAT_FULL:
 			buffer = llformat("%s (%d, %d, %d)",
 				region_name.c_str(),
 				pos_x, pos_y, pos_z);
@@ -147,19 +147,19 @@ BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat f
 		// the parcel has a name, so include it in the landmark name
 		switch (fmt)
 		{
-		case LLAgent::LOCATION_FORMAT_LANDMARK:
+		case LOCATION_FORMAT_LANDMARK:
 			buffer = llformat("%.100s", parcel_name.c_str());
 			break;
-		case LLAgent::LOCATION_FORMAT_NORMAL:
+		case LOCATION_FORMAT_NORMAL:
 			buffer = llformat("%s, %s", region_name.c_str(), parcel_name.c_str());
 			break;
-		case LLAgent::LOCATION_FORMAT_WITHOUT_SIM:
+		case LOCATION_FORMAT_WITHOUT_SIM:
 			buffer = llformat("%s, %s (%d, %d, %d)",
 				region_name.c_str(),
 				parcel_name.c_str(),
 				pos_x, pos_y, pos_z);
 			break;
-		case LLAgent::LOCATION_FORMAT_FULL:
+		case LOCATION_FORMAT_FULL:
 			std::string sim_access_string = region->getSimAccessString();
 			buffer = llformat("%s, %s (%d, %d, %d)%s%s",
 				region_name.c_str(),
@@ -173,7 +173,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat f
 	str = buffer;
 	return TRUE;
 }
-BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat fmt)
+BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt)
 {
 	return buildLocationString(str,fmt, gAgent.getPositionAgent());
 }
diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h
index c3bc58d791..47ecb04547 100644
--- a/indra/newview/llagentui.h
+++ b/indra/newview/llagentui.h
@@ -33,19 +33,25 @@
 #ifndef LLAGENTUI_H
 #define LLAGENTUI_H
 
-#include "llagent.h"
-
 class LLAgentUI
 {
 public:
+	enum ELocationFormat
+	{
+		LOCATION_FORMAT_NORMAL,
+		LOCATION_FORMAT_LANDMARK,
+		LOCATION_FORMAT_WITHOUT_SIM,
+		LOCATION_FORMAT_FULL,
+	};
+
 	static void buildName(std::string& name);
 	static void buildFullname(std::string &name);
 
 	static std::string buildSLURL(const bool escaped = true);
 	//build location string using the current position of gAgent.
-	static BOOL buildLocationString(std::string& str, LLAgent::ELocationFormat fmt = LLAgent::LOCATION_FORMAT_LANDMARK);
+	static BOOL buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK);
 	//build location string using a region position of the avatar. 
-	static BOOL buildLocationString(std::string& str, LLAgent::ELocationFormat fmt,const LLVector3& agent_pos_region);
+	static BOOL buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region);
 };
 
 #endif //LLAGENTUI_H
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index dd73ebbd8f..b5c36b1083 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -968,7 +968,7 @@ void LLSnapshotLivePreview::saveTexture()
 	{
 		LLVFile::writeFile(formatted->getData(), formatted->getDataSize(), gVFS, new_asset_id, LLAssetType::AT_TEXTURE);
 		std::string pos_string;
-		LLAgentUI::buildLocationString(pos_string, LLAgent::LOCATION_FORMAT_FULL);
+		LLAgentUI::buildLocationString(pos_string, LLAgentUI::LOCATION_FORMAT_FULL);
 		std::string who_took_it;
 		LLAgentUI::buildFullname(who_took_it);
 		LLAssetStorage::LLStoreAssetCallback callback = NULL;
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 404751a44a..5272bc2165 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -162,6 +162,14 @@ bool LLIMModel::newSession(LLUUID session_id, std::string name, EInstantMessage
 
 }
 
+bool LLIMModel::clearSession(LLUUID session_id)
+{
+	if (sSessionsMap.find(session_id) == sSessionsMap.end()) return false;
+	delete (sSessionsMap[session_id]);
+	sSessionsMap.erase(session_id);
+	return true;
+}
+
 std::list<LLSD> LLIMModel::getMessages(LLUUID session_id, int start_index)
 {
 	std::list<LLSD> return_list;
@@ -1438,7 +1446,8 @@ LLUUID LLIMMgr::addSession(
 }
 
 // This removes the panel referenced by the uuid, and then restores
-// internal consistency. The internal pointer is not deleted.
+// internal consistency. The internal pointer is not deleted? Did you mean
+// a pointer to the corresponding LLIMSession? Session data is cleared now.
 void LLIMMgr::removeSession(const LLUUID& session_id)
 {
 	LLFloaterIMPanel* floater = findFloaterBySession(session_id);
@@ -1452,6 +1461,12 @@ void LLIMMgr::removeSession(const LLUUID& session_id)
 		clearPendingAgentListUpdates(session_id);
 	}
 	notifyObserverSessionRemoved(session_id);
+
+	//if we don't clear session data on removing the session
+	//we can't use LLBottomTray as observer of session creation/delettion and 
+	//creating chiclets only on session created even, we need to handle chiclets creation
+	//the same way as LLFloaterIMPanels were managed.
+	LLIMModel::getInstance()->clearSession(session_id);
 }
 
 void LLIMMgr::inviteToSession(
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 777d68978e..ce6f0394dd 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -70,6 +70,7 @@ public:
 	boost::signals2::connection addChangedCallback( boost::function<void (const LLSD& data)> cb );
 
 	bool newSession(LLUUID session_id, std::string name, EInstantMessage type, LLUUID other_participant_id);
+	bool clearSession(LLUUID session_id);
 	std::list<LLSD> getMessages(LLUUID session_id, int start_index = 0);
 	bool addMessage(LLUUID session_id, std::string from, LLUUID other_participant_id, std::string utf8_text);
 	bool addToHistory(LLUUID session_id, std::string from, std::string utf8_text); 
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp
index 2c56a70ced..df9aa32d1b 100644
--- a/indra/newview/lllandmarkactions.cpp
+++ b/indra/newview/lllandmarkactions.cpp
@@ -218,8 +218,8 @@ void LLLandmarkActions::createLandmarkHere()
 {
 	std::string landmark_name, landmark_desc;
 
-	LLAgentUI::buildLocationString(landmark_name, LLAgent::LOCATION_FORMAT_LANDMARK);
-	LLAgentUI::buildLocationString(landmark_desc, LLAgent::LOCATION_FORMAT_FULL);
+	LLAgentUI::buildLocationString(landmark_name, LLAgentUI::LOCATION_FORMAT_LANDMARK);
+	LLAgentUI::buildLocationString(landmark_desc, LLAgentUI::LOCATION_FORMAT_FULL);
 	LLUUID folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
 
 	createLandmarkHere(landmark_name, landmark_desc, folder_id);
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 1542c7483a..a8ec826e88 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -44,7 +44,6 @@
 #include "lluictrlfactory.h"
 
 // newview includes
-#include "llagent.h"
 #include "llinventorymodel.h"
 #include "lllandmarkactions.h"
 #include "lllandmarklist.h"
@@ -494,8 +493,8 @@ void LLLocationInputCtrl::refreshLocation()
 
 	// Update location field.
 	std::string location_name;
-	LLAgent::ELocationFormat format =  (gSavedSettings.getBOOL("ShowCoordinatesOption") ? 
-			LLAgent::LOCATION_FORMAT_WITHOUT_SIM: LLAgent::LOCATION_FORMAT_NORMAL);
+	LLAgentUI::ELocationFormat format =  (gSavedSettings.getBOOL("ShowCoordinatesOption") ? 
+			LLAgentUI::LOCATION_FORMAT_WITHOUT_SIM: LLAgentUI::LOCATION_FORMAT_NORMAL);
 
 	if (!LLAgentUI::buildLocationString(location_name, format)) location_name = "Unknown";
 	setText(location_name);
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 46bbb382a5..e40568a0cb 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -349,7 +349,7 @@ void LLNavigationBar::onTeleportFinished(const LLVector3d& global_agent_pos)
 	 * At this moment gAgent.getPositionAgent() contains previous coordinates.
 	 * according to EXT-65 agent position is being reseted on each frame.  
 	 */
-	LLAgentUI::buildLocationString(location, LLAgent::LOCATION_FORMAT_WITHOUT_SIM,
+	LLAgentUI::buildLocationString(location, LLAgentUI::LOCATION_FORMAT_WITHOUT_SIM,
 			gAgent.getPosAgentFromGlobal(global_agent_pos));
 	
 	//Touch it, if it is at list already, add new location otherwise
@@ -411,7 +411,7 @@ void LLNavigationBar::rebuildTeleportHistoryMenu()
 		else
 			type = LLTeleportHistoryMenuItem::TYPE_CURRENT;
 
-		LLTeleportHistoryMenuItem::Params item_params(type, hist_items[i].mTitle);
+		LLTeleportHistoryMenuItem::Params item_params(type, hist_items[i].getTitle());
 		item_params.on_click.function(boost::bind(&LLNavigationBar::onTeleportHistoryMenuItemClicked, this, i));
 		mTeleportHistoryMenu->addChild(LLUICtrlFactory::create<LLTeleportHistoryMenuItem>(item_params));
 	}
@@ -575,6 +575,11 @@ void LLNavigationBar::showNavigationPanel(BOOL visible)
 			setRect(nbRect);
 		}
 	}
+
+	if(LLSideTray::instanceCreated())
+	{
+		LLSideTray::getInstance()->resetPanelRect();
+	}
 }
 
 void LLNavigationBar::showFavoritesPanel(BOOL visible)
@@ -636,4 +641,8 @@ void LLNavigationBar::showFavoritesPanel(BOOL visible)
 	}
 
 	fb->setVisible(visible);
+	if(LLSideTray::instanceCreated())
+	{
+		LLSideTray::getInstance()->resetPanelRect();
+	}
 }
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 2e87f0b65b..4cbb018ce9 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -180,6 +180,8 @@ BOOL LLPanelGroup::postBuild()
 	if(panel_roles)		mTabs.push_back(panel_roles);
 	if(panel_notices)	mTabs.push_back(panel_notices);
 	if(panel_land)		mTabs.push_back(panel_land);
+
+	panel_general->setupCtrls(this);
 	
 	return TRUE;
 }
@@ -194,7 +196,7 @@ void LLPanelGroup::reshape(S32 width, S32 height, BOOL called_from_parent )
 	if(button)
 	{
 		btn_rect = button->getRect();
-		btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
+		btn_rect.setLeftTopAndSize( btn_rect.mLeft, btn_rect.getHeight() + 2, btn_rect.getWidth(), btn_rect.getHeight());
 		button->setRect(btn_rect);
 	}
 
@@ -202,7 +204,7 @@ void LLPanelGroup::reshape(S32 width, S32 height, BOOL called_from_parent )
 	if(button)
 	{
 		btn_rect = button->getRect();
-		btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
+		btn_rect.setLeftTopAndSize( btn_rect.mLeft, btn_rect.getHeight() + 2, btn_rect.getWidth(), btn_rect.getHeight());
 		button->setRect(btn_rect);
 	}
 
@@ -211,7 +213,7 @@ void LLPanelGroup::reshape(S32 width, S32 height, BOOL called_from_parent )
 	if(button)
 	{
 		btn_rect = button->getRect();
-		btn_rect.setLeftTopAndSize( btn_rect.mLeft, 28, btn_rect.getWidth(), btn_rect.getHeight());
+		btn_rect.setLeftTopAndSize( btn_rect.mLeft, btn_rect.getHeight() + 2, btn_rect.getWidth(), btn_rect.getHeight());
 		button->setRect(btn_rect);
 	}
 }
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index e5e1d1b6ad..6db6738d18 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -160,6 +160,8 @@ public:
 
 	const LLUUID& getGroupID() const { return mGroupID;}
 
+	virtual void setupCtrls	(LLPanel* parent) {};
+
 protected:
 	LLUUID	mGroupID;
 	std::string	mHelpText;
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 2d06dcdb36..73ea990b3f 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -99,13 +99,6 @@ BOOL LLPanelGroupGeneral::postBuild()
 	// General info
 	mGroupNameEditor = getChild<LLLineEditor>("group_name_editor", recurse);
 	
-	mInsignia = getChild<LLTextureCtrl>("insignia", recurse);
-	if (mInsignia)
-	{
-		mInsignia->setCommitCallback(onCommitAny, this);
-		mDefaultIconID = mInsignia->getImageAssetID();
-	}
-	
 	mEditCharter = getChild<LLTextEditor>("charter", recurse);
 	if(mEditCharter)
 	{
@@ -115,7 +108,6 @@ BOOL LLPanelGroupGeneral::postBuild()
 	}
 
 
-	mFounderName = getChild<LLNameBox>("founder_name");
 
 	mListVisibleMembers = getChild<LLNameListCtrl>("visible_members", recurse);
 	if (mListVisibleMembers)
@@ -215,6 +207,17 @@ BOOL LLPanelGroupGeneral::postBuild()
 	return LLPanelGroupTab::postBuild();
 }
 
+void LLPanelGroupGeneral::setupCtrls(LLPanel* panel_group)
+{
+	mInsignia = panel_group->getChild<LLTextureCtrl>("insignia");
+	if (mInsignia)
+	{
+		mInsignia->setCommitCallback(onCommitAny, this);
+		mDefaultIconID = mInsignia->getImageAssetID();
+	}
+	mFounderName = panel_group->getChild<LLNameBox>("founder_name");
+}
+
 // static
 void LLPanelGroupGeneral::onFocusEdit(LLFocusableElement* ctrl, void* data)
 {
@@ -848,7 +851,6 @@ void LLPanelGroupGeneral::reset()
 {
 	mFounderName->setVisible(false);
 
-	getChild<LLUICtrl>("prepend_founded_by")->setVisible(false);
 	
 	mCtrlReceiveNotices->set(false);
 	
@@ -876,7 +878,8 @@ void LLPanelGroupGeneral::reset()
 	mGroupNameEditor->setVisible(true);
 
 	mComboActiveTitle->setVisible(false);
-	mInsignia->setImageAssetID(mDefaultIconID);
+
+	mInsignia->setImageAssetID(LLUUID::null);
 
 	{
 		std::string empty_str = "";
@@ -968,7 +971,8 @@ void LLPanelGroupGeneral::setGroupID(const LLUUID& id)
 	mComboActiveTitle = getChild<LLComboBox>("active_title");
 
 	mFounderName->setVisible(true);
-	getChild<LLUICtrl>("prepend_founded_by")->setVisible(true);
+
+	mInsignia->setImageAssetID(LLUUID::null);
 
 	resetDirty();
 
diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h
index 21d526f43d..b828480a12 100644
--- a/indra/newview/llpanelgroupgeneral.h
+++ b/indra/newview/llpanelgroupgeneral.h
@@ -67,6 +67,8 @@ public:
 
 	virtual void setGroupID(const LLUUID& id);
 
+	virtual void setupCtrls	(LLPanel* parent);
+
 private:
 	void	reset();
 
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 5e5608460c..3ac9076e85 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -40,6 +40,7 @@
 #include "llaccordionctrl.h"
 #include "llfocusmgr.h"
 #include "llrootview.h"
+#include "llnavigationbar.h"
 
 #include "llaccordionctrltab.h"
 
@@ -642,10 +643,30 @@ LLPanel*	LLSideTray::showPanel		(const std::string& panel_name, const LLSD& para
 }
 
 static const S32	fake_offset = 132;
-static const S32	fake_top_offset = 78;
+static const S32	fake_top_offset = 18;
+
+void LLSideTray::resetPanelRect	()
+{
+	LLNavigationBar* nav_bar = LLNavigationBar::getInstance();
+	LLRect nav_rect = nav_bar->getRect();
+	const LLRect& parent_rect = gViewerWindow->getRootView()->getRect();
+
+	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>());	
+
+	S32 panel_width = sidetray_params.default_button_width+sidetray_params.default_button_margin;
+	if(!mCollapsed)
+		panel_width+=mMaxBarWidth;
+
+	S32 panel_height = parent_rect.getHeight()-fake_top_offset;
+
+	reshape(panel_width,panel_height);
+}
 
 void	LLSideTray::setPanelRect	()
 {
+	LLNavigationBar* nav_bar = LLNavigationBar::getInstance();
+	LLRect nav_rect = nav_bar->getRect();
+	
 	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>());	
 
 	const LLRect& parent_rect = gViewerWindow->getRootView()->getRect();
@@ -654,9 +675,11 @@ void	LLSideTray::setPanelRect	()
 	if(!mCollapsed)
 		panel_width+=mMaxBarWidth;
 
-	S32 panel_height = parent_rect.getHeight() - fake_top_offset - LLBottomTray::getInstance()->getRect().getHeight();
+	S32 panel_height = parent_rect.getHeight()-fake_top_offset - nav_rect.getHeight();
+	S32 panel_top = parent_rect.mTop-fake_top_offset - nav_rect.getHeight();
+
 	LLRect panel_rect;
-	panel_rect.setLeftTopAndSize( parent_rect.mRight-panel_width, parent_rect.mTop-fake_top_offset, panel_width, panel_height);
+	panel_rect.setLeftTopAndSize( parent_rect.mRight-panel_width, panel_top, panel_width, panel_height);
 	setRect(panel_rect);
 }
 
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h
index b691a42db1..13acbbb659 100644
--- a/indra/newview/llsidetray.h
+++ b/indra/newview/llsidetray.h
@@ -207,6 +207,9 @@ public:
 	void		reshape			(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	S32			getTrayWidth();
 
+	void		resetPanelRect	();
+	
+
 protected:
 	LLSideTrayTab* getTab		(const std::string& name);
 
@@ -217,9 +220,10 @@ protected:
 
 	void		toggleTabButton	(LLSideTrayTab* tab);
 
-
 	void		setPanelRect	();
 
+	
+
 private:
 	// Implementation of LLDestroyClass<LLSideTray>
 	static void destroyClass()
diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp
index 5235dc9358..bc886d5743 100644
--- a/indra/newview/llteleporthistory.cpp
+++ b/indra/newview/llteleporthistory.cpp
@@ -40,6 +40,7 @@
 #include "llagent.h"
 #include "llslurl.h"
 #include "llurlsimstring.h"
+#include "llviewercontrol.h"        // for gSavedSettings
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "llworldmap.h"
@@ -49,20 +50,9 @@
 // LLTeleportHistoryItem
 //////////////////////////////////////////////////////////////////////////////
 
-LLTeleportHistoryItem::LLTeleportHistoryItem(const LLSD& val)
+const std::string& LLTeleportHistoryItem::getTitle() const
 {
-	mTitle = val["title"].asString();
-	mGlobalPos.setValue(val["global_pos"]);
-}
-
-LLSD LLTeleportHistoryItem::toLLSD() const
-{
-	LLSD val;
-
-	val["title"]		= mTitle;
-	val["global_pos"]	= mGlobalPos.getValue();
-	
-	return val;
+	return gSavedSettings.getBOOL("ShowCoordinatesOption") ? mFullTitle : mTitle;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -149,7 +139,9 @@ void LLTeleportHistory::updateCurrentLocation(const LLVector3d& new_pos)
 			llwarns << "Invalid current item. (this should not happen)" << llendl;
 			return;
 		}
-		mItems[mCurrentItem].mTitle = getCurrentLocationTitle();
+		LLVector3 new_pos_local = gAgent.getPosAgentFromGlobal(new_pos);
+		mItems[mCurrentItem].mFullTitle = getCurrentLocationTitle(true, new_pos_local);
+		mItems[mCurrentItem].mTitle = getCurrentLocationTitle(false, new_pos_local);
 		mItems[mCurrentItem].mGlobalPos	= new_pos;
 		mItems[mCurrentItem].mRegionID = gAgent.getRegion()->getRegionID();
 	}
@@ -182,10 +174,12 @@ void LLTeleportHistory::purgeItems()
 }
 
 // static
-std::string LLTeleportHistory::getCurrentLocationTitle()
+std::string LLTeleportHistory::getCurrentLocationTitle(bool full, const LLVector3& local_pos_override)
 {
 	std::string location_name;
-	if (!LLAgentUI::buildLocationString(location_name, LLAgent::LOCATION_FORMAT_NORMAL)) location_name = "Unknown";
+	LLAgentUI::ELocationFormat fmt = full ? LLAgentUI::LOCATION_FORMAT_WITHOUT_SIM : LLAgentUI::LOCATION_FORMAT_NORMAL;
+
+	if (!LLAgentUI::buildLocationString(location_name, fmt, local_pos_override)) location_name = "Unknown";
 	return location_name;
 }
 
diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h
index 060534635d..9f5563ed0b 100644
--- a/indra/newview/llteleporthistory.h
+++ b/indra/newview/llteleporthistory.h
@@ -55,11 +55,14 @@ public:
 	LLTeleportHistoryItem(std::string title, LLVector3d global_pos)
 		: mTitle(title), mGlobalPos(global_pos)
 	{}
-	
-	LLTeleportHistoryItem(const LLSD& val);
-	LLSD toLLSD() const;
 
+	/**
+	 * @return title formatted according to the current value of the ShowCoordinatesOption setting.
+	 */
+	const std::string& getTitle() const;
+	
 	std::string	mTitle;		// human-readable location title
+	std::string mFullTitle; // human-readable location title including coordinates
 	LLVector3d	mGlobalPos; // global position
 	LLUUID		mRegionID;	// region ID for getting the region info 
 };
@@ -168,8 +171,15 @@ private:
 	 * Invokes the "history changed" callback(s).
 	 */
 	void					onHistoryChanged();
-	
-	static std::string		getCurrentLocationTitle();
+
+	/**
+	 * Format current agent location in a human-readable manner.
+	 * 
+	 * @param full whether to include coordinates
+	 * @param local_pos_override hack: see description of updateCurrentLocation()
+	 * @return
+	 */
+	static std::string		getCurrentLocationTitle(bool full, const LLVector3& local_pos_override);
 	
 	/**
 	 * Actually, the teleport history.
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 3c7a8d757b..1b47fa43c7 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1197,6 +1197,10 @@ void LLTextureCtrl::draw()
 		mTexturep = LLViewerTextureManager::getFetchedTextureFromFile(mFallbackImageName);
 		mTexturep->setBoostLevel(LLViewerTexture::BOOST_PREVIEW);
 	}
+	else//mImageAssetID == LLUUID::null
+	{
+		mTexturep = NULL;
+	}
 	
 	// Border
 	LLRect border( 0, getRect().getHeight(), getRect().getWidth(), BTN_HEIGHT_SMALL );
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 2243df951e..03e2d35b9f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="470"
+ height="445"
  label="General"
  class="panel_group_general"
  layout="topleft"
@@ -43,14 +43,14 @@ Hover your mouse over the options for more help.
     <text_editor
      type="string"
      follows="left|top"
-     left="95"
+     left="5"
      height="75"
      hide_scrollbar="true"
      layout="topleft"
      max_length="511"
      name="charter"
-     top="30"
-     width="170"
+     top="5"
+     width="260"
      word_wrap="true">
         Group Charter
     </text_editor>
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 65d1e3c3a7..2de41a9ee6 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -44,10 +44,10 @@
      height="113"
      label=""
      layout="topleft"
-     left_delta="-10"
+	 left="10"
      name="insignia"
      tool_tip="Click to choose a picture"
-     top_pad="5"
+     top_pad="15"
      width="100" />
     <text
      type="string"
@@ -99,8 +99,8 @@
      left="5"
      visible="false"
      width="65" />
-      <accordion layout="topleft" left="2" width="296" top="135" height="600" follows="all" name="group_accordion">
-		<accordion_tab min_height="515" title="Group General" name="group_general_tab">
+      <accordion layout="topleft" left="2" width="296" top="135" height="500" follows="all" name="group_accordion">
+		<accordion_tab min_height="445" title="Group General" name="group_general_tab">
         	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>
 		</accordion_tab>
 		<accordion_tab min_height="380" title="Group Roles" name="group_roles_tab" expanded="False" can_resize="false">
-- 
cgit v1.3