summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelinventory.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-12-12 15:51:43 -0500
committerOz Linden <oz@lindenlab.com>2013-12-12 15:51:43 -0500
commitdec487cd7f04f00d4aa6428d190ffbf978ea57da (patch)
treed96cda0e2f03c1cf5b1f7ffcdd564690e0ab2cad /indra/newview/llsidepanelinventory.cpp
parentc9775dde6249582f0e8976be15e72bfebc4ac3fc (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
merge changes for 3.6.12-release
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
-rwxr-xr-xindra/newview/llsidepanelinventory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 8915bb2fef..cbf43dbb93 100755
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -397,7 +397,7 @@ void LLSidepanelInventory::onToggleInboxBtn()
void LLSidepanelInventory::onOpen(const LLSD& key)
{
LLFirstUse::newInventory(false);
-
+ mPanelMainInventory->setFocusFilterEditor();
#if AUTO_EXPAND_INBOX
// Expand the inbox if we have fresh items
LLPanelMarketplaceInbox * inbox = findChild<LLPanelMarketplaceInbox>(MARKETPLACE_INBOX_PANEL);