Merge

22 files changed, 242 insertions, 47 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index c8e26ecaea..6dcc1957a9 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -189,6 +189,7 @@ LLFloater::Params::Params()
 	can_close("can_close", true),
 	can_drag_on_left("can_drag_on_left", false),
 	can_tear_off("can_tear_off", true),
+	save_dock_state("save_dock_state", false),
 	save_rect("save_rect", false),
 	save_visibility("save_visibility", false),
 	can_dock("can_dock", false),
@@ -508,6 +509,7 @@ LLFloater::~LLFloater()
 	storeRectControl();
 	setVisible(false); // We're not visible if we're destroyed
 	storeVisibilityControl();
+	storeDockStateControl();
 }
 
 void LLFloater::storeRectControl()
@@ -526,6 +528,15 @@ void LLFloater::storeVisibilityControl()
 	}
 }
 
+void LLFloater::storeDockStateControl()
+{
+	if( !sQuitting && mDocStateControl.size() > 1 )
+	{
+		LLUI::sSettingGroups["floater"]->setBOOL( mDocStateControl, isDocked() );
+	}
+}
+
+
 void LLFloater::setVisible( BOOL visible )
 {
 	LLPanel::setVisible(visible); // calls handleVisibilityChange()
@@ -784,6 +795,16 @@ void LLFloater::applyRectControl()
 	}
 }
 
+void LLFloater::applyDockState()
+{
+	if (mDocStateControl.size() > 1)
+	{
+		bool dockState = LLUI::sSettingGroups["floater"]->getBOOL(mDocStateControl);
+		setDocked(dockState);
+	}
+
+}
+
 void LLFloater::applyTitle()
 {
 	if (!mDragHandle)
@@ -1403,7 +1424,10 @@ void LLFloater::setDocked(bool docked, bool pop_on_undock)
 		mButtonsEnabled[BUTTON_DOCK] = !mDocked;
 		mButtonsEnabled[BUTTON_UNDOCK] = mDocked;
 		updateButtons();
+
+		storeDockStateControl();
 	}
+	
 }
 
 // static
@@ -2520,6 +2544,11 @@ void LLFloater::setInstanceName(const std::string& name)
 		{
 			mVisibilityControl = LLFloaterReg::declareVisibilityControl(mInstanceName);
 		}
+		if(!mDocStateControl.empty())
+		{
+			mDocStateControl = LLFloaterReg::declareDockStateControl(mInstanceName);
+		}
+
 	}
 }
 
@@ -2592,6 +2621,11 @@ void LLFloater::initFromParams(const LLFloater::Params& p)
 	{
 		mVisibilityControl = "t"; // flag to build mVisibilityControl name once mInstanceName is set
 	}
+
+	if(p.save_dock_state)
+	{
+		mDocStateControl = "t"; // flag to build mDocStateControl name once mInstanceName is set
+	}
 	
 	// open callback 
 	if (p.open_callback.isProvided())
@@ -2670,6 +2704,8 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o
 
 	moveResizeHandlesToFront();
 
+	applyDockState();
+
 	return true; // *TODO: Error checking
 }
 
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index afdc4ccf00..ef0d06a58e 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -124,6 +124,7 @@ public:
 								can_tear_off,
 								save_rect,
 								save_visibility,
+								save_dock_state,
 								can_dock;
 		Optional<S32>			header_height,
 								legacy_header_height; // HACK see initFromXML()
@@ -280,8 +281,10 @@ protected:
 
 	void			setRectControl(const std::string& rectname) { mRectControl = rectname; };
 	void			applyRectControl();
+	void			applyDockState();
 	void			storeRectControl();
 	void			storeVisibilityControl();
+	void			storeDockStateControl();
 
 	void		 	setKey(const LLSD& key);
 	void		 	setInstanceName(const std::string& name);
@@ -322,6 +325,7 @@ public:
 protected:
 	std::string		mRectControl;
 	std::string		mVisibilityControl;
+	std::string		mDocStateControl;
 	LLSD			mKey;				// Key used for retrieving instances; set (for now) by LLFLoaterReg
 
 	LLDragHandle*	mDragHandle;
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp
index 3c5a8a6921..d60a879410 100644
--- a/indra/llui/llfloaterreg.cpp
+++ b/indra/llui/llfloaterreg.cpp
@@ -364,6 +364,26 @@ std::string LLFloaterReg::declareVisibilityControl(const std::string& name)
 }
 
 //static
