diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-07 18:39:29 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-07 18:39:29 +0300 |
commit | bb2a0adecaee2f7464caff602473d75c6b65bcaa (patch) | |
tree | 6da7bc3cf29b8f5f6dd7b08f9beee007b6408f02 /indra/newview/llpreview.cpp | |
parent | 7ba7bc6c3733420bd4d73a180627a81640a5b265 (diff) | |
parent | adce2ecdf8f3a0efcd4907699d286012124ac496 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpreview.cpp')
-rw-r--r-- | indra/newview/llpreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index d5ec3a36c3..d0db77dcbe 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -36,7 +36,7 @@ #include "llpreview.h" #include "lllineeditor.h" -#include "llinventory.h" +#include "llinventorydefines.h" #include "llinventorymodel.h" #include "llresmgr.h" #include "lltextbox.h" |