From ce27987c872cdaf2ec781644bc2ceb1a336a0a25 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 12 May 2014 16:25:48 -0400
Subject: STORM-2030 Rapidly clicking the refresh button in selected floaters
 may result in duplicate entries

---
 indra/newview/llfloaterland.cpp       |  7 ++++++-
 indra/newview/llfloaterregioninfo.cpp | 21 +++++++++++++++++++++
 indra/newview/llfloaterregioninfo.h   |  2 ++
 indra/newview/llfloatertopobjects.cpp | 20 ++++++++++++++++++++
 indra/newview/llfloatertopobjects.h   |  1 +
 5 files changed, 50 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index e30bff1edf..79d8424e1a 100755
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -1517,6 +1517,8 @@ void LLPanelLandObjects::onClickRefresh(void* userdata)
 	LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
 	if (!region) return;
 
+	self->mBtnRefresh->setEnabled(false);
+
 	// ready the list for results
 	self->mOwnerList->deleteAllItems();
 	self->mOwnerList->setCommentText(LLTrans::getString("Searching"));
@@ -1576,6 +1578,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 		{
 			msg->getU32("DataExtended", "TimeStamp", most_recent_time, i);
 		}
+
 		if (owner_id.isNull())
 		{
 			continue;
@@ -1611,10 +1614,10 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 		item_params.columns.add().value(LLDate((time_t)most_recent_time)).font(FONT).column("mostrecent").type("date");
 
 		self->mOwnerList->addNameItemRow(item_params);
-
 		LL_DEBUGS() << "object owner " << owner_id << " (" << (is_group_owned ? "group" : "agent")
 				<< ") owns " << object_count << " objects." << LL_ENDL;
 	}
+
 	// check for no results
 	if (0 == self->mOwnerList->getItemCount())
 	{
@@ -1624,6 +1627,8 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 	{
 		self->mOwnerList->setEnabled(TRUE);
 	}
+
+	self->mBtnRefresh->setEnabled(true);
 }
 
 // static
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 8d1114e056..ab3136d0c3 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -480,6 +480,17 @@ void LLFloaterRegionInfo::refresh()
 	}
 }
 
+void LLFloaterRegionInfo::enableTopButtons()
+{
+	getChildView("top_colliders_btn")->setEnabled(true);
+	getChildView("top_scripts_btn")->setEnabled(true);
+}
+
+void LLFloaterRegionInfo::disableTopButtons()
+{
+	getChildView("top_colliders_btn")->setEnabled(false);
+	getChildView("top_scripts_btn")->setEnabled(false);
+}
 
 ///----------------------------------------------------------------------------
 /// Local class implementation
@@ -1028,6 +1039,11 @@ void LLPanelRegionDebugInfo::onClickTopColliders(void* data)
 	if(!instance) return;
 	LLFloaterReg::showInstance("top_objects");
 	instance->clearList();
+	instance->disableRefreshBtn();
+
+	self->getChildView("top_colliders_btn")->setEnabled(false);
+	self->getChildView("top_scripts_btn")->setEnabled(false);
+
 	self->sendEstateOwnerMessage(gMessageSystem, "colliders", invoice, strings);
 }
 
@@ -1042,6 +1058,11 @@ void LLPanelRegionDebugInfo::onClickTopScripts(void* data)
 	if(!instance) return;
 	LLFloaterReg::showInstance("top_objects");
 	instance->clearList();
+	instance->disableRefreshBtn();
+
+	self->getChildView("top_colliders_btn")->setEnabled(false);
+	self->getChildView("top_scripts_btn")->setEnabled(false);
+
 	self->sendEstateOwnerMessage(gMessageSystem, "scripts", invoice, strings);
 }
 
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index dd961e21b2..58f421f602 100755
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -96,6 +96,8 @@ public:
 	
 	void requestRegionInfo();
 	void requestMeshRezInfo();
+	void enableTopButtons();
+	void disableTopButtons();
 
 private:
 	
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index 7530c72dd2..3a167cfc77 100755
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -50,6 +50,7 @@
 #include "llviewerregion.h"
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
+#include "llfloaterregioninfo.h"
 
 //LLFloaterTopObjects* LLFloaterTopObjects::sInstance = NULL;
 
@@ -268,6 +269,13 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		format.setArg("[COUNT]", llformat("%d", total_count));
 		getChild<LLUICtrl>("title_text")->setValue(LLSD(format));
 	}
+
+	LLFloaterRegionInfo* region_info_floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
+	if(region_info_floater)
+	{
+		region_info_floater->enableTopButtons();
+	}
+	getChildView("refresh_btn")->setEnabled(true);
 }
 
 void LLFloaterTopObjects::onCommitObjectsList()
@@ -453,12 +461,24 @@ void LLFloaterTopObjects::onRefresh()
 	msg->addStringFast(_PREHASH_Filter, filter);
 	msg->addS32Fast(_PREHASH_ParcelLocalID, 0);
 
+	LLFloaterRegionInfo* region_info_floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
+	if(region_info_floater)
+	{
+		region_info_floater->disableTopButtons();
+	}
+	disableRefreshBtn();
+
 	msg->sendReliable(gAgent.getRegionHost());
 
 	mFilter.clear();
 	mFlags = 0;
 }
 
+void LLFloaterTopObjects::disableRefreshBtn()
+{
+	getChildView("refresh_btn")->setEnabled(false);
+}
+
 void LLFloaterTopObjects::onGetByObjectName()
 {
 	mFlags  = STAT_FILTER_BY_OBJECT;
diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h
index 28d2aa58e2..dbbe9ac521 100755
--- a/indra/newview/llfloatertopobjects.h
+++ b/indra/newview/llfloatertopobjects.h
@@ -66,6 +66,7 @@ public:
 	void onRefresh();
 
 	static void setMode(U32 mode);
+	void disableRefreshBtn();
 
 private:
 	LLFloaterTopObjects(const LLSD& key);
-- 
cgit v1.2.3


From 4fffc8c8e458ed13993fd0d5bc07ff641cb56005 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 13 May 2014 12:30:29 -0400
Subject: STORM-2031 Display issues with Top colliders/Top scripts floater
 OPEN-217 Change to media_plugin_quicktime.cpp causes Windows compile to fail

---
 indra/newview/llfloatertopobjects.cpp                      |  4 +++-
 indra/newview/skins/default/xui/en/floater_top_objects.xml | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index 7530c72dd2..940fe3733c 100755
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -207,7 +207,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		columns[column_num++]["font"] = "SANSSERIF";
 
 		columns[column_num]["column"] = "location";
-		columns[column_num]["value"] = llformat("<%0.1f,%0.1f,%0.1f>", location_x, location_y, location_z);
+		columns[column_num]["value"] = llformat("<%0.f, %0.f, %0.f>", location_x, location_y, location_z);
 		columns[column_num++]["font"] = "SANSSERIF";
 
 		columns[column_num]["column"] = "parcel";
@@ -257,6 +257,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		format.setArg("[COUNT]", llformat("%d", total_count));
 		format.setArg("[TIME]", llformat("%0.3f", mtotalScore));
 		getChild<LLUICtrl>("title_text")->setValue(LLSD(format));
+		list->setColumnLabel("URLs", getString("URLs"));
+		list->setColumnLabel("memory", getString("memory"));
 	}
 	else
 	{
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index 0b71177345..36ceddd305 100755
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -38,6 +38,18 @@
      name="none_descriptor">
         None found.
     </floater.string>
+    <floater.string
+     name="URLs">
+        URLs
+    </floater.string>
+    <floater.string
+     name="memory">
+        Memory (KB)
+    </floater.string>
+
+
+
+
     <text
      type="string"
      length="1"
@@ -82,7 +94,7 @@
          name="parcel"
          width="120" />
         <scroll_list.columns
-         label="Time"
+         label="Date"
          name="time"
          width="130" />
           <scroll_list.columns
-- 
cgit v1.2.3


From 4da7f68549f531a6bec3643727cc68fb29a00bfa Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 5 Jun 2014 17:06:59 -0400
Subject: VWR-25689 Support 'older than' when inventory filtering

---
 indra/newview/llinventoryfilter.cpp                | 37 +++++++++++++++--
 indra/newview/llinventoryfilter.h                  |  6 ++-
 indra/newview/llinventorypanel.cpp                 |  5 +++
 indra/newview/llinventorypanel.h                   |  1 +
 indra/newview/llpanelmaininventory.cpp             | 12 ++++++
 .../xui/en/floater_inventory_view_finder.xml       | 48 ++++++++++++++++------
 6 files changed, 92 insertions(+), 17 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 000eee3317..25447da53b 100755
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -37,6 +37,7 @@
 #include "llfolderview.h"
 #include "llinventorybridge.h"
 #include "llviewerfoldertype.h"
+#include "llradiogroup.h"
 
 // linden library includes
 #include "llclipboard.h"
@@ -51,6 +52,7 @@ LLInventoryFilter::FilterOps::FilterOps(const Params& p)
 	mMinDate(p.date_range.min_date),
 	mMaxDate(p.date_range.max_date),
 	mHoursAgo(p.hours_ago),
+	mDateSearchDirection(p.date_search_direction),
 	mShowFolderState(p.show_folder_state),
 	mPermissions(p.permissions),
 	mFilterTypes(p.types),
@@ -209,6 +211,7 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
 	{
 		const U16 HOURS_TO_SECONDS = 3600;
 		time_t earliest = time_corrected() - mFilterOps.mHoursAgo * HOURS_TO_SECONDS;
+
 		if (mFilterOps.mMinDate > time_min() && mFilterOps.mMinDate < earliest)
 		{
 			earliest = mFilterOps.mMinDate;
@@ -217,9 +220,20 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
 		{
 			earliest = 0;
 		}
-		if (listener->getCreationDate() < earliest ||
-			listener->getCreationDate() > mFilterOps.mMaxDate)
-			return FALSE;
+
+llwarns << "DBG 3 " << mFilterOps.mDateSearchDirection << llendl;
+		if (1 == mFilterOps.mDateSearchDirection)
+		{
+			if (listener->getCreationDate() < earliest ||
+				listener->getCreationDate() > mFilterOps.mMaxDate)
+				return FALSE;
+		}
+		else
+		{
+			if (listener->getCreationDate() > earliest ||
+				listener->getCreationDate() > mFilterOps.mMaxDate)
+				return FALSE;
+		}
 	}
 
 	////////////////////////////////////////////////////////////////////////////////
@@ -635,6 +649,13 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 		BOOL less_restrictive = (are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo)) || !hours);
 		BOOL more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero);
 
+		// Toggle for older than search
+		if (0 == mFilterOps.mDateSearchDirection)
+		{
+			less_restrictive = !less_restrictive;
+			more_restrictive = !more_restrictive;
+		}
+
 		mFilterOps.mHoursAgo = hours;
 		mFilterOps.mMinDate = time_min();
 		mFilterOps.mMaxDate = time_max();
@@ -662,6 +683,16 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 	}
 }
 
+void LLInventoryFilter::setDateSearchDirection(U32 direction)
+{
+llwarns << "DBG 2 " << direction << llendl;
+	if (direction != mFilterOps.mDateSearchDirection)
+	{
+		mFilterOps.mDateSearchDirection = direction;
+		setModified(FILTER_RESTART);
+	}
+}
+
 void LLInventoryFilter::setFilterLinks(U64 filter_links)
 {
 	if (mFilterOps.mFilterLinks != filter_links)
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index ce516af0b9..2a95512995 100755
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -94,7 +94,8 @@ public:
 			Optional<EFilterLink>		links;
 			Optional<LLUUID>			uuid;
 			Optional<DateRange>			date_range;
-			Optional<S32>				hours_ago;
+			Optional<U32>				hours_ago;
+			Optional<U32>				date_search_direction;
 			Optional<EFolderShow>		show_folder_state;
 			Optional<PermissionMask>	permissions;
 
@@ -107,6 +108,7 @@ public:
 				uuid("uuid"),
 				date_range("date_range"),
 				hours_ago("hours_ago", 0),
+				date_search_direction("date_search_direction", 0),
 				show_folder_state("show_folder_state", SHOW_NON_EMPTY_FOLDERS),
 				permissions("permissions", PERM_NONE)
 			{}
@@ -124,6 +126,7 @@ public:
 		time_t			mMinDate,
 						mMaxDate;
 		U32				mHoursAgo;
+		U32				mDateSearchDirection;
 
 		EFolderShow		mShowFolderState;
 		PermissionMask	mPermissions;
@@ -177,6 +180,7 @@ public:
 
 	void 				setHoursAgo(U32 hours);
 	U32 				getHoursAgo() const;
+	void				setDateSearchDirection(U32 direction);
 
 	void 				setFilterLinks(U64 filter_link);
 	U64					getFilterLinks() const;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index e74e58015a..1a3710afe7 100755
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -400,6 +400,11 @@ void LLInventoryPanel::setHoursAgo(U32 hours)
 	getFilter().setHoursAgo(hours);
 }
 
+void LLInventoryPanel::setDateSearchDirection(U32 direction)
+{
+	getFilter().setDateSearchDirection(direction);
+}
+
 void LLInventoryPanel::setFilterLinks(U64 filter_links)
 {
 	getFilter().setFilterLinks(filter_links);
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 91c3efd8f0..a490dfce5d 100755
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -173,6 +173,7 @@ public:
 	const std::string getFilterSubString();
 	void setSinceLogoff(BOOL sl);
 	void setHoursAgo(U32 hours);
+	void setDateSearchDirection(U32 direction);
 	BOOL getSinceLogoff();
 	void setFilterLinks(U64 filter_links);
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index b02298090a..310b5f5639 100755
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -55,6 +55,7 @@
 #include "llviewertexturelist.h"
 #include "llsidepanelinventory.h"
 #include "llfolderview.h"
+#include "llradiogroup.h"
 
 const std::string FILTERS_FILENAME("filters.xml");
 
@@ -82,6 +83,7 @@ public:
 	void updateElementsFromFilter();
 	BOOL getCheckShowEmpty();
 	BOOL getCheckSinceLogoff();
+	U32 getDateSearchDirection();
 
 	static void onTimeAgo(LLUICtrl*, void *);
 	static void onCloseBtn(void* user_data);
@@ -91,6 +93,7 @@ private:
 	LLPanelMainInventory*	mPanelMainInventory;
 	LLSpinCtrl*			mSpinSinceDays;
 	LLSpinCtrl*			mSpinSinceHours;
+	LLRadioGroup*		mSinceDirection;
 	LLInventoryFilter*	mFilter;
 };
 
@@ -687,6 +690,9 @@ BOOL LLFloaterInventoryFinder::postBuild()
 	mSpinSinceDays = getChild<LLSpinCtrl>("spin_days_ago");
 	childSetCommitCallback("spin_days_ago", onTimeAgo, this);
 
+	mSinceDirection = getChild<LLRadioGroup>("date_search_direction");
+	mSinceDirection->setSelectedIndex(0);
+
 	childSetAction("Close", onCloseBtn, this);
 
 	updateElementsFromFilter();
@@ -851,6 +857,7 @@ void LLFloaterInventoryFinder::draw()
 	mPanelMainInventory->getPanel()->setHoursAgo(hours);
 	mPanelMainInventory->getPanel()->setSinceLogoff(getCheckSinceLogoff());
 	mPanelMainInventory->setFilterTextFromFilter();
+	mPanelMainInventory->getPanel()->setDateSearchDirection(getDateSearchDirection());
 
 	LLPanel::draw();
 }
@@ -865,6 +872,11 @@ BOOL LLFloaterInventoryFinder::getCheckSinceLogoff()
 	return getChild<LLUICtrl>("check_since_logoff")->getValue();
 }
 
+U32 LLFloaterInventoryFinder::getDateSearchDirection()
+{
+	return 	mSinceDirection->getSelectedIndex();
+}
+
 void LLFloaterInventoryFinder::onCloseBtn(void* user_data)
 {
 	LLFloaterInventoryFinder* finderp = (LLFloaterInventoryFinder*)user_data;
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index c86ed595a7..5c7c4de9e8 100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="408"
+ height="440"
  layout="topleft"
  name="Inventory Finder"
  help_topic="inventory_finder"
@@ -95,36 +95,36 @@
      width="126" />
     <icon
      height="16"
-     image_name="Inv_Mesh"
+     image_name="Inv_Notecard"
      layout="topleft"
      left="8"
      mouse_opaque="true"
-     name="icon_mesh"
-     top="142"
+     name="icon_notecard"
+     top="122"
      width="16" />
     <check_box
      height="16"
-     label="Meshes"
+     label="Notecards"
      layout="topleft"
      left_pad="2"
-     name="check_mesh"
+     name="check_notecard"
      top_delta="0"
      width="126" />
     <icon
      height="16"
-     image_name="Inv_Notecard"
+     image_name="Inv_Mesh"
      layout="topleft"
      left="8"
      mouse_opaque="true"
-     name="icon_notecard"
-     top="122"
+     name="icon_mesh"
+     top="142"
      width="16" />
     <check_box
      height="16"
-     label="Notecards"
+     label="Meshes"
      layout="topleft"
      left_pad="2"
-     name="check_notecard"
+     name="check_mesh"
      top_delta="0"
      width="126" />
     <icon
@@ -261,12 +261,34 @@
      width="144">
         - OR -
     </text>
+
+ <radio_group
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left_delta="0"
+  name="date_search_direction"
+  top_pad="0"
+  width="270">
+  <radio_item
+   label="Older than"
+   layout="topleft"
+   name="older"
+   top_pad="6" />
+  <radio_item
+   label="Younger than"
+   layout="topleft"
+   name="yonger"
+   top_pad="-10"
+   left="120" />
+ </radio_group>
+
     <spinner
      follows="left|top"
      height="16"
      increment="1"
      initial_value="0"
-     label="Hours Ago"
+     label="Hours"
      label_width="64"
      layout="topleft"
      left_delta="0"
@@ -279,7 +301,7 @@
      height="16"
      increment="1"
      initial_value="0"
-     label="Days Ago"
+     label="Days"
      label_width="64"
      layout="topleft"
      left_delta="0"
-- 
cgit v1.2.3


From 89837f385261804781979bdac499d264457e3297 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Fri, 6 Jun 2014 14:56:11 -0400
Subject: STOMR-2034 XML adjustments and a bit of code cleanup

---
 indra/newview/llinventoryfilter.cpp                |  6 +-
 indra/newview/llpanelmaininventory.cpp             |  4 +-
 .../xui/en/floater_inventory_view_finder.xml       | 66 ++++++++++++----------
 3 files changed, 42 insertions(+), 34 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 25447da53b..ce0f66edbb 100755
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -174,6 +174,8 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
 
 	const U32 filterTypes = mFilterOps.mFilterTypes;
 
+	const U32 FILTER_YOUNGER = 0;
+
 	////////////////////////////////////////////////////////////////////////////////
 	// FILTERTYPE_OBJECT
 	// Pass if this item's type is of the correct filter type
@@ -221,8 +223,7 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
 			earliest = 0;
 		}
 
-llwarns << "DBG 3 " << mFilterOps.mDateSearchDirection << llendl;
-		if (1 == mFilterOps.mDateSearchDirection)
+		if (FILTER_YOUNGER == mFilterOps.mDateSearchDirection)
 		{
 			if (listener->getCreationDate() < earliest ||
 				listener->getCreationDate() > mFilterOps.mMaxDate)
@@ -685,7 +686,6 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 
 void LLInventoryFilter::setDateSearchDirection(U32 direction)
 {
-llwarns << "DBG 2 " << direction << llendl;
 	if (direction != mFilterOps.mDateSearchDirection)
 	{
 		mFilterOps.mDateSearchDirection = direction;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 310b5f5639..862a07358b 100755
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -681,6 +681,8 @@ BOOL LLFloaterInventoryFinder::postBuild()
 	const LLRect& viewrect = mPanelMainInventory->getRect();
 	setRect(LLRect(viewrect.mLeft - getRect().getWidth(), viewrect.mTop, viewrect.mLeft, viewrect.mTop - getRect().getHeight()));
 
+	const U32 FILTER_NEWER = 0;
+
 	childSetAction("All", selectAllTypes, this);
 	childSetAction("None", selectNoTypes, this);
 
@@ -691,7 +693,7 @@ BOOL LLFloaterInventoryFinder::postBuild()
 	childSetCommitCallback("spin_days_ago", onTimeAgo, this);
 
 	mSinceDirection = getChild<LLRadioGroup>("date_search_direction");
-	mSinceDirection->setSelectedIndex(0);
+	mSinceDirection->setSelectedIndex(FILTER_NEWER);
 
 	childSetAction("Close", onCloseBtn, this);
 
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index 5c7c4de9e8..54e08822f1 100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -223,25 +223,33 @@
      top="262"
      width="100" />
     <button
-     follows="left|top"
      height="20"
      label="None"
      label_selected="None"
-     layout="topleft"
      left_delta="0"
      name="None"
-     top_pad="4"
+     left_pad="10"
      width="100" />
     <check_box
      height="16"
      label="Always show folders"
      layout="topleft"
-     left_delta="0"
+     left="8"
      name="check_show_empty"
-     top_pad="4"
+     top_pad="6"
      width="144" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="horiz_separator"
+     top_pad="8"
+     width="260"/>
     <check_box
      height="16"
+     top="324"
      label="Since Logoff"
      layout="topleft"
      left_delta="0"
@@ -257,32 +265,30 @@
      layout="topleft"
      left_delta="0"
      name="- OR -"
-     top_delta="16"
+     top="342"
      width="144">
         - OR -
     </text>
-
- <radio_group
-  follows="top|left"
-  height="16"
-  layout="topleft"
-  left_delta="0"
-  name="date_search_direction"
-  top_pad="0"
-  width="270">
-  <radio_item
-   label="Older than"
-   layout="topleft"
-   name="older"
-   top_pad="6" />
-  <radio_item
-   label="Younger than"
-   layout="topleft"
-   name="yonger"
-   top_pad="-10"
-   left="120" />
- </radio_group>
-
+    <radio_group
+     height="16"
+     layout="topleft"
+     name="date_search_direction"
+     top="360"
+     left="8"
+     width="270">
+     <radio_item
+      label="Newer than"
+      layout="topleft"
+      name="newer"
+      top_pad="6"
+      left="0" />
+     <radio_item
+      label="Older than"
+      layout="topleft"
+      name="older"
+      top_delta="0"
+      left="120" />
+    </radio_group>
     <spinner
      follows="left|top"
      height="16"
@@ -307,7 +313,7 @@
      left_delta="0"
      max_val="10000"
      name="spin_days_ago"
-     top_pad="4"
+     top_pad="14"
      width="144" />
     <button
      follows="top|right"
@@ -317,6 +323,6 @@
      layout="topleft"
      name="Close"
      right="-6"
-     top="382"
+     top="412"
      width="76" />
 </floater>
-- 
cgit v1.2.3


From f759b3b9121621e14e766865198fb3ba8bdfd00c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Fri, 6 Jun 2014 16:23:20 -0400
Subject: STORM-2034 Add a constant, try to fix some datetime logic filtering
 errors

---
 indra/newview/llinventoryfilter.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index ce0f66edbb..c712e98bd5 100755
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -223,7 +223,7 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
 			earliest = 0;
 		}
 
-		if (FILTER_YOUNGER == mFilterOps.mDateSearchDirection)
+		if (FILTER_YOUNGER == mFilterOps.mDateSearchDirection || isSinceLogoff())
 		{
 			if (listener->getCreationDate() < earliest ||
 				listener->getCreationDate() > mFilterOps.mMaxDate)
@@ -641,6 +641,8 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 {
 	if (mFilterOps.mHoursAgo != hours)
 	{
+		const U32 FILTER_NEWER = 1;
+
 		bool are_date_limits_valid = mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max();
 
 		bool is_increasing = hours > mFilterOps.mHoursAgo;
@@ -650,8 +652,8 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 		BOOL less_restrictive = (are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo)) || !hours);
 		BOOL more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero);
 
-		// Toggle for older than search
-		if (0 == mFilterOps.mDateSearchDirection)
+		// Toggle for newer than search
+		if (FILTER_NEWER == mFilterOps.mDateSearchDirection)
 		{
 			less_restrictive = !less_restrictive;
 			more_restrictive = !more_restrictive;
-- 
cgit v1.2.3


From 481f3cc54ba5ede6eadef77f1f808c39cb2cec92 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sat, 7 Jun 2014 05:16:56 -0400
Subject: STORM-2034 Add persistence for new setting, more XML formatting
 changes, Fix two issues with how hours and days are calculated and displayed

---
 indra/newview/llinventoryfilter.cpp                | 16 ++++++----
 indra/newview/llinventoryfilter.h                  |  9 +++++-
 indra/newview/llpanelmaininventory.cpp             | 17 +++++-----
 .../xui/en/floater_inventory_view_finder.xml       | 36 ++++++++++++++++------
 4 files changed, 54 insertions(+), 24 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index c712e98bd5..a3b2dd3366 100755
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -174,8 +174,6 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
 
 	const U32 filterTypes = mFilterOps.mFilterTypes;
 
-	const U32 FILTER_YOUNGER = 0;
-
 	////////////////////////////////////////////////////////////////////////////////
 	// FILTERTYPE_OBJECT
 	// Pass if this item's type is of the correct filter type
@@ -223,7 +221,7 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
 			earliest = 0;
 		}
 
-		if (FILTER_YOUNGER == mFilterOps.mDateSearchDirection || isSinceLogoff())
+		if (FILTERDATEDIRECTION_NEWER == mFilterOps.mDateSearchDirection || isSinceLogoff())
 		{
 			if (listener->getCreationDate() < earliest ||
 				listener->getCreationDate() > mFilterOps.mMaxDate)
@@ -641,8 +639,6 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 {
 	if (mFilterOps.mHoursAgo != hours)
 	{
-		const U32 FILTER_NEWER = 1;
-
 		bool are_date_limits_valid = mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max();
 
 		bool is_increasing = hours > mFilterOps.mHoursAgo;
@@ -653,7 +649,7 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 		BOOL more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero);
 
 		// Toggle for newer than search
-		if (FILTER_NEWER == mFilterOps.mDateSearchDirection)
+		if (FILTERDATEDIRECTION_NEWER == mFilterOps.mDateSearchDirection)
 		{
 			less_restrictive = !less_restrictive;
 			more_restrictive = !more_restrictive;
@@ -695,6 +691,11 @@ void LLInventoryFilter::setDateSearchDirection(U32 direction)
 	}
 }
 
+U32 LLInventoryFilter::getDateSearchDirection() const
+{
+	return mFilterOps.mDateSearchDirection;
+}
+
 void LLInventoryFilter::setFilterLinks(U64 filter_links)
 {
 	if (mFilterOps.mFilterLinks != filter_links)
@@ -959,6 +960,7 @@ LLInventoryFilter& LLInventoryFilter::operator=( const  LLInventoryFilter&  othe
 	setFilterObjectTypes(other.getFilterObjectTypes());
 	setDateRange(other.getMinDate(), other.getMaxDate());
 	setHoursAgo(other.getHoursAgo());
+	setDateSearchDirection(other.getDateSearchDirection());
 	setShowFolderState(other.getShowFolderState());
 	setFilterPermissions(other.getFilterPermissions());
 	setFilterSubString(other.getFilterSubString());
@@ -978,6 +980,7 @@ void LLInventoryFilter::toParams(Params& params) const
 	params.filter_ops.date_range.min_date = getMinDate();
 	params.filter_ops.date_range.max_date = getMaxDate();
 	params.filter_ops.hours_ago = getHoursAgo();
+	params.filter_ops.date_search_direction = getDateSearchDirection();
 	params.filter_ops.show_folder_state = getShowFolderState();
 	params.filter_ops.permissions = getFilterPermissions();
 	params.substring = getFilterSubString();
@@ -999,6 +1002,7 @@ void LLInventoryFilter::fromParams(const Params& params)
 	}
 	setDateRange(params.filter_ops.date_range.min_date,   params.filter_ops.date_range.max_date);
 	setHoursAgo(params.filter_ops.hours_ago);
+	setDateSearchDirection(params.filter_ops.date_search_direction);
 	setShowFolderState(params.filter_ops.show_folder_state);
 	setFilterPermissions(params.filter_ops.permissions);
 	setFilterSubString(params.substring);
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index 2a95512995..0d3d3889cb 100755
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -55,6 +55,12 @@ public:
 		FILTERTYPE_EMPTYFOLDERS = 0x1 << 5		// pass if folder is not a system   folder to be hidden if
 	};
 
+	enum EFilterDateDirection
+	{
+		FILTERDATEDIRECTION_NEWER,
+		FILTERDATEDIRECTION_OLDER
+	};
+
 	enum EFilterLink
 	{
 		FILTERLINK_INCLUDE_LINKS,	// show links too
@@ -108,7 +114,7 @@ public:
 				uuid("uuid"),
 				date_range("date_range"),
 				hours_ago("hours_ago", 0),
-				date_search_direction("date_search_direction", 0),
+				date_search_direction("date_search_direction", FILTERDATEDIRECTION_NEWER),
 				show_folder_state("show_folder_state", SHOW_NON_EMPTY_FOLDERS),
 				permissions("permissions", PERM_NONE)
 			{}
@@ -181,6 +187,7 @@ public:
 	void 				setHoursAgo(U32 hours);
 	U32 				getHoursAgo() const;
 	void				setDateSearchDirection(U32 direction);
+	U32					getDateSearchDirection() const;
 
 	void 				setFilterLinks(U64 filter_link);
 	U64					getFilterLinks() const;
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 862a07358b..ba712d40ae 100755
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -56,6 +56,7 @@
 #include "llsidepanelinventory.h"
 #include "llfolderview.h"
 #include "llradiogroup.h"
+//#include "llinventoryfilter.h"
 
 const std::string FILTERS_FILENAME("filters.xml");
 
@@ -93,7 +94,6 @@ private:
 	LLPanelMainInventory*	mPanelMainInventory;
 	LLSpinCtrl*			mSpinSinceDays;
 	LLSpinCtrl*			mSpinSinceHours;
-	LLRadioGroup*		mSinceDirection;
 	LLInventoryFilter*	mFilter;
 };
 
@@ -681,8 +681,6 @@ BOOL LLFloaterInventoryFinder::postBuild()
 	const LLRect& viewrect = mPanelMainInventory->getRect();
 	setRect(LLRect(viewrect.mLeft - getRect().getWidth(), viewrect.mTop, viewrect.mLeft, viewrect.mTop - getRect().getHeight()));
 
-	const U32 FILTER_NEWER = 0;
-
 	childSetAction("All", selectAllTypes, this);
 	childSetAction("None", selectNoTypes, this);
 
@@ -692,9 +690,6 @@ BOOL LLFloaterInventoryFinder::postBuild()
 	mSpinSinceDays = getChild<LLSpinCtrl>("spin_days_ago");
 	childSetCommitCallback("spin_days_ago", onTimeAgo, this);
 
-	mSinceDirection = getChild<LLRadioGroup>("date_search_direction");
-	mSinceDirection->setSelectedIndex(FILTER_NEWER);
-
 	childSetAction("Close", onCloseBtn, this);
 
 	updateElementsFromFilter();
@@ -727,6 +722,7 @@ void LLFloaterInventoryFinder::updateElementsFromFilter()
 	std::string filter_string = mFilter->getFilterSubString();
 	LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState();
 	U32 hours = mFilter->getHoursAgo();
+	U32 date_search_direction = mFilter->getDateSearchDirection();
 
 	// update the ui elements
 	setTitle(mFilter->getName());
@@ -748,6 +744,7 @@ void LLFloaterInventoryFinder::updateElementsFromFilter()
 	getChild<LLUICtrl>("check_since_logoff")->setValue(mFilter->isSinceLogoff());
 	mSpinSinceHours->set((F32)(hours % 24));
 	mSpinSinceDays->set((F32)(hours / 24));
+	getChild<LLRadioGroup>("date_search_direction")->setSelectedIndex(date_search_direction);
 }
 
 void LLFloaterInventoryFinder::draw()
@@ -850,10 +847,14 @@ void LLFloaterInventoryFinder::draw()
 	U32 hours = (U32)mSpinSinceHours->get();
 	if (hours > 24)
 	{
-		days += hours / 24;
+		days = hours / 24;
 		hours = (U32)hours % 24;
+		// A UI element that has focus will not display a new value set to it
+		mSpinSinceHours->setFocus(false);
+		mSpinSinceDays->setFocus(false);
 		mSpinSinceDays->set((F32)days);
 		mSpinSinceHours->set((F32)hours);
+		mSpinSinceHours->setFocus(true);
 	}
 	hours += days * 24;
 	mPanelMainInventory->getPanel()->setHoursAgo(hours);
@@ -876,7 +877,7 @@ BOOL LLFloaterInventoryFinder::getCheckSinceLogoff()
 
 U32 LLFloaterInventoryFinder::getDateSearchDirection()
 {
-	return 	mSinceDirection->getSelectedIndex();
+	return 	getChild<LLRadioGroup>("date_search_direction")->getSelectedIndex();
 }
 
 void LLFloaterInventoryFinder::onCloseBtn(void* user_data)
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index 54e08822f1..17bc818cc1 100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -294,27 +294,45 @@
      height="16"
      increment="1"
      initial_value="0"
-     label="Hours"
-     label_width="64"
      layout="topleft"
      left_delta="0"
      max_val="240000"
      name="spin_hours_ago"
      top_pad="4"
-     width="144" />
+     width="64" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="3"
+     top_delta="4"
+     width="80">
+        Hours
+    </text>
     <spinner
      follows="left|top"
      height="16"
      increment="1"
      initial_value="0"
-     label="Days"
-     label_width="64"
      layout="topleft"
-     left_delta="0"
      max_val="10000"
      name="spin_days_ago"
-     top_pad="14"
-     width="144" />
+     top_pad="4"
+     left="8"
+     width="64" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="3"
+     top_delta="4"
+     width="80">
+        Days
+    </text>
     <button
      follows="top|right"
      height="20"
@@ -323,6 +341,6 @@
      layout="topleft"
      name="Close"
      right="-6"
-     top="412"
+     top="406"
      width="76" />
 </floater>
-- 
cgit v1.2.3


From e856e10c7d06c8a19b9e12407f13900fee8b80c1 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Mon, 9 Jun 2014 11:15:09 -0400
Subject: STORM-2034 Trivial code cleanup

---
 indra/newview/llpanelmaininventory.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index ba712d40ae..a23b56a637 100755
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -56,7 +56,6 @@
 #include "llsidepanelinventory.h"
 #include "llfolderview.h"
 #include "llradiogroup.h"
-//#include "llinventoryfilter.h"
 
 const std::string FILTERS_FILENAME("filters.xml");
 
-- 
cgit v1.2.3


From 51aa604af4e8b3b7361c31dcf2578c8a42bf3b1e Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 10 Jun 2014 13:06:53 -0400
Subject: STORM-2034 Try to fix incorrect logic about increasing and decreasing
 filtering. Minor XML adjustment.

---
 indra/newview/llinventoryfilter.cpp                               | 8 ++++----
 .../newview/skins/default/xui/en/menu_inventory_gear_default.xml  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index a3b2dd3366..1d788321b8 100755
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -642,17 +642,17 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 		bool are_date_limits_valid = mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max();
 
 		bool is_increasing = hours > mFilterOps.mHoursAgo;
+		bool is_decreasing = hours < mFilterOps.mHoursAgo;
 		bool is_increasing_from_zero = is_increasing && !mFilterOps.mHoursAgo && !isSinceLogoff();
 
 		// *NOTE: need to cache last filter time, in case filter goes stale
 		BOOL less_restrictive = (are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo)) || !hours);
 		BOOL more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero);
 
-		// Toggle for newer than search
-		if (FILTERDATEDIRECTION_NEWER == mFilterOps.mDateSearchDirection)
+		if (FILTERDATEDIRECTION_OLDER == mFilterOps.mDateSearchDirection)
 		{
-			less_restrictive = !less_restrictive;
-			more_restrictive = !more_restrictive;
+			less_restrictive = (are_date_limits_valid && ((is_decreasing && mFilterOps.mHoursAgo)) || !hours);
+			more_restrictive = (are_date_limits_valid && (!is_decreasing && hours) || is_increasing_from_zero);
 		}
 
 		mFilterOps.mHoursAgo = hours;
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index d2519a5aa4..06d0b849a3 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -63,7 +63,7 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Show Filters"
+     label="Show Filters..."
      layout="topleft"
      name="show_filters">
         <on_click
-- 
cgit v1.2.3


From 078941c4a43289e35c9e8f0f566a6e55941592fb Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 10 Jun 2014 17:23:48 -0400
Subject: STORM-2034 Made small coding change per Oz's request

---
 indra/newview/llinventoryfilter.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 1d788321b8..0bbb4aeeff 100755
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -646,10 +646,14 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 		bool is_increasing_from_zero = is_increasing && !mFilterOps.mHoursAgo && !isSinceLogoff();
 
 		// *NOTE: need to cache last filter time, in case filter goes stale
-		BOOL less_restrictive = (are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo)) || !hours);
-		BOOL more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero);
-
-		if (FILTERDATEDIRECTION_OLDER == mFilterOps.mDateSearchDirection)
+		BOOL less_restrictive;
+		BOOL more_restrictive;
+		if (FILTERDATEDIRECTION_NEWER == mFilterOps.mDateSearchDirection)
+		{
+			less_restrictive = (are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo)) || !hours);
+			more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero);
+		}
+		else
 		{
 			less_restrictive = (are_date_limits_valid && ((is_decreasing && mFilterOps.mHoursAgo)) || !hours);
 			more_restrictive = (are_date_limits_valid && (!is_decreasing && hours) || is_increasing_from_zero);
-- 
cgit v1.2.3


From ae7e074e7c8c35693fe8a5b888e96b911a46b43b Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 11 Jun 2014 17:05:06 -0400
Subject: STORM-2034 Fix and improve processing when hours overflow to days

---
 indra/newview/llpanelmaininventory.cpp | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a23b56a637..46826c29ef 100755
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -702,6 +702,30 @@ void LLFloaterInventoryFinder::onTimeAgo(LLUICtrl *ctrl, void *user_data)
 	if ( self->mSpinSinceDays->get() ||  self->mSpinSinceHours->get() )
 	{
 		self->getChild<LLUICtrl>("check_since_logoff")->setValue(false);
+
+		U32 days = (U32)self->mSpinSinceDays->get();
+		U32 hours = (U32)self->mSpinSinceHours->get();
+		if (hours >= 24)
+		{
+// Try to handle both cases of spinner clicking and text input in a sensible fashion as best as possible.
+// There is no way to tell if someone has clicked the spinner to get to 24 or input 24 manually, so in this
+// case add to days.  Any value > 24 means they have input the hours manually, so do not add to the current
+// day value.
+			if (24 == hours)  // Got to 24 via spinner clicking or text input of 24
+			{
+				days = days + hours / 24;
+			}
+			else	// Text input, so do not add to days
+			{ 
+				days = hours / 24;
+			}
+			hours = (U32)hours % 24;
+			self->mSpinSinceHours->setFocus(false);
+			self->mSpinSinceDays->setFocus(false);
+			self->mSpinSinceDays->set((F32)days);
+			self->mSpinSinceHours->set((F32)hours);
+			self->mSpinSinceHours->setFocus(true);
+		}
 	}
 }
 
