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')

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')

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')

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')

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')

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')

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')

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')

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')

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