summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-08-08 18:09:11 -0400
committerLogan Dethrow <log@lindenlab.com>2011-08-08 18:09:11 -0400
commit1fa2afbe2007690612f360eff3603a353ee95672 (patch)
treebd5a48c23a2280afcd0115cc6dd1d70764162b1c /indra/newview/llinventorypanel.cpp
parentfe14e50a45a450cd7bcdfe73a8bbda03c018053f (diff)
parent4ab5831b3eed23c06d2ccd3cf55f6c018613c788 (diff)
merge
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 702e8d5a1f..d5d40ca65d 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -902,6 +902,18 @@ void LLInventoryPanel::onFocusReceived()
LLPanel::onFocusReceived();
}
+bool LLInventoryPanel::addBadge(LLBadge * badge)
+{
+ bool badge_added = false;
+
+ if (acceptsBadge())
+ {
+ badge_added = badge->addToView(mFolderRoot);
+ }
+
+ return badge_added;
+}
+
void LLInventoryPanel::openAllFolders()
{
mFolderRoot->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN);