diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-07 10:39:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-07 10:39:05 -0500 |
| commit | e1e38c4cee980f815091cd94c8a529ffe3e24918 (patch) | |
| tree | 35b16f61bd120f83bb74a77d4417dce1108e0542 /indra/newview/llviewerinventory.cpp | |
| parent | c02d6a319f378d5dcc34c51b20f556f175d2a40a (diff) | |
| parent | 09c01c4e925833873a83665fe0642637b65e547e (diff) | |
merge changes for storm-34
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 9c7ef7922b..b3642a2c1e 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -61,6 +61,7 @@ #include "llviewermessage.h" #include "llsidepanelappearance.h" #include "llavatarnamecache.h" +#include "llavataractions.h" #include "lllogininstance.h" ///---------------------------------------------------------------------------- @@ -214,6 +215,7 @@ public: }; LLInventoryHandler gInventoryHandler; + ///---------------------------------------------------------------------------- /// Class LLViewerInventoryItem ///---------------------------------------------------------------------------- |