diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
| commit | 61e3c95dbf8282dbce5455a7adc466d9c2108a13 (patch) | |
| tree | 1d7f029348b6a5c5c66413d00898190fc338e8c2 /indra/newview/llviewerinventory.cpp | |
| parent | 38ab28511473fb6882bab0d5a1ce3f372c48a171 (diff) | |
| parent | 09c01c4e925833873a83665fe0642637b65e547e (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 7dbaa4cf92..70696dc762 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 ///---------------------------------------------------------------------------- |