diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
| commit | 562006aa5585a42418cae978516505035cd34d8d (patch) | |
| tree | f42488d1b07907937f5b9e236617d9f02297d32d /indra/newview/llpanelobject.cpp | |
| parent | 9a8042d5a3edfd07727793a1939c3ab361ceec9a (diff) | |
| parent | 7cd1020f2953b776e1878e7b4e365d4b23e6b07b (diff) | |
Merge with SVN viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 9ec9874384..6a61e0f02f 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -39,9 +39,11 @@ #include "lleconomy.h" #include "llerror.h" #include "llfontgl.h" +#include "llmaterialtable.h" #include "llpermissionsflags.h" #include "llstring.h" #include "llvolume.h" +#include "material_codes.h" #include "m3math.h" // project includes |