summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-10-22 11:37:20 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-10-22 11:37:20 -0400
commite9dd8af1cecceb75c234236dcc9c6451f9b83e34 (patch)
tree4954dc3699c25a251cc72f4ea525b03ef5b2483e /indra/newview/llviewerinventory.cpp
parent7b1dd1c84ea781992532a9aa65029928f32f3f4f (diff)
parentfca9c0b2f9128ef1c1a3a9d470a66aa95afffada (diff)
merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r--indra/newview/llviewerinventory.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 75a5b14154..1907aaea4e 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -59,6 +59,7 @@
#include "llcommandhandler.h"
#include "llviewermessage.h"
#include "llsidepanelappearance.h"
+#include "llavataractions.h"
///----------------------------------------------------------------------------
/// Helper class to store special inventory item names and their localized values.
@@ -211,6 +212,7 @@ public:
};
LLInventoryHandler gInventoryHandler;
+
///----------------------------------------------------------------------------
/// Class LLViewerInventoryItem
///----------------------------------------------------------------------------