+std::string LLFloaterReg::declareDockStateControl(const std::string& name)
+{
+	std::string controlname = getDockStateControlName(name);
+	LLUI::sSettingGroups["floater"]->declareBOOL(controlname, FALSE,
+												 llformat("Window Docking state for %s", name.c_str()),
+												 TRUE);
+	return controlname;
+
+}
+
+//static
+std::string LLFloaterReg::getDockStateControlName(const std::string& name)
+{
+	std::string res = std::string("floater_dock_") + name;
+	LLStringUtil::replaceChar( res, ' ', '_' );
+	return res;
+}
+
+
+//static
 void LLFloaterReg::registerControlVariables()
 {
 	// Iterate through alll registered instance names and register rect and visibility control variables
diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h
index 451bd1dbe3..634a235926 100644
--- a/indra/llui/llfloaterreg.h
+++ b/indra/llui/llfloaterreg.h
@@ -121,6 +121,10 @@ public:
 	static std::string declareRectControl(const std::string& name);
 	static std::string getVisibilityControlName(const std::string& name);
 	static std::string declareVisibilityControl(const std::string& name);
+
+	static std::string declareDockStateControl(const std::string& name);
+	static std::string getDockStateControlName(const std::string& name);
+
 	static void registerControlVariables();
 
 	// Callback wrappers
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f9d4a06de8..c0eefaa642 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3631,6 +3631,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>IMShowControlPanel</key>
+    <map>
+      <key>Comment</key>
+      <string>Show IM Control Panel</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>IgnoreAllNotifications</key>
     <map>
       <key>Comment</key>
@@ -4875,7 +4886,7 @@
       <key>Value</key>
       <integer>10</integer>
     </map>
-    <key>ToastOpaqueTime</key>
+    <key>ToastFadingTime</key>
     <map>
       <key>Comment</key>
       <string>Number of seconds while a toast is fading </string>
@@ -4887,6 +4898,29 @@
       <integer>1</integer>
     </map>
     <key>StartUpToastLifeTime</key>
+    <key>NearbyToastFadingTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Number of seconds while a nearby chat toast is fading </string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>3</integer>
+    </map>
+    <key>NearbyToastLifeTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Number of seconds while a nearby chat toast exists</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>23</integer>
+    </map>
+    <key>StartUpToastLifeTime</key>
     <map>
       <key>Comment</key>
       <string>Number of seconds while a StartUp toast exist</string>
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 670f8717a2..bad61101c1 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -57,8 +57,6 @@ static LLDefaultChildRegistry::Register<LLIMP2PChiclet> t4("chiclet_im_p2p");
 static LLDefaultChildRegistry::Register<LLIMGroupChiclet> t5("chiclet_im_group");
 
 S32 LLNotificationChiclet::mUreadSystemNotifications = 0;
-S32 LLNotificationChiclet::mUreadIMNotifications = 0;
-
 
 boost::signals2::signal<LLChiclet* (const LLUUID&),
 		LLIMChiclet::CollectChicletCombiner<std::list<LLChiclet*> > >
@@ -99,7 +97,6 @@ LLNotificationChiclet::LLNotificationChiclet(const Params& p)
 	// connect counter handlers to the signals
 	connectCounterUpdatersToSignal("notify");
 	connectCounterUpdatersToSignal("groupnotify");
-	connectCounterUpdatersToSignal("notifytoast");
 }
 
 LLNotificationChiclet::~LLNotificationChiclet()
@@ -113,16 +110,8 @@ void LLNotificationChiclet::connectCounterUpdatersToSignal(std::string notificat
 	LLNotificationsUI::LLEventHandler* n_handler = manager->getHandlerForNotification(notification_type);
 	if(n_handler)
 	{
-		if(notification_type == "notifytoast")
-		{
-			n_handler->setNewNotificationCallback(boost::bind(&LLNotificationChiclet::updateUreadIMNotifications, this));
-			n_handler->setDelNotification(boost::bind(&LLNotificationChiclet::updateUreadIMNotifications, this));
-		}
-		else
-		{
-			n_handler->setNewNotificationCallback(boost::bind(&LLNotificationChiclet::incUreadSystemNotifications, this));
-			n_handler->setDelNotification(boost::bind(&LLNotificationChiclet::decUreadSystemNotifications, this));
-		}
+		n_handler->setNewNotificationCallback(boost::bind(&LLNotificationChiclet::incUreadSystemNotifications, this));
+		n_handler->setDelNotification(boost::bind(&LLNotificationChiclet::decUreadSystemNotifications, this));
 	}
 }
 