@@ -844,7 +868,7 @@ void LLFloaterInventoryFinder::draw()
 	}
 	U32 days = (U32)mSpinSinceDays->get();
 	U32 hours = (U32)mSpinSinceHours->get();
-	if (hours > 24)
+	if (hours >= 24)
 	{
 		days = hours / 24;
 		hours = (U32)hours % 24;
@@ -856,6 +880,7 @@ void LLFloaterInventoryFinder::draw()
 		mSpinSinceHours->setFocus(true);
 	}
 	hours += days * 24;
+
 	mPanelMainInventory->getPanel()->setHoursAgo(hours);
 	mPanelMainInventory->getPanel()->setSinceLogoff(getCheckSinceLogoff());
 	mPanelMainInventory->setFilterTextFromFilter();
-- 
cgit v1.2.3


From e2c4d2a0a10e1f69bb074e3be620ce3ecd613969 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 17 Jun 2014 05:45:20 -0400
Subject: STORM-2034 Adjust comment block indent

---
 indra/newview/llpanelmaininventory.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 46826c29ef..6c8765c62d 100755
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -707,10 +707,10 @@ void LLFloaterInventoryFinder::onTimeAgo(LLUICtrl *ctrl, void *user_data)
 		U32 hours = (U32)self->mSpinSinceHours->get();
 		if (hours >= 24)
 		{
-// Try to handle both cases of spinner clicking and text input in a sensible fashion as best as possible.
-// There is no way to tell if someone has clicked the spinner to get to 24 or input 24 manually, so in this
-// case add to days.  Any value > 24 means they have input the hours manually, so do not add to the current
-// day value.
+			// Try to handle both cases of spinner clicking and text input in a sensible fashion as best as possible.
+			// There is no way to tell if someone has clicked the spinner to get to 24 or input 24 manually, so in
+			// this case add to days.  Any value > 24 means they have input the hours manually, so do not add to the
+			// current day value.
 			if (24 == hours)  // Got to 24 via spinner clicking or text input of 24
 			{
 				days = days + hours / 24;
-- 
cgit v1.2.3


From e3a27586f15ba008c82ca7a64998598dc36b43d3 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Wed, 9 Jul 2014 09:10:10 -0600
Subject: STORM-2037 - Update fetchKeywordsFileresponder to use latest
 LLHTTPClient::responder changes

---
 indra/newview/llsyntaxid.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index b1194dcd1b..a763d42a8d 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -47,23 +47,22 @@ public:
 		LL_DEBUGS("SyntaxLSL") << "Instantiating with file saving to: '" << filespec << "'" << LL_ENDL;
 	}
 
-	virtual void errorWithContent(U32 status,
-								  const std::string& reason,
-								  const LLSD& content)
+	/* virtual */ void httpFailure()
 	{
-		LL_WARNS("SyntaxLSL") << "failed to fetch syntax file [status:" << status << "]: " << content << LL_ENDL;
+		LL_WARNS("SyntaxLSL") << "failed to fetch syntax file [status:" << getStatus() << "]: " << getContent() << LL_ENDL;
 	}
 
-	virtual void result(const LLSD& content_ref)
+	/* virtual */ void httpSuccess()
 	{
 		// Continue only if a valid LLSD object was returned.
-		if (content_ref.isMap())
+		const LLSD& content = getContent();
+		if (content.isMap())
 		{
-			if (LLSyntaxIdLSL::getInstance()->isSupportedVersion(content_ref))
+			if (LLSyntaxIdLSL::getInstance()->isSupportedVersion(content))
 			{
-				LLSyntaxIdLSL::getInstance()->setKeywordsXml(content_ref);
+				LLSyntaxIdLSL::getInstance()->setKeywordsXml(content);
 
-				cacheFile(content_ref);
+				cacheFile(content);
 				LLSyntaxIdLSL::getInstance()->handleFileFetched(mFileSpec);
 			}
 			else
-- 
cgit v1.2.3


From 4cba2c4457609d426a5db0511776bf5db2014256 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Sat, 12 Jul 2014 11:19:05 +0100
Subject: BUG-6659 On the Edit tab of the build menu, clicking the area in
 between the full bright checkbox and the materials drop down box opens the
 color picker.

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 426c0c4915..cb6b2fafd8 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -36,8 +36,9 @@
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="45"
+             height="22"
              label=""
+             label_height="0"
              layout="topleft"
              left="10"
              name="colorswatch"
-- 
cgit v1.2.3


From f4783697812428e3c0f4c5fba4ed91a6d19d8b34 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Wed, 16 Jul 2014 16:00:06 -0400
Subject: GAMING-19: clarify messaging when refused region entry

---
 indra/newview/llviewermessage.cpp                  | 140 ++++++++++++---------
 .../newview/skins/default/xui/en/notifications.xml |  21 ++++
 .../skins/default/xui/en/teleport_strings.xml      |   5 +-
 3 files changed, 104 insertions(+), 62 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index be24c04dfc..e70bf87d0e 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5742,83 +5742,101 @@ bool handle_special_notification(std::string notificationID, LLSD& llsdBlock)
 }
 
 // some of the server notifications need special handling. This is where we do that.
-bool handle_teleport_access_blocked(LLSD& llsdBlock)
+bool handle_teleport_access_blocked(LLSD& llsdBlock, const std::string & notificationID, const std::string & defaultMessage)
 {
-	std::string notificationID("TeleportEntryAccessBlocked");
 	U8 regionAccess = static_cast<U8>(llsdBlock["_region_access"].asInteger());
 	std::string regionMaturity = LLViewerRegion::accessToString(regionAccess);
 	LLStringUtil::toLower(regionMaturity);
 	llsdBlock["REGIONMATURITY"] = regionMaturity;
 	
 	bool returnValue = false;
-	LLNotificationPtr maturityLevelNotification;
-	std::string notifySuffix = "_Notify";
-	if (regionAccess == SIM_ACCESS_MATURE)
-	{
-		if (gAgent.isTeen())
-		{
-			gAgent.clearTeleportRequest();
-			maturityLevelNotification = LLNotificationsUtil::add(notificationID+"_AdultsOnlyContent", llsdBlock);
-			returnValue = true;
+	LLNotificationPtr tp_failure_notification;
+	std::string notifySuffix;
 
-			notifySuffix = "_NotifyAdultsOnly";
-		}
-		else if (gAgent.prefersPG())
+	if (notificationID == std::string("TeleportEntryAccessBlocked"))
+	{
+		notifySuffix = "_Notify";
+		if (regionAccess == SIM_ACCESS_MATURE)
 		{
-			if (gAgent.hasRestartableFailedTeleportRequest())
+			if (gAgent.isTeen())
 			{
-				maturityLevelNotification = LLNotificationsUtil::add(notificationID+"_ChangeAndReTeleport", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_and_reteleport_callback);
+				gAgent.clearTeleportRequest();
+				tp_failure_notification = LLNotificationsUtil::add(notificationID+"_AdultsOnlyContent", llsdBlock);
 				returnValue = true;
+
+				notifySuffix = "_NotifyAdultsOnly";
+			}
+			else if (gAgent.prefersPG())
+			{
+				if (gAgent.hasRestartableFailedTeleportRequest())
+				{
+					tp_failure_notification = LLNotificationsUtil::add(notificationID+"_ChangeAndReTeleport", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_and_reteleport_callback);
+					returnValue = true;
+				}
+				else
+				{
+					gAgent.clearTeleportRequest();
+					tp_failure_notification = LLNotificationsUtil::add(notificationID+"_Change", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_callback);
+					returnValue = true;
+				}
 			}
 			else
 			{
 				gAgent.clearTeleportRequest();
-				maturityLevelNotification = LLNotificationsUtil::add(notificationID+"_Change", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_callback);
+				tp_failure_notification = LLNotificationsUtil::add(notificationID+"_PreferencesOutOfSync", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_callback);
 				returnValue = true;
 			}
 		}
-		else
-		{
-			gAgent.clearTeleportRequest();
-			maturityLevelNotification = LLNotificationsUtil::add(notificationID+"_PreferencesOutOfSync", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_callback);
-			returnValue = true;
-		}
-	}
-	else if (regionAccess == SIM_ACCESS_ADULT)
-	{
-		if (!gAgent.isAdult())
-		{
-			gAgent.clearTeleportRequest();
-			maturityLevelNotification = LLNotificationsUtil::add(notificationID+"_AdultsOnlyContent", llsdBlock);
-			returnValue = true;
-
-			notifySuffix = "_NotifyAdultsOnly";
-		}
-		else if (gAgent.prefersPG() || gAgent.prefersMature())
+		else if (regionAccess == SIM_ACCESS_ADULT)
 		{
-			if (gAgent.hasRestartableFailedTeleportRequest())
+			if (!gAgent.isAdult())
 			{
-				maturityLevelNotification = LLNotificationsUtil::add(notificationID+"_ChangeAndReTeleport", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_and_reteleport_callback);
+				gAgent.clearTeleportRequest();
+				tp_failure_notification = LLNotificationsUtil::add(notificationID+"_AdultsOnlyContent", llsdBlock);
 				returnValue = true;
+
+				notifySuffix = "_NotifyAdultsOnly";
+			}
+			else if (gAgent.prefersPG() || gAgent.prefersMature())
+			{
+				if (gAgent.hasRestartableFailedTeleportRequest())
+				{
+					tp_failure_notification = LLNotificationsUtil::add(notificationID+"_ChangeAndReTeleport", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_and_reteleport_callback);
+					returnValue = true;
+				}
+				else
+				{
+					gAgent.clearTeleportRequest();
+					tp_failure_notification = LLNotificationsUtil::add(notificationID+"_Change", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_callback);
+					returnValue = true;
+				}
 			}
 			else
 			{
 				gAgent.clearTeleportRequest();
-				maturityLevelNotification = LLNotificationsUtil::add(notificationID+"_Change", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_callback);
+				tp_failure_notification = LLNotificationsUtil::add(notificationID+"_PreferencesOutOfSync", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_callback);
 				returnValue = true;
 			}
 		}
-		else
+	}		// End of special handling for "TeleportEntryAccessBlocked"
+	else
+	{	// Normal case, no message munging
+		gAgent.clearTeleportRequest();
+		if (LLNotifications::getInstance()->templateExists(notificationID))
 		{
-			gAgent.clearTeleportRequest();
-			maturityLevelNotification = LLNotificationsUtil::add(notificationID+"_PreferencesOutOfSync", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_callback);
-			returnValue = true;
+			tp_failure_notification = LLNotificationsUtil::add(notificationID, llsdBlock, llsdBlock);
 		}
+		else
+		{
+			llsdBlock["MESSAGE"] = defaultMessage;
+			tp_failure_notification = LLNotificationsUtil::add("GenericAlertOK", llsdBlock);
 		}
+		returnValue = true;
+	}
 
-	if ((maturityLevelNotification == NULL) || maturityLevelNotification->isIgnored())
+	if ((tp_failure_notification == NULL) || tp_failure_notification->isIgnored())
 	{
-		// Given a simple notification if no maturityLevelNotification is set or it is ignore
+		// Given a simple notification if no tp_failure_notification is set or it is ignore
 		LLNotificationsUtil::add(notificationID + notifySuffix, llsdBlock);
 	}
 
@@ -6034,8 +6052,8 @@ void process_alert_core(const std::string& message, BOOL modal)
 		std::string alert_name(message.substr(ALERT_PREFIX.length()));
 		if (!handle_special_alerts(alert_name))
 		{
-		LLNotificationsUtil::add(alert_name);
-	}
+			LLNotificationsUtil::add(alert_name);
+		}
 	}
 	else if (message.find(NOTIFY_PREFIX) == 0)
 	{
@@ -6057,10 +6075,10 @@ void process_alert_core(const std::string& message, BOOL modal)
 			LLFloaterRegionRestarting::close();
 		}
 
-			std::string new_msg =LLNotifications::instance().getGlobalString(text);
-			args["MESSAGE"] = new_msg;
-			LLNotificationsUtil::add("SystemMessage", args);
-		}
+		std::string new_msg =LLNotifications::instance().getGlobalString(text);
+		args["MESSAGE"] = new_msg;
+		LLNotificationsUtil::add("SystemMessage", args);
+	}
 	else if (modal)
 	{
 		LLSD args;
@@ -6643,8 +6661,8 @@ std::string formatted_time(const time_t& the_time)
 
 void process_teleport_failed(LLMessageSystem *msg, void**)
 {
-	std::string reason;
-	std::string big_reason;
+	std::string message_id;		// Tag from server, like "RegionEntryAccessBlocked"
+	std::string big_reason;		// Actual message to display
 	LLSD args;
 
 	// Let the interested parties know that teleport failed.
@@ -6654,16 +6672,16 @@ void process_teleport_failed(LLMessageSystem *msg, void**)
 	if (msg->has(_PREHASH_AlertInfo) && msg->getSizeFast(_PREHASH_AlertInfo, _PREHASH_Message) > 0)
 	{
 		// Get the message ID
-		msg->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, reason);
-		big_reason = LLAgent::sTeleportErrorMessages[reason];
+		msg->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, message_id);
+		big_reason = LLAgent::sTeleportErrorMessages[message_id];
 		if ( big_reason.size() > 0 )
 		{	// Substitute verbose reason from the local map
 			args["REASON"] = big_reason;
 		}
 		else
 		{	// Nothing found in the map - use what the server returned in the original message block
-			msg->getStringFast(_PREHASH_Info, _PREHASH_Reason, reason);
-			args["REASON"] = reason;
+			msg->getStringFast(_PREHASH_Info, _PREHASH_Reason, big_reason);
+			args["REASON"] = big_reason;
 		}
 
 		LLSD llsd_block;
@@ -6679,7 +6697,7 @@ void process_teleport_failed(LLMessageSystem *msg, void**)
 			else
 			{
 				// change notification name in this special case
-				if (handle_teleport_access_blocked(llsd_block))
+				if (handle_teleport_access_blocked(llsd_block, message_id, args["REASON"]))
 				{
 					if( gAgent.getTeleportState() != LLAgent::TELEPORT_NONE )
 					{
@@ -6692,17 +6710,17 @@ void process_teleport_failed(LLMessageSystem *msg, void**)
 
 	}
 	else
-	{
-		msg->getStringFast(_PREHASH_Info, _PREHASH_Reason, reason);
+	{	// Extra message payload not found - use what the simulator sent
+		msg->getStringFast(_PREHASH_Info, _PREHASH_Reason, message_id);
 
-		big_reason = LLAgent::sTeleportErrorMessages[reason];
+		big_reason = LLAgent::sTeleportErrorMessages[message_id];
 		if ( big_reason.size() > 0 )
 		{	// Substitute verbose reason from the local map
 			args["REASON"] = big_reason;
 		}
 		else
 		{	// Nothing found in the map - use what the server returned
-			args["REASON"] = reason;
+			args["REASON"] = message_id;
 		}
 	}
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f49f300868..20f69e689c 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -167,6 +167,16 @@ No tutorial is currently available.
      yestext="Yes"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="GenericAlertOK"
+   type="alertmodal">
+[MESSAGE]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="BadInstallation"
@@ -4579,6 +4589,17 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="RegionTPSpecialUsageBlocked"
+   type="alertmodal">
+    <tag>fail</tag>
+    Unable to enter region. '[REGION_NAME]' is a Skill Gaming Region, and you must meet certain criteria in order to enter. For details, please review the [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="PreferredMaturityChanged"
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index fdf41991cd..5a9a16d344 100755
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -48,7 +48,10 @@ Go to &apos;Welcome Island Public&apos; to repeat the tutorial.
     <message name="MustGetAgeRegion">
       You must be age 18 or over to enter this region.
     </message>
-	</message_set>
+    <message name="RegionTPSpecialUsageBlocked">
+      Unable to enter region. '[REGION_NAME]' is a Skill Gaming Region, and you must meet certain criteria in order to enter. For details, please review the [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+    </message>
+  </message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
 			Sending to destination.
-- 
cgit v1.2.3


From 03361678a6ca109e4ef479c148d36f6d157e8e5a Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 08:08:20 +0200
Subject: Changed: Facebook floater layout. Changed: Facebook floater size.
 Changed: Aligned all widgets to an unified layout, keep 10 pixels left/right
 and so on. Removed: Account tab and moved it into Status tab.

---
 .../skins/default/xui/en/floater_facebook.xml      |  39 +++----
 .../default/xui/en/panel_facebook_account.xml      |  77 -------------
 .../default/xui/en/panel_facebook_friends.xml      |  21 ++--
 .../skins/default/xui/en/panel_facebook_photo.xml  | 116 ++++++++++----------
 .../skins/default/xui/en/panel_facebook_place.xml  | 120 +++++++++------------
 .../skins/default/xui/en/panel_facebook_status.xml | 114 +++++++++++++++-----
 6 files changed, 221 insertions(+), 266 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_facebook_account.xml

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml
index 4535b9084e..2ea34fb751 100644
--- a/indra/newview/skins/default/xui/en/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/en/floater_facebook.xml
@@ -2,7 +2,6 @@
 <floater
   positioning="cascading"
   can_close="true"
-  can_resize="true"
   help_topic="floater_facebook"
   layout="topleft"
   name="floater_facebook"
@@ -10,23 +9,15 @@
   single_instance="true"
   reuse_instance="true"
   title="POST TO FACEBOOK"
-  min_height="501"
+  min_height="462"
   min_width="304"
-  height="482"
-  width="304">
-  <panel
-   height="482"
-   width="304"
-   visible="true"
-   name="background"
-   follows="all"
-   top="0"
-   left="0">
+  height="462"
+  width="272">
    <tab_container
      name="tabs"
      tab_group="1"
-     tab_min_width="70"
-     tab_height="30"
+     tab_min_width="64"
+     tab_height="21"
      tab_position="top"
      top="7"
      height="437"
@@ -57,23 +48,19 @@
        follows="all"
        label="FRIENDS"
        name="panel_facebook_friends"/>
-     <panel
+     <!--<panel
        filename="panel_facebook_account.xml"
        class="llfacebookaccountpanel"
        follows="all"
        label="ACCOUNT"
-       name="panel_facebook_account"/>
+       name="panel_facebook_account"/>-->
    </tab_container>
-    <panel
-     name="connection_status_panel"
-     follows="left|bottom|right"
-     height="24">
      <text
       name="connection_error_text"
       type="string"
       follows="left|bottom|right"
-      top="5"
-      left="9"
+      bottom="-5"
+      left="10"
       width="250"
       height="20"
       wrap="true"
@@ -88,14 +75,14 @@
       height="24"
       width="24"
       name="connection_loading_indicator"
-      top="2"
-      left="9"
+      top_delta="-2"
+      left="10"
       visible="true"/>
      <text
       name="connection_loading_text"
       type="string"
       follows="left|bottom|right"
-      top="5"
+      top_delta="2"
       left_pad="5"
       width="250"
       height="20"
@@ -106,6 +93,4 @@
       font="SansSerif">
       Loading...
     </text>
-  </panel>
- </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_account.xml b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
deleted file mode 100644
index 122cbfb717..0000000000
--- a/indra/newview/skins/default/xui/en/panel_facebook_account.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<panel
-	 height="400"
-	 width="304"
-	 layout="topleft"
-    follows="all"
-   name="panel_facebook_account">
-  <string
-      name="facebook_connected"
-      value="You are connected to Facebook as:" />
-  <string
-      name="facebook_disconnected"
-      value="Not connected to Facebook" />
-  <text
-   layout="topleft"
-   length="1"
-   follows="top|left"
-   font="SansSerif"
-   height="16"
-   left="9"
-   name="account_caption_label"
-   top="21"
-   type="string">
-    Not connected to Facebook.
-  </text>
-  <text
-   layout="topleft"
-   top_pad="2"
-   length="1"
-   follows="top|left"
-   font="SansSerif"
-   height="16"
-   left="9"
-   name="account_name_label"
-   parse_urls="true"
-   type="string"/>
-  <panel
-    layout="topleft"
-    follows="left|top"
-    name="panel_buttons"
-    height="345"
-    left="9">
-    <button
-     layout="topleft"
-     follows="left|top"
-     top_pad="9"
-     visible="true"
-     height="23"
-     label="Connect..."
-     name="connect_btn"
-     width="210">
-      <commit_callback function="SocialSharing.Connect"/>
-    </button>
-
-    <button
-     layout="topleft"
-     follows="left|top"
-     top_delta="0"
-     height="23"
-     label="Disconnect"
-     name="disconnect_btn"
-     width="210"
-     visible="false">
-      <commit_callback function="SocialSharing.Disconnect"/>
-    </button>
-    <text
-      layout="topleft"
-      length="1"
-      follows="top|left"
-      height="16"
-      left="0"
-      name="account_learn_more_label"
-      top_pad="20"
-      type="string">
-      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Learn about posting to Facebook]
-    </text>
-  </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
index 9d21a3a293..6ec85eb247 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
@@ -1,6 +1,6 @@
 <panel
 	 height="400"
-	 width="304"
+	 width="272"
 	 layout="topleft"
     follows="all"
    name="panel_facebook_friends">
@@ -11,15 +11,15 @@
    name="facebook_friends_no_connected"
    value="You're currently not connected to Facebook. Please go to the Account tab to connect and enable this feature." />
   <accordion
- background_visible="true"
+ background_visible="false"
  bg_alpha_color="DkGray2"
  bg_opaque_color="DkGray2"
    follows="all"
-   height="408"
+   height="383"
    layout="topleft"
-   left="3"
+   left="10"
    name="friends_accordion"
-   right="-2"
+   right="-10"
    top_pad="2">
     <accordion_tab
      layout="topleft"
@@ -36,7 +36,7 @@
        name="second_life_friends"
        show_permissions_granted="true"
        top="0"
-       width="307" />
+       width="272" />
     </accordion_tab>
     <accordion_tab
      layout="topleft"
@@ -53,19 +53,20 @@
        name="suggested_friends"
        show_permissions_granted="true"
        top="0"
-       width="307" />
+       width="272" />
     </accordion_tab>
   </accordion>
     <text
         layout="topleft"
         word_wrap="true"
         height="64"
-        width="290"
+        width="250"
         follows="top|left|right"
         font="SansSerif"
-        left="9"
+        left="10"
+		right="-10"
         name="facebook_friends_status"
-        top="21"
+        top="5"
         type="string">
         Not connected to Facebook.
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
index b5b6dee004..22e6598352 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -1,29 +1,19 @@
     <panel
       height="400"
-      width="304"
+      width="272"
       layout="topleft"
       follows="all"
       name="panel_facebook_photo">
-      <layout_stack
-	   layout="topleft"
-       border_size="0"
-       height="392"
-       follows="all"
-       orientation="vertical"
-       name="stack_photo"
-       top="8">
-        <layout_panel	
-         name="snapshot_panel"
-         height="367">
             <combo_box
              control_name="FacebookPhotoResolution"
              follows="left|top"
-             top="6"
-             left="9"
+			 layout="topleft"
+             top="7"
+             left="10"
              name="resolution_combobox"
              tool_tip="Image resolution"
              height="21"
-             width="135">
+             width="124">
               <combo_box.item
                label="Current Window"
                name="CurrentWindow"
@@ -47,13 +37,14 @@
             </combo_box>
             <combo_box
                 control_name="FacebookPhotoFilters"
-                follows="right|top"
+                follows="left|top"
+				layout="topleft"
                 name="filters_combobox"
                 tool_tip="Image filters"
-                top="6"
-                left="165"
+                top="7"
+                left_pad="4"
                 height="21"
-                width="135">
+                width="124">
                 <combo_box.item
                 label="No Filter"
                 name="NoFilter"
@@ -61,48 +52,62 @@
             </combo_box>
             <panel
                 height="150"
-                width="250"
+                width="252"
                 visible="true"
+				layout="topleft"
                 name="thumbnail_placeholder"
-                top="33"
-                follows="left|top|right"
-                left="9">
+                top_pad="5"
+                follows="left|top|rith"
+				right="-10"
+                left="10">
             </panel>
-            <button
-             follows="left|top"
-             height="23"
-             label="Refresh"
-             left="9"
-             top_pad="5"
-             name="new_snapshot_btn"
-             tool_tip="Click to refresh"
-             visible="true"
-             width="100" >
-             <button.commit_callback
-               function="SocialSharing.RefreshPhoto" />
-            </button>
-            <text
+			<text
                 follows="left|top"
+				layout="topleft"
                 font="SansSerif"
                 text_color="EmphasisColor"
                 height="14"
-                top_pad="-19"
-                left_pad="-30"
+                top_pad="2"
+                left="10"
                 length="1"
                 halign="center"
                 name="working_lbl"
                 translate="false"
                 type="string"
                 visible="true"
-                width="150">
+                width="251">
                 Refreshing...
             </text>
+			<view_border 
+			 bevel_style="in"
+			 follows="left|top"
+			 layout="topleft"
+			 height="1"
+			 left="10"
+			 name="refresh_border"
+			 width="250"
+			 top_pad="0"/>
+            <button
+             follows="left|top"
+			 layout="topleft"
+             height="23"
+             label="Refresh"
+             left="10"
+             top_pad="5"
+             name="new_snapshot_btn"
+             tool_tip="Click to refresh"
+             visible="true"
+             width="100" >
+             <button.commit_callback
+               function="SocialSharing.RefreshPhoto" />
+            </button>
             <button
                 follows="right|top"
+				layout="topleft"
                 height="23"
                 label="Preview"
-                left="200"
-                top_pad="-19"
+                right="-10"
+                top_delta="0"
                 name="big_preview_btn"
                 tool_tip="Click to toggle preview"
                 is_toggle="true"
@@ -114,9 +119,10 @@
             <text
              length="1"
              follows="top|left|right"
+			 layout="topleft"
              font="SansSerif"
              height="16"
-             left="9"
+             left="10"
              name="caption_label"
              top_pad="20"
              type="string">
@@ -124,23 +130,22 @@
             </text>
             <text_editor
              follows="left|top|right|bottom"
+			 layout="topleft"
              height="87"
              width="250"
-             left="9"
+             left="10"
+			 right="-10"
              length="1"
              max_length="700"
              name="photo_caption"
              type="string"
              word_wrap="true">
             </text_editor>
-        </layout_panel>
-        <layout_panel
-          name="photo_button_panel"
-          height="25">
           <button
-           follows="left|bottom"
-           top="0"
-           left="9"
+           follows="left|top"
+		   layout="topleft"
+           top_pad="22"
+           left="10"
            height="23"
            label="Post"
            name="post_photo_btn"
@@ -149,16 +154,15 @@
              function="SocialSharing.SendPhoto" />
           </button>
           <button
-               follows="left|bottom"
+               follows="right|top"
+			   layout="topleft"
                height="23"
                label="Cancel"
                name="cancel_photo_btn"
-               left_pad="15"
+               right="-10"
                top_delta="0"
                width="100">
             <button.commit_callback
              function="SocialSharing.Cancel" />
-          </button>          
-        </layout_panel>        
-      </layout_stack>
+          </button>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_place.xml b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
index 84c87df523..6a4b5e2b8a 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
@@ -1,115 +1,96 @@
     <panel
       height="400"
-      width="304"
+      width="272"
 	  layout="topleft"
       follows="all"
       name="panel_facebook_place">
-      <layout_stack
-	    layout="topleft"
-        border_size="0"
-        height="392"
-        follows="all"
-        orientation="vertical"
-        name="stack_place"
-        top="8">
-        <layout_panel
-          name="place_detail_panel"
-          height="181">
           <text
             length="1"
             follows="top|left|right"
+			layout="topleft"
             font="SansSerif"
             height="16"
-            left="9"
+            left="10"
             name="place_caption_label"
-            top="13"
+            top="5"
             type="string">
             Say something about where you are:
           </text>
           <text_editor
             follows="top|left|right"
-            height="150"
+			layout="topleft"
+            height="70"
             width="250"
-            left="9"
+            left="10"
+			right="-10"
             length="1"
             max_length="700"
             name="place_caption"
             type="string"
             word_wrap="true">
            </text_editor>
-          </layout_panel>
-          <layout_panel
-            name="place_map_panel"
-            height="186">
+		  <check_box
+              follows="left|top"
+			  layout="topleft"
+              initial_value="false"
+			  height="16"
+              top_pad="8"
+              width="8"
+              label="Include overhead view of location"
+              name="add_place_view_cb"
+              left="10"/>
               <panel
                   follows="left|top"
-                  height="128"
-                  width="128"
+				  layout="topleft"
+                  height="243"
+                  width="250"
                   background_visible="true"
                   bg_opaque_color="Black"
                   bg_alpha_color="Black"
-                  top="20"
-                  left="9"
+                  top_pad="8"
+                  left="10"
+				  right="-12"
                   visible="true"
                   name="map_border">
               </panel>
-              <loading_indicator
-              follows="left|top"
-              height="24"
-              width="24"
-              name="map_loading_indicator"
-              top="77"
-              left="61"
-              visible="true"/>
               <icon
                 follows="left|top"
-                height="128"
-                width="128"
+				layout="topleft"
+                height="243"
+                width="250"
                 image_name="Map_Placeholder_Icon"
-                layout="topleft"
-                top="20"
-                left="9"
+                top_delta="0"
+				right="-12"
+                left="10"
                 visible="true"
                 name="map_placeholder">
               </icon>
               <icon
                   follows="left|top"
-                  height="128"
-                  width="128"
+				  layout="topleft"
+                  height="243"
+                  width="250"
                   image_name="Map_Placeholder_Icon"
-                  layout="topleft"
-                  top="20"
-                  left="9"
+                  top_delta="0"
+                  left="10"
+				  right="-12"
                   visible="true"
                   name="map_default">
               </icon>
-            <check_box
+			  <loading_indicator
               follows="left|top"
-              initial_value="false"
-              top_delta="8"
-              width="8"
-              label=""
-              name="add_place_view_cb"
-              left_pad="5"/>
-            <text
-              follows="left|top"
-              font="SansSerif"
-              height="32"
-              width="130"
-              word_wrap="true"
-              left_pad="12"
-              top_delta="-8"
-              type="string">
-              Include overhead view of location
-            </text>
-          </layout_panel>
-          <layout_panel
-            name="place_button_panel"
-            height="25">
+			  layout="topleft"
+              height="24"
+              width="24"
+              name="map_loading_indicator2"
+              top_delta="116"
+              left="126"
+              visible="true"/>
             <button
               follows="left|bottom"
-              top="0"
-              left="9"
+			  layout="topleft"
+              top_pad="95"
+              left="10"
               height="23"
               label="Post"
               name="post_place_btn"
@@ -118,16 +99,15 @@
                  function="SocialSharing.SendCheckin" />
             </button>
             <button
-              follows="left|bottom"
+              follows="right|bottom"
+			  layout="topleft"
               height="23"
               label="Cancel"
               name="cancel_place_btn"
-              left_pad="15"
+              right="-10"
               top_delta="0"
               width="100">
               <button.commit_callback
                   function="SocialSharing.Cancel" />
             </button>
-        </layout_panel>
-     </layout_stack>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_status.xml b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
index 480abec558..fe0f3c9279 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
@@ -1,50 +1,113 @@
     <panel
 	 height="400"
-	 width="304"
+	 width="272"
      follows="all"
 	 layout="topleft"
      name="panel_facebook_status">
-     <layout_stack
+        <string
+      name="facebook_connected"
+      value="You are connected to Facebook as:" />
+  <string
+      name="facebook_disconnected"
+      value="Not connected to Facebook" />
+  <text
+   layout="topleft"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="10"
+   name="account_caption_label"
+   top="5"
+   type="string">
+    Not connected to Facebook.
+  </text>
+  <text
+   layout="topleft"
+   top_pad="2"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="10"
+   name="account_name_label"
+   parse_urls="true"
+   type="string"/>
+  <panel
+    layout="topleft"
+    follows="left|top"
+    name="panel_buttons"
+    height="60"
+    left="0">
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_pad="9"
+     left="10"
+     visible="true"
+     height="23"
+     label="Connect..."
+     name="connect_btn"
+     width="251">
+      <commit_callback function="SocialSharing.Connect"/>
+    </button>
+
+    <button
+     layout="topleft"
+     follows="left|top|right"
+     top_delta="0"
+     left="10"
+     right="-10"
+     height="23"
+     label="Disconnect"
+     name="disconnect_btn"
+     width="210"
+     visible="false">
+      <commit_callback function="SocialSharing.Disconnect"/>
+    </button>
+    <text
       layout="topleft"
-      border_size="0"
-      height="392"
-      follows="all"
-      orientation="vertical"
-      name="stack_status"
-      top="8">
-      <layout_panel
-       name="status_detail_panel"
-       height="367">
+      length="1"
+      follows="top|left|right"
+      left="10"
+      right="-10"
+      height="16"
+      name="account_learn_more_label"
+      top_pad="5"
+      type="string">
+      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Learn about posting to Facebook]
+    </text>
+  </panel>
+        
        <text
         length="1"
+        layout="topleft"
         follows="top|left|right"
         font="SansSerif"
         height="16"
-        left="9"
+        left="10"
         name="status_caption_label"
-        top="13"
+        top_pad="5"
         type="string">
         What's on your mind?
        </text>
        <text_editor
         follows="left|top|right"
+        layout="topleft"
         height="150"
-        width="250"
-        left="9"
+        width="252"
+        left="10"
         length="1"
         max_length="700"
         name="status_message"
         type="string"
         word_wrap="true">
        </text_editor>
-      </layout_panel>
-      <layout_panel
-       name="status_button_panel"
-       height="25">
        <button
-        follows="left|bottom"
-        top="0"
-        left="9"
+        follows="left|top"
+        layout="topleft"
+        top_pad="6"
+        left="10"
         height="23"
         label="Post"
         name="post_status_btn"
@@ -53,16 +116,15 @@
           function="SocialSharing.SendStatus" />
        </button>
        <button
-        follows="left|bottom"
+        follows="right|top"
+        layout="topleft"
         height="23"
         label="Cancel"
         name="cancel_status_btn"
-        left_pad="15"
+        right="-10"
         top_delta="0"
         width="100">
         <button.commit_callback
           function="SocialSharing.Cancel" />
        </button>
-      </layout_panel>
-     </layout_stack>
     </panel>
-- 
cgit v1.2.3


From c885547056e40f80b1f26074782b478b5e10cc93 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 08:09:24 +0200
Subject: Changed: Flickr floater layout. Changed: Flickr floater size.
 Changed: Aligned all widgets to an unified layout, keep 10 pixels left/right
 and so on.

---
 .../skins/default/xui/en/floater_flickr.xml        |  23 ++--
 .../skins/default/xui/en/panel_flickr_account.xml  |  22 ++--
 .../skins/default/xui/en/panel_flickr_photo.xml    | 145 +++++++++++----------
 3 files changed, 104 insertions(+), 86 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_flickr.xml b/indra/newview/skins/default/xui/en/floater_flickr.xml
index 1a9ffd0489..24de3ddd8d 100644
--- a/indra/newview/skins/default/xui/en/floater_flickr.xml
+++ b/indra/newview/skins/default/xui/en/floater_flickr.xml
@@ -10,11 +10,11 @@
   single_instance="true"
   reuse_instance="true"
   title="UPLOAD TO FLICKR"
-  height="622"
-  width="304">
+  height="590"
+  width="272">
   <panel
-   height="622"
-   width="304"
+   height="590"
+   width="272"
    visible="true"
    name="background"
    follows="all"
@@ -24,10 +24,11 @@
      name="tabs"
      tab_group="1"
      tab_min_width="70"
-     tab_height="30"
+     tab_height="21"
      tab_position="top"
      top="7"
-     height="577"
+     height="555"
+     follows="all"
      halign="center"
      use_highlighting_on_hover="true">
      <panel
@@ -51,8 +52,8 @@
       name="connection_error_text"
       type="string"
       follows="left|bottom|right"
-      top="5"
-      left="9"
+      bottom="-5"
+      left="10"
       width="250"
       height="20"
       wrap="true"
@@ -67,14 +68,14 @@
       height="24"
       width="24"
       name="connection_loading_indicator"
-      top="2"
-      left="9"
+      top_delta="-2"
+      left="10"
       visible="true"/>
      <text
       name="connection_loading_text"
       type="string"
       follows="left|bottom|right"
-      top="5"
+      top_delta="2"
       left_pad="5"
       width="250"
       height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_account.xml b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
index 506d2e2f74..5c2f335780 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
@@ -1,6 +1,6 @@
 <panel
 	 height="540"
-	 width="304"
+	 width="272"
 	 layout="topleft"
    name="panel_flickr_account">
   <string
@@ -15,9 +15,9 @@
    follows="top|left"
    font="SansSerif"
    height="16"
-   left="9"
+   left="10"
    name="account_caption_label"
-   top="21"
+   top="5"
    type="string">
     Not connected to Flickr.
   </text>
@@ -28,7 +28,7 @@
    follows="top|left"
    font="SansSerif"
    height="16"
-   left="9"
+   left="10"
    name="account_name_label"
    parse_urls="true"
    type="string"/>
@@ -36,12 +36,14 @@
     layout="topleft"
     name="panel_buttons"
     height="345"
-    left="9">
+    left="0">
     <button
      layout="topleft"
-     follows="left|top"
+     follows="left|top|right"
      top_pad="9"
      visible="true"
+	 left="10"
+	 right="-10"
      height="23"
      label="Connect..."
      name="connect_btn"
@@ -51,8 +53,10 @@
 
     <button
      layout="topleft"
-     follows="left|top"
+     follows="left|top|right"
      top_delta="0"
+	 left="10"
+	 right="-10"
      height="23"
      label="Disconnect"
      name="disconnect_btn"
@@ -65,9 +69,9 @@
       length="1"
       follows="top|left"
       height="16"
-      left="0"
+      left="10"
       name="account_learn_more_label"
-      top_pad="20"
+      top_pad="5"
       type="string">
       [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Learn about posting to Flickr]
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 8d8ef45c0d..e31695645d 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -1,28 +1,19 @@
     <panel
       height="540"
-      width="304"
+      width="272"
+	  follows="all"
       layout="topleft"
       name="panel_flickr_photo">
-      <layout_stack
-	   layout="topleft"
-       border_size="0"
-       height="532"
-       follows="all"
-       orientation="vertical"
-       name="stack_photo"
-       top="8">
-        <layout_panel	
-         name="snapshot_panel"
-         height="507">
             <combo_box
              control_name="FlickrPhotoResolution"
              follows="left|top"
-             top="6"
-             left="9"
+			 layout="topleft"
+             top="7"
+             left="10"
              name="resolution_combobox"
              tool_tip="Image resolution"
              height="21"
-             width="135">
+             width="124">
               <combo_box.item
                label="Current Window"
                name="CurrentWindow"
@@ -42,13 +33,14 @@
             </combo_box>
             <combo_box
                control_name="FlickrPhotoFilters"
-               follows="right|top"
+               follows="left|top"
+			   layout="topleft"
                name="filters_combobox"
                tool_tip="Image filters"
-               top="6"
-               left="165"
+               top_delta="0"
+               left_pad="4"
                height="21"
-               width="135">
+               width="124">
                 <combo_box.item
                  label="No Filter"
                  name="NoFilter"
@@ -59,45 +51,59 @@
                 width="250"
                 visible="true"
                 name="thumbnail_placeholder"
-                top="33"
-                follows="left|top"
-                left="9">
+                top_pad="5"
+                follows="left|top|right"
+				layout="topleft"
+				right="-10"
+                left="10">
             </panel>
-            <button
-             follows="left|top"
-             height="23"
-             label="Refresh"
-             left="9"
-             top_pad="5"
-             name="new_snapshot_btn"
-             tool_tip="Click to refresh"
-             visible="true"
-             width="100" >
-             <button.commit_callback
-               function="SocialSharing.RefreshPhoto" />
-            </button>
-            <text
+			<text
                 follows="left|top"
+				layout="topleft"
                 font="SansSerif"
                 text_color="EmphasisColor"
                 height="14"
-                top_pad="-19"
-                left_pad="-30"
+                top_pad="2"
+                left="10"
                 length="1"
                 halign="center"
                 name="working_lbl"
                 translate="false"
                 type="string"
                 visible="true"
-                width="150">
+                width="251">
                 Refreshing...
             </text>
+			<view_border 
+			 bevel_style="in"
+			 follows="left|top"
+			 layout="topleft"
+			 height="1"
+			 left="10"
+			 name="refresh_border"
+			 width="250"
+			 top_pad="0"/>
+            <button
+             follows="left|top"
+			 layout="topleft"
+             height="23"
+             label="Refresh"
+             left="10"
+             top_pad="5"
+             name="new_snapshot_btn"
+             tool_tip="Click to refresh"
+             visible="true"
+             width="100" >
+             <button.commit_callback
+               function="SocialSharing.RefreshPhoto" />
+            </button>
             <button
                 follows="right|top"
+				layout="topleft"
                 height="23"
                 label="Preview"
-                left="200"
-                top_pad="-19"
+                right="-10"
+                top_delta="0"
                 name="big_preview_btn"
                 tool_tip="Click to toggle preview"
                 is_toggle="true"
@@ -109,19 +115,21 @@
             <text
              length="1"
              follows="top|left|right"
+			 layout="topleft"
              font="SansSerif"
              height="16"
-             left="9"
+             left="10"
              name="title_label"
-             top_pad="15"
+             top_pad="10"
              type="string">
               Title:
             </text>
             <line_editor
              follows="left|top"
+			 layout="topleft"
              height="20"
              width="250"
-             left="9"
+             left="10"
              length="1"
              max_length="256"
              name="photo_title"
@@ -130,19 +138,23 @@
             <text
              length="1"
              follows="top|left|right"
+			 layout="topleft"
              font="SansSerif"
              height="16"
-             left="9"
+             left="10"
+			 right="-10"
              name="description_label"
              top_pad="10"
+			 width="25"
              type="string">
               Description:
             </text>
             <text_editor
              follows="left|top"
+			 layout="topleft"
              height="50"
-             width="250"
-             left="9"
+             width="249"
+             left="10"
              length="1"
              max_length="700"
              name="photo_description"
@@ -151,6 +163,7 @@
             </text_editor>
             <check_box
              follows="left|top"
+			 layout="topleft"
              initial_value="true"
              label="Include SL location at end of description"
              name="add_location_cb"
@@ -159,23 +172,25 @@
              top_pad="8"/>
             <text
              length="1"
-             follows="top|left|right"
+             follows="top|left"
+			 layout="topleft"
              font="SansSerif"
              height="16"
-             left="9"
+             left="10"
              name="tags_label"
-             top_pad="10"
+             top_pad="6"
              type="string">
               Tags:
             </text>
             <text
               length="1"
               follows="top|left"
+			  layout="topleft"
               font="SansSerifSmall"
               text_color="White_50"
               height="30"
               name="tags_help_label"
-              left="50"
+              left="51"
               top_pad="-16"
               type="string">
 Separate tags with spaces
@@ -183,9 +198,10 @@ Use "" for multi-word tags
             </text>
             <text_editor
              follows="left|top"
+			 layout="topleft"
              height="50"
-             width="250"
-             left="9"
+             width="249"
+             left="10"
              length="1"
              max_length="700"
              name="photo_tags"
@@ -195,8 +211,9 @@ Use "" for multi-word tags
             <combo_box
              control_name="FlickrPhotoRating"
              follows="left|top"
-             top_pad="16"
-             left="9"
+			 layout="topleft"
+             top_pad="7"
+             left="10"
              name="rating_combobox"
              tool_tip="Flickr content rating"
              height="21"
@@ -214,14 +231,11 @@ Use "" for multi-word tags
                name="RestrictedRating"
                value="3" />
             </combo_box>
-        </layout_panel>
-        <layout_panel
-          name="photo_button_panel"
-          height="25">
           <button
            follows="left|top"
-           top="0"
-           left="9"
+		   layout="topleft"
+           top_pad="7"
+           left="10"
            height="23"
            label="Upload"
            name="post_photo_btn"
@@ -230,16 +244,15 @@ Use "" for multi-word tags
              function="SocialSharing.SendPhoto" />
           </button>
           <button
-               follows="left|top"
+               follows="right|top"
+			   layout="topleft"
                height="23"
                label="Cancel"
                name="cancel_photo_btn"
-               left_pad="15"
+               right="-10"
                top_delta="0"
                width="100">
             <button.commit_callback
              function="SocialSharing.Cancel" />
-          </button>          
-        </layout_panel>        
-      </layout_stack>
+          </button>
     </panel>
-- 
cgit v1.2.3


From acee1894023aa971aeca92316d01a68553f32904 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 08:09:54 +0200
Subject: Changed: Twitter floater layout. Changed: Twitter floater size.
 Changed: Aligned all widgets to an unified layout, keep 10 pixels left/right
 and so on.

---
 .../skins/default/xui/en/floater_twitter.xml       |  34 ++----
 .../skins/default/xui/en/panel_twitter_account.xml |  24 ++--
 .../skins/default/xui/en/panel_twitter_photo.xml   | 124 +++++++++++----------
 3 files changed, 88 insertions(+), 94 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_twitter.xml b/indra/newview/skins/default/xui/en/floater_twitter.xml
index aa5bfce2e9..3e1a91e58d 100644
--- a/indra/newview/skins/default/xui/en/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/en/floater_twitter.xml
@@ -10,21 +10,13 @@
   single_instance="true"
   reuse_instance="true"
   title="TWITTER"
-  height="502"
-  width="304">
-  <panel
-   height="502"
-   width="304"
-   visible="true"
-   name="background"
-   follows="all"
-   top="0"
-   left="0">
+  height="462"
+  width="272">
    <tab_container
      name="tabs"
      tab_group="1"
      tab_min_width="70"
-     tab_height="30"
+     tab_height="21"
      tab_position="top"
      top="7"
      height="457"
@@ -43,17 +35,13 @@
        label="ACCOUNT"
        name="panel_twitter_account"/>     
     </tab_container>
-    <panel
-     name="connection_status_panel"
-     follows="left|bottom|right"
-     height="24">
      <text
       name="connection_error_text"
       type="string"
       follows="left|bottom|right"
-      top="5"
-      left="9"
-      width="250"
+      bottom="-5"
+      left="10"
+      width="252"
       height="20"
       wrap="true"
       halign="left"
@@ -67,16 +55,16 @@
       height="24"
       width="24"
       name="connection_loading_indicator"
-      top="2"
-      left="9"
+      top_delta="-2"
+      left="10"
       visible="true"/>
      <text
       name="connection_loading_text"
       type="string"
       follows="left|bottom|right"
-      top="5"
+      top_delta="2"
       left_pad="5"
-      width="250"
+      width="223"
       height="20"
       wrap="true"
       halign="left"
@@ -85,6 +73,4 @@
       font="SansSerif">
       Loading...
     </text>
-  </panel>
- </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_account.xml b/indra/newview/skins/default/xui/en/panel_twitter_account.xml
index ee4f6396e1..b9049a0bba 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_account.xml
@@ -1,6 +1,6 @@
 <panel
 	 height="400"
-	 width="304"
+	 width="272"
 	 layout="topleft"
    name="panel_twitter_account">
   <string
@@ -15,9 +15,9 @@
    follows="top|left"
    font="SansSerif"
    height="16"
-   left="9"
+   left="10"
    name="account_caption_label"
-   top="21"
+   top="5"
    type="string">
     Not connected to Twitter.
   </text>
@@ -28,19 +28,23 @@
    follows="top|left"
    font="SansSerif"
    height="16"
-   left="9"
+   left="10"
    name="account_name_label"
    parse_urls="true"
    type="string"/>
   <panel
     layout="topleft"
+	follows="top|left"
     name="panel_buttons"
     height="345"
-    left="9">
+	top_pad="3"
+    left="0">
     <button
      layout="topleft"
-     follows="left|top"
+     follows="left|top|right"
      top_pad="9"
+	 left="10"
+	 right="-10"
      visible="true"
      height="23"
      label="Connect..."
@@ -51,8 +55,10 @@
 
     <button
      layout="topleft"
-     follows="left|top"
+     follows="left|top|right"
      top_delta="0"
+	 left="10"
+	 right="-10"
      height="23"
      label="Disconnect"
      name="disconnect_btn"
@@ -65,9 +71,9 @@
       length="1"
       follows="top|left"
       height="16"
-      left="0"
+      left="10"
       name="account_learn_more_label"
-      top_pad="20"
+      top_pad="5"
       type="string">
       [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Learn about posting to Twitter]
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index c2be56da21..9a460ceead 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -3,31 +3,22 @@
       width="304"
       layout="topleft"
       name="panel_twitter_photo">
-      <layout_stack
-	   layout="topleft"
-       border_size="0"
-       height="412"
-       follows="all"
-       orientation="vertical"
-       name="stack_photo"
-       top="8">
-        <layout_panel
-         name="text_panel"
-         height="160">
           <text
            length="1"
+		   layout="topleft"
            follows="top|left|right"
            font="SansSerif"
            height="16"
-           left="9"
+           left="10"
            name="status_label"
-           top="3"
+           top="5"
            type="string">
             What's happening?
           </text>
           <text
            length="1"
            follows="top|left"
+		   layout="topleft"
            font="SansSerif"
            text_color="EmphasisColor"
            halign="right"
@@ -35,15 +26,16 @@
            width="30"
            left="227"
            name="status_counter_label"
-           top="3"
+           top="5"
            type="string">
             140
           </text>
           <text_editor
            follows="left|top"
+		   layout="topleft"
            height="87"
            width="250"
-           left="9"
+           left="10"
            length="1"
            max_length="140"
            name="photo_status"
@@ -52,33 +44,32 @@
           </text_editor>
           <check_box
            follows="left|top"
+		   layout="topleft"
            initial_value="true"
            label="Include SL location"
            name="add_location_cb"
-            left="9"
+            left="10"
             height="16"
-           top_pad="10"/>
+           top_pad="8"/>
           <check_box
            follows="left|top"
+		   layout="topleft"
            initial_value="true"
            label="Include a photo"
            name="add_photo_cb"
-            left="9"
+            left="10"
             height="16"
-           top_pad="10"/>
-        </layout_panel>
-          <layout_panel
-           name="snapshot_panel"
-           height="227">
+           top_pad="1"/>
             <combo_box
              control_name="TwitterPhotoResolution"
              follows="left|top"
-             top="6"
-             left="9"
+			 layout="topleft"
+             top_pad="5"
+             left="10"
              name="resolution_combobox"
              tool_tip="Image resolution"
              height="21"
-             width="135">
+             width="124">
               <combo_box.item
                label="Current Window"
                name="CurrentWindow"
@@ -99,61 +90,76 @@
               <combo_box
                   control_name="TwitterPhotoFilters"
                   follows="right|top"
+				  layout="topleft"
                   name="filters_combobox"
                   tool_tip="Image filters"
-                  top="6"
-                  left="165"
+                  top_delta="0"
+                  right="-10"
                   height="21"
-                  width="135">
+                  width="124">
                   <combo_box.item
                   label="No Filter"
                   name="NoFilter"
                   value="NoFilter" />
               </combo_box>
             <panel
+				layout="topleft"
                 height="150"
                 width="250"
                 visible="true"
                 name="thumbnail_placeholder"
-                top="33"
-                follows="left|top"
-                left="9">
+                top_pad="5"
+				right="-10"
+                follows="left|top|right"
+                left="10">
             </panel>
-            <button
-             follows="left|top"
-             height="23"
-             label="Refresh"
-             left="9"
-             top_pad="5"
-             name="new_snapshot_btn"
-             tool_tip="Click to refresh"
-             visible="true"
-             width="100" >
-             <button.commit_callback
-               function="SocialSharing.RefreshPhoto" />
-            </button>
-            <text
+			<text
                 follows="left|top"
+				layout="topleft"
                 font="SansSerif"
                 text_color="EmphasisColor"
                 height="14"
-                top_pad="-19"
-                left_pad="-30"
+                top_pad="2"
+                left="10"
                 length="1"
                 halign="center"
                 name="working_lbl"
                 translate="false"
                 type="string"
                 visible="true"
-                width="150">
+                width="251">
                 Refreshing...
             </text>
+			<view_border 
+			 bevel_style="in"
+			 follows="left|top"
+			 layout="topleft"
+			 height="1"
+			 left="10"
+			 name="refresh_border"
+			 width="250"
+			 top_pad="0"/>
+            <button
+             follows="left|top"
+			 layout="topleft"
+             height="23"
+             label="Refresh"
+             left="10"
+             top_pad="5"
+             name="new_snapshot_btn"
+             tool_tip="Click to refresh"
+             visible="true"
+             width="100" >
+             <button.commit_callback
+               function="SocialSharing.RefreshPhoto" />
+            </button>
               <button
                   follows="right|top"
+				  layout="topleft"
                   height="23"
                   label="Preview"
-                  left="200"
-                  top_pad="-19"
+                  right="-10"
+                  top_delta="0"
                   name="big_preview_btn"
                   tool_tip="Click to toggle preview"
                   is_toggle="true"
@@ -162,14 +168,11 @@
                   <button.commit_callback
                   function="SocialSharing.BigPreview" />
               </button>
-        </layout_panel>
-        <layout_panel
-          name="photo_button_panel"
-          height="25">
           <button
            follows="left|top"
-           top="0"
-           left="9"
+		   layout="topleft"
+           top_pad="3"
+           left="10"
            height="23"
            label="Tweet"
            name="post_photo_btn"
@@ -178,16 +181,15 @@
              function="SocialSharing.SendPhoto" />
           </button>
           <button
-               follows="left|top"
+               follows="right|top"
+			   layout="topleft"
                height="23"
                label="Cancel"
                name="cancel_photo_btn"
-               left_pad="15"
+			   right="-10"
                top_delta="0"
                width="100">
             <button.commit_callback
              function="SocialSharing.Cancel" />
           </button>          
-        </layout_panel>        
-      </layout_stack>
     </panel>
-- 
cgit v1.2.3


From c7de2ac4395e44618094d69e0c5d83482d300838 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 09:06:46 +0200
Subject: Changed: Reflected changes made to the Facebook floater XMLs in code.
 Fixed: Deprecated llerrs/llwarns/lldebugs/llinfos on the way.

---
 indra/newview/llfloaterfacebook.cpp | 320 ++++++++++++++++--------------------
 indra/newview/llfloaterfacebook.h   |  44 ++---
 2 files changed, 160 insertions(+), 204 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp
index 9e3f917eae..516cf5c15c 100644
--- a/indra/newview/llfloaterfacebook.cpp
+++ b/indra/newview/llfloaterfacebook.cpp
@@ -58,7 +58,6 @@ static LLPanelInjector<LLFacebookStatusPanel> t_panel_status("llfacebookstatuspa
 static LLPanelInjector<LLFacebookPhotoPanel> t_panel_photo("llfacebookphotopanel");
 static LLPanelInjector<LLFacebookCheckinPanel> t_panel_checkin("llfacebookcheckinpanel");
 static LLPanelInjector<LLFacebookFriendsPanel> t_panel_friends("llfacebookfriendspanel");
-static LLPanelInjector<LLFacebookAccountPanel> t_panel_account("llfacebookaccountpanel");
 
 const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte
 const std::string DEFAULT_CHECKIN_LOCATION_URL = "http://maps.secondlife.com/";
@@ -99,13 +98,29 @@ S32 compute_jpeg_quality(S32 width, S32 height)
 LLFacebookStatusPanel::LLFacebookStatusPanel() :
 	mMessageTextEditor(NULL),
 	mPostButton(NULL),
-    mCancelButton(NULL)
+    mCancelButton(NULL),
+	mAccountCaptionLabel(NULL),
+	mAccountNameLabel(NULL),
+	mPanelButtons(NULL),
+	mConnectButton(NULL),
+	mDisconnectButton(NULL)
 {
+	mCommitCallbackRegistrar.add("SocialSharing.Connect", boost::bind(&LLFacebookStatusPanel::onConnect, this));
+	mCommitCallbackRegistrar.add("SocialSharing.Disconnect", boost::bind(&LLFacebookStatusPanel::onDisconnect, this));
+
+	setVisibleCallback(boost::bind(&LLFacebookStatusPanel::onVisibilityChange, this, _2));
+
 	mCommitCallbackRegistrar.add("SocialSharing.SendStatus", boost::bind(&LLFacebookStatusPanel::onSend, this));
 }
 
 BOOL LLFacebookStatusPanel::postBuild()
 {
+	mAccountCaptionLabel = getChild<LLTextBox>("account_caption_label");
+	mAccountNameLabel = getChild<LLTextBox>("account_name_label");
+	mPanelButtons = getChild<LLUICtrl>("panel_buttons");
+	mConnectButton = getChild<LLUICtrl>("connect_btn");
+	mDisconnectButton = getChild<LLUICtrl>("disconnect_btn");
+
 	mMessageTextEditor = getChild<LLUICtrl>("status_message");
 	mPostButton = getChild<LLUICtrl>("post_status_btn");
 	mCancelButton = getChild<LLUICtrl>("cancel_status_btn");
@@ -115,6 +130,16 @@ BOOL LLFacebookStatusPanel::postBuild()
 
 void LLFacebookStatusPanel::draw()
 {
+	LLFacebookConnect::EConnectionState connection_state = LLFacebookConnect::instance().getConnectionState();
+
+	//Disable the 'disconnect' button and the 'use another account' button when disconnecting in progress
+	bool disconnecting = connection_state == LLFacebookConnect::FB_DISCONNECTING;
+	mDisconnectButton->setEnabled(!disconnecting);
+
+	//Disable the 'connect' button when a connection is in progress
+	bool connecting = connection_state == LLFacebookConnect::FB_CONNECTION_IN_PROGRESS;
+	mConnectButton->setEnabled(!connecting);
+
     if (mMessageTextEditor && mPostButton && mCancelButton)
 	{
         bool no_ongoing_connection = !(LLFacebookConnect::instance().isTransactionOngoing());
@@ -145,6 +170,19 @@ void LLFacebookStatusPanel::onSend()
 
 bool LLFacebookStatusPanel::onFacebookConnectStateChange(const LLSD& data)
 {
+	if(LLFacebookConnect::instance().isConnected())
+	{
+		//In process of disconnecting so leave the layout as is
+		if(data.get("enum").asInteger() != LLFacebookConnect::FB_DISCONNECTING)
+		{
+			showConnectedLayout();
+		}
+	}
+	else
+	{
+		showDisconnectedLayout();
+	}
+
 	switch (data.get("enum").asInteger())
 	{
 		case LLFacebookConnect::FB_CONNECTED:
@@ -169,6 +207,103 @@ void LLFacebookStatusPanel::sendStatus()
 	}
 }
 
+void LLFacebookStatusPanel::onVisibilityChange(BOOL visible)
+{
+	if(visible)
+	{
+		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
+		LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectStateChange, this, _1));
+
+		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
+		LLEventPumps::instance().obtain("FacebookConnectInfo").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectInfoChange, this));
+
+		//Connected
+		if(LLFacebookConnect::instance().isConnected())
+		{
+			showConnectedLayout();
+		}
+		//Check if connected (show disconnected layout in meantime)
+		else
+		{
+			showDisconnectedLayout();
+		}
+        if ((LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_NOT_CONNECTED) ||
+            (LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_CONNECTION_FAILED))
+        {
+            LLFacebookConnect::instance().checkConnectionToFacebook();
+        }
+	}
+	else
+	{
+		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
+		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
+	}
+}
+
+bool LLFacebookStatusPanel::onFacebookConnectInfoChange()
+{
+	LLSD info = LLFacebookConnect::instance().getInfo();
+	std::string clickable_name;
+
+	//Strings of format [http://www.somewebsite.com Click Me] become clickable text
+	if(info.has("link") && info.has("name"))
+	{
+		clickable_name = "[" + info["link"].asString() + " " + info["name"].asString() + "]";
+	}
+
+	mAccountNameLabel->setText(clickable_name);
+
+	return false;
+}
+
+void LLFacebookStatusPanel::showConnectButton()
+{
+	if(!mConnectButton->getVisible())
+	{
+		mConnectButton->setVisible(TRUE);
+		mDisconnectButton->setVisible(FALSE);
+	}
+}
+
+void LLFacebookStatusPanel::hideConnectButton()
+{
+	if(mConnectButton->getVisible())
+	{
+		mConnectButton->setVisible(FALSE);
+		mDisconnectButton->setVisible(TRUE);
+	}
+}
+
+void LLFacebookStatusPanel::showDisconnectedLayout()
+{
+	mAccountCaptionLabel->setText(getString("facebook_disconnected"));
+	mAccountNameLabel->setText(std::string(""));
+	showConnectButton();
+}
+
+void LLFacebookStatusPanel::showConnectedLayout()
+{
+	LLFacebookConnect::instance().loadFacebookInfo();
+
+	mAccountCaptionLabel->setText(getString("facebook_connected"));
+	hideConnectButton();
+}
+
+void LLFacebookStatusPanel::onConnect()
+{
+	LLFacebookConnect::instance().checkConnectionToFacebook(true);
+
+	//Clear only the facebook browser cookies so that the facebook login screen appears
+	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
+}
+
+void LLFacebookStatusPanel::onDisconnect()
+{
+	LLFacebookConnect::instance().disconnectFromFacebook();
+
+	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
+}
+
 void LLFacebookStatusPanel::clearAndClose()
 {
 	mMessageTextEditor->setValue("");
@@ -185,7 +320,6 @@ void LLFacebookStatusPanel::clearAndClose()
 ///////////////////////////
 
 LLFacebookPhotoPanel::LLFacebookPhotoPanel() :
-mSnapshotPanel(NULL),
 mResolutionComboBox(NULL),
 mRefreshBtn(NULL),
 mBtnPreview(NULL),
@@ -213,7 +347,6 @@ BOOL LLFacebookPhotoPanel::postBuild()
 {
 	setVisibleCallback(boost::bind(&LLFacebookPhotoPanel::onVisibilityChange, this, _2));
 	
-	mSnapshotPanel = getChild<LLUICtrl>("snapshot_panel");
 	mResolutionComboBox = getChild<LLUICtrl>("resolution_combobox");
 	mResolutionComboBox->setValue("[i1200,i630]"); // hardcoded defaults ftw!
 	mResolutionComboBox->setCommitCallback(boost::bind(&LLFacebookPhotoPanel::updateResolution, this, TRUE));
@@ -300,16 +433,9 @@ void LLFacebookPhotoPanel::draw()
 		// calc preview offset within the preview rect
 		const S32 local_offset_x = (thumbnail_rect.getWidth()  - thumbnail_w) / 2 ;
 		const S32 local_offset_y = (thumbnail_rect.getHeight() - thumbnail_h) / 2 ;
+		S32 offset_x = thumbnail_rect.mLeft + local_offset_x;
+		S32 offset_y = thumbnail_rect.mBottom + local_offset_y;
 
-		// calc preview offset within the floater rect
-        // Hack : To get the full offset, we need to take into account each and every offset of each widgets up to the floater.
-        // This is almost as arbitrary as using a fixed offset so that's what we do here for the sake of simplicity.
-        // *TODO : Get the offset looking through the hierarchy of widgets, should be done in postBuild() so to avoid traversing the hierarchy each time.
-		S32 offset_x = thumbnail_rect.mLeft + local_offset_x - 1;
-		S32 offset_y = thumbnail_rect.mBottom + local_offset_y - 39;
-        
-		mSnapshotPanel->localPointToOtherView(offset_x, offset_y, &offset_x, &offset_y, getParentByType<LLFloater>());
-        
 		gGL.matrixMode(LLRender::MM_MODELVIEW);
 		// Apply floater transparency to the texture unless the floater is focused.
 		F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
@@ -344,7 +470,7 @@ void LLFacebookPhotoPanel::onVisibilityChange(BOOL visible)
 			LLSnapshotLivePreview* preview = getPreviewView();
 			if(preview)
 			{
-				lldebugs << "opened, updating snapshot" << llendl;
+				LL_DEBUGS() << "opened, updating snapshot" << LL_ENDL;
 				preview->updateSnapshot(TRUE);
 			}
 		}
@@ -477,7 +603,7 @@ void LLFacebookPhotoPanel::updateControls()
 	BOOL got_snap = previewp && previewp->getSnapshotUpToDate();
     
 	// *TODO: Separate maximum size for Web images from postcards
-	lldebugs << "Is snapshot up-to-date? " << got_snap << llendl;
+	LL_DEBUGS() << "Is snapshot up-to-date? " << got_snap << LL_ENDL;
     
 	updateResolution(FALSE);
 }
@@ -507,13 +633,13 @@ void LLFacebookPhotoPanel::updateResolution(BOOL do_update)
 		if (width == 0 || height == 0)
 		{
 			// take resolution from current window size
-			lldebugs << "Setting preview res from window: " << gViewerWindow->getWindowWidthRaw() << "x" << gViewerWindow->getWindowHeightRaw() << llendl;
+			LL_DEBUGS() << "Setting preview res from window: " << gViewerWindow->getWindowWidthRaw() << "x" << gViewerWindow->getWindowHeightRaw() << LL_ENDL;
 			previewp->setSize(gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw());
 		}
 		else
 		{
 			// use the resolution from the selected pre-canned drop-down choice
-			lldebugs << "Setting preview res selected from combo: " << width << "x" << height << llendl;
+			LL_DEBUGS() << "Setting preview res selected from combo: " << width << "x" << height << LL_ENDL;
 			previewp->setSize(width, height);
 		}
 
@@ -887,164 +1013,6 @@ bool LLFacebookFriendsPanel::onConnectedToFacebook(const LLSD& data)
 	return false;
 }
 
-///////////////////////////
-//LLFacebookAccountPanel//////
-///////////////////////////
-
-LLFacebookAccountPanel::LLFacebookAccountPanel() : 
-mAccountCaptionLabel(NULL),
-mAccountNameLabel(NULL),
-mPanelButtons(NULL),
-mConnectButton(NULL),
-mDisconnectButton(NULL)
-{
-	mCommitCallbackRegistrar.add("SocialSharing.Connect", boost::bind(&LLFacebookAccountPanel::onConnect, this));
-	mCommitCallbackRegistrar.add("SocialSharing.Disconnect", boost::bind(&LLFacebookAccountPanel::onDisconnect, this));
-
-	setVisibleCallback(boost::bind(&LLFacebookAccountPanel::onVisibilityChange, this, _2));
-}
-
-BOOL LLFacebookAccountPanel::postBuild()
-{
-	mAccountCaptionLabel = getChild<LLTextBox>("account_caption_label");
-	mAccountNameLabel = getChild<LLTextBox>("account_name_label");
-	mPanelButtons = getChild<LLUICtrl>("panel_buttons");
-	mConnectButton = getChild<LLUICtrl>("connect_btn");
-	mDisconnectButton = getChild<LLUICtrl>("disconnect_btn");
-
-	return LLPanel::postBuild();
-}
-
-void LLFacebookAccountPanel::draw()
-{
-	LLFacebookConnect::EConnectionState connection_state = LLFacebookConnect::instance().getConnectionState();
-
-	//Disable the 'disconnect' button and the 'use another account' button when disconnecting in progress
-	bool disconnecting = connection_state == LLFacebookConnect::FB_DISCONNECTING;
-	mDisconnectButton->setEnabled(!disconnecting);
-
-	//Disable the 'connect' button when a connection is in progress
-	bool connecting = connection_state == LLFacebookConnect::FB_CONNECTION_IN_PROGRESS;
-	mConnectButton->setEnabled(!connecting);
-
-	LLPanel::draw();
-}
-
-void LLFacebookAccountPanel::onVisibilityChange(BOOL visible)
-{
-	if(visible)
-	{
-		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookAccountPanel::onFacebookConnectStateChange, this, _1));
-
-		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectInfo").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookAccountPanel::onFacebookConnectInfoChange, this));
-
-		//Connected
-		if(LLFacebookConnect::instance().isConnected())
-		{
-			showConnectedLayout();
-		}
-		//Check if connected (show disconnected layout in meantime)
-		else
-		{
-			showDisconnectedLayout();
-		}
-        if ((LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_NOT_CONNECTED) ||
-            (LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_CONNECTION_FAILED))
-        {
-            LLFacebookConnect::instance().checkConnectionToFacebook();
-        }
-	}
-	else
-	{
-		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
-	}
-}
-
-bool LLFacebookAccountPanel::onFacebookConnectStateChange(const LLSD& data)
-{
-	if(LLFacebookConnect::instance().isConnected())
-	{
-		//In process of disconnecting so leave the layout as is
-		if(data.get("enum").asInteger() != LLFacebookConnect::FB_DISCONNECTING)
-		{
-			showConnectedLayout();
-		}
-	}
-	else
-	{
-		showDisconnectedLayout();
-	}
-
-	return false;
-}
-
-bool LLFacebookAccountPanel::onFacebookConnectInfoChange()
-{
-	LLSD info = LLFacebookConnect::instance().getInfo();
-	std::string clickable_name;
-
-	//Strings of format [http://www.somewebsite.com Click Me] become clickable text
-	if(info.has("link") && info.has("name"))
-	{
-		clickable_name = "[" + info["link"].asString() + " " + info["name"].asString() + "]";
-	}
-
-	mAccountNameLabel->setText(clickable_name);
-
-	return false;
-}
-
-void LLFacebookAccountPanel::showConnectButton()
-{
-	if(!mConnectButton->getVisible())
-	{
-		mConnectButton->setVisible(TRUE);
-		mDisconnectButton->setVisible(FALSE);
-	}
-}
-
-void LLFacebookAccountPanel::hideConnectButton()
-{
-	if(mConnectButton->getVisible())
-	{
-		mConnectButton->setVisible(FALSE);
-		mDisconnectButton->setVisible(TRUE);
-	}
-}
-
-void LLFacebookAccountPanel::showDisconnectedLayout()
-{
-	mAccountCaptionLabel->setText(getString("facebook_disconnected"));
-	mAccountNameLabel->setText(std::string(""));
-	showConnectButton();
-}
-
-void LLFacebookAccountPanel::showConnectedLayout()
-{
-	LLFacebookConnect::instance().loadFacebookInfo();
-
-	mAccountCaptionLabel->setText(getString("facebook_connected"));
-	hideConnectButton();
-}
-
-void LLFacebookAccountPanel::onConnect()
-{
-	LLFacebookConnect::instance().checkConnectionToFacebook(true);
-
-	//Clear only the facebook browser cookies so that the facebook login screen appears
-	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
-}
-
-void LLFacebookAccountPanel::onDisconnect()
-{
-	LLFacebookConnect::instance().disconnectFromFacebook();
-
-	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
-}
-
 ////////////////////////
 //LLFloaterFacebook///////
 ////////////////////////
@@ -1094,7 +1062,7 @@ void LLFloaterFacebook::showPhotoPanel()
 	LLTabContainer* parent = dynamic_cast<LLTabContainer*>(mFacebookPhotoPanel->getParent());
 	if (!parent)
 	{
-		llwarns << "Cannot find panel container" << llendl;
+		LL_WARNS() << "Cannot find panel container" << LL_ENDL;
 		return;
 	}
 
diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h
index 34356412d6..86e3a148b9 100644
--- a/indra/newview/llfloaterfacebook.h
+++ b/indra/newview/llfloaterfacebook.h
@@ -51,6 +51,22 @@ public:
 	void clearAndClose();
 
 private:
+	void onVisibilityChange(BOOL new_visibility);
+	bool onFacebookConnectInfoChange();
+	void onConnect();
+	void onUseAnotherAccount();
+	void onDisconnect();
+
+	void showConnectButton();
+	void hideConnectButton();
+	void showDisconnectedLayout();
+	void showConnectedLayout();
+
+	LLTextBox * mAccountCaptionLabel;
+	LLTextBox * mAccountNameLabel;
+	LLUICtrl * mPanelButtons;
+	LLUICtrl * mConnectButton;
+	LLUICtrl * mDisconnectButton;
 	LLUICtrl* mMessageTextEditor;
 	LLUICtrl* mPostButton;
 	LLUICtrl* mCancelButton;
@@ -87,7 +103,6 @@ private:
     
 	LLHandle<LLView> mPreviewHandle;
 
-	LLUICtrl * mSnapshotPanel;
 	LLUICtrl * mResolutionComboBox;
 	LLUICtrl * mFilterComboBox;
 	LLUICtrl * mRefreshBtn;
@@ -147,33 +162,6 @@ private:
 	LLAvatarList* mSuggestedFriends;
 };
 
