diff options
author | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
commit | f9081220accfe5c197f1c567af8806bde236f946 (patch) | |
tree | e711a74a34aa309222d28f694f02345dde305c4d /indra/newview/llpanelobjectinventory.cpp | |
parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
parent | 0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index dbe0ec3b86..4237681c80 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -41,6 +41,7 @@ #include "llpanelobjectinventory.h" +#include "llmenugl.h" #include "roles_constants.h" #include "llagent.h" |