@@ -147,12 +136,6 @@ void LLNotificationChiclet::setToggleState(BOOL toggled) {
 	mButton->setToggleState(toggled);
 }
 
-void LLNotificationChiclet::updateUreadIMNotifications()
-{
-	mUreadIMNotifications = gIMMgr->getNumberOfUnreadIM();
-	setCounter(mUreadSystemNotifications + mUreadIMNotifications);
-}
-
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index d1153a075d..6eefd9829f 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -608,10 +608,9 @@ public:
 
 	/*virtual*/ ~ LLNotificationChiclet();
 
-	// methods for updating a number of unread System or IM notifications
-	void incUreadSystemNotifications() { setCounter(++mUreadSystemNotifications + mUreadIMNotifications); }
-	void decUreadSystemNotifications() { setCounter(--mUreadSystemNotifications + mUreadIMNotifications); }
-	void updateUreadIMNotifications();
+	// methods for updating a number of unread System notifications
+	void incUreadSystemNotifications() { setCounter(++mUreadSystemNotifications); }
+	void decUreadSystemNotifications() { setCounter(--mUreadSystemNotifications); }
 	void setToggleState(BOOL toggled);
 
 protected:
@@ -622,7 +621,6 @@ protected:
 	friend class LLUICtrlFactory;
 
 	static S32 mUreadSystemNotifications;
-	static S32 mUreadIMNotifications;
 
 protected:
 	LLButton* mButton;
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index ccfe7d4b64..8ac7f3fd7e 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -35,6 +35,7 @@
 
 // Viewer includes
 #include "llagent.h"
+#include "llcallingcard.h"
 #include "llfocusmgr.h"
 #include "llfloaterreg.h"
 #include "llviewercontrol.h"
@@ -76,6 +77,7 @@ LLFloaterAvatarPicker::LLFloaterAvatarPicker(const LLSD& key)
 	mCloseOnSelect(FALSE)
 {
 // 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_picker.xml");
+	mCommitCallbackRegistrar.add("Refresh.FriendList", boost::bind(&LLFloaterAvatarPicker::populateFriend, this));
 }
 
 BOOL LLFloaterAvatarPicker::postBuild()
@@ -95,7 +97,11 @@ BOOL LLFloaterAvatarPicker::postBuild()
 	LLScrollListCtrl* nearme = getChild<LLScrollListCtrl>("NearMe");
 	nearme->setDoubleClickCallback(onBtnSelect, this);
 	childSetCommitCallback("NearMe", onList, this);
-	
+
+	LLScrollListCtrl* friends = getChild<LLScrollListCtrl>("Friends");
+	friends->setDoubleClickCallback(onBtnSelect, this);
+	childSetCommitCallback("Friends", onList, this);
+
 	childSetAction("Select", onBtnSelect, this);
 	childDisable("Select");
 
@@ -119,6 +125,8 @@ BOOL LLFloaterAvatarPicker::postBuild()
 	
 	center();
 	
+	populateFriend();
+
 	return TRUE;
 }
 
