From 910f25a32ce1d287788b0c184a530c2c450391fa Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 19 Nov 2009 18:41:41 +0200
Subject: fixed EXT-2515 "Docked floaters should be resizeable" undock floater
 when user resize floater by resize bar;

--HG--
branch : product-engine
---
 indra/llui/llresizebar.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/llui/llresizebar.cpp b/indra/llui/llresizebar.cpp
index 304ac64f31..a7cf9be277 100644
--- a/indra/llui/llresizebar.cpp
+++ b/indra/llui/llresizebar.cpp
@@ -143,6 +143,12 @@ BOOL LLResizeBar::handleHover(S32 x, S32 y, MASK mask)
 		
 		if( valid_rect.localPointInRect( screen_x, screen_y ) && mResizingView )
 		{
+			// undock floater when user resize it
+			if (((LLFloater*)getParent())->isDocked())
+			{
+				((LLFloater*)getParent())->setDocked(false, false);
+			}
+
 			// Resize the parent
 			LLRect orig_rect = mResizingView->getRect();
 			LLRect scaled_rect = orig_rect;
-- 
cgit v1.2.3


From 9b9c11778cd5d71f3b238ca5bd5b69e118d97be9 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Thu, 19 Nov 2009 19:51:47 +0200
Subject: fixed minor bug EXT-1615 Landmark name is truncated before @
 character after placing landmark on Favorites Bar

--HG--
branch : product-engine
---
 indra/newview/llpanellandmarkinfo.cpp | 2 ++
 indra/newview/llviewerinventory.cpp   | 6 ++++++
 indra/newview/llviewerinventory.h     | 1 +
 3 files changed, 9 insertions(+)

diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
index f94a59ecef..5de7c3f851 100644
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@@ -352,6 +352,8 @@ void LLPanelLandmarkInfo::createLandmark(const LLUUID& folder_id)
 	}
 
 	LLStringUtil::replaceChar(desc, '\n', ' ');
+	LLViewerInventoryItem::insertDefaultSortField(name);
+
 	// If no folder chosen use the "Landmarks" folder.
 	LLLandmarkActions::createLandmarkHere(name, desc,
 		folder_id.notNull() ? folder_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK));
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 089535dfab..87d256b60a 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1336,6 +1336,12 @@ BOOL LLViewerInventoryItem::extractSortFieldAndDisplayName(const std::string& na
 	return result;
 }
 
+void LLViewerInventoryItem::insertDefaultSortField(std::string& name)
+{
+	name.insert(0, std::string("1") + getSeparator());
+}
+
+
 // This returns true if the item that this item points to 
 // doesn't exist in memory (i.e. LLInventoryModel).  The baseitem
 // might still be in the database but just not loaded yet.
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 529425aa25..d27faffdd9 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -81,6 +81,7 @@ public:
 	virtual U32 getCRC32() const; // really more of a checksum.
 
 	static BOOL extractSortFieldAndDisplayName(const std::string& name, S32* sortField, std::string* displayName);
+	static void insertDefaultSortField(std::string& name);
 
 	// construct a complete viewer inventory item
 	LLViewerInventoryItem(const LLUUID& uuid, const LLUUID& parent_uuid,
-- 
cgit v1.2.3


From f3c53a84d3e4605546fbe038ad8a2b863d2cc399 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 19 Nov 2009 22:38:27 +0200
Subject: Fixed normal bug EXT-2348 "My Landmarks: Show On Map does nothing for
 landmarks from Library" - Added callback to ensure that a landmark is loaded
 from the global landmark list. - Added disabling "Map" button to indicate
 that a landmark info is being  loaded.

--HG--
branch : product-engine
---
 indra/newview/lllandmarkactions.cpp |  18 +++-
 indra/newview/lllandmarkactions.h   |   6 +-
 indra/newview/llpanellandmarks.cpp  | 198 ++++++++++++++++++++----------------
 indra/newview/llpanellandmarks.h    |  13 ++-
 4 files changed, 140 insertions(+), 95 deletions(-)

diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp
index 003afafa87..70546ccae6 100644
--- a/indra/newview/lllandmarkactions.cpp
+++ b/indra/newview/lllandmarkactions.cpp
@@ -374,22 +374,34 @@ void LLLandmarkActions::onRegionResponseNameAndCoords(region_name_and_coords_cal
 
 bool LLLandmarkActions::getLandmarkGlobalPos(const LLUUID& landmarkInventoryItemID, LLVector3d& posGlobal)
 {
-	LLLandmark* landmark = LLLandmarkActions::getLandmark(landmarkInventoryItemID);
+	LLViewerInventoryItem* item = gInventory.getItem(landmarkInventoryItemID);
+	if (NULL == item)
+		return NULL;
+
+	const LLUUID& asset_id = item->getAssetUUID();
 
+	LLLandmark* landmark = gLandmarkList.getAsset(asset_id, NULL);
 	if (NULL == landmark)
 		return false;
 
 	return landmark->getGlobalPos(posGlobal);
 }
 
-LLLandmark* LLLandmarkActions::getLandmark(const LLUUID& landmarkInventoryItemID)
+LLLandmark* LLLandmarkActions::getLandmark(const LLUUID& landmarkInventoryItemID, LLLandmarkList::loaded_callback_t cb)
 {
 	LLViewerInventoryItem* item = gInventory.getItem(landmarkInventoryItemID);
 	if (NULL == item)
 		return NULL;
 
 	const LLUUID& asset_id = item->getAssetUUID();
-	return gLandmarkList.getAsset(asset_id, NULL);
+
+	LLLandmark* landmark = gLandmarkList.getAsset(asset_id, cb);
+	if (landmark)
+	{
+		return landmark;
+	}
+
+	return NULL;
 }
 
 void LLLandmarkActions::copySLURLtoClipboard(const LLUUID& landmarkInventoryItemID)
diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h
index c65b831f3e..987caf0936 100644
--- a/indra/newview/lllandmarkactions.h
+++ b/indra/newview/lllandmarkactions.h
@@ -35,7 +35,10 @@
 
 #include "llinventorymodel.h"
 
+#include "lllandmarklist.h"
+
 class LLLandmark;
+
 /**
  * @brief Provides helper functions to manage landmarks
  */
@@ -112,10 +115,11 @@ public:
 
     /**
      * @brief Retrieve a landmark from gLandmarkList by inventory item's id
+     * If a landmark is not currently in the gLandmarkList a callback "cb" is called when it is loaded.
      * 
      * @return pointer to loaded landmark from gLandmarkList or NULL if landmark does not exist or wasn't loaded.
      */
-    static LLLandmark* getLandmark(const LLUUID& landmarkInventoryItemID);
+    static LLLandmark* getLandmark(const LLUUID& landmarkInventoryItemID, LLLandmarkList::loaded_callback_t cb = NULL);
 
     /**
      * @brief  Performs standard action of copying of SLURL from landmark to user's clipboard.
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index e199db37ab..10b419dfdb 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -148,20 +148,13 @@ void LLLandmarksPanel::onShowOnMap()
 		llwarns << "There are no selected list. No actions are performed." << llendl;
 		return;
 	}
-	LLLandmark* landmark = getCurSelectedLandmark();
-	if (!landmark)
-		return;
 
-	LLVector3d landmark_global_pos;
-	if (!landmark->getGlobalPos(landmark_global_pos))
-		return;
-	
-	LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
-	if (!landmark_global_pos.isExactlyZero() && worldmap_instance)
-	{
-		worldmap_instance->trackLocation(landmark_global_pos);
-		LLFloaterReg::showInstance("world_map", "center");
-	}
+	// Disable the "Map" button because loading landmark can take some time.
+	// During this time the button is useless. It will be enabled on callback finish
+	// or upon switching to other item.
+	mShowOnMapBtn->setEnabled(FALSE);
+
+	doActionOnCurSelectedLandmark(boost::bind(&LLLandmarksPanel::doShowOnMap, this, _1));
 }
 
 // virtual
@@ -256,15 +249,18 @@ bool LLLandmarksPanel::isReceivedFolderSelected() const
 
 	return false;
 }
-LLLandmark* LLLandmarksPanel::getCurSelectedLandmark() const
-{
 
+void LLLandmarksPanel::doActionOnCurSelectedLandmark(LLLandmarkList::loaded_callback_t cb)
+{
 	LLFolderViewItem* cur_item = getCurSelectedItem();
 	if(cur_item && cur_item->getListener()->getInventoryType() == LLInventoryType::IT_LANDMARK)
 	{ 
-		return LLLandmarkActions::getLandmark(cur_item->getListener()->getUUID());
+		LLLandmark* landmark = LLLandmarkActions::getLandmark(cur_item->getListener()->getUUID(), cb);
+		if (landmark)
+		{
+			cb(landmark);
+		}
 	}
-	return NULL;
 }
 
 LLFolderViewItem* LLLandmarksPanel::getCurSelectedItem() const 
@@ -294,45 +290,11 @@ void LLLandmarksPanel::processParcelInfo(const LLParcelData& parcel_data)
 	// We have to make request to sever to get parcel_id and snaption_id. 
 	if(isLandmarkSelected())
 	{
-		LLLandmark* landmark  =  getCurSelectedLandmark();
 		LLFolderViewItem* cur_item = getCurSelectedItem();
 		LLUUID id = cur_item->getListener()->getUUID();
-		LLInventoryItem* inv_item =  mCurrentSelectedList->getModel()->getItem(id);
-		if(landmark)
-		{
-			LLPanelPickEdit* panel_pick = LLPanelPickEdit::create();
-			LLVector3d landmark_global_pos;
-			landmark->getGlobalPos(landmark_global_pos);
-
-			// let's toggle pick panel into  panel places
-			LLPanel* panel_places =  LLSideTray::getInstance()->getChild<LLPanel>("panel_places");//-> sidebar_places
-			panel_places->addChild(panel_pick);
-			LLRect paren_rect(panel_places->getRect());
-			panel_pick->reshape(paren_rect.getWidth(),paren_rect.getHeight(), TRUE);
-			panel_pick->setRect(paren_rect);
-			panel_pick->onOpen(LLSD());
-
-			LLPickData data;
-			data.pos_global = landmark_global_pos;
-			data.name = cur_item->getName();
-			data.desc = inv_item->getDescription();
-			data.snapshot_id = parcel_data.snapshot_id;
-			data.parcel_id = parcel_data.parcel_id;
-			panel_pick->setPickData(&data);
-
-			LLSD params;
-			params["parcel_id"] =parcel_data.parcel_id;
-			/* set exit callback to get back onto panel places  
-			 in callback we will make cleaning up( delete pick_panel instance, 
-			 remove landmark panel from observer list
-			*/ 
-			panel_pick->setExitCallback(boost::bind(&LLLandmarksPanel::onPickPanelExit,this,
-					panel_pick, panel_places,params));
-			panel_pick->setSaveCallback(boost::bind(&LLLandmarksPanel::onPickPanelExit,this,
-				panel_pick, panel_places,params));
-			panel_pick->setCancelCallback(boost::bind(&LLLandmarksPanel::onPickPanelExit,this,
-							panel_pick, panel_places,params));
-		}
+		LLInventoryItem* inv_item = mCurrentSelectedList->getModel()->getItem(id);
+		doActionOnCurSelectedLandmark(boost::bind(
+				&LLLandmarksPanel::doProcessParcelInfo, this, _1, cur_item, inv_item, parcel_data));
 	}
 }
 
