diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-06 21:38:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 21:38:05 -0500 |
| commit | 09c01c4e925833873a83665fe0642637b65e547e (patch) | |
| tree | 2e3478234c046ad76cc7b1558a8d30fffaffdb25 /indra/newview/llviewerinventory.cpp | |
| parent | 3f6fe6912a28fbf0b2fcff1f8c959c4cb83a07b8 (diff) | |
| parent | 9833f436641c5aa545decd1a75ae7704d34cc32f (diff) | |
Automated merge with file:///Users/oz/Work/V-D
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 ///---------------------------------------------------------------------------- |