diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
commit | 77da469d6f7901ee0cddf5fb351cd2a756b217f0 (patch) | |
tree | e0d7326fc438f7b579e3ddbcbb4772afa5402d23 /indra/newview/llviewerinventory.h | |
parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
parent | d4fb82c217bccda536f7a7b2ca1809bb8c2dba40 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewerinventory.h')
-rwxr-xr-x | indra/newview/llviewerinventory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index ca92565600..78b61d4fbc 100755 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -30,7 +30,7 @@ #include "llinventory.h" #include "llframetimer.h" #include "llwearable.h" -#include "llui.h" //for LLDestroyClass +#include "llinitdestroyclass.h" //for LLDestroyClass #include <boost/signals2.hpp> // boost::signals2::trackable |