@@ -747,42 +709,7 @@ void LLLandmarksPanel::onCustomAction(const LLSD& userdata)
 	}
 	else if ("create_pick" == command_name)
 	{
-		LLLandmark* landmark = getCurSelectedLandmark();
-		if(!landmark) return;
-		
-		LLViewerRegion* region = gAgent.getRegion();
-		if (!region) return;
-
-		LLGlobalVec pos_global;
-		LLUUID region_id;
-		landmark->getGlobalPos(pos_global);
-		landmark->getRegionID(region_id);
-		LLVector3 region_pos((F32)fmod(pos_global.mdV[VX], (F64)REGION_WIDTH_METERS),
-						  (F32)fmod(pos_global.mdV[VY], (F64)REGION_WIDTH_METERS),
-						  (F32)pos_global.mdV[VZ]);
-
-		LLSD body;
-		std::string url = region->getCapability("RemoteParcelRequest");
-		if (!url.empty())
-		{
-			body["location"] = ll_sd_from_vector3(region_pos);
-			if (!region_id.isNull())
-			{
-				body["region_id"] = region_id;
-			}
-			if (!pos_global.isExactlyZero())
-			{
-				U64 region_handle = to_region_handle(pos_global);
-				body["region_handle"] = ll_sd_from_U64(region_handle);
-			}
-			LLHTTPClient::post(url, body, new LLRemoteParcelRequestResponder(getObserverHandle()));
-		}
-		else 
-		{
-			llwarns << "Can't create pick for landmark for region" << region_id 
-					<< ". Region: "	<< region->getName() 
-					<< " does not support RemoteParcelRequest" << llendl; 
-		}
+		doActionOnCurSelectedLandmark(boost::bind(&LLLandmarksPanel::doCreatePick, this, _1));
 	}
 }
 
@@ -931,6 +858,97 @@ void LLLandmarksPanel::updateFilteredAccordions()
 	mDirtyFilter = false;
 }
 
+void LLLandmarksPanel::doShowOnMap(LLLandmark* landmark)
+{
+	LLVector3d landmark_global_pos;
+	if (!landmark->getGlobalPos(landmark_global_pos))
+		return;
+
+	LLFloaterWorldMap* worldmap_instance = LLFloaterWorldMap::getInstance();
+	if (!landmark_global_pos.isExactlyZero() && worldmap_instance)
+	{
+		worldmap_instance->trackLocation(landmark_global_pos);
+		LLFloaterReg::showInstance("world_map", "center");
+	}
+
+	mShowOnMapBtn->setEnabled(TRUE);
+}
+
+void LLLandmarksPanel::doProcessParcelInfo(LLLandmark* landmark,
+										   LLFolderViewItem* cur_item,
+										   LLInventoryItem* inv_item,
+										   const LLParcelData& parcel_data)
+{
+	LLPanelPickEdit* panel_pick = LLPanelPickEdit::create();
+	LLVector3d landmark_global_pos;
+	landmark->getGlobalPos(landmark_global_pos);
+
+	// let's toggle pick panel into  panel places
+	LLPanel* panel_places =  LLSideTray::getInstance()->getChild<LLPanel>("panel_places");//-> sidebar_places
+	panel_places->addChild(panel_pick);
+	LLRect paren_rect(panel_places->getRect());
+	panel_pick->reshape(paren_rect.getWidth(),paren_rect.getHeight(), TRUE);
+	panel_pick->setRect(paren_rect);
+	panel_pick->onOpen(LLSD());
+
+	LLPickData data;
+	data.pos_global = landmark_global_pos;
+	data.name = cur_item->getName();
+	data.desc = inv_item->getDescription();
+	data.snapshot_id = parcel_data.snapshot_id;
+	data.parcel_id = parcel_data.parcel_id;
+	panel_pick->setPickData(&data);
+
+	LLSD params;
+	params["parcel_id"] = parcel_data.parcel_id;
+	/* set exit callback to get back onto panel places
+	 in callback we will make cleaning up( delete pick_panel instance,
+	 remove landmark panel from observer list
+	*/
+	panel_pick->setExitCallback(boost::bind(&LLLandmarksPanel::onPickPanelExit,this,
+			panel_pick, panel_places,params));
+	panel_pick->setSaveCallback(boost::bind(&LLLandmarksPanel::onPickPanelExit,this,
+		panel_pick, panel_places,params));
+	panel_pick->setCancelCallback(boost::bind(&LLLandmarksPanel::onPickPanelExit,this,
+					panel_pick, panel_places,params));
+}
+
+void LLLandmarksPanel::doCreatePick(LLLandmark* landmark)
+{
+	LLViewerRegion* region = gAgent.getRegion();
+	if (!region) return;
+
+	LLGlobalVec pos_global;
+	LLUUID region_id;
+	landmark->getGlobalPos(pos_global);
+	landmark->getRegionID(region_id);
+	LLVector3 region_pos((F32)fmod(pos_global.mdV[VX], (F64)REGION_WIDTH_METERS),
+					  (F32)fmod(pos_global.mdV[VY], (F64)REGION_WIDTH_METERS),
+					  (F32)pos_global.mdV[VZ]);
+
+	LLSD body;
+	std::string url = region->getCapability("RemoteParcelRequest");
+	if (!url.empty())
+	{
+		body["location"] = ll_sd_from_vector3(region_pos);
+		if (!region_id.isNull())
+		{
+			body["region_id"] = region_id;
+		}
+		if (!pos_global.isExactlyZero())
+		{
+			U64 region_handle = to_region_handle(pos_global);
+			body["region_handle"] = ll_sd_from_U64(region_handle);
+		}
+		LLHTTPClient::post(url, body, new LLRemoteParcelRequestResponder(getObserverHandle()));
+	}
+	else
+	{
+		llwarns << "Can't create pick for landmark for region" << region_id
+				<< ". Region: "	<< region->getName()
+				<< " does not support RemoteParcelRequest" << llendl;
+	}
+}
 
 //////////////////////////////////////////////////////////////////////////
 // HELPER FUNCTIONS
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index 097d79badf..777ee562d2 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -37,6 +37,7 @@
 
 // newview
 #include "llinventorymodel.h"
+#include "lllandmarklist.h"
 #include "llpanelplacestab.h"
 #include "llpanelpick.h"
 #include "llremoteparcelrequest.h"
@@ -68,7 +69,7 @@ protected:
 	 */
 	bool isLandmarkSelected() const;
 	bool isReceivedFolderSelected() const;
-	LLLandmark* getCurSelectedLandmark() const;
+	void doActionOnCurSelectedLandmark(LLLandmarkList::loaded_callback_t cb);
 	LLFolderViewItem* getCurSelectedItem() const;
 	void updateSortOrder(LLInventoryPanel* panel, bool byDate);
 
@@ -127,6 +128,16 @@ private:
 	 */
 	void updateFilteredAccordions();
 
+	/**
+	 * Landmark actions callbacks. Fire when a landmark is loaded from the list.
+	 */
+	void doShowOnMap(LLLandmark* landmark);
+	void doProcessParcelInfo(LLLandmark* landmark,
+							 LLFolderViewItem* cur_item,
+							 LLInventoryItem* inv_item,
+							 const LLParcelData& parcel_data);
+	void doCreatePick(LLLandmark* landmark);
+
 private:
 	LLInventorySubTreePanel*	mFavoritesInventoryPanel;
 	LLInventorySubTreePanel*	mLandmarksInventoryPanel;
