diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-02 16:22:18 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-02 16:22:18 -0500 |
| commit | 310a7b60f7d3af1e14cdd91c94e8a5841b182a4c (patch) | |
| tree | 13d1b6caea6c93169ee643ec3cff06a1d8a02d17 /indra/newview/llviewerinventory.cpp | |
| parent | cdf639087011dc7f4510cedd9951e8d890818b97 (diff) | |
| parent | bde7d67066d189416a725da4527a02eb4f78ba4a (diff) | |
Merge conflict resolution for previous commit.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 366e5602bd..470739baa9 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -38,6 +38,7 @@ #include "llagent.h" #include "llfoldertype.h" +#include "llfolderview.h" #include "llviewercontrol.h" #include "llconsole.h" #include "llinventorymodel.h" |