-class LLFacebookAccountPanel : public LLPanel
-{
-public:
-	LLFacebookAccountPanel();
-	BOOL postBuild();
-	void draw();
-
-private:
-	void onVisibilityChange(BOOL new_visibility);
-	bool onFacebookConnectStateChange(const LLSD& data);
-	bool onFacebookConnectInfoChange();
-	void onConnect();
-	void onUseAnotherAccount();
-	void onDisconnect();
-
-	void showConnectButton();
-	void hideConnectButton();
-	void showDisconnectedLayout();
-	void showConnectedLayout();
-
-	LLTextBox * mAccountCaptionLabel;
-	LLTextBox * mAccountNameLabel;
-	LLUICtrl * mPanelButtons;
-	LLUICtrl * mConnectButton;
-	LLUICtrl * mDisconnectButton;
-};
-
 class LLFloaterFacebook : public LLFloater
 {
 public:
-- 
cgit v1.2.3


From a34188354d7d54fa3548e8ee0bebcaeaaa2bcbd9 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 09:07:08 +0200
Subject: Changed: Reflected changes made to the Flickr floater XMLs in code.
 Fixed: Deprecated llerrs/llwarns/lldebugs/llinfos on the way.

---
 indra/newview/llfloaterflickr.cpp | 23 +++++++----------------
 indra/newview/llfloaterflickr.h   |  1 -
 2 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 4e6d98ecfa..36afab86b7 100644
--- a/indra/newview/llfloaterflickr.cpp
+++ b/indra/newview/llfloaterflickr.cpp
@@ -65,7 +65,6 @@ const std::string FLICKR_MACHINE_TAGS_NAMESPACE = "secondlife";
 ///////////////////////////
 
 LLFlickrPhotoPanel::LLFlickrPhotoPanel() :
-mSnapshotPanel(NULL),
 mResolutionComboBox(NULL),
 mRefreshBtn(NULL),
 mBtnPreview(NULL),
@@ -96,7 +95,6 @@ BOOL LLFlickrPhotoPanel::postBuild()
 {
 	setVisibleCallback(boost::bind(&LLFlickrPhotoPanel::onVisibilityChange, this, _2));
 	
-	mSnapshotPanel = getChild<LLUICtrl>("snapshot_panel");
 	mResolutionComboBox = getChild<LLUICtrl>("resolution_combobox");
 	mResolutionComboBox->setCommitCallback(boost::bind(&LLFlickrPhotoPanel::updateResolution, this, TRUE));
 	mFilterComboBox = getChild<LLUICtrl>("filters_combobox");
@@ -191,16 +189,9 @@ void LLFlickrPhotoPanel::draw()
 		// calc preview offset within the preview rect
 		const S32 local_offset_x = (thumbnail_rect.getWidth()  - thumbnail_w) / 2 ;
 		const S32 local_offset_y = (thumbnail_rect.getHeight() - thumbnail_h) / 2 ;
+		S32 offset_x = thumbnail_rect.mLeft + local_offset_x;
+		S32 offset_y = thumbnail_rect.mBottom + local_offset_y;
 
-		// calc preview offset within the floater rect
-        // Hack : To get the full offset, we need to take into account each and every offset of each widgets up to the floater.
-        // This is almost as arbitrary as using a fixed offset so that's what we do here for the sake of simplicity.
-        // *TODO : Get the offset looking through the hierarchy of widgets, should be done in postBuild() so to avoid traversing the hierarchy each time.
-		S32 offset_x = thumbnail_rect.mLeft + local_offset_x - 1;
-		S32 offset_y = thumbnail_rect.mBottom + local_offset_y - 39;
-        
-		mSnapshotPanel->localPointToOtherView(offset_x, offset_y, &offset_x, &offset_y, getParentByType<LLFloater>());
-        
 		gGL.matrixMode(LLRender::MM_MODELVIEW);
 		// Apply floater transparency to the texture unless the floater is focused.
 		F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
@@ -235,7 +226,7 @@ void LLFlickrPhotoPanel::onVisibilityChange(BOOL visible)
 			LLSnapshotLivePreview* preview = getPreviewView();
 			if(preview)
 			{
-				lldebugs << "opened, updating snapshot" << llendl;
+				LL_DEBUGS() << "opened, updating snapshot" << LL_ENDL;
 				preview->updateSnapshot(TRUE);
 			}
 		}
@@ -427,7 +418,7 @@ void LLFlickrPhotoPanel::updateControls()
 	BOOL got_snap = previewp && previewp->getSnapshotUpToDate();
 
 	// *TODO: Separate maximum size for Web images from postcards
-	lldebugs << "Is snapshot up-to-date? " << got_snap << llendl;
+	LL_DEBUGS() << "Is snapshot up-to-date? " << got_snap << LL_ENDL;
 
 	updateResolution(FALSE);
 }