-- 
cgit v1.2.3


From ba2e9f4495b2423e5a03a2136762a539c532710a Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 20 Nov 2009 12:19:29 +0200
Subject: fixed EXT-2457 "Remove unresolved notifications counter from the
 Login/Startup toast";

--HG--
branch : product-engine
---
 indra/newview/llscreenchannel.cpp              | 12 +-----------
 indra/newview/skins/default/xui/en/strings.xml |  3 +--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index d1cf4a0810..c4d3fb9d7d 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -535,17 +535,7 @@ void LLScreenChannel::createStartUpToast(S32 notif_num, F32 timer)
 
 	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);
+	std::string	text = LLTrans::getString("StartUpNotifications");
 
 	toast_rect = mStartUpToastPanel->getRect();
 	mStartUpToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e76763d7eb..b3728cb425 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1782,8 +1782,7 @@ Clears (deletes) the media and all params from the given face.
 	<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>
+  <string name="StartUpNotifications">New notifications arrived while you were away.</string>
   <!-- overflow toast's string-->
   <string name="OverflowInfoChannelString">You have %d more notification</string>
   
-- 
cgit v1.2.3


From a995c494d4a3c7750532f01d2c8c693e7ff32ea3 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 20 Nov 2009 12:52:40 +0200
Subject: removed redundant local variable

--HG--
branch : product-engine
---
 indra/newview/llscreenchannel.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index c4d3fb9d7d..24505f6bd6 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -533,8 +533,6 @@ void LLScreenChannel::createStartUpToast(S32 notif_num, F32 timer)
 
 	LLTextBox* text_box = mStartUpToastPanel->getChild<LLTextBox>("toast_text");
 
-	std::string mStartUpFormatString;
-
 	std::string	text = LLTrans::getString("StartUpNotifications");
 
 	toast_rect = mStartUpToastPanel->getRect();
-- 
cgit v1.2.3


From 8dd743e783464f59b1d80763d8e2e8c52e048cb1 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Fri, 20 Nov 2009 13:53:23 +0200
Subject: implemented task EXT-1900  Add options to Gestures gear menu

--HG--
branch : product-engine
---
 indra/newview/llfloatergesture.cpp                 | 313 ++++++++++++++++-----
 indra/newview/llfloatergesture.h                   |  42 ++-
 .../skins/default/xui/en/floater_gesture.xml       |  12 +-
 .../skins/default/xui/en/menu_gesture_gear.xml     |  75 +++++
 4 files changed, 350 insertions(+), 92 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_gesture_gear.xml

diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index af86274472..0f8e4c10d7 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -34,32 +34,24 @@
 
 #include "llfloatergesture.h"
 
-#include "lldir.h"
 #include "llinventory.h"
-#include "llmultigesture.h"
+#include "llinventorybridge.h"
+#include "llinventorymodel.h"
+#include "llinventoryclipboard.h"
 
 #include "llagent.h"
-#include "llviewerwindow.h"
-#include "llbutton.h"
-#include "llcombobox.h"
+#include "llappearancemgr.h"
+#include "llclipboard.h"
 #include "llgesturemgr.h"
-#include "llinventorymodel.h"
-#include "llinventorypanel.h"
-#include "llfloaterinventory.h"
 #include "llkeyboard.h"
-#include "lllineeditor.h"
+#include "llmenugl.h"
+#include "llmultigesture.h"
 #include "llpreviewgesture.h"
-#include "llresizehandle.h"
-#include "llscrollbar.h"
-#include "llscrollcontainer.h"
 #include "llscrolllistctrl.h"
-#include "lltextbox.h"
 #include "lltrans.h"
-#include "lluictrlfactory.h"
 #include "llviewergesture.h"
-#include "llviewertexturelist.h"
+#include "llviewermenu.h" 
 #include "llviewerinventory.h"
-#include "llvoavatar.h"
 #include "llviewercontrol.h"
 
 BOOL item_name_precedes( LLInventoryItem* a, LLInventoryItem* b )
@@ -77,6 +69,35 @@ public:
 private:
 	LLFloaterGesture* mFloater;
 };
+//-----------------------------
+// GestureCallback
+//-----------------------------
+
+class GestureShowCallback : public LLInventoryCallback
+{
+public:
+	void fire(const LLUUID &inv_item)
+	{
+		LLPreviewGesture::show(inv_item, LLUUID::null);
+	}
+};
+
+class GestureCopiedCallback : public LLInventoryCallback
+{
+private:
+	LLFloaterGesture* mFloater;
+	
+public:
+	GestureCopiedCallback(LLFloaterGesture* floater): mFloater(floater)
+	{}
+	void fire(const LLUUID &inv_item)
+	{
+		if(mFloater)
+		{
+			mFloater->addGesture(inv_item,NULL,mFloater->getChild<LLScrollListCtrl>("gesture_list"));
+		}
+	}
+};
 
 //---------------------------------------------------------------------------
 // LLFloaterGesture
@@ -86,7 +107,13 @@ LLFloaterGesture::LLFloaterGesture(const LLSD& key)
 {
 	mObserver = new LLFloaterGestureObserver(this);
 	LLGestureManager::instance().addObserver(mObserver);
-	//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_gesture.xml");
+
+	mCommitCallbackRegistrar.add("Gesture.Action.ToogleActiveState", boost::bind(&LLFloaterGesture::onActivateBtnClick, this));
+	mCommitCallbackRegistrar.add("Gesture.Action.ShowPreview", boost::bind(&LLFloaterGesture::onClickEdit, this));
+	mCommitCallbackRegistrar.add("Gesture.Action.CopyPast", boost::bind(&LLFloaterGesture::onCopyPastAction, this, _2));
+	mCommitCallbackRegistrar.add("Gesture.Action.SaveToCOF", boost::bind(&LLFloaterGesture::addToCurrentOutFit, this));
+
+	mEnableCallbackRegistrar.add("Gesture.EnableAction", boost::bind(&LLFloaterGesture::isActionEnabled, this, _2));
 }
 
 void LLFloaterGesture::done()
@@ -151,19 +178,18 @@ BOOL LLFloaterGesture::postBuild()
 	label = getTitle();
 	
 	setTitle(label);
-
-	getChild<LLUICtrl>("gesture_list")->setCommitCallback(boost::bind(&LLFloaterGesture::onCommitList, this));
-	getChild<LLScrollListCtrl>("gesture_list")->setDoubleClickCallback(boost::bind(&LLFloaterGesture::onClickPlay, this));
-
-	getChild<LLUICtrl>("inventory_btn")->setCommitCallback(boost::bind(&LLFloaterGesture::onClickInventory, this));
+	mGestureList = getChild<LLScrollListCtrl>("gesture_list");
+	mGestureList->setCommitCallback(boost::bind(&LLFloaterGesture::onCommitList, this));
+	mGestureList->setDoubleClickCallback(boost::bind(&LLFloaterGesture::onClickPlay, this));
 
 	getChild<LLUICtrl>("edit_btn")->setCommitCallback(boost::bind(&LLFloaterGesture::onClickEdit, this));
 
 	getChild<LLUICtrl>("play_btn")->setCommitCallback(boost::bind(&LLFloaterGesture::onClickPlay, this));
 	getChild<LLUICtrl>("stop_btn")->setCommitCallback(boost::bind(&LLFloaterGesture::onClickPlay, this));
 	getChild<LLButton>("activate_btn")->setClickedCallback(boost::bind(&LLFloaterGesture::onActivateBtnClick, this));
-
+	
 	getChild<LLUICtrl>("new_gesture_btn")->setCommitCallback(boost::bind(&LLFloaterGesture::onClickNew, this));
+	getChild<LLButton>("del_btn")->setClickedCallback(boost::bind(&LLFloaterGesture::onDeleteSelected, this));
 
 	childSetVisible("play_btn", true);
 	childSetVisible("stop_btn", false);
@@ -178,14 +204,13 @@ BOOL LLFloaterGesture::postBuild()
 
 	buildGestureList();
 	
-	childSetFocus("gesture_list");
+	mGestureList->setFocus(TRUE);
 
-	LLCtrlListInterface *list = getGestureList();
-	if (list)
+	if (mGestureList)
 	{
 		const BOOL ascending = TRUE;
-		list->sortByColumn(std::string("name"), ascending);
-		list->selectFirstItem();
+		mGestureList->sortByColumn(std::string("name"), ascending);
+		mGestureList->selectFirstItem();
 	}
 	
 	// Update button labels