@@ -159,25 +167,37 @@ void LLFloaterAvatarPicker::onBtnSelect(void* userdata)
 
 	if(self->mCallback)
 	{
+		std::string acvtive_panel_name;
+		LLScrollListCtrl* list =  NULL;
 		LLPanel* active_panel = self->childGetVisibleTab("ResidentChooserTabs");
-
-		if(active_panel == self->getChild<LLPanel>("SearchPanel"))
+		if(active_panel)
 		{
-			std::vector<std::string>	avatar_names;
-			std::vector<LLUUID>			avatar_ids;
-			getSelectedAvatarData(self->getChild<LLScrollListCtrl>("SearchResults"), avatar_names, avatar_ids);
-			self->mCallback(avatar_names, avatar_ids, self->mCallbackUserdata);
+			acvtive_panel_name = active_panel->getName();
+		}
+		if(acvtive_panel_name == "SearchPanel")
+		{
+			list = self->getChild<LLScrollListCtrl>("SearchResults");
+		}
+		else if(acvtive_panel_name == "NearMePanel")
+		{
+			list =self->getChild<LLScrollListCtrl>("NearMe");
+		}
+		else if (acvtive_panel_name == "FriendsPanel")
+		{
+			list =self->getChild<LLScrollListCtrl>("Friends");
 		}
-		else if(active_panel == self->getChild<LLPanel>("NearMePanel"))
+
+		if(list)
 		{
 			std::vector<std::string>	avatar_names;
 			std::vector<LLUUID>			avatar_ids;
-			getSelectedAvatarData(self->getChild<LLScrollListCtrl>("NearMe"), avatar_names, avatar_ids);
+			getSelectedAvatarData(list, avatar_names, avatar_ids);
 			self->mCallback(avatar_names, avatar_ids, self->mCallbackUserdata);
 		}
 	}
 	self->getChild<LLScrollListCtrl>("SearchResults")->deselectAllItems(TRUE);
 	self->getChild<LLScrollListCtrl>("NearMe")->deselectAllItems(TRUE);
+	self->getChild<LLScrollListCtrl>("Friends")->deselectAllItems(TRUE);
 	if(self->mCloseOnSelect)
 	{
 		self->mCloseOnSelect = FALSE;
@@ -268,6 +288,26 @@ void LLFloaterAvatarPicker::populateNearMe()
 	}
 }
 
+void LLFloaterAvatarPicker::populateFriend()
+{
+	LLScrollListCtrl* friends_scroller = getChild<LLScrollListCtrl>("Friends");
+	friends_scroller->deleteAllItems();
+	LLCollectAllBuddies collector;
+	LLAvatarTracker::instance().applyFunctor(collector);
+	LLCollectAllBuddies::buddy_map_t::iterator it;
+	
+	
+	for(it = collector.mOnline.begin(); it!=collector.mOnline.end(); it++)
+	{
+		friends_scroller->addStringUUIDItem(it->first, it->second);
+	}
+	for(it = collector.mOffline.begin(); it!=collector.mOffline.end(); it++)
+	{
+			friends_scroller->addStringUUIDItem(it->first, it->second);
+	}
+	friends_scroller->sortByColumnIndex(0, TRUE);
+}
+
 void LLFloaterAvatarPicker::draw()
 {
 	LLFloater::draw();
@@ -289,6 +329,10 @@ BOOL LLFloaterAvatarPicker::visibleItemsSelected() const
 	{
 		return getChild<LLScrollListCtrl>("NearMe")->getFirstSelectedIndex() >= 0;
 	}
+	else if(active_panel == getChild<LLPanel>("FriendsPanel"))
+	{
+		return getChild<LLScrollListCtrl>("Friends")->getFirstSelectedIndex() >= 0;
+	}
 	return FALSE;
 }
 
@@ -321,6 +365,7 @@ void LLFloaterAvatarPicker::setAllowMultiple(BOOL allow_multiple)
 {
 	getChild<LLScrollListCtrl>("SearchResults")->setAllowMultipleSelection(allow_multiple);
 	getChild<LLScrollListCtrl>("NearMe")->setAllowMultipleSelection(allow_multiple);
+	getChild<LLScrollListCtrl>("Friends")->setAllowMultipleSelection(allow_multiple);
 }
 
 // static 
diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h
index 85aacb68a5..b8ace985d9 100644
--- a/indra/newview/llfloateravatarpicker.h
+++ b/indra/newview/llfloateravatarpicker.h
@@ -67,6 +67,7 @@ private:
 		   void onTabChanged();
 	
 	void populateNearMe();
+	void populateFriend();
 	BOOL visibleItemsSelected() const; // Returns true if any items in the current tab are selected.
 
 	void find();
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index f3fec70ac9..b21df87093 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -302,6 +302,8 @@ void LLIMFloater::onSlide()
 	LLPanel* im_control_panel = getChild<LLPanel>("panel_im_control_panel");
 	im_control_panel->setVisible(!im_control_panel->getVisible());
 