@@ -457,13 +448,13 @@ void LLFlickrPhotoPanel::updateResolution(BOOL do_update)
 		if (width == 0 || height == 0)
 		{
 			// take resolution from current window size
-			lldebugs << "Setting preview res from window: " << gViewerWindow->getWindowWidthRaw() << "x" << gViewerWindow->getWindowHeightRaw() << llendl;
+			LL_DEBUGS() << "Setting preview res from window: " << gViewerWindow->getWindowWidthRaw() << "x" << gViewerWindow->getWindowHeightRaw() << LL_ENDL;
 			previewp->setSize(gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw());
 		}
 		else
 		{
 			// use the resolution from the selected pre-canned drop-down choice
-			lldebugs << "Setting preview res selected from combo: " << width << "x" << height << llendl;
+			LL_DEBUGS() << "Setting preview res selected from combo: " << width << "x" << height << LL_ENDL;
 			previewp->setSize(width, height);
 		}
 
@@ -726,7 +717,7 @@ void LLFloaterFlickr::showPhotoPanel()
 	LLTabContainer* parent = dynamic_cast<LLTabContainer*>(mFlickrPhotoPanel->getParent());
 	if (!parent)
 	{
-		llwarns << "Cannot find panel container" << llendl;
+		LL_WARNS() << "Cannot find panel container" << LL_ENDL;
 		return;
 	}
 
diff --git a/indra/newview/llfloaterflickr.h b/indra/newview/llfloaterflickr.h
index ba27c9a3d8..74da3bcea9 100644
--- a/indra/newview/llfloaterflickr.h
+++ b/indra/newview/llfloaterflickr.h
@@ -67,7 +67,6 @@ private:
 
 	LLHandle<LLView> mPreviewHandle;
 
-	LLUICtrl * mSnapshotPanel;
 	LLUICtrl * mResolutionComboBox;
 	LLUICtrl * mFilterComboBox;
 	LLUICtrl * mRefreshBtn;
-- 
cgit v1.2.3


From 9f9fb34742b80f89d9c8e058d6177947c8f55d06 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 09:10:52 +0200
Subject: Changed: Reflected changes made to the Twitter floater XMLs in code.
 Fixed: Deprecated llerrs/llwarns/lldebugs/llinfos on the way.

---
 indra/newview/llfloatertwitter.cpp | 23 +++++++----------------
 indra/newview/llfloatertwitter.h   |  1 -
 2 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatertwitter.cpp b/indra/newview/llfloatertwitter.cpp
index 78e9259919..868d623d57 100644
--- a/indra/newview/llfloatertwitter.cpp
+++ b/indra/newview/llfloatertwitter.cpp
@@ -64,7 +64,6 @@ const std::string DEFAULT_STATUS_TEXT = " #SecondLife";
 ///////////////////////////
 
 LLTwitterPhotoPanel::LLTwitterPhotoPanel() :
-mSnapshotPanel(NULL),
 mResolutionComboBox(NULL),
 mRefreshBtn(NULL),
 mBtnPreview(NULL),
@@ -94,7 +93,6 @@ BOOL LLTwitterPhotoPanel::postBuild()
 {
 	setVisibleCallback(boost::bind(&LLTwitterPhotoPanel::onVisibilityChange, this, _2));
 	
-	mSnapshotPanel = getChild<LLUICtrl>("snapshot_panel");
 	mResolutionComboBox = getChild<LLUICtrl>("resolution_combobox");
 	mResolutionComboBox->setValue("[i800,i600]"); // hardcoded defaults ftw!
 	mResolutionComboBox->setCommitCallback(boost::bind(&LLTwitterPhotoPanel::updateResolution, this, TRUE));
@@ -194,15 +192,8 @@ void LLTwitterPhotoPanel::draw()
 		// calc preview offset within the preview rect
 		const S32 local_offset_x = (thumbnail_rect.getWidth()  - thumbnail_w) / 2 ;
 		const S32 local_offset_y = (thumbnail_rect.getHeight() - thumbnail_h) / 2 ;
-
-		// calc preview offset within the floater rect
-        // Hack : To get the full offset, we need to take into account each and every offset of each widgets up to the floater.
-        // This is almost as arbitrary as using a fixed offset so that's what we do here for the sake of simplicity.
-        // *TODO : Get the offset looking through the hierarchy of widgets, should be done in postBuild() so to avoid traversing the hierarchy each time.
-		S32 offset_x = thumbnail_rect.mLeft + local_offset_x - 1;
-		S32 offset_y = thumbnail_rect.mBottom + local_offset_y - 39;
-        
-		mSnapshotPanel->localPointToOtherView(offset_x, offset_y, &offset_x, &offset_y, getParentByType<LLFloater>());
+		S32 offset_x = thumbnail_rect.mLeft + local_offset_x;
+		S32 offset_y = thumbnail_rect.mBottom + local_offset_y;
         
 		gGL.matrixMode(LLRender::MM_MODELVIEW);
 		// Apply floater transparency to the texture unless the floater is focused.
@@ -238,7 +229,7 @@ void LLTwitterPhotoPanel::onVisibilityChange(BOOL visible)
 			LLSnapshotLivePreview* preview = getPreviewView();
 			if(preview)
 			{
-				lldebugs << "opened, updating snapshot" << llendl;
+				LL_DEBUGS() << "opened, updating snapshot" << LL_ENDL;
 				preview->updateSnapshot(TRUE);
 			}
 		}
@@ -455,7 +446,7 @@ void LLTwitterPhotoPanel::updateControls()
 	BOOL got_snap = previewp && previewp->getSnapshotUpToDate();
     
 	// *TODO: Separate maximum size for Web images from postcards
-	lldebugs << "Is snapshot up-to-date? " << got_snap << llendl;
+	LL_DEBUGS() << "Is snapshot up-to-date? " << got_snap << LL_ENDL;
     
 	updateResolution(FALSE);
 }
@@ -485,13 +476,13 @@ void LLTwitterPhotoPanel::updateResolution(BOOL do_update)
 		if (width == 0 || height == 0)
 		{
 			// take resolution from current window size
-			lldebugs << "Setting preview res from window: " << gViewerWindow->getWindowWidthRaw() << "x" << gViewerWindow->getWindowHeightRaw() << llendl;
+			LL_DEBUGS() << "Setting preview res from window: " << gViewerWindow->getWindowWidthRaw() << "x" << gViewerWindow->getWindowHeightRaw() << LL_ENDL;
 			previewp->setSize(gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw());
 		}
 		else
 		{
 			// use the resolution from the selected pre-canned drop-down choice
-			lldebugs << "Setting preview res selected from combo: " << width << "x" << height << llendl;
+			LL_DEBUGS() << "Setting preview res selected from combo: " << width << "x" << height << LL_ENDL;
 			previewp->setSize(width, height);
 		}
 
@@ -755,7 +746,7 @@ void LLFloaterTwitter::showPhotoPanel()
 	LLTabContainer* parent = dynamic_cast<LLTabContainer*>(mTwitterPhotoPanel->getParent());
 	if (!parent)
 	{
-		llwarns << "Cannot find panel container" << llendl;
+		LL_WARNS() << "Cannot find panel container" << LL_ENDL;
 		return;
 	}
 
diff --git a/indra/newview/llfloatertwitter.h b/indra/newview/llfloatertwitter.h
index f07ec2ca2f..d586799d18 100644
--- a/indra/newview/llfloatertwitter.h
+++ b/indra/newview/llfloatertwitter.h
@@ -70,7 +70,6 @@ private:
 
 	LLHandle<LLView> mPreviewHandle;
 
-	LLUICtrl * mSnapshotPanel;
 	LLUICtrl * mResolutionComboBox;
 	LLUICtrl * mFilterComboBox;
 	LLUICtrl * mRefreshBtn;
-- 
cgit v1.2.3


From dca057c6656d98ee05c2fc98dd912d4fd5d35505 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 10:16:38 +0200
Subject: Changed: Snapshot floater layout. Changed: Snapshots to disk default
 to 'Custom' (Window Resolution) Added: Big Auto-scaling integrated image
 Preview. Can be toggled. Added: Fixed german translations for the new floater
 layout. Removed: Need to have SnapshotFiltersEnabled to see the filter
 dropdown. Removed: SnapshotFiltersEnabled debug.

---
 indra/newview/app_settings/settings.xml            |  11 -
 indra/newview/llfloatersnapshot.cpp                | 136 +++----
 .../skins/default/xui/de/floater_snapshot.xml      |  13 +-
 .../default/xui/de/panel_snapshot_inventory.xml    |   2 +-
 .../skins/default/xui/de/panel_snapshot_local.xml  |   2 +-
 .../default/xui/de/panel_snapshot_options.xml      |  11 +-
 .../default/xui/de/panel_snapshot_postcard.xml     |   2 -
 .../default/xui/de/panel_snapshot_profile.xml      |   2 +-
 .../skins/default/xui/en/floater_snapshot.xml      | 450 +++++++++++----------
 .../default/xui/en/panel_postcard_message.xml      |  30 +-
 .../default/xui/en/panel_postcard_settings.xml     |  74 ++--
 .../default/xui/en/panel_snapshot_inventory.xml    |  77 ++--
 .../skins/default/xui/en/panel_snapshot_local.xml  | 240 +++++------
 .../default/xui/en/panel_snapshot_options.xml      | 162 ++++----
 .../default/xui/en/panel_snapshot_postcard.xml     |  32 +-
 .../default/xui/en/panel_snapshot_profile.xml      | 202 ++++-----
 16 files changed, 671 insertions(+), 775 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 03b953b6cc..7ebda3eea6 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11452,17 +11452,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>SnapshotFiltersEnabled</key>
-    <map>
-        <key>Comment</key>
-        <string>Enable filters in the Snapshot Advanced panel (experimental).</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>Boolean</string>
-        <key>Value</key>
-        <integer>0</integer>
-    </map>
     <key>SnapshotFormat</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 960d3f35dd..c4b00c8342 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -1,4 +1,4 @@