@@ -199,18 +224,17 @@ void LLFloaterGesture::refreshAll()
 {
 	buildGestureList();
 
-	LLCtrlListInterface *list = getGestureList();
-	if (!list) return;
+	if (!mGestureList) return;
 
 	if (mSelectedID.isNull())
 	{
-		list->selectFirstItem();
+		mGestureList->selectFirstItem();
 	}
 	else
 	{
-		if (! list->setCurrentByID(mSelectedID))
+		if (! mGestureList->setCurrentByID(mSelectedID))
 		{
-			list->selectFirstItem();
+			mGestureList->selectFirstItem();
 		}
 	}
 
@@ -220,20 +244,16 @@ void LLFloaterGesture::refreshAll()
 
 void LLFloaterGesture::buildGestureList()
 {
-	LLCtrlListInterface *list = getGestureList();
-	LLCtrlScrollInterface *scroll = childGetScrollInterface("gesture_list");
-
-	if (! (list && scroll)) return;
-
-	LLUUID selected_item = list->getCurrentID();
+	std::vector<LLUUID> selected_items;
+	getSelectedIds(selected_items);
 	LL_DEBUGS("Gesture")<< "Rebuilding gesture list "<< LL_ENDL;
-	list->operateOnAll(LLCtrlListInterface::OP_DELETE);
+	mGestureList->deleteAllItems();
 
 	LLGestureManager::item_map_t::const_iterator it;
 	const LLGestureManager::item_map_t& active_gestures = LLGestureManager::instance().getActiveGestures();
 	for (it = active_gestures.begin(); it != active_gestures.end(); ++it)
 	{
-		addGesture(it->first,it->second, list);
+		addGesture(it->first,it->second, mGestureList);
 	}
 	if (gInventory.isCategoryComplete(mGestureFolderID))
 	{
@@ -249,16 +269,17 @@ void LLFloaterGesture::buildGestureList()
 			if (active_gestures.find(item->getUUID()) == active_gestures.end())
 			{
 				// if gesture wasn't loaded yet, we can display only name
-				addGesture(item->getUUID(), NULL, list);
+				addGesture(item->getUUID(), NULL, mGestureList);
 			}
 		}
 	}
 	// attempt to preserve scroll position through re-builds
 	// since we do re-build any time anything dirties
-	if(list->selectByValue(LLSD(selected_item)))
+	for(std::vector<LLUUID>::iterator it = selected_items.begin(); it != selected_items.end(); it++)
 	{
-		scroll->scrollToShowSelected();
+		mGestureList->selectByID(*it);
 	}
+	mGestureList->scrollToShowSelected();
 }
 
 void LLFloaterGesture::addGesture(const LLUUID& item_id , LLMultiGesture* gesture,LLCtrlListInterface * list )
@@ -346,33 +367,59 @@ void LLFloaterGesture::addGesture(const LLUUID& item_id , LLMultiGesture* gestur
 	list->addElement(element, ADD_BOTTOM);
 }
 