+	gSavedSettings.setBOOL("IMShowControlPanel", im_control_panel->getVisible());
+
 	getChild<LLButton>("slide_left_btn")->setVisible(im_control_panel->getVisible());
 	getChild<LLButton>("slide_right_btn")->setVisible(!im_control_panel->getVisible());
 }
@@ -344,6 +346,8 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
 				LLDockControl::TOP,  boost::bind(&LLIMFloater::getAllowedRect, floater, _1)));
 	}
 
+	floater->childSetVisible("panel_im_control_panel", gSavedSettings.getBOOL("IMShowControlPanel"));
+
 	return floater;
 }
 
@@ -405,8 +409,6 @@ 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/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 217007fb15..32dc5e5927 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -224,7 +224,6 @@ BOOL LLNearbyChatBar::postBuild()
 	mChatBox->setIgnoreTab(TRUE);
 	mChatBox->setPassDelete(TRUE);
 	mChatBox->setReplaceNewlinesWithSpaces(FALSE);
-	mChatBox->setMaxTextLength(1023);
 	mChatBox->setEnableLineHistory(TRUE);
 
 	mOutputMonitor = getChild<LLOutputMonitorCtrl>("chat_zone_indicator");
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 6b0d6d61e0..957513e154 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -162,6 +162,8 @@ bool	LLNearbyChatScreenChannel::createPoolToast()
 	
 	LLToast::Params p;
 	p.panel = panel;
+	p.lifetime_secs = gSavedSettings.getS32("NearbyToastLifeTime");
+	p.fading_time_secs = gSavedSettings.getS32("NearbyToastFadingTime");
 
 	LLToast* toast = new LLToast(p); 
 	
@@ -326,6 +328,12 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 		initChannel();
 	}
 
+	//only messages from AGENTS
+	if(CHAT_SOURCE_OBJECT == chat_msg.mSourceType)
+	{
+		return;//dn't show toast for messages from objects
+	}
+
 	LLUUID id;
 	id.generate();
 
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 3d0db71045..48a93f0d42 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -131,6 +131,9 @@ void LLLandmarksPanel::onSearchEdit(const std::string& string)
 	{
 		LLAccordionCtrlTab* tab = *iter;
 		tab->setVisible(true);
+
+		// expand accordion to see matched items in all ones. See EXT-2014.
+		tab->changeOpenClose(false);
 	}
 }
 
@@ -883,7 +886,7 @@ bool LLLandmarksPanel::handleDragAndDropToTrash(BOOL drop, EDragAndDropType carg
 	return true;
 }
 
-
+// static
 void LLLandmarksPanel::doIdle(void* landmarks_panel)
 {
 	LLLandmarksPanel* panel = (LLLandmarksPanel* ) landmarks_panel;
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index 93a931dc78..419603e14e 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -427,7 +427,6 @@ void LLSysWellWindow::sessionRemoved(const LLUUID& sessionId)
 {
 	delIMRow(sessionId);
 	reshapeWindow();
-	LLBottomTray::getInstance()->getSysWell()->updateUreadIMNotifications();
 }
 
 void LLSysWellWindow::sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id)
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 24824a095c..903df21e78 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -49,13 +49,15 @@ LLToast::Params::Params()
 	enable_hide_btn("enable_hide_btn", true),
 	force_show("force_show", false),
 	force_store("force_store", false),
+	fading_time_secs("fading_time_secs", gSavedSettings.getS32("ToastFadingTime")),
 	lifetime_secs("lifetime_secs", gSavedSettings.getS32("NotificationToastLifeTime"))
 {};
 
 LLToast::LLToast(const LLToast::Params& p) 
 :	LLModalDialog(LLSD(), p.is_modal),
 	mPanel(p.panel), 
-	mToastLifetime(p.lifetime_secs),  
+	mToastLifetime(p.lifetime_secs),
+	mToastFadingTime(p.fading_time_secs),
 	mNotificationID(p.notif_id),  
 	mSessionID(p.session_id),
 	mCanFade(p.can_fade),