-/** 
+/** 
  * @file llfloatersnapshot.cpp
  * @brief Snapshot preview window, allowing saving, e-mailing, etc.
  *
@@ -62,7 +62,6 @@ const S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512
 static LLDefaultChildRegistry::Register<LLSnapshotFloaterView> r("snapshot_floater_view");
 
 
-
 ///----------------------------------------------------------------------------
 /// Class LLFloaterSnapshot::Impl
 ///----------------------------------------------------------------------------
@@ -96,7 +95,7 @@ public:
 	static void onClickAutoSnap(LLUICtrl *ctrl, void* data);
 	static void onClickFilter(LLUICtrl *ctrl, void* data);
 	//static void onClickAdvanceSnap(LLUICtrl *ctrl, void* data);
-	static void onClickMore(void* data) ;
+	static void onClickPreview(void* data) ;
 	static void onClickUICheck(LLUICtrl *ctrl, void* data);
 	static void onClickHUDCheck(LLUICtrl *ctrl, void* data);
 	static void applyKeepAspectCheck(LLFloaterSnapshot* view, BOOL checked);
@@ -264,31 +263,33 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
 
 	BOOL advanced = gSavedSettings.getBOOL("AdvanceSnapshot");
 
-	// Show/hide advanced options.
-	LLPanel* advanced_options_panel = floaterp->getChild<LLPanel>("advanced_options_panel");
-	floaterp->getChild<LLButton>("advanced_options_btn")->setImageOverlay(advanced ? "TabIcon_Open_Off" : "TabIcon_Close_Off");
-	if (advanced != advanced_options_panel->getVisible())
+	//BD - Automatically calculate the size of our snapshot window to enlarge
+	//     the snapshot preview to its maximum size, this is especially helpfull
+	//     for pretty much every aspect ratio other than 1:1.
+	F32 panel_width = 400.f * gViewerWindow->getWorldViewAspectRatio();
+
+	//BD - Make sure we clamp at 700 here because 700 would be for 16:9 which we
+	//     consider the maximum. Everything bigger will be clamped and will have
+	//     a slightly smaller preview window which most likely won't fill up the
+	//     whole snapshot floater as it should.
+	if(panel_width > 700.f)
 	{
-		S32 panel_width = advanced_options_panel->getRect().getWidth();
-		floaterp->getChild<LLPanel>("advanced_options_panel")->setVisible(advanced);
-		S32 floater_width = floaterp->getRect().getWidth();
-		floater_width += (advanced ? panel_width : -panel_width);
-		floaterp->reshape(floater_width, floaterp->getRect().getHeight());
+		panel_width = 700.f;
 	}
 
-	if(!advanced) //set to original window resolution
+	S32 floater_width = 224.f;
+	if(advanced)
 	{
-		previewp->mKeepAspectRatio = TRUE;
-
-		floaterp->getChild<LLComboBox>("profile_size_combo")->setCurrentByIndex(0);
-		floaterp->getChild<LLComboBox>("postcard_size_combo")->setCurrentByIndex(0);
-		floaterp->getChild<LLComboBox>("texture_size_combo")->setCurrentByIndex(0);
-		floaterp->getChild<LLComboBox>("local_size_combo")->setCurrentByIndex(0);
-
-		LLSnapshotLivePreview* previewp = getPreviewView(floaterp);
-		previewp->setSize(gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw());
+		floater_width = floater_width + panel_width;
 	}
 
+	LLUICtrl* thumbnail_placeholder = floaterp->getChild<LLUICtrl>("thumbnail_placeholder");
+	thumbnail_placeholder->setVisible(advanced);
+	thumbnail_placeholder->reshape(panel_width, thumbnail_placeholder->getRect().getHeight());
+	floaterp->getChild<LLUICtrl>("image_res_text")->setVisible(advanced);
+	floaterp->getChild<LLUICtrl>("file_size_label")->setVisible(advanced);
+	floaterp->reshape(floater_width, floaterp->getRect().getHeight());
+
 	bool use_freeze_frame = floaterp->getChild<LLUICtrl>("freeze_frame_check")->getValue().asBoolean();
 
 	if (use_freeze_frame)
@@ -388,7 +389,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 			height_ctrl->setValue(h);
 		}
 
-		// Сlamp snapshot resolution to window size when showing UI or HUD in snapshot.
+		// Clamp snapshot resolution to window size when showing UI or HUD in snapshot.
 		if (gSavedSettings.getBOOL("RenderUIInSnapshot") || gSavedSettings.getBOOL("RenderHUDInSnapshot"))
 		{
 			S32 width = gViewerWindow->getWindowWidthRaw();
@@ -581,20 +582,6 @@ void LLFloaterSnapshot::Impl::onClickFilter(LLUICtrl *ctrl, void* data)
 	}
 }
 
-void LLFloaterSnapshot::Impl::onClickMore(void* data)
-{
-	BOOL visible = gSavedSettings.getBOOL("AdvanceSnapshot");
-	
-	LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
-	if (view)
-	{
-		view->impl.setStatus(Impl::STATUS_READY);
-		gSavedSettings.setBOOL("AdvanceSnapshot", !visible);
-		updateControls(view) ;
-		updateLayout(view) ;
-	}
-}
-
 // static
 void LLFloaterSnapshot::Impl::onClickUICheck(LLUICtrl *ctrl, void* data)
 {
@@ -701,6 +688,20 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde
 	}
 }
 
+void LLFloaterSnapshot::Impl::onClickPreview(void* data)
+{
+	BOOL visible = gSavedSettings.getBOOL("AdvanceSnapshot");
+	
+	LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
+	if (view)
+	{
+		view->impl.setStatus(Impl::STATUS_READY);
+		gSavedSettings.setBOOL("AdvanceSnapshot", !visible);
+		updateControls(view) ;
+		updateLayout(view) ;
+	}
+}
+
 // Show/hide upload progress indicators.
 // static
 void LLFloaterSnapshot::Impl::setWorking(LLFloaterSnapshot* floater, bool working)
@@ -1055,7 +1056,7 @@ BOOL LLFloaterSnapshot::postBuild()
 	mSucceessLblPanel = getChild<LLUICtrl>("succeeded_panel");
 	mFailureLblPanel = getChild<LLUICtrl>("failed_panel");
 
-	childSetAction("advanced_options_btn", Impl::onClickMore, this);
+	childSetAction("preview_btn", Impl::onClickPreview, this);
 
 	childSetCommitCallback("ui_check", Impl::onClickUICheck, this);
 	getChild<LLUICtrl>("ui_check")->setValue(gSavedSettings.getBOOL("RenderUIInSnapshot"));
@@ -1075,24 +1076,15 @@ BOOL LLFloaterSnapshot::postBuild()
 	getChild<LLUICtrl>("auto_snapshot_check")->setValue(gSavedSettings.getBOOL("AutoSnapshot"));
 	childSetCommitCallback("auto_snapshot_check", Impl::onClickAutoSnap, this);
     
+
 	// Filters
 	LLComboBox* filterbox = getChild<LLComboBox>("filters_combobox");
-    if (gSavedSettings.getBOOL("SnapshotFiltersEnabled"))
-    {
-        // Update filter list if setting is on (experimental)
-        std::vector<std::string> filter_list = LLImageFiltersManager::getInstance()->getFiltersList();
-        for (U32 i = 0; i < filter_list.size(); i++)
-        {
-            filterbox->add(filter_list[i]);
-        }
-        childSetCommitCallback("filters_combobox", Impl::onClickFilter, this);
-    }
-    else
+    std::vector<std::string> filter_list = LLImageFiltersManager::getInstance()->getFiltersList();
+    for (U32 i = 0; i < filter_list.size(); i++)
     {
-        // Hide Filter UI if setting is off (default)
-        getChild<LLUICtrl>("filter_list_label")->setVisible(FALSE);
-        filterbox->setVisible(FALSE);
+        filterbox->add(filter_list[i]);
     }
+    childSetCommitCallback("filters_combobox", Impl::onClickFilter, this);
     
 	LLWebProfile::setImageUploadResultCallback(boost::bind(&LLFloaterSnapshot::Impl::onSnapshotUploadFinished, _1));
 	LLPostCard::setPostResultCallback(boost::bind(&LLFloaterSnapshot::Impl::onSendingPostcardFinished, _1));
@@ -1119,7 +1111,7 @@ BOOL LLFloaterSnapshot::postBuild()
 	getChild<LLComboBox>("profile_size_combo")->selectNthItem(0);
 	getChild<LLComboBox>("postcard_size_combo")->selectNthItem(0);
 	getChild<LLComboBox>("texture_size_combo")->selectNthItem(0);
-	getChild<LLComboBox>("local_size_combo")->selectNthItem(0);
+	getChild<LLComboBox>("local_size_combo")->selectNthItem(8);
 	getChild<LLComboBox>("local_format_combo")->selectNthItem(0);
 
 	impl.mPreviewHandle = previewp->getHandle();
@@ -1145,7 +1137,7 @@ void LLFloaterSnapshot::draw()
 
 	LLFloater::draw();
 
-	if (previewp && !isMinimized())
+	if (previewp && !isMinimized() && sThumbnailPlaceholder->getVisible())
 	{		
 		if(previewp->getThumbnailImage())
 		{
@@ -1172,44 +1164,13 @@ void LLFloaterSnapshot::draw()
 
 			previewp->drawPreviewRect(offset_x, offset_y) ;
 
-			// Draw some controls on top of the preview thumbnail.
-			static const S32 PADDING = 5;
-			static const S32 REFRESH_LBL_BG_HEIGHT = 32;
-
-			// Reshape and position the posting result message panels at the top of the thumbnail.
-			// Do this regardless of current posting status (finished or not) to avoid flicker
-			// when the result message is displayed for the first time.
-			// if (impl.getStatus() == Impl::STATUS_FINISHED)
-			{
-				LLRect result_lbl_rect = mSucceessLblPanel->getRect();
-				const S32 result_lbl_h = result_lbl_rect.getHeight();
-				result_lbl_rect.setLeftTopAndSize(local_offset_x, local_offset_y + thumbnail_h, thumbnail_w - 1, result_lbl_h);
-				mSucceessLblPanel->reshape(result_lbl_rect.getWidth(), result_lbl_h);
-				mSucceessLblPanel->setRect(result_lbl_rect);
-				mFailureLblPanel->reshape(result_lbl_rect.getWidth(), result_lbl_h);
-				mFailureLblPanel->setRect(result_lbl_rect);
-			}
-
-			// Position the refresh button in the bottom left corner of the thumbnail.
-			mRefreshBtn->setOrigin(local_offset_x + PADDING, local_offset_y + PADDING);
-
-			if (impl.mNeedRefresh)
-			{
-				// Place the refresh hint text to the right of the refresh button.
-				const LLRect& refresh_btn_rect = mRefreshBtn->getRect();
-				mRefreshLabel->setOrigin(refresh_btn_rect.mLeft + refresh_btn_rect.getWidth() + PADDING, refresh_btn_rect.mBottom);
-
-				// Draw the refresh hint background.
-				LLRect refresh_label_bg_rect(offset_x, offset_y + REFRESH_LBL_BG_HEIGHT, offset_x + thumbnail_w - 1, offset_y);
-				gl_rect_2d(refresh_label_bg_rect, LLColor4::white % 0.9f, TRUE);
-			}
-
 			gGL.pushUIMatrix();
 			LLUI::translate((F32) thumbnail_rect.mLeft, (F32) thumbnail_rect.mBottom);
 			sThumbnailPlaceholder->draw();
 			gGL.popUIMatrix();
 		}
 	}
+	impl.updateLayout(this);
 }
 
 void LLFloaterSnapshot::onOpen(const LLSD& key)
@@ -1225,6 +1186,9 @@ void LLFloaterSnapshot::onOpen(const LLSD& key)
 	gSnapshotFloaterView->setVisible(TRUE);
 	gSnapshotFloaterView->adjustToFitScreen(this, FALSE);
 
+	impl.updateControls(this);
+	impl.updateLayout(this);
+
 	// Initialize default tab.
 	getChild<LLSideTrayPanelContainer>("panel_container")->getCurrentPanel()->onOpen(LLSD());
 }
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index 798461c007..b98ee78685 100755
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -41,23 +41,24 @@
 	</string>
 	<button name="advanced_options_btn" tool_tip="Erweiterte Optionen"/>
 	<text name="image_res_text">
-		[WIDTH] x [HEIGHT] px
+		[WIDTH]px (Breite) x [HEIGHT]px (Höhe)
 	</text>
 	<text name="file_size_label">
 		[SIZE] KB
 	</text>
+	<button name="advanced_options" label="AUFNAHME OPTIONEN"/>
 	<panel name="advanced_options_panel">
-		<text name="advanced_options_label">
-			ERWEITERTE OPTIONEN
-		</text>
 		<text name="layer_type_label">
-			Aufnahme:
+			Aufnehmen:
 		</text>
 		<combo_box label="Bildebenen" name="layer_types">
 			<combo_box.item label="Farben" name="Colors"/>
 			<combo_box.item label="Tiefe" name="Depth"/>
 		</combo_box>
-		<check_box label="Schnittstelle" name="ui_check"/>
+		<combo_box label="Filter" name="filters_combobox">
+			<combo_box.item label="Kein Filter" name="NoFilter"/>
+		</combo_box>
+		<check_box label="Benutzeroberfläche" name="ui_check"/>
 		<check_box label="HUDs" name="hud_check"/>
 		<check_box label="Standbild (Vollbild)" name="freeze_frame_check"/>
 		<check_box label="Automatisch aktualisieren" name="auto_snapshot_check"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
index 10827ce6f2..271d745869 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_inventory">
 	<text name="title">
-		In meinem Inventar speichern
+		Inventar
 	</text>
 	<text name="hint_lbl">
 		Das Speichern eines Bilds in Ihrem Inventar kostet [UPLOAD_COST] L$. Um das Bild als Textur zu speichern, wählen Sie eines der quadratischen Formate aus.
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
index 3aeae80388..935e8d2356 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_local">
 	<text name="title">
-		Auf meinem Computer speichern
+		Festplatte
 	</text>
 	<combo_box label="Auflösung" name="local_size_combo">
 		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
index e1d8a5dc6d..e2ba5bd4db 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
-	<button label="In meinem Profil posten" name="save_to_profile_btn"/>
-	<button label="E-Mail" name="save_to_email_btn"/>
-	<button label="In meinem Inventar speichern ([AMOUNT] L$)" name="save_to_inventory_btn"/>
-	<button label="Auf meinem Computer speichern" name="save_to_computer_btn"/>
+	<button label="Ins Profil hochladen" name="save_to_profile_btn"/>
+	<button label="Per E-Mail senden" name="save_to_email_btn"/>
+	<button label="Im Inventar speichern" name="save_to_inventory_btn"/>
+	<button label="Auf Festplatte speichern" name="save_to_computer_btn"/>
+	<button label="Zu Facebook hochladen" name="send_to_facebook_btn"/>
+	<button label="Zu Twitter hochladen" name="send_to_twitter_btn"/>
+	<button label="Zu Flickr hochladen" name="send_to_flickr_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
index c9afe86d7f..e0fc60621e 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
@@ -12,6 +12,4 @@
 	<text name="title">
 		E-Mail
 	</text>
-	<button label="Nachricht" name="message_btn"/>
-	<button label="Einstellungen" name="settings_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
index 8d1c52dea8..1ecb6090af 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_profile">
 	<text name="title">
-		In meinem Profil posten
+		Profil
 	</text>
 	<combo_box label="Auflösung" name="profile_size_combo">
 		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 771035b40d..410594f1c6 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -3,15 +3,17 @@
  positioning="cascading"
  legacy_header_height="18"
  can_minimize="true"
+ can_resize="false"
  can_close="true"
- height="500"
+ height="455"
  layout="topleft"
  name="Snapshot"
  help_topic="snapshot"
  save_rect="true"
  save_visibility="false"
  title="SNAPSHOT"
- width="470">
+ width="624"
+ min_height="455">
     <floater.string
      name="unknown">
         unknown
@@ -57,11 +59,11 @@
  	    Saved to Computer!
  	</string>
  	<string
-        name="facebook_failed_str">
+     name="facebook_failed_str">
  	    Failed to upload image to your Facebook timeline.
  	</string>
  	<string
-        name="profile_failed_str">
+     name="profile_failed_str">
  	    Failed to upload image to your Profile Feed.
  	</string>
  	<string
@@ -78,35 +80,201 @@
  	</string>
     <button
      follows="left|top"
-     height="23"
-     image_overlay="TabIcon_Close_Off"
+     height="18"
+     image_overlay="Refresh_Off"
+     image_overlay_alignment="left"
+     imgoverlay_label_space="5"
+	 pad_bottom="0"
+	 halign="left"
+	 image_selected="transparent.j2c"
+	 image_unselected="transparent.j2c"
      layout="topleft"
-     left="236"
-     name="advanced_options_btn"
-     tool_tip="Advanced options"
-     top="25"
-     width="23" />
-  <ui_ctrl 
-    height="160"
-    width="250"
-    layout="topleft"
-    name="thumbnail_placeholder"
-    top="50"
-    follows="left|top"
-    left="10">
+     left="5"
+	 label="REFRESH"
+     name="new_snapshot_btn"
+     top_pad="26"
+     width="195" />
+	<panel
+     height="154"
+     layout="topleft"
+	 follows="top|left"
+     left="0"
+     name="advanced_options_panel"
+     top_pad="0"
+     width="200">
+        <view_border 
+         bevel_style="in"
+         follows="left|top|right" 
+         height="1"
+         left="6"
+         layout="topleft"
+         name="advanced_options_hr"
+         right="-1"
+         top_pad="5"
+         />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="13"
+         layout="topleft"
+         left="10"
+         name="layer_type_label"
+         top_pad="10"
+         width="100">
+            Capture:
+        </text>
+        <combo_box
+         follows="left|top|right"
+         height="23"
+         label="Image Layers"
+         layout="topleft"
+         left="30"
+         name="layer_types"
+         right="-2">
+            <combo_box.item
+             label="Colors"
+             name="Colors"
+             value="colors" />
+            <combo_box.item
+             label="Depth"
+             name="Depth"
+             value="depth" />
+        </combo_box>
+        <check_box
+         label="Interface"
+         layout="topleft"
+         left="30"
+		 height="16"
+         top_pad="8"
+         width="180"
+         name="ui_check" />
+        <check_box
+         label="HUDs"
+         layout="topleft"
+		 height="16"
+         left="30"
+         top_pad="1"
+         width="180"
+         name="hud_check" />
+        <check_box
+         label="Freeze frame (fullscreen)"
+         layout="topleft"
+		 height="16"
+         left="10"
+         top_pad="1"
+         width="180"
+         name="freeze_frame_check" />
+        <check_box
+         label="Auto-refresh"
+         layout="topleft"
+		 height="16"
+         left="10"
+         top_pad="1"
+         width="180"
+         name="auto_snapshot_check" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="13"
+         layout="topleft"
+         left="10"
+         name="filter_list_label"
+         top_pad="10"
+         width="50">
+            Filter:
+        </text>
+        <combo_box
+            control_name="PhotoFilters"
+            follows="left|right|top"
+            name="filters_combobox"
+            tool_tip="Image filters"
+            top_delta="-3"
+            left="50"
+			right="-1"
+            height="21"
+            width="135">
+            <combo_box.item
+            label="No Filter"
+            name="NoFilter"
+            value="NoFilter" />
+        </combo_box>
+		 <view_border 
+         bevel_style="in"
+         follows="left|top|right" 
+         height="1"
+         left="6"
+         layout="topleft"
+         name="advanced_options_hr"
+         right="-1"
+         top_pad="10"
+         />
+    </panel>
+	<panel_container
+     follows="left|top"
+     height="230"
+     layout="topleft"
+     left="0"
+     name="panel_container"
+     default_panel_name="panel_snapshot_options"
+     top_pad="10"
+     width="205">
       <panel
+       class="llpanelsnapshotoptions"
+       filename="panel_snapshot_options.xml"
+       follows="all"
+       layout="topleft"
+       left="0"
+       name="panel_snapshot_options"
+       top="0" />
+      <panel
+       class="llpanelsnapshotprofile"
+       follows="all"
+       layout="topleft"
+       name="panel_snapshot_profile"
+       filename="panel_snapshot_profile.xml" />
+      <panel
+       class="llpanelsnapshotpostcard"
+       follows="all"
+       layout="topleft"
+       name="panel_snapshot_postcard"
+       filename="panel_snapshot_postcard.xml" />
+      <panel
+       class="llpanelsnapshotinventory"
+       follows="all"
+       layout="topleft"
+       name="panel_snapshot_inventory"
+       filename="panel_snapshot_inventory.xml" />
+      <panel
+       class="llpanelsnapshotlocal"
+       follows="all"
+       layout="topleft"
+       name="panel_snapshot_local"
+       filename="panel_snapshot_local.xml" />
+    </panel_container>
+	<view_border 
+         bevel_style="in"
+         follows="left|top" 
+         height="1"
+         left="6"
+         layout="topleft"
+         name="status_hr"
+         width="192"
+         top_pad="-16"/>
+	<panel
        background_visible="true"
-       bg_alpha_color="0.9 1 0.9 1"
+       bg_alpha_color="0 0 0 0.25"
        follows="left|top"
        font="SansSerifLarge"
        halign="center"
        height="20"
        layout="topleft"
-       left="0"
+       left="10"
        length="1"
        name="succeeded_panel"
-       right="-1"
-       top="0"
+	   width="188"
+       top_pad="1"
        type="string"
        visible="false">
           <text
@@ -119,7 +287,7 @@
            length="1"
            name="succeeded_lbl"
            right="-1"
-           text_color="0.2 0.5 0.2 1"
+           text_color="0.2 0.85 0.2 1"
            top="4"
            translate="false"
            type="string">
@@ -128,17 +296,17 @@
       </panel>
       <panel
        background_visible="true"
-       bg_alpha_color="1 0.9 0.9 1"
+       bg_alpha_color="0 0 0 0.25"
        follows="left|top"
        font="SansSerifLarge"
        halign="center"
        height="20"
        layout="topleft"
-       left_delta="0"
+       left="10"
        length="1"
        name="failed_panel"
-       right="-1"
-       top="0"
+	   width="188"
+       top_delta="0"
        type="string"
        visible="false">
           <text
@@ -151,7 +319,7 @@
            length="1"
            name="failed_lbl"
            right="-1"
-           text_color="0.5 0.2 0.2 1"
+           text_color="0.95 0.4 0.4 1"
            top="4"
            translate="false"
            type="string">
@@ -160,51 +328,39 @@
       </panel>
       <loading_indicator
        follows="left|top"
-       height="48"
+       height="24"
        layout="topleft"
        name="working_indicator"
-       left="101"
-       top="46"
+       left="95"
+       top_delta="0"
        visible="false"
-       width="48" />
+       width="24" />
       <text
-       follows="left|top|right"
+       follows="left|top"
        font="SansSerifBold"
        height="14"
        layout="topleft"
-       left="5"
+       left="10"
        length="1"
-       halign="center"
+       halign="right"
        name="working_lbl"
-       right="-5"
-       top="98"
+       top_delta="4"
        translate="false"
        type="string"
        visible="false"
-       width="130">
+       width="80">
           Working
       </text>
-      <button
-       follows="left|top"
-       height="22"
-       image_overlay="Refresh_Off"
-       layout="topleft"
-       left="20"
-       name="new_snapshot_btn"
-       bottom="-20"
-       visible="false"
-       width="22" />
       <text
        follows="left|top"
        font="SansSerifBold"
        halign="left"
        height="18"
        layout="topleft"
-       left_pad="10"
+       left="10"
        length="1"
        name="refresh_lbl"
-       right="-5"
-       text_color="red"
+       text_color="0.95 0.4 0.4 1"
        top_delta="0"
        translate="false"
        type="string"
@@ -212,17 +368,23 @@
        width="130">
           Refresh to save.
       </text>
-  </ui_ctrl>
+  <ui_ctrl 
+    layout="topleft"
+    name="thumbnail_placeholder"
+    top="23"
+	left="215"
+	width="400"
+	height="400"
+    follows="top|left"/>
   <view_border 
    bevel_style="in" 
    height="21"
-   width="250"
    layout="topleft"
    name="img_info_border"
-   top_pad="3"
-   follows="left|top"
-   left_delta="0"
-   />
+   top_pad="0"
+   right="-10"
+   follows="left|top|right"
+   left_delta="0"/>
    <text
     type="string"
     font="SansSerifSmall"
@@ -234,15 +396,15 @@
     halign="left"
     name="image_res_text"
     top_delta="5"
-    width="100">
-       [WIDTH] x [HEIGHT] px
+    width="200">
+       [WIDTH]px (width) x [HEIGHT]px (height)
    </text>
    <text
-    follows="left|top"
+    follows="right|top"
     font="SansSerifSmall"
     height="14"
     layout="topleft"
-    left="200"
+    left="-65"
     length="1"
     halign="right"
     name="file_size_label"
@@ -251,161 +413,13 @@
     width="50">
        [SIZE] KB
    </text>
-    <panel_container
-     follows="left|top"
-     height="260"
-     layout="topleft"
-     left="0"
-     name="panel_container"
-     default_panel_name="panel_snapshot_options"
-     top_pad="10"
-     width="270">
-      <panel
-       class="llpanelsnapshotoptions"
-       filename="panel_snapshot_options.xml"
-       follows="all"
-       layout="topleft"
-       left="0"
-       name="panel_snapshot_options"
-       top="0" />
-      <panel
-       class="llpanelsnapshotprofile"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_profile"
-       filename="panel_snapshot_profile.xml" />
-      <panel
-       class="llpanelsnapshotpostcard"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_postcard"
-       filename="panel_snapshot_postcard.xml" />
-      <panel
-       class="llpanelsnapshotinventory"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_inventory"
-       filename="panel_snapshot_inventory.xml" />
-      <panel
-       class="llpanelsnapshotlocal"
-       follows="all"
+   <button
+       follows="left|top"
+       height="420"
        layout="topleft"
-       name="panel_snapshot_local"
-       filename="panel_snapshot_local.xml" />
-    </panel_container>
-    <panel
-     height="295"
-     layout="topleft"
-     left="270"
-     name="advanced_options_panel"
-     top="20"
-     width="200">
-        <text
-         type="string"
-         font="SansSerifSmall"
-         length="1"
-         follows="left|top"
-         height="14"
-         layout="topleft"
-         left="10"
-         halign="left"
-         name="advanced_options_label"
-         right="-10"
-         top="10">
-            ADVANCED OPTIONS
-        </text>
-        <view_border 
-         bevel_style="in"
-         follows="left|top|right" 
-         height="1"
-         left="10"
-         layout="topleft"
-         name="advanced_options_hr"
-         right="-10"
-         top_pad="5"
-         />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="13"
-         layout="topleft"
-         left="10"
-         name="layer_type_label"
-         top_pad="10"
-         width="50">
-            Capture:
-        </text>
-        <combo_box
-         follows="left|top|right"
-         height="23"
-         label="Image Layers"
-         layout="topleft"
-         left="30"
-         name="layer_types"
-         right="-10">
-            <combo_box.item
-             label="Colors"
-             name="Colors"
-             value="colors" />
-            <combo_box.item
-             label="Depth"
-             name="Depth"
-             value="depth" />
-        </combo_box>
-        <check_box
-         label="Interface"
-         layout="topleft"
-         left="30"
-         top_pad="10"
-         width="180"
-         name="ui_check" />
-        <check_box
-         label="HUDs"
-         layout="topleft"
-         left="30"
-         top_pad="10"
-         width="180"
-         name="hud_check" />
-        <check_box
-         label="Freeze frame (fullscreen)"
-         layout="topleft"
-         left="10"
-         top_pad="8"
-         width="180"
-         name="freeze_frame_check" />
-        <check_box
-         label="Auto-refresh"
-         layout="topleft"
-         left="10"
-         top_pad="8"
-         width="180"
-         name="auto_snapshot_check" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="13"
-         layout="topleft"
-         left="10"
-         name="filter_list_label"
-         top_pad="10"
-         width="50">
-            Filter:
-        </text>
-        <combo_box
-            control_name="PhotoFilters"
-            follows="left|right|top"
-            name="filters_combobox"
-            tool_tip="Image filters"
-            top_pad="8"
-            left="30"
-            height="21"
-            width="135">
-            <combo_box.item
-            label="No Filter"
-            name="NoFilter"
-            value="NoFilter" />
-        </combo_box>
-    </panel>
+	   image_overlay="Arrow_Right"
+       name="preview_btn"
+       left="203"
+	   top="25"
+       width="8" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_message.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
index ab2a42ea01..56601da2fd 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
@@ -25,7 +25,7 @@
      layout="topleft"
      left_pad="10"
      name="to_form"
-     right="-10"
+     right="-5"
      top_delta="-4" />
     <text
      type="string"
@@ -47,7 +47,7 @@
      left_pad="10"
      max_length_bytes="100"
      name="name_form"
-     right="-10"
+     right="-5"
      top_delta="-4" />
     <text
      type="string"
@@ -70,31 +70,31 @@
      left_pad="10"
      max_length_bytes="100"
      name="subject_form"
-     right="-10"
+     right="-5"
      top_delta="-4" />
     <text
      type="string"
      length="1"
      bottom_delta="23"
-     follows="top|left|right"
+     follows="top|left"
      font="SansSerif"
+     height="16"
      layout="topleft"
      left="12"
-     name="msg_label"
-     right="-10">
+     name="msg_label">
         Message:
     </text>
     <text_editor
      type="string"
      length="1"
      follows="left|top|right"
-     height="60"
+     height="45"
      layout="topleft"
      left_delta="0"
      max_length="700"
      name="msg_form"
-     right="-10"
-     top_pad="10"
+     right="-5"
+     top_pad="5"
      word_wrap="true">
         Type your message here.
     </text_editor>
@@ -104,21 +104,21 @@
      label="Cancel"
      layout="topleft"
      name="cancel_btn"
-     right="-32"
-     top="350"
-     width="100">
+     right="-5"
+     top="345"
+     width="90">
       <button.commit_callback
        function="Postcard.Cancel" />
     </button>
     <button
-     follows="right|bottom"
+     follows="left|bottom"
      height="23"
      label="Send"
      layout="topleft"
-     left_delta="-106"
+     left="10"
      name="send_btn"
      top_delta="0"
-     width="100">
+     width="95">
       <button.commit_callback
        function="Postcard.Send" />
     </button>
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index 3f67a48b14..22f19ca99a 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -11,8 +11,8 @@
      layout="topleft"
      left="10"
      name="postcard_size_combo"
-     right="-10"
-     top_pad="10">
+     right="-5"
+     top_pad="5">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
@@ -40,19 +40,19 @@
      height="275"
      layout="bottomleft"
      name="postcard_image_params_ls"
-     left_delta="0"
+     left="0"
      orientation="vertical"
-     top_pad="10"
-     right="-10">
+     top_pad="0"
+     right="-1">
         <layout_panel
          follows="top|left|right"
-         height="60"
+         height="47"
          layout="topleft"
          left="0"
          name="postcard_image_size_lp"
          auto_resize="false"
          top="0"
-         right="-1"
+         right="-5"
          visible="true">
             <spinner
              allow_text_entry="false"
@@ -60,32 +60,31 @@
              follows="left|top"
              height="20"
              increment="32"
-             label="Width"
-             label_width="40"
+             label="Width x Height"
+             label_width="78"
              layout="topleft"
              left="10"
              max_val="6016"
              min_val="32"
              name="postcard_snapshot_width"
-             top_pad="10"
-             width="95" />
+             top_pad="3"
+             width="132" />
             <spinner
              allow_text_entry="false"
              decimal_digits="0"
              follows="left|top"
              height="20"
              increment="32"
-             label="Height"
-             label_width="40"
+             label=""
+             label_width="0"
              layout="topleft"
-             left_pad="5"
+             left_pad="0"
              max_val="6016"
              min_val="32"
              name="postcard_snapshot_height"
              top_delta="0"
-             width="95" />
+             width="54" />
             <check_box
-              height="10"
              bottom_delta="20"
              follows="left|top"
              label="Constrain proportions"
@@ -95,42 +94,27 @@
         </layout_panel>
         <layout_panel
          follows="top|left|right"
-         height="23"
+         height="19"
          layout="topleft"
          left="0"
          name="postcard_image_format_quality_lp"
          auto_resize="true"
          top="0"
-         right="-1"
          visible="true">
             <slider
-             decimal_digits="0"
-             follows="left|top"
-             height="15"
-             increment="1"
-             initial_value="75"
-             label="Image quality"
-             label_width="80"
-             layout="topleft"
-             left="0"
-             max_val="100"
-             name="image_quality_slider"
-             top_pad="7"
-             width="190" />
-            <text
-             type="string"
-             follows="left|top"
-             font="SansSerifSmall"
-             length="1"
-             height="14"
-             layout="topleft"
-             left_pad="-5"
-             halign="left"
-             name="image_quality_level"
-             top_delta="0"
-             width="60">
-               ([QLVL])
-            </text>
+            decimal_digits="0"
+            follows="left|top"
+            height="15"
+            increment="1"
+            initial_value="75"
+            label="Quality:"
+            label_width="45"
+            layout="topleft"
+            left="10"
+            max_val="100"
+            name="image_quality_slider"
+            top_pad="6"
+            width="195" />
         </layout_panel>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index 71d808fa4b..3a42b9a2f8 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -12,12 +12,12 @@
      left="12"
      mouse_opaque="true"
      name="title_icon"
-     top="5"
+     top="6"
      width="18" />
     <text
      follows="top|left|right"
      font="SansSerifBold"
-     height="20"
+     height="14"
      layout="topleft"
      left_pad="12"
      length="1"
@@ -25,42 +25,28 @@
      right="-10"
      text_color="white"
      type="string"
-     top_delta="5">
-        Save to My Inventory
+     top_delta="3">
+        Inventory
     </text>
     <view_border 
      bevel_style="in"
      follows="left|top|right" 
      height="1"
-     left="10"
+     left="9"
      layout="topleft"
      name="hr"
-     right="-10"
+     right="-5"
      top_pad="5"
      />
-    <text
-     bottom="35"
-     follows="top|left|right"
-     font="SansSerif"
-     height="56"
-     layout="topleft"
-     left="12"
-     length="1"
-     name="hint_lbl"
-     top_pad="10"
-     type="string"
-     word_wrap="true">
-        Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
-    </text>
     <combo_box
      follows="top|left|right"
-     height="23"
+     height="20"
      label="Resolution"
      layout="topleft"
      left_delta="0"
      name="texture_size_combo"
-     right="-10"
-     top_pad="10">
+     right="-5"
+     top_pad="5">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
@@ -88,61 +74,74 @@
      follows="left|top"
      height="20"
      increment="32"
-     label="Width"
-     label_width="40"
+     label="Width x Height"
+     label_width="80"
      layout="topleft"
      left="10"
      max_val="6016"
      min_val="32"
      name="inventory_snapshot_width"
-     top_pad="10"
-     width="95" />
+     top_pad="7"
+     width="134" />
     <spinner
      allow_text_entry="false"
      decimal_digits="0"
      follows="left|top"
      height="20"
      increment="32"
-     label="Height"
-     label_width="40"
+     label=""
+     label_width="0"
      layout="topleft"
-     left_pad="5"
+     left_pad="0"
      max_val="6016"
      min_val="32"
      name="inventory_snapshot_height"
      top_delta="0"
-     width="95" />
+     width="54" />
     <check_box
      bottom_delta="20"
-     height="10"
      follows="left|top"
      label="Constrain proportions"
      layout="topleft"
      left="10"
      name="inventory_keep_aspect_check"
      visible="false" />
+    <text
+     follows="top|left"
+     font="SansSerif"
+     height="56"
+     layout="topleft"
+     left="10"
+     length="1"
+     name="hint_lbl"
+     top_pad="10"
+     width="190"
+     type="string"
+     word_wrap="true">
+        Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
+    </text>
     <button
      follows="right|bottom"
      height="23"
      label="Cancel"
      layout="topleft"
      name="cancel_btn"
-     right="-32"
-     top="350"
-     width="100">
+     right="-5"
+     top="337"
+     width="90">
       <button.commit_callback
        function="Inventory.Cancel" />
     </button>
     <button
-     follows="right|bottom"
+     follows="left|bottom"
      height="23"
      label="Save"
      layout="topleft"
-     left_delta="-106"
+     left="10"
      name="save_btn"
      top_delta="0"
-     width="100">
+     width="95">
       <button.commit_callback
        function="Inventory.Save" />
     </button>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 781ab17403..430010f7e4 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -12,12 +12,12 @@
      left="12"
      mouse_opaque="true"
      name="title_icon"
-     top="5"
+     top="7"
      width="18" />
     <text
      follows="top|left|right"
      font="SansSerifBold"
-     height="20"
+     height="14"
      layout="topleft"
      left_pad="12"
      length="1"
@@ -25,8 +25,8 @@
      right="-10"
      text_color="white"
      type="string"
-     top_delta="4">
-        Save to My Computer
+     top_delta="2">
+        Disk
     </text>
     <view_border 
      bevel_style="in"
@@ -35,18 +35,17 @@
      left="10"
      layout="topleft"
      name="hr"
-     right="-10"
-     top_pad="5"
-     />
+     right="-5"
+     top_pad="5"/>
     <combo_box
      follows="left|top|right"
-     height="23"
+     height="20"
      label="Resolution"
      layout="topleft"
      left_delta="0"
      name="local_size_combo"
-     right="-10"
-     top_pad="10">
+     right="-5"
+     top_pad="5">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
@@ -80,149 +79,114 @@
          name="Custom"
          value="[i-1,i-1]" />
     </combo_box>
-    <layout_stack
-     animate="false"
-     follows="all"
-     height="275"
-     layout="bottomleft"
-     name="local_image_params_ls"
-     left_delta="0"
-     orientation="vertical"
-     top_pad="10"
-     right="-10">
-        <layout_panel
-         follows="top|left|right"
-         height="60"
-         layout="topleft"
-         left="0"
-         name="local_image_size_lp"
-         auto_resize="false"
-         top="0"
-         right="-1"
-         visible="true">
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label="Width"
-             label_width="40"
-             layout="topleft"
-             left="10"
-             max_val="6016"
-             min_val="32"
-             name="local_snapshot_width"
-             top_pad="10"
-             width="95" />
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label="Height"
-             label_width="40"
-             layout="topleft"
-             left_pad="5"
-             max_val="6016"
-             min_val="32"
-             name="local_snapshot_height"
-             top_delta="0"
-             width="95" />
-            <check_box
-             bottom_delta="20"
-             height="10"
-             follows="left|top"
-             label="Constrain proportions"
-             layout="topleft"
-             left="10"
-             name="local_keep_aspect_check" />
-        </layout_panel>
-        <layout_panel
-         follows="top|left|right"
-         height="23"
-         layout="topleft"
-         left="0"
-         name="local_image_format_quality_lp"
-         auto_resize="true"
-         top="0"
-         right="-1"
-         visible="true">
-            <combo_box
-             follows="left|top"
-             height="23"
-             label="Format"
-             layout="topleft"
-             left_delta="0"
-             name="local_format_combo"
-             top_pad="0"
-             width="120">
-                <combo_box.item
-                 label="PNG (Lossless)"
-                 name="PNG"
-                 value="PNG" />
-                <combo_box.item
-                 label="JPEG"
-                 name="JPEG"
-                 value="JPEG" />
-                <combo_box.item
-                 label="BMP (Lossless)"
-                 name="BMP"
-                 value="BMP" />
-            </combo_box>
-            <slider
-             decimal_digits="0"
-             follows="left|top"
-             height="15"
-             increment="1"
-             initial_value="75"
-             label="Image quality"
-             label_width="80"
-             layout="topleft"
-             left="10"
-             max_val="100"
-             name="image_quality_slider"
-             top_pad="7"
-             width="200" />
-            <text
-             type="string"
-             follows="left|top"
-             font="SansSerifSmall"
-             length="1"
-             height="14"
-             layout="topleft"
-             left_pad="-5"
-             halign="left"
-             name="image_quality_level"
-             top_delta="0"
-             width="60">
-               ([QLVL])
-            </text>
-        </layout_panel>
-    </layout_stack>
+    <spinner
+     allow_text_entry="false"
+     decimal_digits="0"
+     follows="left|top"
+     height="20"
+     increment="32"
+     label="Width x Height"
+     label_width="80"
+     layout="topleft"
+     left="10"
+     max_val="6016"
+     min_val="32"
+     name="local_snapshot_width"
+     top_pad="7"
+     width="134" />
+    <spinner
+     allow_text_entry="false"
+     decimal_digits="0"
+     follows="left|top"
+     height="20"
+     increment="32"
+     label=""
+     label_width="0"
+     layout="topleft"
+     left_pad="0"
+     max_val="6016"
+     min_val="32"
+     name="local_snapshot_height"
+     top_delta="0"
+     width="54" />
+    <check_box
+     bottom_delta="20"
+     follows="left|top"
+     label="Constrain proportions"
+     layout="topleft"
+     left="10"
+     name="local_keep_aspect_check" />
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="13"
+      layout="topleft"
+      left="10"
+      name="local_format_label"
+      top_pad="7"
+      width="50">
+         Format:
+     </text>
+    <combo_box
+     follows="left|top|right"
+     height="20"
+     label="Format"
+     layout="topleft"
+     left="65"
+     right="-5"
+     name="local_format_combo"
+     top_delta="-3"
+     width="120">
+        <combo_box.item
+         label="PNG (Lossless)"
+         name="PNG"
+         value="PNG" />
+        <combo_box.item
+         label="JPEG"
+         name="JPEG"
+         value="JPEG" />
+        <combo_box.item
+         label="BMP (Lossless)"
+         name="BMP"
+         value="BMP" />
+    </combo_box>
+    <slider
+     decimal_digits="0"
+     follows="left|top"
+     height="15"
+     increment="1"
+     initial_value="75"
+     label="Quality:"
+     label_width="45"
+     layout="topleft"
+     left="10"
+     max_val="100"
+     name="image_quality_slider"
+     top_pad="6"
+     width="195" />
     <button
      follows="right|bottom"
      height="23"
      label="Cancel"
      layout="topleft"
      name="cancel_btn"
-     right="-32"
-     top="350"
-     width="100">
+     right="-5"
+     top="337"
+     width="90">
       <button.commit_callback
        function="Local.Cancel" />
     </button>
     <flyout_button
-     follows="right|bottom"
+     follows="left|bottom"
      height="23"
      label="Save"
      layout="topleft"
-     left_delta="-106"
+     left="10"
      name="save_btn"
      tool_tip="Save image to a file"
      top_delta="0"
-     width="100">
+     width="95">
         <flyout_button.item
          label="Save"
          name="save_item"
@@ -232,4 +196,4 @@
          name="saveas_item"
          value="save as" />
     </flyout_button>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index eff60f8228..0bb2ccba5e 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -4,117 +4,127 @@
  height="240"
  layout="topleft"
  name="panel_snapshot_options"
- width="490">
+ width="198">
+ <button
+   follows="left|top"
+   font="SansSerif"
+   halign="left"
+   height="22"
+   image_overlay="Snapshot_Download"
+   image_overlay_alignment="left"
+   image_top_pad="-0"
+   imgoverlay_label_space="10"
+   label="Save to Disk"
+   layout="topleft"
+   left="5"
+   name="save_to_computer_btn"
+   top_pad="9">
+    <button.commit_callback
+     function="Snapshot.SaveToComputer" />
+  </button>
   <button
-   follows="left|top|right"
+   follows="left|top"
    font="SansSerif"
    halign="left"
-   height="38"
-   image_overlay="Snapshot_Profile"
+   height="22"
+   image_overlay="Snapshot_Inventory"
    image_overlay_alignment="left"
-   image_top_pad="-2"
+   image_top_pad="-1"
    imgoverlay_label_space="10"
-   label="Post to My Profile Feed"
+   label="Save to Inventory (L$[AMOUNT])"
    layout="topleft"
    left_delta="0"
+   name="save_to_inventory_btn"
+   top_pad="5">
+    <button.commit_callback
+     function="Snapshot.SaveToInventory" />
+  </button>
+  <button
+   follows="left|top"
+   font="SansSerif"
+   halign="left"
+   height="22"
+   image_overlay="Snapshot_Profile"
+   image_overlay_alignment="left"
+   image_top_pad="-1"
+   imgoverlay_label_space="10"
+   label="Upload to Profile"
+   layout="topleft"
    name="save_to_profile_btn"
-   pad_left="10"
-   right="-10"
-   top_pad="10">
+   left_delta="0"
+   top_pad="5">
     <button.commit_callback
      function="Snapshot.SaveToProfile" />
   </button>
   <button
-   follows="left|top|right"
+   follows="left|top"
    font="SansSerif"
    halign="left"
-   height="38"
-   image_overlay="Snapshot_Email"
+   height="22"
+   image_overlay="Snapshot_Facebook"
    image_overlay_alignment="left"
-   image_top_pad="-2"
+   image_top_pad="0"
    imgoverlay_label_space="10"
-   label="Email"
+   label="Upload to Facebook"
    layout="topleft"
    left_delta="0"
-   name="save_to_email_btn"
-   pad_left="10"
-   right="-10"
-   top_pad="10">
+   name="send_to_facebook_btn"
+   top_pad="5">
     <button.commit_callback
-     function="Snapshot.SaveToEmail" />
+     function="Floater.Toggle"
+     parameter="facebook"/>
   </button>
   <button
-   follows="left|top|right"
+   follows="left|top"
    font="SansSerif"
    halign="left"
-   height="38"
-   image_overlay="Snapshot_Inventory"
+   height="22"
+   image_overlay="Command_Twitter_Icon"
    image_overlay_alignment="left"
-   image_top_pad="-2"
+   image_top_pad="0"
    imgoverlay_label_space="10"
-   label="Save to My Inventory (L$[AMOUNT])"
+   label="Upload to Twitter"
    layout="topleft"
    left_delta="0"
-   name="save_to_inventory_btn"
-   pad_left="10"
-   right="-10"
-   top_pad="10">
+   name="send_to_twitter_btn"
+   top_pad="5">
     <button.commit_callback
-     function="Snapshot.SaveToInventory" />
+     function="Floater.Toggle"
+     parameter="twitter"/>
   </button>
   <button
-   follows="left|top|right"
+   follows="left|top"
    font="SansSerif"
    halign="left"
-   height="38"
-   image_overlay="Snapshot_Download"
+   height="22"
+   image_overlay="Command_Flickr_Icon"
    image_overlay_alignment="left"
-   image_top_pad="-2"
+   image_top_pad="0"
    imgoverlay_label_space="10"
-   label="Save to My Computer"
+   label="Upload to Flickr"
    layout="topleft"
    left_delta="0"
-   name="save_to_computer_btn"
-   pad_left="10"
-   right="-10"
-   top_pad="10">
+   name="send_to_flickr_btn"
+   top_pad="5">
     <button.commit_callback
-     function="Snapshot.SaveToComputer" />
+     function="Floater.Toggle"
+     parameter="flickr"/>
+  </button>
+  <button
+   follows="left|top"
+   font="SansSerif"
+   halign="left"
+   height="22"
+   image_overlay="Snapshot_Email"
+   image_overlay_alignment="left"
+   image_top_pad="0"
+   imgoverlay_label_space="10"
+   label="Send via E-mail"
+   layout="topleft"
+   left_delta="0"
+   name="save_to_email_btn"
+   top_pad="5">
+    <button.commit_callback
+     function="Snapshot.SaveToEmail" />
   </button>
-  <text
-    font="SansSerif"
-    layout="topleft"
-    length="1"
-    follows="top|left"
-    height="16"
-    left="10"
-    name="send_to_facebook_textbox"
-    top_pad="10"
-    type="string">
-    Send to:  [secondlife:/// Facebook]
-  </text>
-  <text
-    font="SansSerif"
-    layout="topleft"
-    length="1"
-    follows="top|left"
-    height="16"
-    left="140"
-    name="send_to_twitter_textbox"
-    top_pad="-16"
-    type="string">
-    [secondlife:/// Twitter]
-  </text>
-  <text
-    font="SansSerif"
-    layout="topleft"
-    length="1"
-    follows="top|left"
-    height="16"
-    left="190"
-    name="send_to_flickr_textbox"
-    top_pad="-16"
-    type="string">
-    [secondlife:/// Flickr]
-  </text>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
index ebba292a93..5be93c44c1 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -24,12 +24,12 @@
      left="12"
      mouse_opaque="true"
      name="title_icon"
-     top="5"
+     top="8"
      width="18" />
     <text
      follows="top|left|right"
      font="SansSerifBold"
-     height="20"
+     height="14"
      layout="topleft"
      left_pad="12"
      length="1"
@@ -37,19 +37,20 @@
      right="-10"
      text_color="white"
      type="string"
-     top_delta="3">
-        Email
+     top_delta="2">
+        E-mail
     </text>
     <button
      follows="right|top"
      height="23"
      is_toggle="true"
-     label="Message"
+     label=""
+     image_overlay="Command_Chat_Icon"
      layout="topleft"
      name="message_btn"
-     right="-82"
-     top_delta="-7"
-     width="70">
+     right="-35"
+     top_delta="-3"
+     width="25">
       <button.commit_callback
        function="Postcard.Message" />
     </button>
@@ -57,12 +58,13 @@
      follows="right|top"
      height="23"
      is_toggle="true"
-     label="Settings"
+     label=""
+     image_overlay="Command_Preferences_Icon"
      layout="topleft"
      name="settings_btn"
      top_delta="0"
-     right="-10"
-     width="70">
+     left_pad="5"
+     width="25">
       <button.commit_callback
        function="Postcard.Settings" />
     </button>
@@ -73,8 +75,8 @@
      left="10"
      layout="topleft"
      name="hr"
-     right="-10"
-     top_pad="5"
+     right="-5"
+     top_pad="2"
      />
     <panel_container
      follows="all"
@@ -83,7 +85,7 @@
      left="0"
      name="postcard_panel_container"
      default_panel_name="panel_postcard_message"
-     top_pad="10"
+     top_pad="0"
      width="490">
       <panel
        follows="all"
@@ -96,4 +98,4 @@
        name="panel_postcard_settings"
        filename="panel_postcard_settings.xml" />
     </panel_container>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
index 0dd357aa1a..bb63bc5347 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
@@ -17,7 +17,7 @@
     <text
      follows="top|left|right"
      font="SansSerifBold"
-     height="20"
+     height="14"
      layout="topleft"
      left_pad="12"
      length="1"
@@ -26,7 +26,7 @@
      text_color="white"
      type="string"
      top_delta="4">
-        Post to My Profile Feed
+        Profile
     </text>
     <view_border 
      bevel_style="in"
@@ -35,18 +35,19 @@
      left="10"
      layout="topleft"
      name="hr"
-     right="-10"
+     right="-5"
      top_pad="5"
      />
     <combo_box
-     follows="left|top"
+     follows="left|top|right"
      height="23"
      label="Resolution"
      layout="topleft"
-     left_delta="0"
+     left="10"
+     right="-5"
      name="profile_size_combo"
-     top_pad="10"
-     width="250">
+     top_pad="5"
+     width="180">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
@@ -68,132 +69,99 @@
          name="Custom"
          value="[i-1,i-1]" />
     </combo_box>
-    <layout_stack
-     animate="false"
-     follows="all"
-     height="270"
-     layout="bottomleft"
-     name="profile_image_params_ls"
+    <spinner
+     allow_text_entry="false"
+     decimal_digits="0"
+     follows="left|top"
+     height="20"
+     increment="32"
+     label="Width x Height"
+     label_width="80"
+     layout="topleft"
+     left="10"
+     max_val="6016"
+     min_val="32"
+     name="profile_snapshot_width"
+     top_pad="7"
+     width="134" />
+    <spinner
+     allow_text_entry="false"
+     decimal_digits="0"
+     follows="left|top"
+     height="20"
+     increment="32"
+     label=""
+     label_width="0"
+     layout="topleft"
+     left_pad="0"
+     max_val="6016"
+     min_val="32"
+     name="profile_snapshot_height"
+     top_delta="0"
+     width="54" />
+    <check_box
+     bottom_delta="20"
+     label="Constrain proportions"
+     layout="topleft"
+     left="10"
+     name="profile_keep_aspect_check" />
+    <text
+     length="1"
+     follows="top|left|right"
+     height="16"
+     layout="topleft"
+     left="12"
+     name="caption_label"
+     right="-10"
+     top_pad="4"
+     type="string">
+        Caption:
+    </text>
+    <text_editor
+     follows="top|left|right"
+     height="35"
+     layout="topleft"
+     left="10"
+     right="-5"
+     length="1"
+     max_length="700"
+     name="caption"
+     width="200"
+     top_pad="2"
+     type="string"
+     word_wrap="true">
+    </text_editor>
+    <check_box
+     follows="left|top"
+     initial_value="true"
+     label="Include location"
+     layout="topleft"
      left_delta="0"
-     orientation="vertical"
-     top_pad="10"
-     right="-10">
-        <layout_panel
-         follows="top|left|right"
-         height="55"
-         layout="topleft"
-         left="0"
-         name="profile_image_size_lp"
-         auto_resize="false"
-         top="0"
-         right="-1"
-         visible="true">
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label="Width"
-             label_width="40"
-             layout="topleft"
-             left="10"
-             max_val="6016"
-             min_val="32"
-             name="profile_snapshot_width"
-             top_pad="10"
-             width="95" />
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label="Height"
-             label_width="40"
-             layout="topleft"
-             left_pad="5"
-             max_val="6016"
-             min_val="32"
-             name="profile_snapshot_height"
-             top_delta="0"
-             width="95" />
-            <check_box
-              height="10"
-             bottom_delta="20"
-             label="Constrain proportions"
-             layout="topleft"
-             left="10"
-             name="profile_keep_aspect_check" />
-        </layout_panel>
-        <layout_panel
-         follows="top|left|right"
-         height="200"
-         layout="topleft"
-         left="0"
-         name="profile_image_metadata_lp"
-         auto_resize="true"
-         top="0"
-         right="-1"
-         visible="true">
-            <text
-             length="1"
-             follows="top|left|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="0"
-             name="caption_label"
-             right="-10"
-             top_pad="0"
-             type="string">
-                Caption:
-            </text>
-            <text_editor
-             follows="all"
-             height="155"
-             layout="topleft"
-             left_delta="0"
-             length="1"
-             max_length="700"
-             name="caption"
-             right="-10"
-             top_pad="5"
-             type="string"
-             word_wrap="true">
-            </text_editor>
-            <check_box
-             follows="left|bottom"
-             initial_value="true"
-             label="Include location"
-             layout="topleft"
-             left_delta="0"
-             name="add_location_cb"
-             top_pad="15" />
-        </layout_panel>
-    </layout_stack>
+     height="18"
+     name="add_location_cb"
+     top_pad="3" />
     <button
      follows="right|bottom"
      height="23"
      label="Cancel"
      layout="topleft"
      name="cancel_btn"
-     right="-32"
-     top="350"
-     width="100">
+     right="-5"
+     top="337"
+     width="90">
       <button.commit_callback
        function="PostToProfile.Cancel" />
     </button>
     <button
-     follows="right|bottom"
+     follows="left|bottom"
      height="23"
      label="Post"
      layout="topleft"
-     left_delta="-106"
+     left="10"
      name="post_btn"
      top_delta="0"
-     width="100">
+     width="95">
       <button.commit_callback
        function="PostToProfile.Send" />
     </button>
-</panel>
+</panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 47241b5d54b84fd2e655f8db0e7841b069f2cbb2 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 10:39:29 +0200
Subject: Changed: Very tiny visual alignment finetunings. Everything has to be
 perfect.

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml       | 8 ++++----
 indra/newview/skins/default/xui/en/panel_snapshot_options.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 410594f1c6..e85a7d81ea 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -106,7 +106,7 @@
          bevel_style="in"
          follows="left|top|right" 
          height="1"
-         left="6"
+         left="10"
          layout="topleft"
          name="advanced_options_hr"
          right="-1"
@@ -204,11 +204,11 @@
          bevel_style="in"
          follows="left|top|right" 
          height="1"
-         left="6"
+         left="10"
          layout="topleft"
          name="advanced_options_hr"
          right="-1"
-         top_pad="10"
+         top_pad="7"
          />
     </panel>
 	<panel_container
@@ -257,7 +257,7 @@
          bevel_style="in"
          follows="left|top" 
          height="1"
-         left="6"
+         left="10"
          layout="topleft"
          name="status_hr"
          width="192"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 0bb2ccba5e..c27a4df264 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -16,7 +16,7 @@
    imgoverlay_label_space="10"
    label="Save to Disk"
    layout="topleft"
-   left="5"
+   left="10"
    name="save_to_computer_btn"
    top_pad="9">
     <button.commit_callback
-- 
cgit v1.2.3


From 4f59510097c9a286cdc325638b4fddef5e4fdb02 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 10:48:22 +0200
Subject: Changed: More tiny alignment inconsestencies between Black Dragon and
 Linden Release.

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index e85a7d81ea..85963756d5 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -260,7 +260,7 @@
          left="10"
          layout="topleft"
          name="status_hr"
-         width="192"
+         width="189"
          top_pad="-16"/>
 	<panel
        background_visible="true"
-- 
cgit v1.2.3


From a2049822126b55ebc0c4bdb7f78f4388d4531544 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 26 Jul 2014 11:46:17 +0200
Subject: STORM-2040: Fixed: German Translation for several snapshot panels.

---
 .../default/xui/de/panel_postcard_message.xml      |  2 +-
 .../default/xui/de/panel_postcard_settings.xml     | 19 +++++---------
 .../skins/default/xui/de/panel_snapshot_local.xml  | 29 ++++++++--------------
 .../default/xui/de/panel_snapshot_profile.xml      | 29 ++++++++--------------
 4 files changed, 29 insertions(+), 50 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/de/panel_postcard_message.xml b/indra/newview/skins/default/xui/de/panel_postcard_message.xml
index 6eeef8af71..609569bd6f 100755
--- a/indra/newview/skins/default/xui/de/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/de/panel_postcard_message.xml
@@ -9,7 +9,7 @@
 	<text name="subject_label">
 		Betreff:
 	</text>
-	<line_editor label="Betreff hier eingeben." name="subject_form"/>
+	<line_editor label="Betreff hier rein." name="subject_form"/>
 	<text name="msg_label">
 		Nachricht:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
index c1a1c0cc46..e6d3b7de66 100755
--- a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
@@ -7,17 +7,10 @@
 		<combo_box.item label="1024x768" name="1024x768"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<layout_stack name="postcard_image_params_ls">
-		<layout_panel name="postcard_image_size_lp">
-			<spinner label="Breite" name="postcard_snapshot_width"/>
-			<spinner label="Höhe" name="postcard_snapshot_height"/>
-			<check_box label="Seitenverhältnis beibehalten" name="postcard_keep_aspect_check"/>
-		</layout_panel>
-		<layout_panel name="postcard_image_format_quality_lp">
-			<slider label="Bildqualität" name="image_quality_slider"/>
-			<text name="image_quality_level">
-				([QLVL])
-			</text>
-		</layout_panel>
-	</layout_stack>
+	<spinner label="Breite x Höhe" name="postcard_snapshot_width"/>
+	<check_box label="Seitenverhältnis beibehalten" name="postcard_keep_aspect_check"/>
+	<slider label="Qualität" name="image_quality_slider"/>
+	<text name="image_quality_level">
+		([QLVL])
+	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
index 935e8d2356..53e78ba290 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
@@ -13,24 +13,17 @@
 		<combo_box.item label="1600x1200" name="1600x1200"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<layout_stack name="local_image_params_ls">
-		<layout_panel name="local_image_size_lp">
-			<spinner label="Breite" name="local_snapshot_width"/>
-			<spinner label="Höhe" name="local_snapshot_height"/>
-			<check_box label="Seitenverhältnis beibehalten" name="local_keep_aspect_check"/>
-		</layout_panel>
-		<layout_panel name="local_image_format_quality_lp">
-			<combo_box label="Format" name="local_format_combo">
-				<combo_box.item label="PNG (verlustfrei)" name="PNG"/>
-				<combo_box.item label="JPEG" name="JPEG"/>
-				<combo_box.item label="BMP (verlustfrei)" name="BMP"/>
-			</combo_box>
-			<slider label="Bildqualität" name="image_quality_slider"/>
-			<text name="image_quality_level">
-				([QLVL])
-			</text>
-		</layout_panel>
-	</layout_stack>
+	<spinner label="Breite x Höhe" name="local_snapshot_width"/>
+	<check_box label="Seitenverhältnis beibehalten" name="local_keep_aspect_check"/>
+	<combo_box label="Format" name="local_format_combo">
+		<combo_box.item label="PNG (verlustfrei)" name="PNG"/>
+		<combo_box.item label="JPEG" name="JPEG"/>
+		<combo_box.item label="BMP (verlustfrei)" name="BMP"/>
+	</combo_box>
+	<slider label="Qualität" name="image_quality_slider"/>
+	<text name="image_quality_level">
+		([QLVL])
+	</text>
 	<button label="Abbrechen" name="cancel_btn"/>
 	<flyout_button label="Speichern" name="save_btn" tool_tip="Bild als Datei speichern">
 		<flyout_button.item label="Speichern" name="save_item"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
index 1ecb6090af..0f21edd1b6 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
@@ -4,25 +4,18 @@
 		Profil
 	</text>
 	<combo_box label="Auflösung" name="profile_size_combo">
-		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
+	<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+	<combo_box.item label="640x480" name="640x480"/>
+	<combo_box.item label="800x600" name="800x600"/>
+	<combo_box.item label="1024x768" name="1024x768"/>
+	<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<layout_stack name="profile_image_params_ls">
-		<layout_panel name="profile_image_size_lp">
-			<spinner label="Breite" name="profile_snapshot_width"/>
-			<spinner label="Höhe" name="profile_snapshot_height"/>
-			<check_box label="Seitenverhältnis beibehalten" name="profile_keep_aspect_check"/>
-		</layout_panel>
-		<layout_panel name="profile_image_metadata_lp">
-			<text name="caption_label">
-				Bildunterschrift:
-			</text>
-			<check_box initial_value="true" label="Ort einschließen" name="add_location_cb"/>
-		</layout_panel>
-	</layout_stack>
+	<spinner label="Breite x Höhe" name="profile_snapshot_width"/>
+	<check_box label="Seitenverhältnis beibehalten" name="profile_keep_aspect_check"/>
+	<text name="caption_label">
+		Bildunterschrift:
+	</text>
+	<check_box initial_value="true" label="Ort einschließen" name="add_location_cb"/>
 	<button label="Abbrechen" name="cancel_btn"/>
 	<button label="Posten" name="post_btn"/>
 </panel>
-- 
cgit v1.2.3


From 3745a1258581f751509afff3e425386565a86f76 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 26 Jul 2014 11:48:19 +0200
Subject: STORM-2040: Changed: Tiny alignment finetunings in several snapshot
 panels for constrain proportions checkbox.

---
 .../default/xui/en/panel_postcard_settings.xml     | 134 ++++++++-------------
 .../default/xui/en/panel_snapshot_inventory.xml    |   4 +-
 .../skins/default/xui/en/panel_snapshot_local.xml  |   2 +-
 .../default/xui/en/panel_snapshot_profile.xml      |   2 +-
 4 files changed, 55 insertions(+), 87 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index 22f19ca99a..f6cc28b86d 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -34,87 +34,55 @@
          name="Custom"
          value="[i-1,i-1]" />
     </combo_box>
-    <layout_stack
-     animate="false"
-     follows="all"
-     height="275"
-     layout="bottomleft"
-     name="postcard_image_params_ls"
-     left="0"
-     orientation="vertical"
-     top_pad="0"
-     right="-1">
-        <layout_panel
-         follows="top|left|right"
-         height="47"
-         layout="topleft"
-         left="0"
-         name="postcard_image_size_lp"
-         auto_resize="false"
-         top="0"
-         right="-5"
-         visible="true">
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label="Width x Height"
-             label_width="78"
-             layout="topleft"
-             left="10"
-             max_val="6016"
-             min_val="32"
-             name="postcard_snapshot_width"
-             top_pad="3"
-             width="132" />
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label=""
-             label_width="0"
-             layout="topleft"
-             left_pad="0"
-             max_val="6016"
-             min_val="32"
-             name="postcard_snapshot_height"
-             top_delta="0"
-             width="54" />
-            <check_box
-             bottom_delta="20"
-             follows="left|top"
-             label="Constrain proportions"
-             layout="topleft"
-             left="10"
-             name="postcard_keep_aspect_check" />
-        </layout_panel>
-        <layout_panel
-         follows="top|left|right"
-         height="19"
-         layout="topleft"
-         left="0"
-         name="postcard_image_format_quality_lp"
-         auto_resize="true"
-         top="0"
-         visible="true">
-            <slider
-            decimal_digits="0"
-            follows="left|top"
-            height="15"
-            increment="1"
-            initial_value="75"
-            label="Quality:"
-            label_width="45"
-            layout="topleft"
-            left="10"
-            max_val="100"
-            name="image_quality_slider"
-            top_pad="6"
-            width="195" />
-        </layout_panel>
-    </layout_stack>
+   <spinner
+    allow_text_entry="false"
+    decimal_digits="0"
+    follows="left|top"
+    height="20"
+    increment="32"
+    label="Width x Height"
+    label_width="78"
+    layout="topleft"
+    left="10"
+    max_val="6016"
+    min_val="32"
+    name="postcard_snapshot_width"
+    top_pad="3"
+    width="132" />
+   <spinner
+    allow_text_entry="false"
+    decimal_digits="0"
+    follows="left|top"
+    height="20"
+    increment="32"
+    label=""
+    label_width="0"
+    layout="topleft"
+    left_pad="0"
+    max_val="6016"
+    min_val="32"
+    name="postcard_snapshot_height"
+    top_delta="0"
+    width="54" />
+   <check_box
+    top_pad="12"
+    follows="left|top"
+    label="Constrain proportions"
+    layout="topleft"
+    left="10"
+    name="postcard_keep_aspect_check" />
+   <slider
+   decimal_digits="0"
+   follows="left|top"
+   height="15"
+   increment="1"
+   initial_value="75"
+   label="Quality:"
+   label_width="45"
+   layout="topleft"
+   left="10"
+   max_val="100"
+   name="image_quality_slider"
+   top_pad="6"
+   width="195" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index 3a42b9a2f8..ea135340b0 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -99,7 +99,7 @@
      top_delta="0"
      width="54" />
     <check_box
-     bottom_delta="20"
+     top_pad="12"
      follows="left|top"
      label="Constrain proportions"
      layout="topleft"
@@ -114,7 +114,7 @@
      left="10"
      length="1"
      name="hint_lbl"
-     top_pad="10"
+     top_pad="6"
      width="190"
      type="string"
      word_wrap="true">
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 430010f7e4..ab1e1e290e 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -110,7 +110,7 @@
      top_delta="0"
      width="54" />
     <check_box
-     bottom_delta="20"
+     top_pad="12"
      follows="left|top"
      label="Constrain proportions"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
index bb63bc5347..612cf49214 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
@@ -100,7 +100,7 @@
      top_delta="0"
      width="54" />
     <check_box
-     bottom_delta="20"
+     top_pad="12"
      label="Constrain proportions"
      layout="topleft"
      left="10"
-- 
cgit v1.2.3


From 69b02defca8bac1133f28cc8b476cbee064dbc95 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 26 Jul 2014 14:09:59 +0200
Subject: STORM-2040: Removed: Unnecessary code for hiding/showing "Constrain
 proportions" checkbox. It's either shown/hidden internally in each panel or
 is simply disabled/enabled depending on the resolution choice, it doesn't
 make any sense having this extra bit of code additionally hiding it.

---
 indra/newview/llpanelsnapshot.cpp          | 19 -------------------
 indra/newview/llpanelsnapshot.h            |  1 -
 indra/newview/llpanelsnapshotinventory.cpp | 13 -------------
 3 files changed, 33 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp
index 5924448671..56569e3207 100755
--- a/indra/newview/llpanelsnapshot.cpp
+++ b/indra/newview/llpanelsnapshot.cpp
@@ -65,8 +65,6 @@ void LLPanelSnapshot::onOpen(const LLSD& key)
 	{
 		LLFloaterSnapshot::getInstance()->notify(LLSD().with("image-format-change", true));
 	}
-
-	updateCustomResControls();
 }
 
 LLFloaterSnapshot::ESnapshotFormat LLPanelSnapshot::getImageFormat() const
@@ -77,11 +75,6 @@ LLFloaterSnapshot::ESnapshotFormat LLPanelSnapshot::getImageFormat() const
 void LLPanelSnapshot::enableControls(BOOL enable)
 {
 	setCtrlsEnabled(enable);
-	if (enable)
-	{
-		// Make sure only relevant controls are enabled/shown.
-		updateCustomResControls();
-	}
 }
 
 LLSpinCtrl* LLPanelSnapshot::getWidthSpinner()
@@ -121,16 +114,6 @@ LLSideTrayPanelContainer* LLPanelSnapshot::getParentContainer()
 	return parent;
 }
 
-// virtual
-void LLPanelSnapshot::updateCustomResControls()
-{
-	// Only show width/height spinners and the aspect ratio checkbox
-	// when a custom resolution is chosen.
-	LLComboBox* combo = getChild<LLComboBox>(getImageSizeComboName());
-	const bool show = combo->getFirstSelectedIndex() == (combo->getItemCount() - 1);
-	getChild<LLUICtrl>(getImageSizePanelName())->setVisible(show);
-}
-
 void LLPanelSnapshot::updateImageQualityLevel()
 {
 	LLSliderCtrl* quality_slider = getChild<LLSliderCtrl>("image_quality_slider");
@@ -188,8 +171,6 @@ void LLPanelSnapshot::onCustomResolutionCommit()
 
 void LLPanelSnapshot::onResolutionComboCommit(LLUICtrl* ctrl)
 {
-	updateCustomResControls();
-
 	LLSD info;
 	info["combo-res-change"]["control-name"] = ctrl->getName();
 	LLFloaterSnapshot::getInstance()->notify(info);
diff --git a/indra/newview/llpanelsnapshot.h b/indra/newview/llpanelsnapshot.h
index f3274cf594..42ad798d60 100755
--- a/indra/newview/llpanelsnapshot.h
+++ b/indra/newview/llpanelsnapshot.h
@@ -57,7 +57,6 @@ public:
 
 protected:
 	LLSideTrayPanelContainer* getParentContainer();
-	virtual void updateCustomResControls();
 	void updateImageQualityLevel();
 	void goBack(); ///< Switch to the default (Snapshot Options) panel
 	void cancel();
diff --git a/indra/newview/llpanelsnapshotinventory.cpp b/indra/newview/llpanelsnapshotinventory.cpp
index 47e46a968f..c8a201a5c8 100755
--- a/indra/newview/llpanelsnapshotinventory.cpp
+++ b/indra/newview/llpanelsnapshotinventory.cpp
@@ -49,7 +49,6 @@ public:
 	/*virtual*/ void onOpen(const LLSD& key);
 
 private:
