summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmarketplaceinbox.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:28:40 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:28:40 -0700
commit3dc61c4b4afed47826070aa906e58c8c5ca3efa0 (patch)
tree078d2f9d44e5d6f0fc0f47cee388377eb8c0e0ed /indra/newview/llpanelmarketplaceinbox.cpp
parent05a72687d848c13754039f6e720a137827533fdb (diff)
parentc320b4878ae9cd166594285a88437f0d5c333353 (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llpanelmarketplaceinbox.cpp')
-rw-r--r--indra/newview/llpanelmarketplaceinbox.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp
index 4a63585ed5..dcecce6fe4 100644
--- a/indra/newview/llpanelmarketplaceinbox.cpp
+++ b/indra/newview/llpanelmarketplaceinbox.cpp
@@ -115,8 +115,8 @@ void LLPanelMarketplaceInbox::onFocusReceived()
if (sidepanel_inventory)
{
sidepanel_inventory->clearSelections(true, false);
- }
-
+ }
+
gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", time_corrected());
}
@@ -167,8 +167,8 @@ U32 LLPanelMarketplaceInbox::getFreshItemCount() const
if (inbox_item_view && inbox_item_view->isFresh())
{
fresh_item_count++;
- }
- }
+ }
+ }
}
}