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