-	/*virtual*/ void updateCustomResControls(); ///< Show/hide custom resolution controls (spinners and checkbox)
 	/*virtual*/ std::string getWidthSpinnerName() const		{ return "inventory_snapshot_width"; }
 	/*virtual*/ std::string getHeightSpinnerName() const	{ return "inventory_snapshot_height"; }
 	/*virtual*/ std::string getAspectRatioCBName() const	{ return "inventory_keep_aspect_check"; }
@@ -73,7 +72,6 @@ BOOL LLPanelSnapshotInventory::postBuild()
 {
 	getChild<LLSpinCtrl>(getWidthSpinnerName())->setAllowEdit(FALSE);
 	getChild<LLSpinCtrl>(getHeightSpinnerName())->setAllowEdit(FALSE);
-	getChild<LLUICtrl>(getAspectRatioCBName())->setVisible(FALSE); // we don't keep aspect ratio for inventory textures
 	return LLPanelSnapshot::postBuild();
 }
 
@@ -84,17 +82,6 @@ void LLPanelSnapshotInventory::onOpen(const LLSD& key)
 	LLPanelSnapshot::onOpen(key);
 }
 
-// virtual
-void LLPanelSnapshotInventory::updateCustomResControls()
-{
-	LLComboBox* combo = getChild<LLComboBox>(getImageSizeComboName());
-	S32 selected_idx = combo->getFirstSelectedIndex();
-	const bool show = selected_idx == (combo->getItemCount() - 1); // Custom selected
-
-	getChild<LLUICtrl>(getWidthSpinnerName())->setVisible(show);
-	getChild<LLUICtrl>(getHeightSpinnerName())->setVisible(show);
-}
-
 // virtual
 void LLPanelSnapshotInventory::updateControls(const LLSD& info)
 {
-- 
cgit v1.2.3


From 4e08ffe99db67f7cb8818d6105bd0bd049341a9e Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 26 Jul 2014 14:18:56 +0200
Subject: STORM-2040: Changed: Width and Height into one label like in all
 other panels.

---
 indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
index 271d745869..d13f56ed3d 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
@@ -13,8 +13,7 @@
 		<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<spinner label="Breite" name="inventory_snapshot_width"/>
-	<spinner label="Höhe" name="inventory_snapshot_height"/>
+	<spinner label="Breite x Höhe" name="inventory_snapshot_width"/>
 	<check_box label="Seitenverhältnis beibehalten" name="inventory_keep_aspect_check"/>
 	<button label="Abbrechen" name="cancel_btn"/>
 	<button label="Speichern" name="save_btn"/>
-- 
cgit v1.2.3


From 2c930a00bf5b2bd4310bf55d296b12d8a0b2e35d Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Tue, 29 Jul 2014 17:48:52 +0200
Subject: BUG-6835: Fixed: Height is missing the "t" under E-mail settings.
 Couldn't reproduce this issue but didn't need to since i know that this issue
 is caused by the broken UI scaling messing this up. Only fix is to make the
 label smaller and pray to god.

---
 indra/newview/skins/default/xui/de/panel_postcard_settings.xml  | 2 +-
 indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml | 2 +-
 indra/newview/skins/default/xui/de/panel_snapshot_local.xml     | 2 +-
 indra/newview/skins/default/xui/de/panel_snapshot_profile.xml   | 2 +-
 indra/newview/skins/default/xui/en/panel_postcard_settings.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_snapshot_local.xml     | 2 +-
 indra/newview/skins/default/xui/en/panel_snapshot_profile.xml   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
index e6d3b7de66..eb1d9212e0 100755
--- a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
@@ -7,7 +7,7 @@
 		<combo_box.item label="1024x768" name="1024x768"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<spinner label="Breite x Höhe" name="postcard_snapshot_width"/>
+	<spinner label="Breite*Höhe" name="postcard_snapshot_width"/>
 	<check_box label="Seitenverhältnis beibehalten" name="postcard_keep_aspect_check"/>
 	<slider label="Qualität" name="image_quality_slider"/>
 	<text name="image_quality_level">
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
index d13f56ed3d..efc9b84e2b 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
@@ -13,7 +13,7 @@
 		<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<spinner label="Breite x Höhe" name="inventory_snapshot_width"/>
+	<spinner label="Breite*Höhe" name="inventory_snapshot_width"/>
 	<check_box label="Seitenverhältnis beibehalten" name="inventory_keep_aspect_check"/>
 	<button label="Abbrechen" name="cancel_btn"/>
 	<button label="Speichern" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
index 53e78ba290..ad822396e7 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
@@ -13,7 +13,7 @@
 		<combo_box.item label="1600x1200" name="1600x1200"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<spinner label="Breite x Höhe" name="local_snapshot_width"/>
+	<spinner label="Breite*Höhe" name="local_snapshot_width"/>
 	<check_box label="Seitenverhältnis beibehalten" name="local_keep_aspect_check"/>
 	<combo_box label="Format" name="local_format_combo">
 		<combo_box.item label="PNG (verlustfrei)" name="PNG"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
index 0f21edd1b6..82faea37a3 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
@@ -10,7 +10,7 @@
 	<combo_box.item label="1024x768" name="1024x768"/>
 	<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<spinner label="Breite x Höhe" name="profile_snapshot_width"/>
+	<spinner label="Breite*Höhe" name="profile_snapshot_width"/>
 	<check_box label="Seitenverhältnis beibehalten" name="profile_keep_aspect_check"/>
 	<text name="caption_label">
 		Bildunterschrift:
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index f6cc28b86d..ee29f09aa2 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -40,7 +40,7 @@
     follows="left|top"
     height="20"
     increment="32"
-    label="Width x Height"
+    label="Width*Height"
     label_width="78"
     layout="topleft"
     left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index ea135340b0..56af898de4 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -74,7 +74,7 @@
      follows="left|top"
      height="20"
      increment="32"
-     label="Width x Height"
+     label="Width*Height"
      label_width="80"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index ab1e1e290e..0e8480d70d 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -85,7 +85,7 @@
      follows="left|top"
      height="20"
      increment="32"
-     label="Width x Height"
+     label="Width*Height"
      label_width="80"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
index 612cf49214..2575511e23 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
@@ -75,7 +75,7 @@
      follows="left|top"
      height="20"
      increment="32"
-     label="Width x Height"
+     label="Width*Height"
      label_width="80"
      layout="topleft"
      left="10"
-- 
cgit v1.2.3


From beeede1f8b1011152cfc1b1dfee3212540216401 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Tue, 29 Jul 2014 17:59:00 +0200
Subject: BUG-6837: Fixed: "Saving to inventory" and "Sending E-mail" text is
 outside the snapshot floater.

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 85963756d5..a380c97f3d 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -331,7 +331,7 @@
        height="24"
        layout="topleft"
        name="working_indicator"
-       left="95"
+       left="10"
        top_delta="0"
        visible="false"
        width="24" />
@@ -340,15 +340,15 @@
        font="SansSerifBold"
        height="14"
        layout="topleft"
-       left="10"
+       left_pad="3"
        length="1"
-       halign="right"
+       halign="left"
        name="working_lbl"
-       top_delta="4"
+       top_delta="5"
        translate="false"
        type="string"
        visible="false"
-       width="80">
+       width="162">
           Working
       </text>
       <text
-- 
cgit v1.2.3


From e4c1929ae6fe40b04e78b821d21809f19f455d26 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Tue, 29 Jul 2014 18:03:24 +0200
Subject: BUG-6840: Fixed: When not connected to Facebook, the Friends tab
 directs you to the Account tab, which no longer exists.

---
 indra/newview/skins/default/xui/en/panel_facebook_friends.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
index 6ec85eb247..97994fb08b 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
@@ -9,7 +9,7 @@
    value="You currently do not have any Facebook friends who are also Second Life residents. Ask your Facebook friends to join Second Life today!" />
   <string
    name="facebook_friends_no_connected"
-   value="You're currently not connected to Facebook. Please go to the Account tab to connect and enable this feature." />
+   value="You're currently not connected to Facebook. Please go to the Status tab to connect and enable this feature." />
   <accordion
  background_visible="false"
  bg_alpha_color="DkGray2"
-- 
cgit v1.2.3


From 47a493df60d066b79ca6c37c746fe153bc3b1fad Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Tue, 29 Jul 2014 18:44:39 +0200
Subject: BUG-6839: Fixed:Snapshot filters do not work when saving snapshot to
 inventory. I think filters actually weren't intended to be used for inventory
 snapshots...but anyway, now we do have filters for inventory snaps.

---
 indra/newview/llsnapshotlivepreview.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index f61db77169..ce51e4214a 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -975,6 +975,21 @@ void LLSnapshotLivePreview::saveTexture()
 		mPreviewImage->getHeight(),
 		mPreviewImage->getComponents());
 
+	// Apply the filter to mPreviewImage
+	if (getFilter() != "")
+	{
+		std::string filter_path = LLImageFiltersManager::getInstance()->getFilterPath(getFilter());
+		if (filter_path != "")
+		{
+			LLImageFilter filter(filter_path);
+			filter.executeFilter(scaled);
+		}
+		else
+		{
+			llwarns << "Couldn't find a path to the following filter : " << getFilter() << llendl;
+		}
+	}
+
 	scaled->biasedScaleToPowerOfTwo(MAX_TEXTURE_SIZE);
 	LL_DEBUGS() << "scaled texture to " << scaled->getWidth() << "x" << scaled->getHeight() << LL_ENDL;
 
-- 
cgit v1.2.3


From 9a8bd2f146d098d33521a383385fdac38f76bf98 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Tue, 29 Jul 2014 18:56:16 +0200
Subject: Fixed: Last pack of outdated llwarns/lldebugs/llendl.

---
 indra/newview/llsnapshotlivepreview.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index ce51e4214a..8ad9ca000c 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -151,7 +151,7 @@ F32 LLSnapshotLivePreview::getImageAspect()
 
 void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail, F32 delay)
 {
-	lldebugs << "updateSnapshot: mSnapshotUpToDate = " << getSnapshotUpToDate() << llendl;
+	LL_DEBUGS() << "updateSnapshot: mSnapshotUpToDate = " << getSnapshotUpToDate() << LL_ENDL;
 
 	// Update snapshot if requested.
 	if (new_snapshot)
@@ -594,7 +594,7 @@ void LLSnapshotLivePreview::generateThumbnailImage(BOOL force_update)
             }
             else
             {
-                llwarns << "Couldn't find a path to the following filter : " << getFilter() << llendl;
+                LL_WARNS() << "Couldn't find a path to the following filter : " << getFilter() << LL_ENDL;
             }
         }
         // Scale to a power of 2 so it can be mapped to a texture
@@ -642,7 +642,7 @@ LLViewerTexture* LLSnapshotLivePreview::getBigThumbnailImage()
             }
             else
             {
-                llwarns << "Couldn't find a path to the following filter : " << getFilter() << llendl;
+                LL_WARNS() << "Couldn't find a path to the following filter : " << getFilter() << LL_ENDL;
             }
         }
         // Scale to a power of 2 so it can be mapped to a texture
@@ -695,7 +695,7 @@ BOOL LLSnapshotLivePreview::onIdle( void* snapshot_preview )
 	// time to produce a snapshot
 	if(!previewp->getSnapshotUpToDate())
     {
-        lldebugs << "producing snapshot" << llendl;
+        LL_DEBUGS() << "producing snapshot" << LL_ENDL;
         if (!previewp->mPreviewImage)
         {
             previewp->mPreviewImage = new LLImageRaw;
@@ -775,7 +775,7 @@ BOOL LLSnapshotLivePreview::onIdle( void* snapshot_preview )
         previewp->setVisible(gSavedSettings.getBOOL("UseFreezeFrame") && previewp->mAllowFullScreenPreview); // only show fullscreen preview when in freeze frame mode
         previewp->mSnapshotDelayTimer.stop();
         previewp->mSnapshotActive = FALSE;
-        lldebugs << "done creating snapshot" << llendl;
+        LL_DEBUGS() << "done creating snapshot" << LL_ENDL;
     }
     
     if (!previewp->getThumbnailUpToDate())
@@ -910,13 +910,13 @@ LLPointer<LLImageFormatted>	LLSnapshotLivePreview::getFormattedImage()
             }
             else
             {
-                llwarns << "Couldn't find a path to the following filter : " << getFilter() << llendl;
+                LL_WARNS() << "Couldn't find a path to the following filter : " << getFilter() << LL_ENDL;
             }
         }
         
         // Create the new formatted image of the appropriate format.
         LLFloaterSnapshot::ESnapshotFormat format = getSnapshotFormat();
-        lldebugs << "Encoding new image of format " << format << llendl;
+        LL_DEBUGS() << "Encoding new image of format " << format << LL_ENDL;
             
         switch (format)
         {
@@ -986,7 +986,7 @@ void LLSnapshotLivePreview::saveTexture()
 		}
 		else
 		{
-			llwarns << "Couldn't find a path to the following filter : " << getFilter() << llendl;
+			LL_WARNS() << "Couldn't find a path to the following filter : " << getFilter() << LL_ENDL;
 		}
 	}
 
-- 
cgit v1.2.3


From a2f31d4734c0731ebf69596622d6039148a9b873 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 30 Jul 2014 04:56:14 +0200
Subject: STORM-2048: Fixed: Loading indicator was always visible.

---
 indra/newview/skins/default/xui/en/panel_facebook_place.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_facebook_place.xml b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
index 6a4b5e2b8a..f87b008c4e 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
@@ -82,10 +82,10 @@
 			  layout="topleft"
               height="24"
               width="24"
-              name="map_loading_indicator2"
+              name="map_loading_indicator"
               top_delta="116"
               left="126"
-              visible="true"/>
+              visible="false"/>
             <button
               follows="left|bottom"
 			  layout="topleft"
-- 
cgit v1.2.3


From c865a7c418ded427d60a3e5f12f5909435b236ec Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 30 Jul 2014 04:57:38 +0200
Subject: STORM-2046: Changed: Defaulted snapshot panel to "extended" state.

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7ebda3eea6..aaf12272f4 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -80,7 +80,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AgentPause</key>
     <map>
-- 
cgit v1.2.3


From 4c44e1c477e146a3b16ef39b1cc5f07d208d7e80 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 30 Jul 2014 05:07:53 +0200
Subject: STORM-2047: Changed: Use different arrow icons for
 expanding/minimizing the floater. This obseletes the entire advanced button
 code.

---
 .../newview/skins/default/xui/en/floater_snapshot.xml  | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index a380c97f3d..07bc9a199d 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -415,11 +415,27 @@
    </text>
    <button
        follows="left|top"
+	   control_name="AdvanceSnapshot"
+	   invisibility_control="AdvanceSnapshot"
        height="420"
+	   is_toggle="true"
        layout="topleft"
 	   image_overlay="Arrow_Right"
-       name="preview_btn"
+       name="retract_btn"
        left="203"
 	   top="25"
        width="8" />
+   <button
+       follows="left|top"
+	   control_name="AdvanceSnapshot"
+	   visibility_control="AdvanceSnapshot"
+       height="420"
+	   is_toggle="true"
+       layout="topleft"
+	   image_overlay="Arrow_Left"
+	   image_selected="PushButton_Off"
+       name="extend_btn"
+       left_delta="0"
+	   top_delta="0"
+       width="8" />
 </floater>
-- 
cgit v1.2.3


From 870c2fbe9dbd78c01a4cf09fb7c672c325d53664 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 30 Jul 2014 05:08:39 +0200
Subject: STORM-2047: Removed: Advanced button code. It's obselete now since
 our UI does it all by itself.

---
 indra/newview/llfloatersnapshot.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index c4b00c8342..632ec08a27 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -95,7 +95,6 @@ public:
 	static void onClickAutoSnap(LLUICtrl *ctrl, void* data);
 	static void onClickFilter(LLUICtrl *ctrl, void* data);
 	//static void onClickAdvanceSnap(LLUICtrl *ctrl, void* data);
-	static void onClickPreview(void* data) ;
 	static void onClickUICheck(LLUICtrl *ctrl, void* data);
 	static void onClickHUDCheck(LLUICtrl *ctrl, void* data);
 	static void applyKeepAspectCheck(LLFloaterSnapshot* view, BOOL checked);
@@ -688,20 +687,6 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde
 	}
 }
 
-void LLFloaterSnapshot::Impl::onClickPreview(void* data)
-{
-	BOOL visible = gSavedSettings.getBOOL("AdvanceSnapshot");
-	
-	LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
-	if (view)
-	{
-		view->impl.setStatus(Impl::STATUS_READY);
-		gSavedSettings.setBOOL("AdvanceSnapshot", !visible);
-		updateControls(view) ;
-		updateLayout(view) ;
-	}
-}
-
 // Show/hide upload progress indicators.
 // static
 void LLFloaterSnapshot::Impl::setWorking(LLFloaterSnapshot* floater, bool working)
@@ -1056,8 +1041,6 @@ BOOL LLFloaterSnapshot::postBuild()
 	mSucceessLblPanel = getChild<LLUICtrl>("succeeded_panel");
 	mFailureLblPanel = getChild<LLUICtrl>("failed_panel");
 
-	childSetAction("preview_btn", Impl::onClickPreview, this);
-
 	childSetCommitCallback("ui_check", Impl::onClickUICheck, this);
 	getChild<LLUICtrl>("ui_check")->setValue(gSavedSettings.getBOOL("RenderUIInSnapshot"));
 
-- 
cgit v1.2.3


From 62e1ac887acf513cf08e805599095d419309b098 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 30 Jul 2014 05:51:11 +0200
Subject: STORM-2049: Fixed: FB/Twitter/Flickr floaters weren't opened with the
 "Photo" tab by default.

---
 indra/newview/llpanelsnapshotoptions.cpp                      | 11 +++--------
 indra/newview/skins/default/xui/en/panel_snapshot_options.xml |  9 +++------
 2 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelsnapshotoptions.cpp b/indra/newview/llpanelsnapshotoptions.cpp
index 743ef3e329..487227daed 100755
--- a/indra/newview/llpanelsnapshotoptions.cpp
+++ b/indra/newview/llpanelsnapshotoptions.cpp
@@ -72,7 +72,9 @@ LLPanelSnapshotOptions::LLPanelSnapshotOptions()
 	mCommitCallbackRegistrar.add("Snapshot.SaveToEmail",		boost::bind(&LLPanelSnapshotOptions::onSaveToEmail,		this));
 	mCommitCallbackRegistrar.add("Snapshot.SaveToInventory",	boost::bind(&LLPanelSnapshotOptions::onSaveToInventory,	this));
 	mCommitCallbackRegistrar.add("Snapshot.SaveToComputer",		boost::bind(&LLPanelSnapshotOptions::onSaveToComputer,	this));
-
+    mCommitCallbackRegistrar.add("Snapshot.SendToFacebook",		boost::bind(&LLPanelSnapshotOptions::onSendToFacebook, this));
+    mCommitCallbackRegistrar.add("Snapshot.SendToTwitter",		boost::bind(&LLPanelSnapshotOptions::onSendToTwitter, this));
+    mCommitCallbackRegistrar.add("Snapshot.SendToFlickr",		boost::bind(&LLPanelSnapshotOptions::onSendToFlickr, this));
 	LLGlobalEconomy::Singleton::getInstance()->addObserver(this);
 }
 
@@ -84,13 +86,6 @@ LLPanelSnapshotOptions::~LLPanelSnapshotOptions()
 // virtual
 BOOL LLPanelSnapshotOptions::postBuild()
 {
-    LLTextBox* sendToFacebookTextBox = getChild<LLTextBox>("send_to_facebook_textbox");
-    sendToFacebookTextBox->setURLClickedCallback(boost::bind(&LLPanelSnapshotOptions::onSendToFacebook, this));
-    LLTextBox* sendToTwitterTextBox = getChild<LLTextBox>("send_to_twitter_textbox");
-    sendToTwitterTextBox->setURLClickedCallback(boost::bind(&LLPanelSnapshotOptions::onSendToTwitter, this));
-    LLTextBox* sendToFlickrTextBox = getChild<LLTextBox>("send_to_flickr_textbox");
-    sendToFlickrTextBox->setURLClickedCallback(boost::bind(&LLPanelSnapshotOptions::onSendToFlickr, this));
-
 	return LLPanel::postBuild();
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index c27a4df264..2f8efd9b13 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -71,8 +71,7 @@
    name="send_to_facebook_btn"
    top_pad="5">
     <button.commit_callback
-     function="Floater.Toggle"
-     parameter="facebook"/>
+     function="Snapshot.SendToFacebook"/>
   </button>
   <button
    follows="left|top"
@@ -89,8 +88,7 @@
    name="send_to_twitter_btn"
    top_pad="5">
     <button.commit_callback
-     function="Floater.Toggle"
-     parameter="twitter"/>
+     function="Snapshot.SendToTwitter"/>
   </button>
   <button
    follows="left|top"
@@ -107,8 +105,7 @@
    name="send_to_flickr_btn"
    top_pad="5">
     <button.commit_callback
-     function="Floater.Toggle"
-     parameter="flickr"/>
+     function="Snapshot.SendToFlickr"/>
   </button>
   <button
    follows="left|top"
-- 
cgit v1.2.3


From 858e2159b9f642213f5edd583b91d9e6d9be8eee Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 30 Jul 2014 06:19:16 +0200
Subject: STORM-2040: Fixed: Width and Height spinners always reverting to
 previous values when entering a custom value while anything else than
 "Custom" is selected in the size dropdown. Do NOT. Ever. Change. Our.
 Resolution. Again. Unless we ask you to with the proper dropdown entries.

---
 indra/newview/llfloatersnapshot.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 632ec08a27..2011afc124 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -967,8 +967,6 @@ void LLFloaterSnapshot::Impl::applyCustomResolution(LLFloaterSnapshot* view, S32
 			//if to upload a snapshot, process spinner input in a special way.
 			previewp->setMaxImageSize((S32) getWidthSpinner(view)->getMaxValue()) ;
 
-			updateSpinners(view, previewp, w, h, w != curw); // may change w and h
-
 			previewp->setSize(w,h);
 			checkAutoSnapshot(previewp, FALSE);
 			LL_DEBUGS() << "applied custom resolution, updating thumbnail" << LL_ENDL;
-- 
cgit v1.2.3


From 9b267404f8b61899bdcdd538af3593f7185fd04b Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Thu, 31 Jul 2014 06:38:21 +0200
Subject: STORM-2049: Misc: Line spacing.

---
 indra/newview/llpanelsnapshotoptions.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelsnapshotoptions.cpp b/indra/newview/llpanelsnapshotoptions.cpp
index 487227daed..0fc9ceec83 100755
--- a/indra/newview/llpanelsnapshotoptions.cpp
+++ b/indra/newview/llpanelsnapshotoptions.cpp
@@ -72,9 +72,9 @@ LLPanelSnapshotOptions::LLPanelSnapshotOptions()
 	mCommitCallbackRegistrar.add("Snapshot.SaveToEmail",		boost::bind(&LLPanelSnapshotOptions::onSaveToEmail,		this));
 	mCommitCallbackRegistrar.add("Snapshot.SaveToInventory",	boost::bind(&LLPanelSnapshotOptions::onSaveToInventory,	this));
 	mCommitCallbackRegistrar.add("Snapshot.SaveToComputer",		boost::bind(&LLPanelSnapshotOptions::onSaveToComputer,	this));
-    mCommitCallbackRegistrar.add("Snapshot.SendToFacebook",		boost::bind(&LLPanelSnapshotOptions::onSendToFacebook, this));
-    mCommitCallbackRegistrar.add("Snapshot.SendToTwitter",		boost::bind(&LLPanelSnapshotOptions::onSendToTwitter, this));
-    mCommitCallbackRegistrar.add("Snapshot.SendToFlickr",		boost::bind(&LLPanelSnapshotOptions::onSendToFlickr, this));
+	mCommitCallbackRegistrar.add("Snapshot.SendToFacebook",		boost::bind(&LLPanelSnapshotOptions::onSendToFacebook, this));
+	mCommitCallbackRegistrar.add("Snapshot.SendToTwitter",		boost::bind(&LLPanelSnapshotOptions::onSendToTwitter, this));
+	mCommitCallbackRegistrar.add("Snapshot.SendToFlickr",		boost::bind(&LLPanelSnapshotOptions::onSendToFlickr, this));
 	LLGlobalEconomy::Singleton::getInstance()->addObserver(this);
 }
 
-- 
cgit v1.2.3


From 09aa769613cea11b739e1c2c1b51457e853f4258 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Thu, 31 Jul 2014 06:44:23 +0200
Subject: STORM-2043: Fixed: "t" missing in postcard settings panel. Man... i'm
 dumb. Every label width was 80 and the one in this panel was 78...

---
 indra/newview/skins/default/xui/de/panel_postcard_settings.xml  | 2 +-
 indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml | 2 +-
 indra/newview/skins/default/xui/de/panel_snapshot_local.xml     | 2 +-
 indra/newview/skins/default/xui/de/panel_snapshot_profile.xml   | 2 +-
 indra/newview/skins/default/xui/en/panel_postcard_settings.xml  | 4 ++--
 indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_snapshot_local.xml     | 2 +-
 indra/newview/skins/default/xui/en/panel_snapshot_profile.xml   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
index eb1d9212e0..e6d3b7de66 100755
--- a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
@@ -7,7 +7,7 @@
 		<combo_box.item label="1024x768" name="1024x768"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<spinner label="Breite*Höhe" name="postcard_snapshot_width"/>
+	<spinner label="Breite x Höhe" name="postcard_snapshot_width"/>
 	<check_box label="Seitenverhältnis beibehalten" name="postcard_keep_aspect_check"/>
 	<slider label="Qualität" name="image_quality_slider"/>
 	<text name="image_quality_level">
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
index efc9b84e2b..d13f56ed3d 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
@@ -13,7 +13,7 @@
 		<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<spinner label="Breite*Höhe" name="inventory_snapshot_width"/>
+	<spinner label="Breite x Höhe" name="inventory_snapshot_width"/>
 	<check_box label="Seitenverhältnis beibehalten" name="inventory_keep_aspect_check"/>
 	<button label="Abbrechen" name="cancel_btn"/>
 	<button label="Speichern" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
index ad822396e7..53e78ba290 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
@@ -13,7 +13,7 @@
 		<combo_box.item label="1600x1200" name="1600x1200"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<spinner label="Breite*Höhe" name="local_snapshot_width"/>
+	<spinner label="Breite x Höhe" name="local_snapshot_width"/>
 	<check_box label="Seitenverhältnis beibehalten" name="local_keep_aspect_check"/>
 	<combo_box label="Format" name="local_format_combo">
 		<combo_box.item label="PNG (verlustfrei)" name="PNG"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
index 82faea37a3..0f21edd1b6 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
@@ -10,7 +10,7 @@
 	<combo_box.item label="1024x768" name="1024x768"/>
 	<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
-	<spinner label="Breite*Höhe" name="profile_snapshot_width"/>
+	<spinner label="Breite x Höhe" name="profile_snapshot_width"/>
 	<check_box label="Seitenverhältnis beibehalten" name="profile_keep_aspect_check"/>
 	<text name="caption_label">
 		Bildunterschrift:
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index ee29f09aa2..f6397fe7a2 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -40,8 +40,8 @@
     follows="left|top"
     height="20"
     increment="32"
-    label="Width*Height"
-    label_width="78"
+    label="Width x Height"
+    label_width="80"
     layout="topleft"
     left="10"
     max_val="6016"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index 56af898de4..ea135340b0 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -74,7 +74,7 @@
      follows="left|top"
      height="20"
      increment="32"
-     label="Width*Height"
+     label="Width x Height"
      label_width="80"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 0e8480d70d..ab1e1e290e 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -85,7 +85,7 @@
      follows="left|top"
      height="20"
      increment="32"
-     label="Width*Height"
+     label="Width x Height"
      label_width="80"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
index 2575511e23..612cf49214 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
@@ -75,7 +75,7 @@
      follows="left|top"
      height="20"
      increment="32"
-     label="Width*Height"
+     label="Width x Height"
      label_width="80"
      layout="topleft"
      left="10"
-- 
cgit v1.2.3


From d9bb05037d517b3f26d03629200410b534d88d42 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Thu, 31 Jul 2014 07:25:28 +0200
Subject: STORM-2050: Fixed: Postcard tab buttons can get 'out of sync'.

---
 indra/newview/llpanelsnapshotpostcard.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelsnapshotpostcard.cpp b/indra/newview/llpanelsnapshotpostcard.cpp
index 95c443b826..703ac25f97 100755
--- a/indra/newview/llpanelsnapshotpostcard.cpp
+++ b/indra/newview/llpanelsnapshotpostcard.cpp
@@ -232,9 +232,9 @@ void LLPanelSnapshotPostcard::onTabButtonPress(S32 btn_idx)
 		getChild<LLSideTrayPanelContainer>("postcard_panel_container");
 
 	container->selectTab(clicked_btn->getToggleState() ? btn_idx : !btn_idx);
-	//clicked_btn->setEnabled(FALSE);
+	clicked_btn->setEnabled(FALSE);
 	other_btn->toggleState();
-	//other_btn->setEnabled(TRUE);
+	other_btn->setEnabled(TRUE);
 
 	LL_DEBUGS() << "Button #" << btn_idx << " (" << clicked_btn->getName() << ") clicked" << LL_ENDL;
 }
-- 
cgit v1.2.3


From 877605ffe1c4688ab020685709979ac6c0b97e58 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Thu, 31 Jul 2014 07:26:15 +0200
Subject: STORM-2050: Changed: Postcard settings icon to a single gear icon
 used for settings like that.

---
 indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
index 5be93c44c1..f5f076905f 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -59,7 +59,7 @@
      height="23"
      is_toggle="true"
      label=""
-     image_overlay="Command_Preferences_Icon"
+     image_overlay="OptionsMenu_Off"
      layout="topleft"
      name="settings_btn"
      top_delta="0"
-- 
cgit v1.2.3


From e0ceacfc356b9b35b6db85aa580c43046e55e500 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 1 Aug 2014 00:36:50 +0200
Subject: STORM-2051: Changed: Selected + disabled texture of the tab buttons
 to disabled only to prevent confusion.

---
 indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
index f5f076905f..2622ccb4c4 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -46,6 +46,7 @@
      is_toggle="true"
      label=""
      image_overlay="Command_Chat_Icon"
+     image_disabled_selected="PushButton_Disabled"
      layout="topleft"
      name="message_btn"
      right="-35"
@@ -60,6 +61,7 @@
      is_toggle="true"
      label=""
      image_overlay="OptionsMenu_Off"
+     image_disabled_selected="PushButton_Disabled"
      layout="topleft"
      name="settings_btn"
      top_delta="0"
-- 
cgit v1.2.3


From 501da5c20a73e99887c3e7c330aeaca6cfe1cc7f Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 1 Aug 2014 18:49:42 +0200
Subject: STORM-2051: Changed: Converted button panels to real tabs, removed
 the buttons and moved the Send and Cancel buttons to the main postcard panel.

---
 indra/newview/llpanelsnapshotpostcard.cpp          | 26 -------
 .../default/xui/de/panel_snapshot_postcard.xml     |  4 ++
 .../default/xui/en/panel_postcard_message.xml      | 57 +++------------
 .../default/xui/en/panel_postcard_settings.xml     | 14 ++--
 .../default/xui/en/panel_snapshot_postcard.xml     | 84 +++++++++++-----------
 5 files changed, 63 insertions(+), 122 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelsnapshotpostcard.cpp b/indra/newview/llpanelsnapshotpostcard.cpp
index 703ac25f97..8e37b1418c 100755
--- a/indra/newview/llpanelsnapshotpostcard.cpp
+++ b/indra/newview/llpanelsnapshotpostcard.cpp
@@ -72,7 +72,6 @@ private:
 	void onMsgFormFocusRecieved();
 	void onFormatComboCommit(LLUICtrl* ctrl);
 	void onQualitySliderCommit(LLUICtrl* ctrl);
-	void onTabButtonPress(S32 btn_idx);
 	void onSend();
 
 	bool mHasFirstMsgFocus;
@@ -86,8 +85,6 @@ LLPanelSnapshotPostcard::LLPanelSnapshotPostcard()
 {
 	mCommitCallbackRegistrar.add("Postcard.Send",		boost::bind(&LLPanelSnapshotPostcard::onSend,	this));
 	mCommitCallbackRegistrar.add("Postcard.Cancel",		boost::bind(&LLPanelSnapshotPostcard::cancel,	this));
-	mCommitCallbackRegistrar.add("Postcard.Message",	boost::bind(&LLPanelSnapshotPostcard::onTabButtonPress,	this, 0));
-	mCommitCallbackRegistrar.add("Postcard.Settings",	boost::bind(&LLPanelSnapshotPostcard::onTabButtonPress,	this, 1));
 
 }
 
@@ -108,8 +105,6 @@ BOOL LLPanelSnapshotPostcard::postBuild()
 
 	getChild<LLUICtrl>("image_quality_slider")->setCommitCallback(boost::bind(&LLPanelSnapshotPostcard::onQualitySliderCommit, this, _1));
 
