summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-07-26 15:47:53 -0700
committerRichard Nelson <richard@lindenlab.com>2011-07-26 15:47:53 -0700
commit6b3a7480a137fa6db37f3d6e1b0235a282ecaa17 (patch)
treedca0c3f77ef2fd40109f10f6ab53f56ec48d90f9 /indra/newview/llinventorypanel.cpp
parent825fc273ee5167052d811dc058b1834c86e005da (diff)
parentdf82fbffa29428af258dc84ce2acbb07180f557e (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);