-void LLFloaterGesture::onClickInventory()
+void LLFloaterGesture::getSelectedIds(std::vector<LLUUID>& ids)
+{
+	std::vector<LLScrollListItem*> items = mGestureList->getAllSelected();
+	for(std::vector<LLScrollListItem*>::const_iterator it = items.begin(); it != items.end(); it++)
+	{
+		ids.push_back((*it)->getUUID());
+	}
+}
+
+bool LLFloaterGesture::isActionEnabled(const LLSD& command)
 {
-	LLCtrlListInterface *list = getGestureList();
-	if (!list) return;
-	const LLUUID& item_id = list->getCurrentID();
+	// paste copy_uuid edit_gesture
+	std::string command_name = command.asString();
+	if("paste" == command_name)
+	{
+		if(!LLInventoryClipboard::instance().hasContents())
+			return false;
 
-	LLFloaterInventory* inv = LLFloaterInventory::showAgentInventory();
-	if (!inv) return;
-	inv->getPanel()->setSelection(item_id, TRUE);
+		LLDynamicArray<LLUUID> ids;
+		LLInventoryClipboard::instance().retrieve(ids);
+		for(LLDynamicArray<LLUUID>::iterator it = ids.begin(); it != ids.end(); it++)
+		{
+			LLInventoryItem* item = gInventory.getItem(*it);
+			
+			if(item && item->getInventoryType() == LLInventoryType::IT_GESTURE)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	else if("copy_uuid" == command_name || "edit_gesture" == command_name 
+			|| "inspect" == command_name)
+	{
+		return	mGestureList->getAllSelected().size() == 1;
+	}
+	return true;
 }
 
 void LLFloaterGesture::onClickPlay()
 {
-	LLCtrlListInterface *list = getGestureList();
-	if (!list) return;
-	const LLUUID& item_id = list->getCurrentID();
+	const LLUUID& item_id = mGestureList->getCurrentID();
 	if(item_id.isNull()) return;
 
 	LL_DEBUGS("Gesture")<<" Trying to play gesture id: "<< item_id <<LL_ENDL;
 	if(!LLGestureManager::instance().isGestureActive(item_id))
 	{
-		// we need to inform server about gesture activating to be consistent with LLPreviewGesture.
+		// we need to inform server about gesture activating to be consistent with LLPreviewGesture and  LLGestureComboBox.
 		BOOL inform_server = TRUE;
 		BOOL deactivate_similar = FALSE;
+		LLGestureManager::instance().setGestureLoadedCallback(item_id, boost::bind(&LLFloaterGesture::playGesture, this, item_id));
 		LLGestureManager::instance().activateGestureWithAsset(item_id, gInventory.getItem(item_id)->getAssetUUID(), inform_server, deactivate_similar);
 		LL_DEBUGS("Gesture")<< "Activating gesture with inventory ID: " << item_id <<LL_ENDL;
-		LLGestureManager::instance().setGestureLoadedCallback(item_id, boost::bind(&LLFloaterGesture::playGesture, this, item_id));
 	}
 	else
 	{
@@ -380,15 +427,6 @@ void LLFloaterGesture::onClickPlay()
 	}
 }
 
-class GestureShowCallback : public LLInventoryCallback
-{
-public:
-	void fire(const LLUUID &inv_item)
-	{
-		LLPreviewGesture::show(inv_item, LLUUID::null);
-	}
-};
-
 void LLFloaterGesture::onClickNew()
 {
 	LLPointer<LLInventoryCallback> cb = new GestureShowCallback();
@@ -399,27 +437,96 @@ void LLFloaterGesture::onClickNew()
 
 void LLFloaterGesture::onActivateBtnClick()
 {
-	LLCtrlListInterface* list = getGestureList();
-	
-	LLUUID gesture_inv_id = list->getSelectedValue();
+	std::vector<LLUUID> ids;
+	getSelectedIds(ids);
+	if(ids.empty())
+		return;
+
 	LLGestureManager* gm = LLGestureManager::getInstance();
-	
-	if(gm->isGestureActive(gesture_inv_id))
+	std::vector<LLUUID>::const_iterator it = ids.begin();
+	BOOL first_gesture_state = gm->isGestureActive(*it);
+	BOOL is_mixed = FALSE;
+	while( ++it != ids.end() )
 	{
-		gm->deactivateGesture(gesture_inv_id);
+		if(first_gesture_state != gm->isGestureActive(*it))
+		{
+			is_mixed = TRUE;
+			break;
+		}
 	}
-	else
+	for(std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); it++)
 	{
-		gm->activateGesture(gesture_inv_id);
+		if(is_mixed)
+		{
+			gm->activateGesture(*it);
+		}
+		else
+		{
+			if(first_gesture_state)
+			{
+				gm->deactivateGesture(*it);
+			}
+			else
+			{
+				gm->activateGesture(*it);
+			}
+		}
 	}
 }
 
+void LLFloaterGesture::onCopyPastAction(const LLSD& command)
+{
+	std::string command_name  = command.asString();
+	// since we select this comman inventory item had  already arrived .
+	if("copy_gesture" == command_name)
+	{
+		std::vector<LLUUID> ids;
+		getSelectedIds(ids);
+		// make sure that clopboard is empty
+		LLInventoryClipboard::instance().reset();
+		for(std::vector<LLUUID>::iterator it = ids.begin(); it != ids.end(); it++)
+		{
+			LLInventoryItem* item = gInventory.getItem(*it);
+			if(item  && item->getInventoryType() == LLInventoryType::IT_GESTURE)
+			{
+				LLInventoryClipboard::instance().add(item->getUUID());
+			}
+		}
+	}
+	else if ("paste" == command_name)
+	{
+		LLInventoryClipboard& clipbord = LLInventoryClipboard::instance();
+		LLDynamicArray<LLUUID> ids;
+		clipbord.retrieve(ids);
+		if(ids.empty() || !gInventory.isCategoryComplete(mGestureFolderID))
+			return;
+		LLInventoryCategory* gesture_dir = gInventory.getCategory(mGestureFolderID);
+		LLPointer<GestureCopiedCallback> cb = new GestureCopiedCallback(this);
+
+		for(LLDynamicArray<LLUUID>::iterator it = ids.begin(); it != ids.end(); it++)
+		{
+			LLInventoryItem* item = gInventory.getItem(*it);
+			LLStringUtil::format_map_t string_args;
+			string_args["[COPY_NAME]"] = item->getName();
+			if(item && item->getInventoryType() == LLInventoryType::IT_GESTURE)
+			{
+				LL_DEBUGS("Gesture")<< "Copying gesture " << item->getName() << "  "<< item->getUUID() << " into "
+										<< gesture_dir->getName() << "  "<< gesture_dir->getUUID() << LL_ENDL;
+				copy_inventory_item(gAgent.getID(), item->getPermissions().getOwner(), item->getUUID(), 
+						gesture_dir->getUUID(), getString("copy_name", string_args), cb);
+			}
+		}
+		clipbord.reset();
+	}
+	else if ("copy_uuid" == command_name)
+	{
+		gClipboard.copyFromString(utf8str_to_wstring(mGestureList->getCurrentID().asString()), mGestureList->getCurrentID());
+	}
+}
 
 void LLFloaterGesture::onClickEdit()
 {
-	LLCtrlListInterface *list = getGestureList();
-	if (!list) return;
-	const LLUUID& item_id = list->getCurrentID();
+	const LLUUID& item_id = mGestureList->getCurrentID();
 
 	LLInventoryItem* item = gInventory.getItem(item_id);
 	if (!item) return;
@@ -433,7 +540,7 @@ void LLFloaterGesture::onClickEdit()
 
 void LLFloaterGesture::onCommitList()
 {
-	const LLUUID& item_id = childGetValue("gesture_list").asUUID();
+	const LLUUID& item_id = mGestureList->getCurrentID();
 
 	mSelectedID = item_id;
 	if (LLGestureManager::instance().isGesturePlaying(item_id))
@@ -447,8 +554,60 @@ void LLFloaterGesture::onCommitList()
 		childSetVisible("stop_btn", false);
 	}
 }
+
+void LLFloaterGesture::onDeleteSelected()
+{
+	std::vector<LLUUID> ids;
+	getSelectedIds(ids);
+	if(ids.empty())
+		return;
+
+	const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+	LLGestureManager* gm = LLGestureManager::getInstance();
+	for(std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); it++)
+	{
+		const LLUUID& selected_item = *it;
+		LLInventoryItem* inv_item = gInventory.getItem(selected_item);
+		if (inv_item && inv_item->getInventoryType() == LLInventoryType::IT_GESTURE)
+		{
+			if(gm->isGestureActive(selected_item))
+			{
+				gm->deactivateGesture(selected_item);
+			}
+			LLInventoryModel::update_list_t update;
+			LLInventoryModel::LLCategoryUpdate old_folder(inv_item->getParentUUID(), -1);
+			update.push_back(old_folder);
+			LLInventoryModel::LLCategoryUpdate new_folder(trash_id, 1);
+			update.push_back(new_folder);
+			gInventory.accountForUpdate(update);
+
+			LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(inv_item);
+			new_item->setParent(trash_id);
+			// no need to restamp it though it's a move into trash because
+			// it's a brand new item already.
+			new_item->updateParentOnServer(FALSE);
+			gInventory.updateItem(new_item);
+		}
+	}
+	gInventory.notifyObservers();
+	buildGestureList();
+}
+
+void LLFloaterGesture::addToCurrentOutFit()
+{
+	std::vector<LLUUID> ids;
+	getSelectedIds(ids);
+	LLAppearanceManager* am = LLAppearanceManager::getInstance();
+	for(std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); it++)
+	{
+		am->addCOFItemLink(*it);
+	}
+}
+
 void LLFloaterGesture::playGesture(LLUUID item_id)
 {
+	LL_DEBUGS("Gesture")<<"Playing gesture "<< item_id<<LL_ENDL;
+
 	if (LLGestureManager::instance().isGesturePlaying(item_id))
 	{
 		LLGestureManager::instance().stopGesture(item_id);
diff --git a/indra/newview/llfloatergesture.h b/indra/newview/llfloatergesture.h
index 50bef818da..14e132900d 100644
--- a/indra/newview/llfloatergesture.h
+++ b/indra/newview/llfloatergesture.h
@@ -36,11 +36,10 @@
 
 #ifndef LL_LLFLOATERGESTURE_H
 #define LL_LLFLOATERGESTURE_H
+#include <vector> 
 
 #include "llfloater.h"
-#include "llinventorymodel.h"
 #include "llinventoryobserver.h"
-#include "lldarray.h"
 
 class LLScrollContainer;
 class LLView;
@@ -53,6 +52,7 @@ class LLScrollListCtrl;
 class LLFloaterGestureObserver;
 class LLFloaterGestureInventoryObserver;
 class LLMultiGesture;
+class LLMenuGL;
 
 class LLFloaterGesture
 :	public LLFloater, LLInventoryFetchDescendentsObserver
@@ -65,26 +65,46 @@ public:
 	virtual BOOL postBuild();
 	virtual void done ();
 	void refreshAll();
+	/**
+	 * @brief Add new scrolllistitem into gesture_list.
+	 * @param  item_id inventory id of gesture
+	 * @param  gesture can be NULL , if item was not loaded yet
+	 */
+	void addGesture(const LLUUID& item_id, LLMultiGesture* gesture, LLCtrlListInterface * list);
 
 protected:
 	// Reads from the gesture manager's list of active gestures
 	// and puts them in this list.
 	void buildGestureList();
-	void addGesture(const LLUUID& item_id, LLMultiGesture* gesture, LLCtrlListInterface * list);
-	void onClickInventory();
+	void playGesture(LLUUID item_id);
+private:
+	void addToCurrentOutFit();
+	/**
+	 * @brief  This method is using to collect selected items. 
+	 * In some places gesture_list can be rebuilt by gestureObservers during  iterating data from LLScrollListCtrl::getAllSelected().
+	 * Therefore we have to copy these items to avoid viewer crash.
+	 * @see LLFloaterGesture::onActivateBtnClick
+	 */
+	void getSelectedIds(std::vector<LLUUID>& ids);
+	bool isActionEnabled(const LLSD& command);
+	/**
+	 * @brief Activation rules:
+	 *  According to Gesture Spec:
+	 *  1. If all selected gestures are active: set to inactive
+	 *  2. If all selected gestures are inactive: set to active
+	 *  3. If selected gestures are in a mixed state: set all to active
+	 */
+	void onActivateBtnClick();
 	void onClickEdit();
 	void onClickPlay();
 	void onClickNew();
 	void onCommitList();
-	void playGesture(LLUUID item_id);
-	LLCtrlListInterface* getGestureList() const 
-	{
-		return childGetListInterface("gesture_list");
-	}
-	void onActivateBtnClick();
-protected:
+	void onCopyPastAction(const LLSD& command);
+	void onDeleteSelected();
+
 	LLUUID mSelectedID;
 	LLUUID mGestureFolderID;
+	LLScrollListCtrl* mGestureList;
 
 	LLFloaterGestureObserver* mObserver;
 };
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index 21d292847a..9f5e6828d2 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -21,12 +21,16 @@
      name="playing">
         (Playing)
     </floater.string>
+    <!-- It's used to build new name for gesture created by "Copy" menu item -->
+    <floater.string
+     name="copy_name">Copy of [COPY_NAME]</floater.string>
     <scroll_list
      bottom_delta="400"
      draw_heading="true"
      follows="all"
      layout="topleft"
      left="0"
+     multi_select="true"
      top="20"
      name="gesture_list">
         <scroll_list.columns
@@ -57,18 +61,18 @@
              left="0"
              name="bottom_panel"
              width="313">
-               <button
+              <menu_button
                follows="bottom|left"
-               font="SansSerifBigBold"
-               tool_tip="Change sort and view of recent residents list"
                height="18"
                image_disabled="OptionsMenu_Disabled"
                image_selected="OptionsMenu_Press"
                image_unselected="OptionsMenu_Off"
                layout="topleft"
                left="10"
-               name="recent_viewsort_btn"
+               menu_filename="menu_gesture_gear.xml"
+               name="gear_btn"
                top="5"
+               tool_tip="More options"
                width="18" />
               <button
                  follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
new file mode 100644
index 0000000000..4642e82c0b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ layout="topleft"
+ mouse_opaque="false"
+ name="menu_gesture_gear"
+ visible="false">
+    <menu_item_call
+     font="SansSerifBold"
+     label="Add/Remove from Favorites"
+     layout="topleft"
+     name="activate">
+        <on_click
+         function="Gesture.Action.ToogleActiveState" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="copy_gesture">
+        <on_click
+         function="Gesture.Action.CopyPast"
+         parameter="copy_gesture" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="copy_gesture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="paste">
+        <on_click
+         function="Gesture.Action.CopyPast"
+         parameter="paste" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy UUID"
+     layout="topleft"
+     name="copy_uuid">
+        <on_click
+         function="Gesture.Action.CopyPast"
+         parameter="copy_uuid" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="copy_uuid" />
+    </menu_item_call>
+    <menu_item_call
+     label="Save to current outfit"
+     layout="topleft"
+     name="save_to_outfit">
+        <on_click
+         function="Gesture.Action.SaveToCOF" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit"
+     layout="topleft"
+     name="edit_gesture">
+        <on_click
+         function="Gesture.Action.ShowPreview" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="edit_gesture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Inspect"
+     layout="topleft"
+     name="inspect">
+        <on_click
+         function="Gesture.Action.ShowPreview" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="inspect" />
+    </menu_item_call>
+</menu>
-- 
cgit v1.2.3


From 91fdbd92c8e93e1676ba501bbc91ee56d38255c3 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 20 Nov 2009 14:39:27 +0200
Subject: Fixed normal bug EXT-2616 ("Speak" button isn't narrowed and has
 title when width of window is 800px) - updated resize behavior to shrink
 Snapshot button: only speaker is shown in this case. - updated LLSpeakButton
 to hide/show its labels - updated talk_button widget (talk_button.xml) to
 have correct follows attributes - also fixed bug with calculating necessary
 updates for children while extending bottom tray

--HG--
branch : product-engine
---
 indra/newview/llbottomtray.cpp                     | 93 +++++++++++++++++++---
 indra/newview/llbottomtray.h                       |  9 ++-
 indra/newview/llspeakbutton.cpp                    | 21 +++++
 indra/newview/llspeakbutton.h                      | 12 +++
 .../skins/default/xui/en/panel_bottomtray.xml      |  4 +-
 .../skins/default/xui/en/widgets/talk_button.xml   |  3 +
 6 files changed, 130 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 7985ccc2a1..c53a5152de 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -48,6 +48,7 @@
 LLBottomTray::LLBottomTray(const LLSD&)
 :	mChicletPanel(NULL),
 	mSysWell(NULL),
+	mSpeakPanel(NULL),
 	mSpeakBtn(NULL),
 	mNearbyChatBar(NULL),
 	mToolbarStack(NULL)
@@ -304,6 +305,7 @@ BOOL LLBottomTray::postBuild()
 	mSnapshotPanel = getChild<LLPanel>("snapshot_panel");
 	setRightMouseDownCallback(boost::bind(&LLBottomTray::showBottomTrayContextMenu,this, _2, _3,_4));
 
+	mSpeakPanel = getChild<LLPanel>("speak_panel");
 	mSpeakBtn = getChild<LLSpeakButton>("talk");
 
 	// Speak button should be initially disabled because
@@ -320,6 +322,7 @@ BOOL LLBottomTray::postBuild()
 	mObjectDefaultWidthMap[RS_BUTTON_GESTURES] = mGesturePanel->getRect().getWidth();
 	mObjectDefaultWidthMap[RS_BUTTON_MOVEMENT] = mMovementPanel->getRect().getWidth();
 	mObjectDefaultWidthMap[RS_BUTTON_CAMERA]   = mCamPanel->getRect().getWidth();
+	mObjectDefaultWidthMap[RS_BUTTON_SPEAK]	   = mSpeakPanel->getRect().getWidth();
 
 	return TRUE;
 }