-	getChild<LLButton>("message_btn")->setToggleState(TRUE);
-
 	return LLPanelSnapshot::postBuild();
 }
 
@@ -218,27 +213,6 @@ void LLPanelSnapshotPostcard::onQualitySliderCommit(LLUICtrl* ctrl)
 	LLFloaterSnapshot::getInstance()->notify(info); // updates the "SnapshotQuality" setting
 }
 
-void LLPanelSnapshotPostcard::onTabButtonPress(S32 btn_idx)
-{
-	LLButton* buttons[2] = {
-			getChild<LLButton>("message_btn"),
-			getChild<LLButton>("settings_btn"),
-	};
-
-	// Switch between Message and Settings tabs.
-	LLButton* clicked_btn = buttons[btn_idx];
-	LLButton* other_btn = buttons[!btn_idx];
-	LLSideTrayPanelContainer* container =
-		getChild<LLSideTrayPanelContainer>("postcard_panel_container");
-
-	container->selectTab(clicked_btn->getToggleState() ? btn_idx : !btn_idx);
-	clicked_btn->setEnabled(FALSE);
-	other_btn->toggleState();
-	other_btn->setEnabled(TRUE);
-
-	LL_DEBUGS() << "Button #" << btn_idx << " (" << clicked_btn->getName() << ") clicked" << LL_ENDL;
-}
-
 void LLPanelSnapshotPostcard::onSend()
 {
 	// Validate input.
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
index e0fc60621e..6c8670a4c8 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
@@ -12,4 +12,8 @@
 	<text name="title">
 		E-Mail
 	</text>
+	<tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="Nachricht"/>
+		<panel name="panel_postcard_settings" label="Einstellungen"/>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_message.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
index 56601da2fd..331a08b4bb 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- height="380"
+ height="319"
  layout="topleft"
  name="panel_postcard_message"
  width="490">
@@ -12,7 +12,7 @@
      font="SansSerif"
      height="16"
      layout="topleft"
-     left="12"
+     left="5"
      name="to_label"
      top="10"
      width="60">
@@ -25,7 +25,7 @@
      layout="topleft"
      left_pad="10"
      name="to_form"
-     right="-5"
+     right="-3"
      top_delta="-4" />
     <text
      type="string"
@@ -35,7 +35,7 @@
      font="SansSerif"
      height="16"
      layout="topleft"
-     left="12"
+     left="5"
      name="name_label"
      width="60">
         From:
@@ -47,7 +47,7 @@
      left_pad="10"
      max_length_bytes="100"
      name="name_form"
-     right="-5"
+     right="-3"
      top_delta="-4" />
     <text
      type="string"
@@ -57,7 +57,7 @@
      font="SansSerif"
      height="16"
      layout="topleft"
-     left="12"
+     left="5"
      name="subject_label"
      width="60">
         Subject:
@@ -65,61 +65,24 @@
     <line_editor
      follows="left|top|right"
      height="20"
-     label="Type your subject here."
      layout="topleft"
      left_pad="10"
      max_length_bytes="100"
      name="subject_form"
-     right="-5"
+     right="-3"
      top_delta="-4" />
-    <text
-     type="string"
-     length="1"
-     bottom_delta="23"
-     follows="top|left"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="12"
-     name="msg_label">
-        Message:
-    </text>
     <text_editor
      type="string"
      length="1"
      follows="left|top|right"
-     height="45"
+     height="48"
      layout="topleft"
-     left_delta="0"
+     left="5"
      max_length="700"
      name="msg_form"
-     right="-5"
+     right="-4"
      top_pad="5"
      word_wrap="true">
         Type your message here.
     </text_editor>
-    <button
-     follows="right|bottom"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     name="cancel_btn"
-     right="-5"
-     top="345"
-     width="90">
-      <button.commit_callback
-       function="Postcard.Cancel" />
-    </button>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Send"
-     layout="topleft"
-     left="10"
-     name="send_btn"
-     top_delta="0"
-     width="95">
-      <button.commit_callback
-       function="Postcard.Send" />
-    </button>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index f6397fe7a2..907751280f 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -9,9 +9,9 @@
      height="23"
      label="Resolution"
      layout="topleft"
-     left="10"
+     left="5"
      name="postcard_size_combo"
-     right="-5"
+     right="-3"
      top_pad="5">
         <combo_box.item
          label="Current Window"
@@ -43,11 +43,11 @@
     label="Width x Height"
     label_width="80"
     layout="topleft"
-    left="10"
+    left="5"
     max_val="6016"
     min_val="32"
     name="postcard_snapshot_width"
-    top_pad="3"
+    top_pad="5"
     width="132" />
    <spinner
     allow_text_entry="false"
@@ -69,7 +69,7 @@
     follows="left|top"
     label="Constrain proportions"
     layout="topleft"
-    left="10"
+    left="5"
     name="postcard_keep_aspect_check" />
    <slider
    decimal_digits="0"
@@ -80,9 +80,9 @@
    label="Quality:"
    label_width="45"
    layout="topleft"
-   left="10"
+   left="5"
    max_val="100"
    name="image_quality_slider"
    top_pad="6"
-   width="195" />
+   width="190" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
index 2622ccb4c4..01265523ea 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -24,7 +24,7 @@
      left="12"
      mouse_opaque="true"
      name="title_icon"
-     top="8"
+     top="7"
      width="18" />
     <text
      follows="top|left|right"
@@ -40,64 +40,64 @@
      top_delta="2">
         E-mail
     </text>
-    <button
-     follows="right|top"
-     height="23"
-     is_toggle="true"
-     label=""
-     image_overlay="Command_Chat_Icon"
-     image_disabled_selected="PushButton_Disabled"
-     layout="topleft"
-     name="message_btn"
-     right="-35"
-     top_delta="-3"
-     width="25">
-      <button.commit_callback
-       function="Postcard.Message" />
-    </button>
-    <button
-     follows="right|top"
-     height="23"
-     is_toggle="true"
-     label=""
-     image_overlay="OptionsMenu_Off"
-     image_disabled_selected="PushButton_Disabled"
-     layout="topleft"
-     name="settings_btn"
-     top_delta="0"
-     left_pad="5"
-     width="25">
-      <button.commit_callback
-       function="Postcard.Settings" />
-    </button>
     <view_border 
      bevel_style="in"
      follows="left|top|right" 
      height="1"
-     left="10"
+     left="9"
      layout="topleft"
      name="hr"
      right="-5"
-     top_pad="2"
+     top_pad="5"
      />
-    <panel_container
+    <tab_container
+     name="postcard_tabs"
+     tab_group="1"
+     tab_min_width="92"
+     tab_height="21"
+     tab_position="top"
+     top_pad="7"
+     left="5"
+     right="-2"
+     height="319"
      follows="all"
-     height="340"
-     layout="topleft"
-     left="0"
-     name="postcard_panel_container"
-     default_panel_name="panel_postcard_message"
-     top_pad="0"
-     width="490">
+     halign="center"
+     use_highlighting_on_hover="true">
       <panel
        follows="all"
        layout="topleft"
+       label="Message"
        name="panel_postcard_message"
        filename="panel_postcard_message.xml" />
       <panel
        follows="all"
        layout="topleft"
+       label="Settings"
        name="panel_postcard_settings"
        filename="panel_postcard_settings.xml" />
-    </panel_container>
+    </tab_container>
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     name="cancel_btn"
+     right="-6"
+     bottom="-20"
+     width="90">
+      <button.commit_callback
+       function="Postcard.Cancel" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="23"
+     label="Send"
+     layout="topleft"
+     left="10"
+     name="send_btn"
+     top_delta="0"
+     width="95">
+      <button.commit_callback
+       function="Postcard.Send" />
+    </button>
 </panel>
\ No newline at end of file
-- 
cgit v1.2.3


From fff5593010aa10eb3921bba475736a5daf1d2968 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 1 Aug 2014 18:50:38 +0200
Subject: STORM-2040: Changed: Slight alignment adjustations.

---
 indra/newview/skins/default/xui/en/panel_snapshot_local.xml   | 2 +-
 indra/newview/skins/default/xui/en/panel_snapshot_options.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_snapshot_profile.xml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index ab1e1e290e..4cc20a8b5a 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -32,7 +32,7 @@
      bevel_style="in"
      follows="left|top|right" 
      height="1"
-     left="10"
+     left="9"
      layout="topleft"
      name="hr"
      right="-5"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 2f8efd9b13..2b26ee19c1 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -16,7 +16,7 @@
    imgoverlay_label_space="10"
    label="Save to Disk"
    layout="topleft"
-   left="10"
+   left="9"
    name="save_to_computer_btn"
    top_pad="9">
     <button.commit_callback
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
index 612cf49214..1b718e6826 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
@@ -12,7 +12,7 @@
      left="12"
      mouse_opaque="true"
      name="title_icon"
-     top="5"
+     top="7"
      width="18" />
     <text
      follows="top|left|right"
@@ -32,7 +32,7 @@
      bevel_style="in"
      follows="left|top|right" 
      height="1"
-     left="10"
+     left="9"
      layout="topleft"
      name="hr"
      right="-5"
-- 
cgit v1.2.3


From 4c11c374c9f8fb5947edc454b7c55e94922f44ed Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 1 Aug 2014 19:23:59 +0200
Subject: STORM-2051: Moved: Missing german button translation.

---
 indra/newview/skins/default/xui/de/panel_postcard_message.xml  | 2 --
 indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/de/panel_postcard_message.xml b/indra/newview/skins/default/xui/de/panel_postcard_message.xml
index 609569bd6f..b34dc776de 100755
--- a/indra/newview/skins/default/xui/de/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/de/panel_postcard_message.xml
@@ -16,6 +16,4 @@
 	<text_editor name="msg_form">
 		Nachricht hier eingeben.
 	</text_editor>
-	<button label="Abbrechen" name="cancel_btn"/>
-	<button label="Senden" name="send_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
index 6c8670a4c8..ead56f2885 100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
@@ -16,4 +16,6 @@
 		<panel name="panel_postcard_message" label="Nachricht"/>
 		<panel name="panel_postcard_settings" label="Einstellungen"/>
 	</tab_container>
+	<button name="cancel_btn" label="Abbrechen"/>
+	<button name="send_btn" label="Absenden"/>
 </panel>
-- 
cgit v1.2.3


From bf3f77a3f092189b9756c9997eefcb8d46888064 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 1 Aug 2014 20:16:31 +0200
Subject: STORM-2052: Changed: Preview expand/hide buttons look and overlay
 image to match the conversation floater style.

---
 .../skins/default/xui/en/floater_snapshot.xml      | 78 ++++++++++++----------
 .../default/xui/en/panel_postcard_settings.xml     |  6 +-
 .../default/xui/en/panel_snapshot_inventory.xml    | 10 +--
 .../skins/default/xui/en/panel_snapshot_local.xml  | 10 +--
 .../default/xui/en/panel_snapshot_options.xml      |  2 +-
 .../default/xui/en/panel_snapshot_postcard.xml     |  6 +-
 .../default/xui/en/panel_snapshot_profile.xml      |  8 +--
 7 files changed, 63 insertions(+), 57 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 07bc9a199d..bc4bf8fd8f 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -80,28 +80,59 @@
  	</string>
     <button
      follows="left|top"
-     height="18"
+     height="25"
      image_overlay="Refresh_Off"
+	 image_hover_unselected="Toolbar_Middle_Over"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
      image_overlay_alignment="left"
      imgoverlay_label_space="5"
 	 pad_bottom="0"
 	 halign="left"
-	 image_selected="transparent.j2c"
-	 image_unselected="transparent.j2c"
      layout="topleft"
-     left="5"
+     left="10"
 	 label="REFRESH"
      name="new_snapshot_btn"
      top_pad="26"
-     width="195" />
+     width="167" />
+	<button
+       follows="left|top"
+	   control_name="AdvanceSnapshot"
+	   invisibility_control="AdvanceSnapshot"
+       height="25"
+	   is_toggle="true"
+       layout="topleft"
+	   image_hover_unselected="Toolbar_Middle_Over"
+	   image_selected="Toolbar_Middle_Off"
+	   image_unselected="Toolbar_Middle_Off"
+	   image_overlay="Conv_toolbar_collapse"
+       name="retract_btn"
+       left_pad="1"
+	   top_delta="0"
+       width="31" />
+   <button
+       follows="left|top"
+	   control_name="AdvanceSnapshot"
+	   visibility_control="AdvanceSnapshot"
+       height="25"
+	   is_toggle="true"
+       layout="topleft"
+	   image_overlay="Conv_toolbar_expand"
+	   image_hover_unselected="Toolbar_Middle_Over"
+	   image_selected="Toolbar_Middle_Off"
+	   image_unselected="Toolbar_Middle_Off"
+       name="extend_btn"
+       left_delta="0"
+	   top_delta="0"
+       width="31" />
 	<panel
      height="154"
      layout="topleft"
 	 follows="top|left"
      left="0"
      name="advanced_options_panel"
-     top_pad="0"
-     width="200">
+     top_pad="-6"
+     width="210">
         <view_border 
          bevel_style="in"
          follows="left|top|right" 
@@ -219,7 +250,7 @@
      name="panel_container"
      default_panel_name="panel_snapshot_options"
      top_pad="10"
-     width="205">
+     width="215">
       <panel
        class="llpanelsnapshotoptions"
        filename="panel_snapshot_options.xml"
@@ -260,7 +291,7 @@
          left="10"
          layout="topleft"
          name="status_hr"
-         width="189"
+         width="199"
          top_pad="-16"/>
 	<panel
        background_visible="true"
@@ -273,7 +304,7 @@
        left="10"
        length="1"
        name="succeeded_panel"
-	   width="188"
+	   width="198"
        top_pad="1"
        type="string"
        visible="false">
@@ -305,7 +336,7 @@
        left="10"
        length="1"
        name="failed_panel"
-	   width="188"
+	   width="198"
        top_delta="0"
        type="string"
        visible="false">
@@ -413,29 +444,4 @@
     width="50">
        [SIZE] KB
    </text>
-   <button
-       follows="left|top"
-	   control_name="AdvanceSnapshot"
-	   invisibility_control="AdvanceSnapshot"
-       height="420"
-	   is_toggle="true"
-       layout="topleft"
-	   image_overlay="Arrow_Right"
-       name="retract_btn"
-       left="203"
-	   top="25"
-       width="8" />
-   <button
-       follows="left|top"
-	   control_name="AdvanceSnapshot"
-	   visibility_control="AdvanceSnapshot"
-       height="420"
-	   is_toggle="true"
-       layout="topleft"
-	   image_overlay="Arrow_Left"
-	   image_selected="PushButton_Off"
-       name="extend_btn"
-       left_delta="0"
-	   top_delta="0"
-       width="8" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index 907751280f..525149d7ee 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -41,14 +41,14 @@
     height="20"
     increment="32"
     label="Width x Height"
-    label_width="80"
+    label_width="90"
     layout="topleft"
     left="5"
     max_val="6016"
     min_val="32"
     name="postcard_snapshot_width"
     top_pad="5"
-    width="132" />
+    width="144" />
    <spinner
     allow_text_entry="false"
     decimal_digits="0"
@@ -63,7 +63,7 @@
     min_val="32"
     name="postcard_snapshot_height"
     top_delta="0"
-    width="54" />
+    width="52" />
    <check_box
     top_pad="12"
     follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index ea135340b0..5782ba7d04 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -75,14 +75,14 @@
      height="20"
      increment="32"
      label="Width x Height"
-     label_width="80"
+     label_width="90"
      layout="topleft"
      left="10"
      max_val="6016"
      min_val="32"
      name="inventory_snapshot_width"
      top_pad="7"
-     width="134" />
+     width="144" />
     <spinner
      allow_text_entry="false"
      decimal_digits="0"
@@ -115,7 +115,7 @@
      length="1"
      name="hint_lbl"
      top_pad="6"
-     width="190"
+     width="200"
      type="string"
      word_wrap="true">
         Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
@@ -128,7 +128,7 @@
      name="cancel_btn"
      right="-5"
      top="337"
-     width="90">
+     width="97">
       <button.commit_callback
        function="Inventory.Cancel" />
     </button>
@@ -140,7 +140,7 @@
      left="10"
      name="save_btn"
      top_delta="0"
-     width="95">
+     width="97">
       <button.commit_callback
        function="Inventory.Save" />
     </button>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 4cc20a8b5a..188c9f8707 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -86,14 +86,14 @@
      height="20"
      increment="32"
      label="Width x Height"
-     label_width="80"
+     label_width="90"
      layout="topleft"
      left="10"
      max_val="6016"
      min_val="32"
      name="local_snapshot_width"
      top_pad="7"
-     width="134" />
+     width="144" />
     <spinner
      allow_text_entry="false"
      decimal_digits="0"
@@ -164,7 +164,7 @@
      max_val="100"
      name="image_quality_slider"
      top_pad="6"
-     width="195" />
+     width="203" />
     <button
      follows="right|bottom"
      height="23"
@@ -173,7 +173,7 @@
      name="cancel_btn"
      right="-5"
      top="337"
-     width="90">
+     width="97">
       <button.commit_callback
        function="Local.Cancel" />
     </button>
@@ -186,7 +186,7 @@
      name="save_btn"
      tool_tip="Save image to a file"
      top_delta="0"
-     width="95">
+     width="97">
         <flyout_button.item
          label="Save"
          name="save_item"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 2b26ee19c1..265217ef60 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -4,7 +4,7 @@
  height="240"
  layout="topleft"
  name="panel_snapshot_options"
- width="198">
+ width="208">
  <button
    follows="left|top"
    font="SansSerif"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
index 01265523ea..975b08be05 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -53,7 +53,7 @@
     <tab_container
      name="postcard_tabs"
      tab_group="1"
-     tab_min_width="92"
+     tab_min_width="97"
      tab_height="21"
      tab_position="top"
      top_pad="7"
@@ -84,7 +84,7 @@
      name="cancel_btn"
      right="-6"
      bottom="-20"
-     width="90">
+     width="97">
       <button.commit_callback
        function="Postcard.Cancel" />
     </button>
@@ -96,7 +96,7 @@
      left="10"
      name="send_btn"
      top_delta="0"
-     width="95">
+     width="97">
       <button.commit_callback
        function="Postcard.Send" />
     </button>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
index 1b718e6826..d86cb92981 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
@@ -76,14 +76,14 @@
      height="20"
      increment="32"
      label="Width x Height"
-     label_width="80"
+     label_width="90"
      layout="topleft"
      left="10"
      max_val="6016"
      min_val="32"
      name="profile_snapshot_width"
      top_pad="7"
-     width="134" />
+     width="144" />
     <spinner
      allow_text_entry="false"
      decimal_digits="0"
@@ -148,7 +148,7 @@
      name="cancel_btn"
      right="-5"
      top="337"
-     width="90">
+     width="97">
       <button.commit_callback
        function="PostToProfile.Cancel" />
     </button>
@@ -160,7 +160,7 @@
      left="10"
      name="post_btn"
      top_delta="0"
-     width="95">
+     width="97">
       <button.commit_callback
        function="PostToProfile.Send" />
     </button>
-- 
cgit v1.2.3


From 45e98414eaeba225a3aa26657789f9d3b80cba22 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 2 Aug 2014 05:25:06 +0200
Subject: STORM-2052: Changed: Swapped button icons.

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index bc4bf8fd8f..4b8f4c8fed 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -105,7 +105,7 @@
 	   image_hover_unselected="Toolbar_Middle_Over"
 	   image_selected="Toolbar_Middle_Off"
 	   image_unselected="Toolbar_Middle_Off"
-	   image_overlay="Conv_toolbar_collapse"
+	   image_overlay="Conv_toolbar_expand"
        name="retract_btn"
        left_pad="1"
 	   top_delta="0"
@@ -117,7 +117,7 @@
        height="25"
 	   is_toggle="true"
        layout="topleft"
-	   image_overlay="Conv_toolbar_expand"
+	   image_overlay="Conv_toolbar_collapse"
 	   image_hover_unselected="Toolbar_Middle_Over"
 	   image_selected="Toolbar_Middle_Off"
 	   image_unselected="Toolbar_Middle_Off"
-- 
cgit v1.2.3


From e5f6c2faa040c2a7c161d60226854c23ff831eb5 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 4 Aug 2014 14:44:35 -0400
Subject: add some debug logging

---
 indra/newview/lltexturefetch.cpp | 3 +++
 indra/newview/llviewerregion.cpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 9ea46cab68..62b2f5f976 100755
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1336,17 +1336,20 @@ bool LLTextureFetchWorker::doWork(S32 param)
 						LL_WARNS() << "trying to seek a non-default texture on the sim. Bad!" << LL_ENDL;
 					}
 					setUrl(http_url + "/?texture_id=" + mID.asString().c_str());
+					LL_DEBUGS("Texture") << "Texture URL " << mUrl << LL_ENDL;
 					mWriteToCacheState = CAN_WRITE ; //because this texture has a fixed texture id.
 				}
 				else
 				{
 					mCanUseHTTP = false ;
+					LL_DEBUGS("Texture") << "Texture not available via HTTP: no URL " << mUrl << LL_ENDL;
 				}
 			}
 			else
 			{
 				// This will happen if not logged in or if a region deoes not have HTTP Texture enabled
 				//LL_WARNS() << "Region not found for host: " << mHost << LL_ENDL;
+				LL_DEBUGS("Texture") << "Texture not available via HTTP: no region " << mUrl << LL_ENDL;
 				mCanUseHTTP = false;
 			}
 		}
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 673913c4f2..b22d37b710 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -285,8 +285,8 @@ private:
 		{
 			regionp->setCapability(iter->first, iter->second);
 
-			LL_DEBUGS("AppInit", "Capabilities") << "got capability for " 
-				<< iter->first << LL_ENDL;
+			LL_DEBUGS("AppInit", "Capabilities")
+				<< "Capability '" << iter->first << "' is '" << iter->second << "'" << LL_ENDL;
 
 			/* HACK we're waiting for the ServerReleaseNotes */
 			if (iter->first == "ServerReleaseNotes" && regionp->getReleaseNotesRequested())
-- 
cgit v1.2.3


From 3dbbc49b4f535ee409c3a7c15b617c2997e80d8c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 6 Aug 2014 15:33:41 -0400
Subject: fix dos line endings

---
 indra/newview/llfloaterfacebook.cpp | 258 ++++++++++++++++++------------------
 indra/newview/llfloaterfacebook.h   |  30 ++---
 2 files changed, 144 insertions(+), 144 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp
index 516cf5c15c..d4f727e1df 100644
--- a/indra/newview/llfloaterfacebook.cpp
+++ b/indra/newview/llfloaterfacebook.cpp
@@ -98,27 +98,27 @@ S32 compute_jpeg_quality(S32 width, S32 height)
 LLFacebookStatusPanel::LLFacebookStatusPanel() :
 	mMessageTextEditor(NULL),
 	mPostButton(NULL),
-    mCancelButton(NULL),
-	mAccountCaptionLabel(NULL),
-	mAccountNameLabel(NULL),
-	mPanelButtons(NULL),
-	mConnectButton(NULL),
+    mCancelButton(NULL),
+	mAccountCaptionLabel(NULL),
+	mAccountNameLabel(NULL),
+	mPanelButtons(NULL),
+	mConnectButton(NULL),
 	mDisconnectButton(NULL)
 {
-	mCommitCallbackRegistrar.add("SocialSharing.Connect", boost::bind(&LLFacebookStatusPanel::onConnect, this));
-	mCommitCallbackRegistrar.add("SocialSharing.Disconnect", boost::bind(&LLFacebookStatusPanel::onDisconnect, this));
-
-	setVisibleCallback(boost::bind(&LLFacebookStatusPanel::onVisibilityChange, this, _2));
+	mCommitCallbackRegistrar.add("SocialSharing.Connect", boost::bind(&LLFacebookStatusPanel::onConnect, this));
+	mCommitCallbackRegistrar.add("SocialSharing.Disconnect", boost::bind(&LLFacebookStatusPanel::onDisconnect, this));
+
+	setVisibleCallback(boost::bind(&LLFacebookStatusPanel::onVisibilityChange, this, _2));
 
 	mCommitCallbackRegistrar.add("SocialSharing.SendStatus", boost::bind(&LLFacebookStatusPanel::onSend, this));
 }
 
 BOOL LLFacebookStatusPanel::postBuild()
 {
-	mAccountCaptionLabel = getChild<LLTextBox>("account_caption_label");
-	mAccountNameLabel = getChild<LLTextBox>("account_name_label");
-	mPanelButtons = getChild<LLUICtrl>("panel_buttons");
-	mConnectButton = getChild<LLUICtrl>("connect_btn");
+	mAccountCaptionLabel = getChild<LLTextBox>("account_caption_label");
+	mAccountNameLabel = getChild<LLTextBox>("account_name_label");
+	mPanelButtons = getChild<LLUICtrl>("panel_buttons");
+	mConnectButton = getChild<LLUICtrl>("connect_btn");
 	mDisconnectButton = getChild<LLUICtrl>("disconnect_btn");
 
 	mMessageTextEditor = getChild<LLUICtrl>("status_message");
@@ -130,15 +130,15 @@ BOOL LLFacebookStatusPanel::postBuild()
 
 void LLFacebookStatusPanel::draw()
 {
-	LLFacebookConnect::EConnectionState connection_state = LLFacebookConnect::instance().getConnectionState();
-
-	//Disable the 'disconnect' button and the 'use another account' button when disconnecting in progress
-	bool disconnecting = connection_state == LLFacebookConnect::FB_DISCONNECTING;
-	mDisconnectButton->setEnabled(!disconnecting);
-
-	//Disable the 'connect' button when a connection is in progress
-	bool connecting = connection_state == LLFacebookConnect::FB_CONNECTION_IN_PROGRESS;
-	mConnectButton->setEnabled(!connecting);
+	LLFacebookConnect::EConnectionState connection_state = LLFacebookConnect::instance().getConnectionState();
+
+	//Disable the 'disconnect' button and the 'use another account' button when disconnecting in progress
+	bool disconnecting = connection_state == LLFacebookConnect::FB_DISCONNECTING;
+	mDisconnectButton->setEnabled(!disconnecting);
+
+	//Disable the 'connect' button when a connection is in progress
+	bool connecting = connection_state == LLFacebookConnect::FB_CONNECTION_IN_PROGRESS;
+	mConnectButton->setEnabled(!connecting);
 
     if (mMessageTextEditor && mPostButton && mCancelButton)
 	{
@@ -170,18 +170,18 @@ void LLFacebookStatusPanel::onSend()
 
 bool LLFacebookStatusPanel::onFacebookConnectStateChange(const LLSD& data)
 {
-	if(LLFacebookConnect::instance().isConnected())
-	{
-		//In process of disconnecting so leave the layout as is
-		if(data.get("enum").asInteger() != LLFacebookConnect::FB_DISCONNECTING)
-		{
-			showConnectedLayout();
-		}
-	}
-	else
-	{
-		showDisconnectedLayout();
-	}
+	if(LLFacebookConnect::instance().isConnected())
+	{
+		//In process of disconnecting so leave the layout as is
+		if(data.get("enum").asInteger() != LLFacebookConnect::FB_DISCONNECTING)
+		{
+			showConnectedLayout();
+		}
+	}
+	else
+	{
+		showDisconnectedLayout();
+	}
 
 	switch (data.get("enum").asInteger())
 	{
@@ -207,101 +207,101 @@ void LLFacebookStatusPanel::sendStatus()
 	}
 }
 
-void LLFacebookStatusPanel::onVisibilityChange(BOOL visible)
-{
-	if(visible)
-	{
-		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectStateChange, this, _1));
-
-		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectInfo").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectInfoChange, this));
-
-		//Connected
-		if(LLFacebookConnect::instance().isConnected())
-		{
-			showConnectedLayout();
-		}
-		//Check if connected (show disconnected layout in meantime)
-		else
-		{
-			showDisconnectedLayout();
-		}
-        if ((LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_NOT_CONNECTED) ||
-            (LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_CONNECTION_FAILED))
-        {
-            LLFacebookConnect::instance().checkConnectionToFacebook();
-        }
-	}
-	else
-	{
-		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
-	}
-}
-
-bool LLFacebookStatusPanel::onFacebookConnectInfoChange()
-{
-	LLSD info = LLFacebookConnect::instance().getInfo();
-	std::string clickable_name;
-
-	//Strings of format [http://www.somewebsite.com Click Me] become clickable text
-	if(info.has("link") && info.has("name"))
-	{
-		clickable_name = "[" + info["link"].asString() + " " + info["name"].asString() + "]";
-	}
-
-	mAccountNameLabel->setText(clickable_name);
-
-	return false;
-}
-
-void LLFacebookStatusPanel::showConnectButton()
-{
-	if(!mConnectButton->getVisible())
-	{
-		mConnectButton->setVisible(TRUE);
-		mDisconnectButton->setVisible(FALSE);
-	}
-}
-
-void LLFacebookStatusPanel::hideConnectButton()
-{
-	if(mConnectButton->getVisible())
-	{
-		mConnectButton->setVisible(FALSE);
-		mDisconnectButton->setVisible(TRUE);
-	}
-}
-
-void LLFacebookStatusPanel::showDisconnectedLayout()
-{
-	mAccountCaptionLabel->setText(getString("facebook_disconnected"));
-	mAccountNameLabel->setText(std::string(""));
-	showConnectButton();
-}
-
-void LLFacebookStatusPanel::showConnectedLayout()
-{
-	LLFacebookConnect::instance().loadFacebookInfo();
-
-	mAccountCaptionLabel->setText(getString("facebook_connected"));
-	hideConnectButton();
-}
-
-void LLFacebookStatusPanel::onConnect()
-{
-	LLFacebookConnect::instance().checkConnectionToFacebook(true);
-
-	//Clear only the facebook browser cookies so that the facebook login screen appears
-	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
-}
-
-void LLFacebookStatusPanel::onDisconnect()
-{
-	LLFacebookConnect::instance().disconnectFromFacebook();
-
-	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
+void LLFacebookStatusPanel::onVisibilityChange(BOOL visible)
+{
+	if(visible)
+	{
+		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
+		LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectStateChange, this, _1));
+
+		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
+		LLEventPumps::instance().obtain("FacebookConnectInfo").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectInfoChange, this));
+
+		//Connected
+		if(LLFacebookConnect::instance().isConnected())
+		{
+			showConnectedLayout();
+		}
+		//Check if connected (show disconnected layout in meantime)
+		else
+		{
+			showDisconnectedLayout();
+		}
+        if ((LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_NOT_CONNECTED) ||
+            (LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_CONNECTION_FAILED))
+        {
+            LLFacebookConnect::instance().checkConnectionToFacebook();
+        }
+	}
+	else
+	{
+		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
+		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
+	}
+}
+
+bool LLFacebookStatusPanel::onFacebookConnectInfoChange()
+{
+	LLSD info = LLFacebookConnect::instance().getInfo();
+	std::string clickable_name;
+
+	//Strings of format [http://www.somewebsite.com Click Me] become clickable text
+	if(info.has("link") && info.has("name"))
+	{
+		clickable_name = "[" + info["link"].asString() + " " + info["name"].asString() + "]";
+	}
+
+	mAccountNameLabel->setText(clickable_name);
+
+	return false;
+}
+
+void LLFacebookStatusPanel::showConnectButton()
+{
+	if(!mConnectButton->getVisible())
+	{
+		mConnectButton->setVisible(TRUE);
+		mDisconnectButton->setVisible(FALSE);
+	}
+}
+
+void LLFacebookStatusPanel::hideConnectButton()
+{
+	if(mConnectButton->getVisible())
+	{
+		mConnectButton->setVisible(FALSE);
+		mDisconnectButton->setVisible(TRUE);
+	}
+}
+
+void LLFacebookStatusPanel::showDisconnectedLayout()
+{
+	mAccountCaptionLabel->setText(getString("facebook_disconnected"));
+	mAccountNameLabel->setText(std::string(""));
+	showConnectButton();
+}
+
+void LLFacebookStatusPanel::showConnectedLayout()
+{
+	LLFacebookConnect::instance().loadFacebookInfo();
+
+	mAccountCaptionLabel->setText(getString("facebook_connected"));
+	hideConnectButton();
+}
+
+void LLFacebookStatusPanel::onConnect()
+{
+	LLFacebookConnect::instance().checkConnectionToFacebook(true);
+
+	//Clear only the facebook browser cookies so that the facebook login screen appears
+	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
+}
+
+void LLFacebookStatusPanel::onDisconnect()
+{
+	LLFacebookConnect::instance().disconnectFromFacebook();
+
+	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
 }
 
 void LLFacebookStatusPanel::clearAndClose()
diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h
index 86e3a148b9..f5a27dd5e7 100644
--- a/indra/newview/llfloaterfacebook.h
+++ b/indra/newview/llfloaterfacebook.h
@@ -51,21 +51,21 @@ public:
 	void clearAndClose();
 
 private:
-	void onVisibilityChange(BOOL new_visibility);
-	bool onFacebookConnectInfoChange();
-	void onConnect();
-	void onUseAnotherAccount();
-	void onDisconnect();
-
-	void showConnectButton();
-	void hideConnectButton();
-	void showDisconnectedLayout();
-	void showConnectedLayout();
-
-	LLTextBox * mAccountCaptionLabel;
-	LLTextBox * mAccountNameLabel;
-	LLUICtrl * mPanelButtons;
-	LLUICtrl * mConnectButton;
+	void onVisibilityChange(BOOL new_visibility);
+	bool onFacebookConnectInfoChange();
+	void onConnect();
+	void onUseAnotherAccount();
+	void onDisconnect();
+
+	void showConnectButton();
+	void hideConnectButton();
+	void showDisconnectedLayout();
+	void showConnectedLayout();
+
+	LLTextBox * mAccountCaptionLabel;
+	LLTextBox * mAccountNameLabel;
+	LLUICtrl * mPanelButtons;
+	LLUICtrl * mConnectButton;
 	LLUICtrl * mDisconnectButton;
 	LLUICtrl* mMessageTextEditor;
 	LLUICtrl* mPostButton;
-- 
cgit v1.2.3


From c43574dbb731f8a73c37f339c21bcffb1341b9a4 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 8 Aug 2014 19:07:21 +0200
Subject: STORM-2059: Removed: Useless 'Current Window' entry in resolution
 dropdown. We can go up to 512 only anyway.

---
 indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index 5782ba7d04..ea579c6dae 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -47,10 +47,6 @@
      name="texture_size_combo"
      right="-5"
      top_pad="5">
-        <combo_box.item
-         label="Current Window"
-         name="CurrentWindow"
-         value="[i0,i0]" />
         <combo_box.item
          label="Small (128x128)"
          name="Small(128x128)"
-- 
cgit v1.2.3


From ade715c7ea6f722cc7448c80f8a7689a171c60c8 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 8 Aug 2014 19:09:08 +0200
Subject: STORM-2057/2058/2061: Changed: Always update snapshot and thumbnail
 on every change. Making everything only show up the "need to refresh" message
 seems impossible with the current onIdle system of the preview other than
 making incredibly hacky stuff.

---
 indra/newview/llfloatersnapshot.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 2011afc124..97dcae8591 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -576,7 +576,7 @@ void LLFloaterSnapshot::Impl::onClickFilter(LLUICtrl *ctrl, void* data)
             LLComboBox* filterbox = static_cast<LLComboBox *>(view->getChild<LLComboBox>("filters_combobox"));
             std::string filter_name = (filterbox->getCurrentIndex() ? filterbox->getSimple() : "");
             previewp->setFilter(filter_name);
-            previewp->updateSnapshot(FALSE, TRUE);
+            previewp->updateSnapshot(TRUE);
         }
 	}
 }
@@ -825,12 +825,11 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 			// hide old preview as the aspect ratio could be wrong
 			checkAutoSnapshot(previewp, FALSE);
 			LL_DEBUGS() << "updating thumbnail" << LL_ENDL;
-			getPreviewView(view)->updateSnapshot(FALSE, TRUE);
+			getPreviewView(view)->updateSnapshot(TRUE);
 			if(do_update)
 			{
 				LL_DEBUGS() << "Will update controls" << LL_ENDL;
 				updateControls(view);
-				setNeedRefresh(view, true);
 			}
 		}
 	}
@@ -873,7 +872,6 @@ void LLFloaterSnapshot::Impl::onImageFormatChange(LLFloaterSnapshot* view)
 		LL_DEBUGS() << "image format changed, updating snapshot" << LL_ENDL;
 		getPreviewView(view)->updateSnapshot(TRUE);
 		updateControls(view);
-		setNeedRefresh(view, false); // we're refreshing
 	}
 }
 
@@ -951,8 +949,6 @@ void LLFloaterSnapshot::Impl::updateSpinners(LLFloaterSnapshot* view, LLSnapshot
 // static
 void LLFloaterSnapshot::Impl::applyCustomResolution(LLFloaterSnapshot* view, S32 w, S32 h)
 {
-	bool need_refresh = false;
-
 	LL_DEBUGS() << "applyCustomResolution(" << w << ", " << h << ")" << LL_ENDL;
 	if (!view) return;
 
@@ -970,20 +966,15 @@ void LLFloaterSnapshot::Impl::applyCustomResolution(LLFloaterSnapshot* view, S32
 			previewp->setSize(w,h);
 			checkAutoSnapshot(previewp, FALSE);
 			LL_DEBUGS() << "applied custom resolution, updating thumbnail" << LL_ENDL;
-			previewp->updateSnapshot(FALSE, TRUE);
+			previewp->updateSnapshot(TRUE);
 			comboSetCustom(view, "profile_size_combo");
 			comboSetCustom(view, "postcard_size_combo");
 			comboSetCustom(view, "texture_size_combo");
 			comboSetCustom(view, "local_size_combo");
-			need_refresh = true;
 		}
 	}
 
 	updateControls(view);
-	if (need_refresh)
-	{
-		setNeedRefresh(view, true); // need to do this after updateControls()
-	}
 }
 
 // static
@@ -1238,8 +1229,6 @@ S32 LLFloaterSnapshot::notify(const LLSD& info)
 	{
         // Disable the send/post/save buttons until snapshot is ready.
         impl.updateControls(this);
-        // Force hiding the "Refresh to save" hint because we know we've just started refresh.
-        impl.setNeedRefresh(this, false);
 		return 1;
 	}
 
-- 
cgit v1.2.3