@@ -127,7 +129,7 @@ bool LLToast::lifetimeHasExpired()
 	if (mTimer.getStarted())
 	{
 		F32 elapsed_time = mTimer.getElapsedTimeF32();
-		if ((mToastLifetime - elapsed_time) <= gSavedSettings.getS32("ToastOpaqueTime")) 
+		if ((mToastLifetime - elapsed_time) <= mToastFadingTime) 
 		{
 			setBackgroundOpaque(FALSE);
 		}
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index 0698c94880..b670f47045 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -63,7 +63,8 @@ public:
 		Optional<LLUUID>				notif_id,	 //notification ID
 										session_id;	 //im session ID
 		Optional<LLNotificationPtr>		notification;
-		Optional<F32>					lifetime_secs;
+		Optional<F32>					lifetime_secs,
+										fading_time_secs; // Number of seconds while a toast is fading
 		Optional<toast_callback_t>		on_delete_toast,
 										on_mouse_enter;
 		Optional<bool>					can_fade,
@@ -157,6 +158,7 @@ private:
 	// timer counts a lifetime of a toast
 	LLTimer		mTimer;
 	F32			mToastLifetime; // in seconds
+	F32			mToastFadingTime; // in seconds
 
 	LLPanel*	mPanel;
 	LLButton*	mHideBtn;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ec6ef92a54..8b7df63884 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1595,8 +1595,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			// Claim to be from a local agent so it doesn't go into
 			// console.
 			chat.mText = name + separator_string + message.substr(message_offset);
-			BOOL local_agent = TRUE;
-			LLFloaterChat::addChat(chat, FALSE, local_agent);
+
+			LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
+			if(nearby_chat)
+			{
+				nearby_chat->addMessage(chat);
+			}
 		}
 		else
 		{
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 d20566b08a..3f4f8b197f 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -86,6 +86,52 @@
              top="52"
              width="132" />
         </panel>
+        <panel
+         border="none"
+         height="150"
+         label="Friends"
+         layout="topleft"
+         left="6"
+         help_topic="avatarpicker_friends_tab"
+         name="FriendsPanel"
+         top="150"
+         width="132">
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="InstructSelectFriend"
+             top="15"
+             width="200">
+                Select a friend(s):
+            </text>
+            <button
+             follows="top|right"
+             layout="topleft"
+             right="-5"
+             top ="5"
+             height="20"
+             width="20"
+             name="RefreshFriends"
+             picture_style="true"
+             image_overlay="Refresh_Off">
+             <button.commit_callback 
+              function="Refresh.FriendList"/>
+            </button>
+            <scroll_list
+             follows="all"
+             height="100"
+             border="false"
+             layout="topleft"
+             left="0"
+             name="Friends"
+             sort_column="0"
+             top_pad="5"
+             width="132" />
+        </panel>
 
         <panel
          border="none"
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 78f53562cd..05b04bbf8e 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -5,10 +5,10 @@
   name="instant_message"
   width="300"
   height="180"
-  background_opaque="false"
-  background_visible="true"
+  background_opaque="true"
+  background_visible="false"
   follows="left|top|right|bottom"
-  bg_alpha_color="0.3 0.3 0.3 1.0">
+  bg_alpha_color="0.3 0.3 0.3 0">
 	<panel width="250" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="msg_caption">
   		<avatar_icon
       		top="25" left="10" width="20" height="20" follows="left|top"
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 b002034a08..fedc49ae87 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -136,6 +136,7 @@
        layout="topleft"
        left="120"
        top="18"
+       max_length="512"
        name="sl_description_edit"
        width="173"
        word_wrap="true">
@@ -188,6 +189,7 @@
        height="100"
        layout="topleft"
        left="120"
+       max_length="512"
        top="142"
        name="fl_description_edit"
        width="173"
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
index af00b96d27..2182163da5 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -23,6 +23,7 @@
      layout="topleft"
      left_delta="7"
      left="0"
+     max_length="254"
      name="chat_box"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
      top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 73a759a8ba..5af7d7d674 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -81,6 +81,7 @@
              height="95"
              layout="topleft"
              left="107"
+             max_length="512"
              name="sl_description_edit"
              top_pad="-3"
              width="173"
@@ -123,6 +124,7 @@
              height="95"
              layout="topleft"
              left="107"
+             max_length="512"
              name="fl_description_edit"
              top_pad="-3"
              width="173"