@@ -476,7 +479,7 @@ S32 LLBottomTray::processWidthDecreased(S32 delta_width)
 	S32 buttons_freed_width = 0;
 	if (still_should_be_processed)
 	{
-		processShrinkButtons(&delta_width);
+		processShrinkButtons(&delta_width, &buttons_freed_width);
 
 		if (delta_width < 0)
 		{
@@ -532,9 +535,16 @@ void LLBottomTray::processWidthIncreased(S32 delta_width)
 	const S32 available_width_chiclet = chiclet_panel_width - chiclet_panel_min_width;
 
 	// how many room we have to show hidden buttons
-	S32 available_width = delta_width + chatbar_available_shrink_width + available_width_chiclet;
+	S32 total_available_width = delta_width + chatbar_available_shrink_width + available_width_chiclet;
 	S32 buttons_required_width = 0; //How many room will take shown buttons
 
+	lldebugs << "Processing extending, available width:"
+		<< ", chatbar - " << chatbar_available_shrink_width
+		<< ", chiclets - " << available_width_chiclet
+		<< ", total - " << total_available_width
+		<< llendl;
+
+	S32 available_width = total_available_width;
 	if (available_width > 0)
 	{
 		lldebugs << "Trying to process: RS_BUTTON_GESTURES" << llendl;
@@ -559,11 +569,14 @@ void LLBottomTray::processWidthIncreased(S32 delta_width)
 		processShowButton(RS_BUTTON_SNAPSHOT, &available_width, &buttons_required_width);
 	}
 
-	// if we have to show some buttons but width increasing is not enough...
-	if (buttons_required_width > 0 && delta_width < buttons_required_width)
+	processExtendButtons(&available_width);
+
+	// if we have to show/extend some buttons but resized delta width is not enough...
+	S32 processed_width = total_available_width - available_width;
+	if (processed_width > delta_width)
 	{
 		// ... let's shrink nearby chat & chiclet panels
-		S32 required_to_process_width = buttons_required_width;
+		S32 required_to_process_width = processed_width;
 
 		// 1. use delta width of resizing
 		required_to_process_width -= delta_width;
@@ -593,9 +606,8 @@ void LLBottomTray::processWidthIncreased(S32 delta_width)
 	}
 
 	// shown buttons take some space, rest should be processed by nearby chatbar & chiclet panels
-	delta_width -= buttons_required_width;
+	delta_width -= processed_width;
 
-	processExtendButtons(&delta_width);
 
 	// how many space can nearby chatbar take?
 	S32 chatbar_panel_width_ = mNearbyChatBar->getRect().getWidth();
@@ -603,8 +615,14 @@ void LLBottomTray::processWidthIncreased(S32 delta_width)
 	{
 		S32 delta_panel_max = chatbar_panel_max_width - chatbar_panel_width_;
 		S32 delta_panel = llmin(delta_width, delta_panel_max);
+		lldebugs << "Unprocesed delta width: " << delta_width
+			<< ", can be applied to chatbar: " << delta_panel_max
+			<< ", will be applied: " << delta_panel
+			<< llendl;
+
 		delta_width -= delta_panel_max;
 		mNearbyChatBar->reshape(chatbar_panel_width_ + delta_panel, mNearbyChatBar->getRect().getHeight());
+		log(mNearbyChatBar, "applied unprocessed delta width");
 	}
 }
 
@@ -666,7 +684,7 @@ void LLBottomTray::processHideButton(EResizeState processed_object_type, S32* re
 	}
 }
 
-void LLBottomTray::processShrinkButtons(S32* required_width)
+void LLBottomTray::processShrinkButtons(S32* required_width, S32* buttons_freed_width)
 {
 	processShrinkButton(RS_BUTTON_CAMERA, required_width);
 
@@ -678,9 +696,44 @@ void LLBottomTray::processShrinkButtons(S32* required_width)
 	{
 		processShrinkButton(RS_BUTTON_GESTURES, required_width);
 	}
+	if (*required_width < 0)
+	{
+
+		S32 panel_min_width = 0;
+		std::string panel_name = mSpeakPanel->getName();
+		bool success = mToolbarStack->getPanelMinSize(panel_name, &panel_min_width, NULL);
+		if (!success)
+		{
+			lldebugs << "Panel was not found to get its min width: " << panel_name << llendl;
+		}
+		else
+		{
+			//
+			mSpeakBtn->setLabelVisible(false);
+			S32 panel_width = mSpeakPanel->getRect().getWidth();
+			S32 possible_shrink_width = panel_width - panel_min_width;
+
+			if (possible_shrink_width > 0)
+			{
+				mSpeakPanel->reshape(panel_width - possible_shrink_width, mSpeakPanel->getRect().getHeight());
+
+				*required_width += possible_shrink_width;
+
+				if (*required_width > 0)
+				{
+					*buttons_freed_width += *required_width;
+				}
+
+				lldebugs << "Shrunk panel: " << panel_name
+					<< ", shrunk width: " << possible_shrink_width
+					<< ", rest width to process: " << *required_width
+					<< llendl;
+			}
+		}
+	}
 }
 