From edc1a4efd379d64b2cfda0401800b9ebd0cbb54e Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 8 Aug 2014 20:54:01 +0200
Subject: STORM-2060: Fixed: Width/Height spinners resetting every time type a
 custom value while 'custom' is not set in the resolution dropdown.

---
 indra/newview/llfloatersnapshot.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 97dcae8591..beb06c4162 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -965,16 +965,14 @@ void LLFloaterSnapshot::Impl::applyCustomResolution(LLFloaterSnapshot* view, S32
 
 			previewp->setSize(w,h);
 			checkAutoSnapshot(previewp, FALSE);
-			LL_DEBUGS() << "applied custom resolution, updating thumbnail" << LL_ENDL;
-			previewp->updateSnapshot(TRUE);
 			comboSetCustom(view, "profile_size_combo");
 			comboSetCustom(view, "postcard_size_combo");
 			comboSetCustom(view, "texture_size_combo");
 			comboSetCustom(view, "local_size_combo");
+			LL_DEBUGS() << "applied custom resolution, updating thumbnail" << LL_ENDL;
+			previewp->updateSnapshot(TRUE);
 		}
 	}
-
-	updateControls(view);
 }
 
 // static
-- 
cgit v1.2.3


From aaf4428fad7796417934dbc9c6ccf2b01ab285d3 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 9 Aug 2014 02:14:01 +0200
Subject: STORM-2066: Fixed: Selecting a resolution dropdown bigger than the
 maximum window resolution with toggled "Show UI in Snapshot" freezes the
 Viewer.

---
 indra/newview/llfloatersnapshot.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index beb06c4162..f927b50092 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -758,6 +758,12 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 		S32 original_width = 0 , original_height = 0 ;
 		previewp->getSize(original_width, original_height) ;
 		
+		if (gSavedSettings.getBOOL("RenderUIInSnapshot") || gSavedSettings.getBOOL("RenderHUDInSnapshot"))
+		{ //clamp snapshot resolution to window size when showing UI or HUD in snapshot
+			width = llmin(width, gViewerWindow->getWindowWidthRaw());
+			height = llmin(height, gViewerWindow->getWindowHeightRaw());
+		}
+
 		if (width == 0 || height == 0)
 		{
 			// take resolution from current window size
@@ -803,12 +809,6 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 		checkAspectRatio(view, width) ;
 
 		previewp->getSize(width, height);
-	
-		if (gSavedSettings.getBOOL("RenderUIInSnapshot") || gSavedSettings.getBOOL("RenderHUDInSnapshot"))
-		{ //clamp snapshot resolution to window size when showing UI or HUD in snapshot
-			width = llmin(width, gViewerWindow->getWindowWidthRaw());
-			height = llmin(height, gViewerWindow->getWindowHeightRaw());
-		}
 
 		updateSpinners(view, previewp, width, height, TRUE); // may change width and height
 		
-- 
cgit v1.2.3


From beb471287eb0dfad55866209bc294f628b58d658 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 9 Aug 2014 02:21:17 +0200
Subject: STORM-2065: Added: 'Scanlines' filter, we now got a 'Video' one for
 that poorly recorded bright video style and one that looks like only
 scanlines were added.

---
 indra/newview/app_settings/filters/Scanlines.xml | 41 ++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 indra/newview/app_settings/filters/Scanlines.xml

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/filters/Scanlines.xml b/indra/newview/app_settings/filters/Scanlines.xml
new file mode 100644
index 0000000000..9f0c3ac318
--- /dev/null
+++ b/indra/newview/app_settings/filters/Scanlines.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <array>
+        <array>
+            <string>linearize</string>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>saturate</string>
+            <real>2.0</real>
+        </array>
+        <array>
+            <string>stencil</string>
+            <string>uniform</string>
+            <string>blend</string>
+            <real>0.0</real>
+            <real>0.5</real>
+        </array>
+        <array>
+            <string>screen</string>
+            <string>line</string>
+            <real>0.02</real>
+            <real>0.02</real>
+        </array>
+        <array>
+            <string>gamma</string>
+            <real>1.75</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>blur</string>
+        </array>
+        <array>
+            <string>blur</string>
+        </array>
+    </array>
+</llsd>
-- 
cgit v1.2.3


From acf278cea1b3f71a2c548798b106e1959b7c485d Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 9 Aug 2014 02:29:23 +0200
Subject: STORM-2063: Fixed: Resolution text appearing for a brief moment when
 updating the controls while the preview is hidden.

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 4b8f4c8fed..8451814c47 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -420,10 +420,11 @@
     type="string"
     font="SansSerifSmall"
     length="1"
-    follows="left|top"
+    follows="left|top|right"
     height="14"
     layout="topleft"
-    left_delta="5"
+    left="220"
+	right="-20"
     halign="left"
     name="image_res_text"
     top_delta="5"
-- 
cgit v1.2.3


From 0762c71bbe006d48de767a119c9b238f552b11b4 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 9 Aug 2014 02:31:47 +0200
Subject: STORM-2064: Changed: Made background of status text invisible.

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 8451814c47..c0907d6031 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -326,8 +326,7 @@
           </text>
       </panel>
       <panel
-       background_visible="true"
-       bg_alpha_color="0 0 0 0.25"
+       background_visible="false"
        follows="left|top"
        font="SansSerifLarge"
        halign="center"
-- 
cgit v1.2.3


From afc6f271a67a8e012de86844be51d6de646f43f7 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sun, 10 Aug 2014 21:14:16 +0200
Subject: STORM-2064: Changed: 'Scanlines' filter to a original picture like
 look with scanlines.

---
 indra/newview/app_settings/filters/Scanlines.xml | 25 +++++++-----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/filters/Scanlines.xml b/indra/newview/app_settings/filters/Scanlines.xml
index 9f0c3ac318..e9ba2889fa 100644
--- a/indra/newview/app_settings/filters/Scanlines.xml
+++ b/indra/newview/app_settings/filters/Scanlines.xml
@@ -7,26 +7,18 @@
             <real>1.0</real>
             <real>1.0</real>
         </array>
-        <array>
-            <string>saturate</string>
-            <real>2.0</real>
-        </array>
         <array>
             <string>stencil</string>
-            <string>uniform</string>
-            <string>blend</string>
+            <string>scanlines</string>
+            <string>add-back</string>
             <real>0.0</real>
-            <real>0.5</real>
-        </array>
-        <array>
-            <string>screen</string>
-            <string>line</string>
-            <real>0.02</real>
-            <real>0.02</real>
+            <real>1.0</real>
+            <real>0.015</real>
+            <real>0</real>
         </array>
         <array>
             <string>gamma</string>
-            <real>1.75</real>
+            <real>0.5</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -34,8 +26,5 @@
         <array>
             <string>blur</string>
         </array>
-        <array>
-            <string>blur</string>
-        </array>
     </array>
-</llsd>
+</llsd>
\ No newline at end of file
-- 
cgit v1.2.3


From 8b51aa1f646658669857638eb4050518f95b2fc2 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sun, 10 Aug 2014 21:16:22 +0200
Subject: Changed: 'Black and White' filter to proper b&w only. No corrections,
 just plain greyscale.

---
 indra/newview/app_settings/filters/BlackAndWhite.xml | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/filters/BlackAndWhite.xml b/indra/newview/app_settings/filters/BlackAndWhite.xml
index 101ed8233a..7894628d29 100644
--- a/indra/newview/app_settings/filters/BlackAndWhite.xml
+++ b/indra/newview/app_settings/filters/BlackAndWhite.xml
@@ -1,19 +1,5 @@
 <llsd>
     <array>
-        <array>
-            <string>linearize</string>
-            <real>0.01</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>contrast</string>
-            <real>0.8</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
         <array>
             <string>grayscale</string>
         </array>
-- 
cgit v1.2.3


From 31519b6fed053174a96413c5cfc763e55b059a9b Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sun, 10 Aug 2014 21:16:44 +0200
Subject: Changed: 'Sepia' filter to proper sepia only. No corrections, just
 plain sepia colors.

---
 indra/newview/app_settings/filters/Sepia.xml | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/filters/Sepia.xml b/indra/newview/app_settings/filters/Sepia.xml
index 3d577b2998..81d7caf0eb 100644
--- a/indra/newview/app_settings/filters/Sepia.xml
+++ b/indra/newview/app_settings/filters/Sepia.xml
@@ -1,30 +1,5 @@
 <llsd>
     <array>
-        <array>
-            <string>linearize</string>
-            <real>0.01</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>contrast</string>
-            <real>0.8</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>stencil</string>
-            <string>vignette</string>
-            <string>fade</string>
-            <real>0.5</real>
-            <real>1.0</real>
-            <real>0.0</real>
-            <real>0.0</real>
-            <real>1.0</real>
-            <real>4.0</real>
-        </array>
         <array>
             <string>sepia</string>
         </array>
-- 
cgit v1.2.3


From 2d316dff3dda88e12ee64b33e22682f24c7ef4fa Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 12 Aug 2014 15:41:24 -0400
Subject: Remove old Windows updater executable from source tree and CMake.

---
 indra/newview/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 3e296c8d9f..b1625ca1d7 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1765,7 +1765,6 @@ if (WINDOWS)
       media_plugin_webkit
       winmm_shim
       windows-crash-logger
-      windows-updater
       )
 
     if (FMODEX)
@@ -1811,7 +1810,6 @@ if (WINDOWS)
 
     add_dependencies(${VIEWER_BINARY_NAME}
       SLPlugin
-      windows-updater
       windows-crash-logger
       )
 
-- 
cgit v1.2.3


From c8e90833207674515a545a4cf539bc9d78236ad2 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Thu, 14 Aug 2014 03:21:58 +0200
Subject: BUG-6958: Fixed: Snapshot position is always <0,0,0>. onIdle isn't
 called as much as they thought it is, it's only called when "Auto refresh" is
 on but not on normal manual snapshot refreshes.

---
 indra/newview/llsnapshotlivepreview.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index 8ad9ca000c..1aa7041175 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -195,6 +195,8 @@ void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail
 		mSnapshotDelayTimer.start();
 		mSnapshotDelayTimer.setTimerExpirySec(delay);
         
+		mPosTakenGlobal = gAgentCamera.getCameraPositionGlobal();
+
         // Tell the floater container that the snapshot is in the process of updating itself
         if (mViewContainer)
         {
@@ -760,7 +762,6 @@ BOOL LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                     curr_preview_image->setFilteringOption(previewp->getSnapshotType() == SNAPSHOT_TEXTURE ? LLTexUnit::TFO_ANISOTROPIC : LLTexUnit::TFO_POINT);
                     curr_preview_image->setAddressMode(LLTexUnit::TAM_CLAMP);
 
-                    previewp->mPosTakenGlobal = gAgentCamera.getCameraPositionGlobal();
                     previewp->mShineCountdown = 4; // wait a few frames to avoid animation glitch due to readback this frame
                 }
             }
-- 
cgit v1.2.3


From ea79b23e85a4e526b222582a585a55d490724e87 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Thu, 14 Aug 2014 03:36:28 +0200
Subject: STORM-2064: Changed: Made background of status text invisible. #2

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index c0907d6031..f0a175902b 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -294,8 +294,7 @@
          width="199"
          top_pad="-16"/>
 	<panel
-       background_visible="true"
-       bg_alpha_color="0 0 0 0.25"
+       background_visible="false"
        follows="left|top"
        font="SansSerifLarge"
        halign="center"
-- 
cgit v1.2.3


From e8d3a37f91296f1551b53ce5d5c26333fe2e2666 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 15 Aug 2014 18:35:00 +0200
Subject: BUG-7020: Fixed: Snapshot floater being resized while it's minimized.

---
 indra/newview/llfloatersnapshot.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index f927b50092..55dfad37d8 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -287,7 +287,10 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
 	thumbnail_placeholder->reshape(panel_width, thumbnail_placeholder->getRect().getHeight());
 	floaterp->getChild<LLUICtrl>("image_res_text")->setVisible(advanced);
 	floaterp->getChild<LLUICtrl>("file_size_label")->setVisible(advanced);
-	floaterp->reshape(floater_width, floaterp->getRect().getHeight());
+	if(!floaterp->isMinimized())
+	{
+		floaterp->reshape(floater_width, floaterp->getRect().getHeight());
+	}
 
 	bool use_freeze_frame = floaterp->getChild<LLUICtrl>("freeze_frame_check")->getValue().asBoolean();
 
-- 
cgit v1.2.3


From e11451fc1d543759d397ecaa4cac7b720cc26506 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 15 Aug 2014 18:36:30 +0200
Subject: STORM-2060: Fixed: Height spinner not being detected as first
 changed.

---
 indra/newview/llfloatersnapshot.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 55dfad37d8..3f9243381c 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -813,7 +813,16 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 
 		previewp->getSize(width, height);
 
-		updateSpinners(view, previewp, width, height, TRUE); // may change width and height
+		bool width_changed;
+		if(original_width != width)
+		{
+			width_changed = TRUE;
+		}
+		else
+		{
+			width_changed = FALSE;
+		}
+		updateSpinners(view, previewp, width, height, width_changed); // may change width and height
 		
 		if(getWidthSpinner(view)->getValue().asInteger() != width || getHeightSpinner(view)->getValue().asInteger() != height)
 		{
-- 
cgit v1.2.3


From 0d46af3d38eeeb295c0b12393668755871042661 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 15 Aug 2014 18:42:17 +0200
Subject: STORM-2064: Changed: Renamed 'Scanlines' filter to 'Video' and
 removed the old 'Video' one.

---
 indra/newview/app_settings/filters/Scanlines.xml | 30 ------------------------
 indra/newview/app_settings/filters/Video.xml     | 23 +++++++-----------
 2 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 indra/newview/app_settings/filters/Scanlines.xml

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/filters/Scanlines.xml b/indra/newview/app_settings/filters/Scanlines.xml
deleted file mode 100644
index e9ba2889fa..0000000000
--- a/indra/newview/app_settings/filters/Scanlines.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<llsd>
-    <array>
-        <array>
-            <string>linearize</string>
-            <real>0.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>stencil</string>
-            <string>scanlines</string>
-            <string>add-back</string>
-            <real>0.0</real>
-            <real>1.0</real>
-            <real>0.015</real>
-            <real>0</real>
-        </array>
-        <array>
-            <string>gamma</string>
-            <real>0.5</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>blur</string>
-        </array>
-    </array>
-</llsd>
\ No newline at end of file
diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml
index fe17f3950a..441a506d40 100755
--- a/indra/newview/app_settings/filters/Video.xml
+++ b/indra/newview/app_settings/filters/Video.xml
@@ -9,27 +9,23 @@
         </array>
         <array>
             <string>darken</string>
-            <real>0.15</real>
+            <real>0.05</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
         </array>
         <array>
             <string>stencil</string>
-            <string>uniform</string>
-            <string>add</string>
-            <real>0.0</real>
-            <real>0.5</real>
-        </array>
-        <array>
-            <string>screen</string>
-            <string>line</string>
-            <real>0.02</real>
+            <string>scanlines</string>
+            <string>add-back</string>
             <real>0.0</real>
+            <real>0.25</real>
+            <real>0.025</real>
+            <real>0</real>
         </array>
         <array>
             <string>gamma</string>
-            <real>0.25</real>
+            <real>0.0</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -37,8 +33,5 @@
         <array>
             <string>blur</string>
         </array>
-        <array>
-            <string>blur</string>
-        </array>
     </array>
-</llsd>
+</llsd>
\ No newline at end of file
-- 
cgit v1.2.3


From 2605ad9c01355ffc2b45b3d0ec74c4da451423f6 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 15 Aug 2014 21:25:31 +0200
Subject: STORM-2064: Changed: Reverted previous changes since Merov has
 clarified that it is intended behavior.

---
 indra/newview/app_settings/filters/Video.xml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml
index 441a506d40..fe17f3950a 100755
--- a/indra/newview/app_settings/filters/Video.xml
+++ b/indra/newview/app_settings/filters/Video.xml
@@ -9,23 +9,27 @@
         </array>
         <array>
             <string>darken</string>
-            <real>0.05</real>
+            <real>0.15</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
         </array>
         <array>
             <string>stencil</string>
-            <string>scanlines</string>
-            <string>add-back</string>
+            <string>uniform</string>
+            <string>add</string>
             <real>0.0</real>
-            <real>0.25</real>
-            <real>0.025</real>
-            <real>0</real>
+            <real>0.5</real>
         </array>
         <array>
-            <string>gamma</string>
+            <string>screen</string>
+            <string>line</string>
+            <real>0.02</real>
             <real>0.0</real>
+        </array>
+        <array>
+            <string>gamma</string>
+            <real>0.25</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -33,5 +37,8 @@
         <array>
             <string>blur</string>
         </array>
+        <array>
+            <string>blur</string>
+        </array>
     </array>
-</llsd>
\ No newline at end of file
+</llsd>
-- 
cgit v1.2.3


From 2b66eeb4a61235fae4c29ecd98890b8b47badafe Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 20 Aug 2014 01:38:50 +0200
Subject: STORM-2073: Fixed: Do not post our status if we press the "Connect"
 button otherwise we end up double posting.

---
 indra/newview/llfloaterfacebook.cpp | 7 +++++--
 indra/newview/llfloaterfacebook.h   | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp
index 516cf5c15c..d8cc070fd0 100644
--- a/indra/newview/llfloaterfacebook.cpp
+++ b/indra/newview/llfloaterfacebook.cpp
@@ -156,7 +156,8 @@ void LLFacebookStatusPanel::onSend()
 {
 	LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookStatusPanel"); // just in case it is already listening
 	LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookStatusPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectStateChange, this, _1));
-		
+	
+	pressedConnect = FALSE;
 	// Connect to Facebook if necessary and then post
 	if (LLFacebookConnect::instance().isConnected())
 	{
@@ -186,7 +187,8 @@ bool LLFacebookStatusPanel::onFacebookConnectStateChange(const LLSD& data)
 	switch (data.get("enum").asInteger())
 	{
 		case LLFacebookConnect::FB_CONNECTED:
-			sendStatus();
+			if(!pressedConnect)
+				sendStatus();
 			break;
 
 		case LLFacebookConnect::FB_POSTED:
@@ -293,6 +295,7 @@ void LLFacebookStatusPanel::onConnect()
 {
 	LLFacebookConnect::instance().checkConnectionToFacebook(true);
 
+	pressedConnect = TRUE;
 	//Clear only the facebook browser cookies so that the facebook login screen appears
 	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
 }
diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h
index 86e3a148b9..e1526db18d 100644
--- a/indra/newview/llfloaterfacebook.h
+++ b/indra/newview/llfloaterfacebook.h
@@ -62,6 +62,8 @@ private:
 	void showDisconnectedLayout();
 	void showConnectedLayout();
 
+	bool pressedConnect;
+
 	LLTextBox * mAccountCaptionLabel;
 	LLTextBox * mAccountNameLabel;
 	LLUICtrl * mPanelButtons;
-- 
cgit v1.2.3


From 5bdf2a0cda79e7cf67818489e8d3a86232863758 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 20 Aug 2014 04:06:15 +0200
Subject: STORM-2060/STORM-2076: Fixed: Whole detection logic not working
 because of reasons i cannot seem to understand in this hypercube like
 snapshot floater.

---
 indra/newview/llfloatersnapshot.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 3f9243381c..31b743b7e8 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -814,13 +814,13 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 		previewp->getSize(width, height);
 
 		bool width_changed;
-		if(original_width != width)
+		if(getHeightSpinner(view)->isDirty())
 		{
-			width_changed = TRUE;
+			width_changed = FALSE;
 		}
 		else
 		{
-			width_changed = FALSE;
+			width_changed = TRUE;
 		}
 		updateSpinners(view, previewp, width, height, width_changed); // may change width and height
 		
@@ -952,6 +952,8 @@ void LLFloaterSnapshot::Impl::setImageSizeSpinnersValues(LLFloaterSnapshot *view
 // static
 void LLFloaterSnapshot::Impl::updateSpinners(LLFloaterSnapshot* view, LLSnapshotLivePreview* previewp, S32& width, S32& height, BOOL is_width_changed)
 {
+	getWidthSpinner(view)->resetDirty();
+	getHeightSpinner(view)->resetDirty();
 	if (checkImageSize(previewp, width, height, is_width_changed, previewp->getMaxImageSize()))
 	{
 		setImageSizeSpinnersValues(view, width, height);
-- 
cgit v1.2.3


From 417362e9d8555b77c8510430e2a4b3e8901be2b3 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 20 Aug 2014 16:04:50 +0200
Subject: STORM-2060/STORM-2076: Changed: Code to a more appropiate, shorter
 version. Thanks Oz.

---
 indra/newview/llfloatersnapshot.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 31b743b7e8..8037c22173 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -813,16 +813,7 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 
 		previewp->getSize(width, height);
 
-		bool width_changed;
-		if(getHeightSpinner(view)->isDirty())
-		{
-			width_changed = FALSE;
-		}
-		else
-		{
-			width_changed = TRUE;
-		}
-		updateSpinners(view, previewp, width, height, width_changed); // may change width and height
+		updateSpinners(view, previewp, width, height, !getHeightSpinner(view)->isDirty()); // may change width and height
 		
 		if(getWidthSpinner(view)->getValue().asInteger() != width || getHeightSpinner(view)->getValue().asInteger() != height)
 		{
-- 
cgit v1.2.3


From 7e5ede1678ef6b167602b3d8d0660c5e89e319f5 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 20 Aug 2014 16:56:18 +0200
Subject: STORM-2060/STORM-2076: Added: Commenting to explain why we use the
 height spinner instead of the width one.

---
 indra/newview/llfloatersnapshot.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 8037c22173..8677028942 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -1,4 +1,4 @@
-/** 
+/** 
  * @file llfloatersnapshot.cpp
  * @brief Snapshot preview window, allowing saving, e-mailing, etc.
  *
@@ -813,6 +813,10 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 
 		previewp->getSize(width, height);
 
+		// We use the height spinner here because we come here via the aspect ratio
+		// checkbox as well and we want height always changing to width by default.
+		// If we use the width spinner we would change width according to height by
+		// default, that is not what we want.
 		updateSpinners(view, previewp, width, height, !getHeightSpinner(view)->isDirty()); // may change width and height
 		
 		if(getWidthSpinner(view)->getValue().asInteger() != width || getHeightSpinner(view)->getValue().asInteger() != height)
-- 
cgit v1.2.3


From 0a134e749d01b711ca38a91044efb787cd815701 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 20 Aug 2014 16:57:30 +0200
Subject: Fixed: Line endings.

---
 indra/newview/llfloaterfacebook.cpp | 260 ++++++++++++++++++------------------
 indra/newview/llfloaterfacebook.h   |  34 ++---
 2 files changed, 147 insertions(+), 147 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp
index d8cc070fd0..33422fb5fd 100644
--- a/indra/newview/llfloaterfacebook.cpp
+++ b/indra/newview/llfloaterfacebook.cpp
@@ -98,27 +98,27 @@ S32 compute_jpeg_quality(S32 width, S32 height)
 LLFacebookStatusPanel::LLFacebookStatusPanel() :
 	mMessageTextEditor(NULL),
 	mPostButton(NULL),
-    mCancelButton(NULL),
-	mAccountCaptionLabel(NULL),
-	mAccountNameLabel(NULL),
-	mPanelButtons(NULL),
-	mConnectButton(NULL),
+    mCancelButton(NULL),
+	mAccountCaptionLabel(NULL),
+	mAccountNameLabel(NULL),
+	mPanelButtons(NULL),
+	mConnectButton(NULL),
 	mDisconnectButton(NULL)
 {
-	mCommitCallbackRegistrar.add("SocialSharing.Connect", boost::bind(&LLFacebookStatusPanel::onConnect, this));
-	mCommitCallbackRegistrar.add("SocialSharing.Disconnect", boost::bind(&LLFacebookStatusPanel::onDisconnect, this));
-
-	setVisibleCallback(boost::bind(&LLFacebookStatusPanel::onVisibilityChange, this, _2));
+	mCommitCallbackRegistrar.add("SocialSharing.Connect", boost::bind(&LLFacebookStatusPanel::onConnect, this));
+	mCommitCallbackRegistrar.add("SocialSharing.Disconnect", boost::bind(&LLFacebookStatusPanel::onDisconnect, this));
+
+	setVisibleCallback(boost::bind(&LLFacebookStatusPanel::onVisibilityChange, this, _2));
 
 	mCommitCallbackRegistrar.add("SocialSharing.SendStatus", boost::bind(&LLFacebookStatusPanel::onSend, this));
 }
 
 BOOL LLFacebookStatusPanel::postBuild()
 {
-	mAccountCaptionLabel = getChild<LLTextBox>("account_caption_label");
-	mAccountNameLabel = getChild<LLTextBox>("account_name_label");
-	mPanelButtons = getChild<LLUICtrl>("panel_buttons");
-	mConnectButton = getChild<LLUICtrl>("connect_btn");
+	mAccountCaptionLabel = getChild<LLTextBox>("account_caption_label");
+	mAccountNameLabel = getChild<LLTextBox>("account_name_label");
+	mPanelButtons = getChild<LLUICtrl>("panel_buttons");
+	mConnectButton = getChild<LLUICtrl>("connect_btn");
 	mDisconnectButton = getChild<LLUICtrl>("disconnect_btn");
 
 	mMessageTextEditor = getChild<LLUICtrl>("status_message");
@@ -130,15 +130,15 @@ BOOL LLFacebookStatusPanel::postBuild()
 
 void LLFacebookStatusPanel::draw()
 {
-	LLFacebookConnect::EConnectionState connection_state = LLFacebookConnect::instance().getConnectionState();
-
-	//Disable the 'disconnect' button and the 'use another account' button when disconnecting in progress
-	bool disconnecting = connection_state == LLFacebookConnect::FB_DISCONNECTING;
-	mDisconnectButton->setEnabled(!disconnecting);
-
-	//Disable the 'connect' button when a connection is in progress
-	bool connecting = connection_state == LLFacebookConnect::FB_CONNECTION_IN_PROGRESS;
-	mConnectButton->setEnabled(!connecting);
+	LLFacebookConnect::EConnectionState connection_state = LLFacebookConnect::instance().getConnectionState();
+
+	//Disable the 'disconnect' button and the 'use another account' button when disconnecting in progress
+	bool disconnecting = connection_state == LLFacebookConnect::FB_DISCONNECTING;
+	mDisconnectButton->setEnabled(!disconnecting);
+
+	//Disable the 'connect' button when a connection is in progress
+	bool connecting = connection_state == LLFacebookConnect::FB_CONNECTION_IN_PROGRESS;
+	mConnectButton->setEnabled(!connecting);
 
     if (mMessageTextEditor && mPostButton && mCancelButton)
 	{
@@ -171,18 +171,18 @@ void LLFacebookStatusPanel::onSend()
 
 bool LLFacebookStatusPanel::onFacebookConnectStateChange(const LLSD& data)
 {
-	if(LLFacebookConnect::instance().isConnected())
-	{
-		//In process of disconnecting so leave the layout as is
-		if(data.get("enum").asInteger() != LLFacebookConnect::FB_DISCONNECTING)
-		{
-			showConnectedLayout();
-		}
-	}
-	else
-	{
-		showDisconnectedLayout();
-	}
+	if(LLFacebookConnect::instance().isConnected())
+	{
+		//In process of disconnecting so leave the layout as is
+		if(data.get("enum").asInteger() != LLFacebookConnect::FB_DISCONNECTING)
+		{
+			showConnectedLayout();
+		}
+	}
+	else
+	{
+		showDisconnectedLayout();
+	}
 
 	switch (data.get("enum").asInteger())
 	{
@@ -209,102 +209,102 @@ void LLFacebookStatusPanel::sendStatus()
 	}
 }
 
-void LLFacebookStatusPanel::onVisibilityChange(BOOL visible)
-{
-	if(visible)
-	{
-		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectStateChange, this, _1));
-
-		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectInfo").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectInfoChange, this));
-
-		//Connected
-		if(LLFacebookConnect::instance().isConnected())
-		{
-			showConnectedLayout();
-		}
-		//Check if connected (show disconnected layout in meantime)
-		else
-		{
-			showDisconnectedLayout();
-		}
-        if ((LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_NOT_CONNECTED) ||
-            (LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_CONNECTION_FAILED))
-        {
-            LLFacebookConnect::instance().checkConnectionToFacebook();
-        }
-	}
-	else
-	{
-		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
-	}
-}
-
-bool LLFacebookStatusPanel::onFacebookConnectInfoChange()
-{
-	LLSD info = LLFacebookConnect::instance().getInfo();
-	std::string clickable_name;
-
-	//Strings of format [http://www.somewebsite.com Click Me] become clickable text
-	if(info.has("link") && info.has("name"))
-	{
-		clickable_name = "[" + info["link"].asString() + " " + info["name"].asString() + "]";
-	}
-
-	mAccountNameLabel->setText(clickable_name);
-
-	return false;
-}
-
-void LLFacebookStatusPanel::showConnectButton()
-{
-	if(!mConnectButton->getVisible())
-	{
-		mConnectButton->setVisible(TRUE);
-		mDisconnectButton->setVisible(FALSE);
-	}
-}
-
-void LLFacebookStatusPanel::hideConnectButton()
-{
-	if(mConnectButton->getVisible())
-	{
-		mConnectButton->setVisible(FALSE);
-		mDisconnectButton->setVisible(TRUE);
-	}
-}
-
-void LLFacebookStatusPanel::showDisconnectedLayout()
-{
-	mAccountCaptionLabel->setText(getString("facebook_disconnected"));
-	mAccountNameLabel->setText(std::string(""));
-	showConnectButton();
-}
-
-void LLFacebookStatusPanel::showConnectedLayout()
-{
-	LLFacebookConnect::instance().loadFacebookInfo();
-
-	mAccountCaptionLabel->setText(getString("facebook_connected"));
-	hideConnectButton();
-}
-
-void LLFacebookStatusPanel::onConnect()
-{
-	LLFacebookConnect::instance().checkConnectionToFacebook(true);
-
-	pressedConnect = TRUE;
-	//Clear only the facebook browser cookies so that the facebook login screen appears
-	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
-}
-
-void LLFacebookStatusPanel::onDisconnect()
-{
-	LLFacebookConnect::instance().disconnectFromFacebook();
-
-	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
+void LLFacebookStatusPanel::onVisibilityChange(BOOL visible)
+{
+	if(visible)
+	{
+		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
+		LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectStateChange, this, _1));
+
+		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
+		LLEventPumps::instance().obtain("FacebookConnectInfo").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectInfoChange, this));
+
+		//Connected
+		if(LLFacebookConnect::instance().isConnected())
+		{
+			showConnectedLayout();
+		}
+		//Check if connected (show disconnected layout in meantime)
+		else
+		{
+			showDisconnectedLayout();
+		}
+        if ((LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_NOT_CONNECTED) ||
+            (LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_CONNECTION_FAILED))
+        {
+            LLFacebookConnect::instance().checkConnectionToFacebook();
+        }
+	}
+	else
+	{
+		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
+		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
+	}
+}
+
+bool LLFacebookStatusPanel::onFacebookConnectInfoChange()
+{
+	LLSD info = LLFacebookConnect::instance().getInfo();
+	std::string clickable_name;
+
+	//Strings of format [http://www.somewebsite.com Click Me] become clickable text
+	if(info.has("link") && info.has("name"))
+	{
+		clickable_name = "[" + info["link"].asString() + " " + info["name"].asString() + "]";
+	}
+
+	mAccountNameLabel->setText(clickable_name);
+
+	return false;
+}
+
+void LLFacebookStatusPanel::showConnectButton()
+{
+	if(!mConnectButton->getVisible())
+	{
+		mConnectButton->setVisible(TRUE);
+		mDisconnectButton->setVisible(FALSE);
+	}
+}
+
+void LLFacebookStatusPanel::hideConnectButton()
+{
+	if(mConnectButton->getVisible())
+	{
+		mConnectButton->setVisible(FALSE);
+		mDisconnectButton->setVisible(TRUE);
+	}
+}
+
+void LLFacebookStatusPanel::showDisconnectedLayout()
+{
+	mAccountCaptionLabel->setText(getString("facebook_disconnected"));
+	mAccountNameLabel->setText(std::string(""));
+	showConnectButton();
+}
+
+void LLFacebookStatusPanel::showConnectedLayout()
+{
+	LLFacebookConnect::instance().loadFacebookInfo();
+
+	mAccountCaptionLabel->setText(getString("facebook_connected"));
+	hideConnectButton();
+}
+
+void LLFacebookStatusPanel::onConnect()
+{
+	LLFacebookConnect::instance().checkConnectionToFacebook(true);
+
+	pressedConnect = TRUE;
+	//Clear only the facebook browser cookies so that the facebook login screen appears
+	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
+}
+
+void LLFacebookStatusPanel::onDisconnect()
+{
+	LLFacebookConnect::instance().disconnectFromFacebook();
+
+	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
 }
 
 void LLFacebookStatusPanel::clearAndClose()
diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h
index e1526db18d..6fe7a6541b 100644
--- a/indra/newview/llfloaterfacebook.h
+++ b/indra/newview/llfloaterfacebook.h
@@ -51,23 +51,23 @@ public:
 	void clearAndClose();
 
 private:
-	void onVisibilityChange(BOOL new_visibility);
-	bool onFacebookConnectInfoChange();
-	void onConnect();
-	void onUseAnotherAccount();
-	void onDisconnect();
-
-	void showConnectButton();
-	void hideConnectButton();
-	void showDisconnectedLayout();
-	void showConnectedLayout();
-
-	bool pressedConnect;
-
-	LLTextBox * mAccountCaptionLabel;
-	LLTextBox * mAccountNameLabel;
-	LLUICtrl * mPanelButtons;
-	LLUICtrl * mConnectButton;
+	void onVisibilityChange(BOOL new_visibility);
+	bool onFacebookConnectInfoChange();
+	void onConnect();
+	void onUseAnotherAccount();
+	void onDisconnect();
+
+	void showConnectButton();
+	void hideConnectButton();
+	void showDisconnectedLayout();
+	void showConnectedLayout();
+
+	bool pressedConnect;
+
+	LLTextBox * mAccountCaptionLabel;
+	LLTextBox * mAccountNameLabel;
+	LLUICtrl * mPanelButtons;
+	LLUICtrl * mConnectButton;
 	LLUICtrl * mDisconnectButton;
 	LLUICtrl* mMessageTextEditor;
 	LLUICtrl* mPostButton;
-- 
cgit v1.2.3


From ed29df03092092247d2743fe1c0ec9e501c4da28 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Tue, 26 Aug 2014 21:04:54 +0200
Subject: STORM-2073: Fixed: Double post when clicking "Post" while not logged
 in. Makes the previous double post for "Connect" obselete.

---
 indra/newview/llfloaterfacebook.cpp | 34 ++++++++++++++++++----------------
 indra/newview/llfloaterfacebook.h   |  3 +--
 2 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp
index 33422fb5fd..6888e076aa 100644
--- a/indra/newview/llfloaterfacebook.cpp
+++ b/indra/newview/llfloaterfacebook.cpp
@@ -157,7 +157,6 @@ void LLFacebookStatusPanel::onSend()
 	LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookStatusPanel"); // just in case it is already listening
 	LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookStatusPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectStateChange, this, _1));
 	
-	pressedConnect = FALSE;
 	// Connect to Facebook if necessary and then post
 	if (LLFacebookConnect::instance().isConnected())
 	{
@@ -170,6 +169,23 @@ void LLFacebookStatusPanel::onSend()
 }
 
 bool LLFacebookStatusPanel::onFacebookConnectStateChange(const LLSD& data)
+{
+	switch (data.get("enum").asInteger())
+	{
+		case LLFacebookConnect::FB_CONNECTED:
+			sendStatus();
+			break;
+
+		case LLFacebookConnect::FB_POSTED:
+			LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookStatusPanel");
+			clearAndClose();
+			break;
+	}
+
+	return false;
+}
+
+bool LLFacebookStatusPanel::onFacebookConnectAccountStateChange(const LLSD& data)
 {
 	if(LLFacebookConnect::instance().isConnected())
 	{
@@ -184,19 +200,6 @@ bool LLFacebookStatusPanel::onFacebookConnectStateChange(const LLSD& data)
 		showDisconnectedLayout();
 	}
 
-	switch (data.get("enum").asInteger())
-	{
-		case LLFacebookConnect::FB_CONNECTED:
-			if(!pressedConnect)
-				sendStatus();
-			break;
-
-		case LLFacebookConnect::FB_POSTED:
-			LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookStatusPanel");
-			clearAndClose();
-			break;
-	}
-
 	return false;
 }
 
@@ -214,7 +217,7 @@ void LLFacebookStatusPanel::onVisibilityChange(BOOL visible)
 	if(visible)
 	{
 		LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel");
-		LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectStateChange, this, _1));
+		LLEventPumps::instance().obtain("FacebookConnectState").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectAccountStateChange, this, _1));
 
 		LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLFacebookAccountPanel");
 		LLEventPumps::instance().obtain("FacebookConnectInfo").listen("LLFacebookAccountPanel", boost::bind(&LLFacebookStatusPanel::onFacebookConnectInfoChange, this));
@@ -295,7 +298,6 @@ void LLFacebookStatusPanel::onConnect()
 {
 	LLFacebookConnect::instance().checkConnectionToFacebook(true);
 
-	pressedConnect = TRUE;
 	//Clear only the facebook browser cookies so that the facebook login screen appears
 	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); 
 }
diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h
index 6fe7a6541b..a4ca666b20 100644
--- a/indra/newview/llfloaterfacebook.h
+++ b/indra/newview/llfloaterfacebook.h
@@ -46,6 +46,7 @@ public:
 	void draw();
     void onSend();
 	bool onFacebookConnectStateChange(const LLSD& data);
+	bool onFacebookConnectAccountStateChange(const LLSD& data);
 
 	void sendStatus();
 	void clearAndClose();
@@ -62,8 +63,6 @@ private:
 	void showDisconnectedLayout();
 	void showConnectedLayout();
 
-	bool pressedConnect;
-
 	LLTextBox * mAccountCaptionLabel;
 	LLTextBox * mAccountNameLabel;
 	LLUICtrl * mPanelButtons;
-- 
cgit v1.2.3


From eef4acc5367a486b0c52c6ce5e1aba995fefd99c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 8 Sep 2014 14:52:59 -0400
Subject: increment viewer version to 3.7.16

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 03d7b8fb9b..36f601f10e 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.7.15
+3.7.16
-- 
cgit v1.2.3