Automated merge with http://hg.secondlife.com/viewer-development

1 files changed, 9 insertions, 7 deletions

diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp
index df89adb8da..678e4f2843 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp
@@ -189,16 +189,16 @@ void LLInboxFolderViewFolder::draw()
 
 void LLInboxFolderViewFolder::selectItem()
 {
-	LLFolderViewFolder::selectItem();
-
 	deFreshify();
+
+	LLFolderViewFolder::selectItem();
 }
 
 void LLInboxFolderViewFolder::toggleOpen()
 {
-	LLFolderViewFolder::toggleOpen();
-
 	deFreshify();
+
+	LLFolderViewFolder::toggleOpen();
 }
 
 void LLInboxFolderViewFolder::computeFreshness()
@@ -270,7 +270,9 @@ BOOL LLInboxFolderViewItem::addToFolder(LLFolderViewFolder* folder, LLFolderView
 
 BOOL LLInboxFolderViewItem::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
-	return TRUE;
+	deFreshify();
+	
+	return LLFolderViewItem::handleDoubleClick(x, y, mask);
 }
 
 // virtual
@@ -290,9 +292,9 @@ void LLInboxFolderViewItem::draw()
 
 void LLInboxFolderViewItem::selectItem()
 {
-	LLFolderViewItem::selectItem();
-
 	deFreshify();
+
+	LLFolderViewItem::selectItem();
 }
 
 void LLInboxFolderViewItem::computeFreshness()