-void LLBottomTray::processShrinkButton(EResizeState processed_object_type, /*const std::string& panel_name, */S32* required_width)
+void LLBottomTray::processShrinkButton(EResizeState processed_object_type, S32* required_width)
 {
 	LLPanel* panel = mStateProcessedObjectMap[processed_object_type];
 	if (NULL == panel)
@@ -729,6 +782,9 @@ void LLBottomTray::processShrinkButton(EResizeState processed_object_type, /*con
 
 void LLBottomTray::processExtendButtons(S32* available_width)
 {
+	// do not allow extending any buttons if we have some buttons hidden
+	if (mResizeState & RS_BUTTONS_CAN_BE_HIDDEN) return;
+
 	processExtendButton(RS_BUTTON_GESTURES, available_width);
 
 	if (*available_width > 0)
@@ -739,6 +795,25 @@ void LLBottomTray::processExtendButtons(S32* available_width)
 	{
 		processExtendButton(RS_BUTTON_MOVEMENT, available_width);
 	}
+	if (*available_width > 0)
+	{
+		S32 panel_max_width = mObjectDefaultWidthMap[RS_BUTTON_SPEAK];
+		S32 panel_width = mSpeakPanel->getRect().getWidth();
+		S32 possible_extend_width = panel_max_width - panel_width;
+		if (possible_extend_width > 0 && possible_extend_width <= *available_width)
+		{
+			mSpeakBtn->setLabelVisible(true);
+			mSpeakPanel->reshape(panel_max_width, mSpeakPanel->getRect().getHeight());
+			log(mSpeakBtn, "speak button is extended");
+
+			*available_width -= possible_extend_width;
+
+			lldebugs << "Extending panel: " << mSpeakPanel->getName()
+				<< ", extended width: " << possible_extend_width
+				<< ", rest width to process: " << *available_width
+				<< llendl;
+		}
+	}
 }
 
 void LLBottomTray::processExtendButton(EResizeState processed_object_type, S32* available_width)
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 97bcc23403..f4f8397799 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -98,6 +98,12 @@ private:
 		, RS_BUTTON_MOVEMENT	= 0x0010
 		, RS_BUTTON_GESTURES	= 0x0020
 		, RS_BUTTON_SPEAK		= 0x0040
+
+		/**
+		 * Specifies buttons which can be hidden when bottom tray is shrunk.
+		 * They are: Gestures, Movement (Move), Camera (View), Snapshot
+		 */
+		, RS_BUTTONS_CAN_BE_HIDDEN = RS_BUTTON_SNAPSHOT | RS_BUTTON_CAMERA | RS_BUTTON_MOVEMENT | RS_BUTTON_GESTURES
 	}EResizeState;
 
 	S32 processWidthDecreased(S32 delta_width);
@@ -112,7 +118,7 @@ private:
 	 * @param - required_width - width which buttons can use to be shrunk. It is a negative value.
 	 * It is increased on the value processed by buttons.
 	 */
-	void processShrinkButtons(S32* required_width);
+	void processShrinkButtons(S32* required_width, S32* buttons_freed_width);
 	void processShrinkButton(EResizeState processed_object_type, S32* required_width);
 
 	/**
@@ -175,6 +181,7 @@ protected:
 
 	LLChicletPanel* 	mChicletPanel;
 	LLNotificationChiclet* 	mSysWell;
+	LLPanel*			mSpeakPanel;
 	LLSpeakButton* 		mSpeakBtn;
 	LLNearbyChatBar*	mNearbyChatBar;
 	LLLayoutStack*		mToolbarStack;
diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp
index 51d53b2674..54f776ca6a 100644
--- a/indra/newview/llspeakbutton.cpp
+++ b/indra/newview/llspeakbutton.cpp
@@ -143,6 +143,27 @@ void LLSpeakButton::setShowToolTip(const std::string& msg)
 	mShowBtn->setToolTip(msg);
 }
 
+void LLSpeakButton::setLabelVisible(bool visible)
+{
+	static std::string label_selected = mSpeakBtn->getLabelSelected();
+	static std::string label_unselected = mSpeakBtn->getLabelUnselected();
+
+	if (visible)
+	{
+		mSpeakBtn->setLabelSelected(label_selected);
+		mSpeakBtn->setLabelUnselected(label_unselected);
+	}
+	else
+	{
+		static LLStringExplicit empty_string("");
+		mSpeakBtn->setLabelSelected(empty_string);
+		mSpeakBtn->setLabelUnselected(empty_string);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+/// PROTECTED SECTION
+//////////////////////////////////////////////////////////////////////////
 void LLSpeakButton::onMouseDown_SpeakBtn()
 {
 	bool down = true;
diff --git a/indra/newview/llspeakbutton.h b/indra/newview/llspeakbutton.h
index 02c8ab3890..424ee5357a 100644
--- a/indra/newview/llspeakbutton.h
+++ b/indra/newview/llspeakbutton.h
@@ -67,6 +67,18 @@ public:
 	void setSpeakToolTip(const std::string& msg);
 	void setShowToolTip(const std::string& msg);
 
+	/**
+	 * Sets visibility of speak button's label according to passed parameter.
+	 *
+	 * It removes label/selected label if "visible" is false and restores otherwise.
+	 *
+	 * @param visible if true - show label and selected label.
+	 * 
+	 * @see mSpeakBtn
+	 * @see LLBottomTray::processShrinkButtons()
+	 */
+	void setLabelVisible(bool visible);
+
 protected:
 	friend class LLUICtrlFactory;
 	LLSpeakButton(const Params& p);
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 00711a29e0..6480469f43 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -60,11 +60,11 @@
          min_height="28"
          width="104"
          top_delta="0"
-         min_width="104"
+         min_width="54"
          name="speak_panel"
          user_resize="false">
           <talk_button
-           follows="right"
+           follows="left|right"
            height="23"
            speak_button.tab_stop="true"
            show_button.tab_stop="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
index 1d8257fbc8..64c2e65a6e 100644
--- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
@@ -6,6 +6,7 @@
     image_unselected="SegmentedBtn_Left_Off"
   -->
   <speak_button
+    follows="left|right" 
     name="left"
     label="Speak"
     label_selected="Speak"
@@ -13,6 +14,7 @@
     tab_stop="false"
     />
   <show_button
+    follows="right" 
     name="right"
     label=""
     left="0"
@@ -25,6 +27,7 @@
     image_unselected="ComboButton_UpOff"
     />
   <monitor
+    follows="right" 
     name="monitor"
     left="0"
     top="18"
-- 
cgit v1.2.3


From 0876df6eef35a88bc0804e1d8eb0f4471eeda9f2 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 20 Nov 2009 14:55:30 +0200
Subject: No ticket. Code to resize bottom tray is refuctored after the latest
 fix for EXT-2616:  - Removed unused param while extending bottom tray  -
 Moved some debug messages

--HG--
branch : product-engine
---
 indra/newview/llbottomtray.cpp | 24 +++++++++++-------------
 indra/newview/llbottomtray.h   |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index c53a5152de..c4f0fa53a7 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -536,7 +536,6 @@ void LLBottomTray::processWidthIncreased(S32 delta_width)
 
 	// how many room we have to show hidden buttons
 	S32 total_available_width = delta_width + chatbar_available_shrink_width + available_width_chiclet;
-	S32 buttons_required_width = 0; //How many room will take shown buttons
 
 	lldebugs << "Processing extending, available width:"
 		<< ", chatbar - " << chatbar_available_shrink_width
@@ -547,26 +546,22 @@ void LLBottomTray::processWidthIncreased(S32 delta_width)
 	S32 available_width = total_available_width;
 	if (available_width > 0)
 	{
-		lldebugs << "Trying to process: RS_BUTTON_GESTURES" << llendl;
-		processShowButton(RS_BUTTON_GESTURES, &available_width, &buttons_required_width);
+		processShowButton(RS_BUTTON_GESTURES, &available_width);
 	}
 
 	if (available_width > 0)
 	{
-		lldebugs << "Trying to process: RS_BUTTON_MOVEMENT" << llendl;
-		processShowButton(RS_BUTTON_MOVEMENT, &available_width, &buttons_required_width);
+		processShowButton(RS_BUTTON_MOVEMENT, &available_width);
 	}
 
 	if (available_width > 0)
 	{
-		lldebugs << "Trying to process: RS_BUTTON_CAMERA" << llendl;
-		processShowButton(RS_BUTTON_CAMERA, &available_width, &buttons_required_width);
+		processShowButton(RS_BUTTON_CAMERA, &available_width);
 	}
 
 	if (available_width > 0)
 	{
-		lldebugs << "Trying to process: RS_BUTTON_SNAPSHOT" << llendl;
-		processShowButton(RS_BUTTON_SNAPSHOT, &available_width, &buttons_required_width);
+		processShowButton(RS_BUTTON_SNAPSHOT, &available_width);
 	}
 
 	processExtendButtons(&available_width);
@@ -626,8 +621,10 @@ void LLBottomTray::processWidthIncreased(S32 delta_width)
 	}
 }
 
-bool LLBottomTray::processShowButton(EResizeState shown_object_type, S32* available_width, S32* buttons_required_width)
+bool LLBottomTray::processShowButton(EResizeState shown_object_type, S32* available_width)
 {
+	lldebugs << "Trying to show object type: " << shown_object_type << llendl;
+
 	LLPanel* panel = mStateProcessedObjectMap[shown_object_type];
 	if (NULL == panel)
 	{
@@ -643,12 +640,11 @@ bool LLBottomTray::processShowButton(EResizeState shown_object_type, S32* availa
 		if (can_be_shown)
 		{
 			*available_width -= required_width;
-			*buttons_required_width += required_width;
 
 			setTrayButtonVisible(shown_object_type, true);
 
-			lldebugs << "processing object type: " << shown_object_type
-				<< ", buttons_required_width: " << *buttons_required_width
+			lldebugs << "processed object type: " << shown_object_type
+				<< ", rest available width: " << *available_width
 				<< llendl;
 			mResizeState &= ~shown_object_type;
 		}
@@ -658,6 +654,8 @@ bool LLBottomTray::processShowButton(EResizeState shown_object_type, S32* availa
 
 void LLBottomTray::processHideButton(EResizeState processed_object_type, S32* required_width, S32* buttons_freed_width)
 {
+	lldebugs << "Trying to hide object type: " << processed_object_type << llendl;
+
 	LLPanel* panel = mStateProcessedObjectMap[processed_object_type];
 	if (NULL == panel)
 	{
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index f4f8397799..7640cdcf9d 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -109,7 +109,7 @@ private:
 	S32 processWidthDecreased(S32 delta_width);
 	void processWidthIncreased(S32 delta_width);
 	void log(LLView* panel, const std::string& descr);
-	bool processShowButton(EResizeState shown_object_type, S32* available_width, S32* buttons_required_width);
+	bool processShowButton(EResizeState shown_object_type, S32* available_width);
 	void processHideButton(EResizeState processed_object_type, S32* required_width, S32* buttons_freed_width);
 
 	/**
-- 
cgit v1.2.3


From 2d9202cb812dec65ec571035389aacd49d19e659 Mon Sep 17 00:00:00 2001
From: Dmitry Oleshko <doleshko@productengine.com>
Date: Fri, 20 Nov 2009 16:28:52 +0200
Subject: implemented low task (EXT-1476) Make layouts for Alert, Tip and
 Script notifications based on XML

- made XML-files for the following controls on the panel for alert toasts: button, check box, icon and line editor.
- changed creation of these controls in code: from XML vs. from Params in run-time
- added getFont method to the LLCheckBox control

--HG--
branch : product-engine
---
 indra/llui/llcheckboxctrl.h                        |   1 +
 indra/newview/lltoastalertpanel.cpp                | 104 +++++++++++----------
 .../newview/skins/default/xui/en/alert_button.xml  |  14 +++
 .../skins/default/xui/en/alert_check_box.xml       |   7 ++
 indra/newview/skins/default/xui/en/alert_icon.xml  |   8 ++
 .../skins/default/xui/en/alert_line_editor.xml     |  11 +++
 6 files changed, 96 insertions(+), 49 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/alert_button.xml
 create mode 100644 indra/newview/skins/default/xui/en/alert_check_box.xml
 create mode 100644 indra/newview/skins/default/xui/en/alert_icon.xml
 create mode 100644 indra/newview/skins/default/xui/en/alert_line_editor.xml

diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index 2f8e8fdd23..b14e66b915 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -107,6 +107,7 @@ public:
 	std::string			getLabel() const;
 
 	void				setFont( const LLFontGL* font ) { mFont = font; }
+	const LLFontGL*		getFont() { return mFont; }
 	
 	virtual void		setControlName(const std::string& control_name, LLView* context);
 
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
index beb31bc833..a4f5164a8d 100644
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@@ -53,6 +53,7 @@
 #include "lluictrlfactory.h"
 #include "llnotifications.h"
 #include "llfunctorregistry.h"
+#include "llrootview.h"
 
 const S32 MAX_ALLOWED_MSG_WIDTH = 400;
 const F32 DEFAULT_BUTTON_DELAY = 0.5f;
@@ -220,16 +221,13 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 	static LLUIColor alert_text_color = LLUIColorTable::instance().getColor("AlertTextColor");
 	if (mCaution)
 	{
-		LLIconCtrl::Params params;
-		params.name("icon");
-		params.rect(LLRect(msg_x, msg_y, msg_x+32, msg_y-32));
-		params.mouse_opaque(false);
-		params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
-		params.tab_stop(false);
-		LLIconCtrl * icon = LLUICtrlFactory::create<LLIconCtrl> (params);
-		icon->setValue ("notify_caution_icon.tga");
-		icon->setMouseOpaque(FALSE);
-		LLToastPanel::addChild(icon);
+		LLIconCtrl* icon = LLUICtrlFactory::getInstance()->createFromFile<LLIconCtrl>("alert_icon.xml", this, LLPanel::child_registry_t::instance());
+		if(icon)
+		{
+			icon->setRect(LLRect(msg_x, msg_y, msg_x+32, msg_y-32));
+			LLToastPanel::addChild(icon);
+		}
+		
 		msg_x += 32 + HPAD;
 		msg_box->setColor( alert_caution_text_color );
 	}
@@ -245,29 +243,30 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 
 	// Buttons	
 	S32 button_left = (LLToastPanel::getRect().getWidth() - btn_total_width) / 2;
-
+	
 	for( S32 i = 0; i < num_options; i++ )
 	{
 		LLRect button_rect;
-		button_rect.setOriginAndSize( button_left, VPAD, button_width, BTN_HEIGHT );
-
-		LLButton::Params p;
-		p.name(options[i].first);
-		p.rect(button_rect);
-		p.click_callback.function(boost::bind(&LLToastAlertPanel::onButtonPressed, this, _2, i));
-		p.font(font);
-		p.label(options[i].second);
+		
+		LLButton* btn = LLUICtrlFactory::getInstance()->createFromFile<LLButton>("alert_button.xml", this, LLPanel::child_registry_t::instance());
+		if(btn)
+		{
+			btn->setName(options[i].first);
+			btn->setRect(button_rect.setOriginAndSize( button_left, VPAD, button_width, BTN_HEIGHT ));
+			btn->setLabel(options[i].second);
+			btn->setFont(font);
+			
+			btn->setClickedCallback(boost::bind(&LLToastAlertPanel::onButtonPressed, this, _2, i));
 
-		LLButton* btn = LLUICtrlFactory::create<LLButton>(p);
-		mButtonData[i].mButton = btn;
+			mButtonData[i].mButton = btn;
 
-		LLToastPanel::addChild(btn);
+			LLToastPanel::addChild(btn);
 
-		if( i == mDefaultOption )
-		{
-			btn->setFocus(TRUE);
+			if( i == mDefaultOption )
+			{
+				btn->setFocus(TRUE);
+			}
 		}
-
 		button_left += button_width + BTN_HPAD;
 	}
 
@@ -275,25 +274,26 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 	if (!edit_text_name.empty())
 	{
 		S32 y = VPAD + BTN_HEIGHT + VPAD/2;
+		mLineEditor = LLUICtrlFactory::getInstance()->createFromFile<LLLineEditor>("alert_line_editor.xml", this, LLPanel::child_registry_t::instance());
+	
+		if (mLineEditor)
+		{
+			LLRect leditor_rect = LLRect( HPAD, y+EDITOR_HEIGHT, dialog_width-HPAD, y);
+			mLineEditor->setName(edit_text_name);
+			mLineEditor->reshape(leditor_rect.getWidth(), leditor_rect.getHeight());
+			mLineEditor->setRect(leditor_rect);
+			mLineEditor->setText(edit_text_contents);
+			mLineEditor->setMaxTextLength(STD_STRING_STR_LEN);
 
-		LLLineEditor::Params params;
-		params.name(edit_text_name);
-		params.rect(LLRect( HPAD, y+EDITOR_HEIGHT, dialog_width-HPAD, y));
-		params.default_text(edit_text_contents);
-		params.max_length_bytes(STD_STRING_STR_LEN);
-		mLineEditor = LLUICtrlFactory::create<LLLineEditor> (params);
+			// make sure all edit keys get handled properly (DEV-22396)
+			mLineEditor->setHandleEditKeysDirectly(TRUE);
 
-		// make sure all edit keys get handled properly (DEV-22396)
-		mLineEditor->setHandleEditKeysDirectly(TRUE);
+			LLToastPanel::addChild(mLineEditor);
 
-		LLToastPanel::addChild(mLineEditor);
-	}
-	
-	if (mLineEditor)
-	{
-		mLineEditor->setDrawAsterixes(is_password);
+			mLineEditor->setDrawAsterixes(is_password);
 
-		setEditTextArgs(notification->getSubstitutions());
+			setEditTextArgs(notification->getSubstitutions());
+		}
 	}
 
 	std::string ignore_label;
@@ -323,7 +323,14 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 
 bool LLToastAlertPanel::setCheckBox( const std::string& check_title, const std::string& check_control )
 {
-	const LLFontGL* font = LLFontGL::getFontSansSerif();
+	mCheck = LLUICtrlFactory::getInstance()->createFromFile<LLCheckBoxCtrl>("alert_check_box.xml", this, LLPanel::child_registry_t::instance());
+
+	if(!mCheck)
+	{
+		return false;
+	}
+
+	const LLFontGL* font =  mCheck->getFont();
 	const S32 LINE_HEIGHT = llfloor(font->getLineHeight() + 0.99f);
 	
 	// Extend dialog for "check next time"
@@ -339,14 +346,13 @@ bool LLToastAlertPanel::setCheckBox( const std::string& check_title, const std::
 	LLToastPanel::reshape( dialog_width, dialog_height, FALSE );
 
 	S32 msg_x = (LLToastPanel::getRect().getWidth() - max_msg_width) / 2;
+
+	// set check_box's attributes
+	LLRect check_rect;
+	mCheck->setRect(check_rect.setOriginAndSize(msg_x, VPAD+BTN_HEIGHT+LINE_HEIGHT/2, max_msg_width, LINE_HEIGHT));
+	mCheck->setLabel(check_title);
+	mCheck->setCommitCallback(boost::bind(&LLToastAlertPanel::onClickIgnore, this, _1));
 	
-	LLCheckBoxCtrl::Params p;
-	p.name("check");
-	p.rect.left(msg_x).bottom(VPAD+BTN_HEIGHT+LINE_HEIGHT/2).width(max_msg_width).height(LINE_HEIGHT);
-	p.label(check_title);
-	p.font(font);
-	p.commit_callback.function(boost::bind(&LLToastAlertPanel::onClickIgnore, this, _1));
-	mCheck = LLUICtrlFactory::create<LLCheckBoxCtrl>(p);
 	LLToastPanel::addChild(mCheck);
 
 	return true;
diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml
new file mode 100644
index 0000000000..48c67a3770
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/alert_button.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<button
+  label_shadow="true"
+  auto_resize="false"
+  image_overlay_alignment="center"
+  use_ellipses="flse"
+  pad_right="10"
+  pad_left="10"
+  is_toggle="false"
+  scale_image="true"
+  commit_on_return="true"
+  font="SansSerifSmall"
+  follows="bottom"/>
diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml
new file mode 100644
index 0000000000..9f1bdb5193
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/alert_check_box.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<check_box
+  text_enabled_color="LabelTextColor"
+  text_disabled_color="LabelDisabledColor"
+  font="SansSerif"
+  follows="left|top"
+  name="check"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml
new file mode 100644
index 0000000000..b0886fce06
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/alert_icon.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<icon color="1.0 1.0 1.0 1.0"
+      tab_stop="false"
+      mouse_opaque="false"
+      name="icon"
+      image_name="notify_caution_icon.tga" 
+      follows="left|top">
+</icon>
diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml
new file mode 100644
index 0000000000..ab708adb06
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<line_editor
+  select_on_focus="false"
+  handle_edit_keys_directly="false"
+  revert_on_esc="true"
+  commit_on_focus_lost="true"
+  ignore_tab="true"
+  max_length="254"
+  text_pad_right="0"
+  text_pad_left="0"
+  mouse_opaque="true"/>
-- 
cgit v1.2.3