diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
commit | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch) | |
tree | c6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/newview/llfloateruipreview.cpp | |
parent | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff) | |
parent | 465a3356a2f32362837d5231a21b9151f45f890b (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
-rw-r--r-- | indra/newview/llfloateruipreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index c6e12476bd..3e804bef9d 100644 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -41,6 +41,7 @@ #include "llfloateruipreview.h" // Own header // Internal utility +#include "lleventtimer.h" #include "llrender.h" #include "llsdutil.h" #include "llxmltree.h" @@ -91,7 +92,6 @@ static std::string get_xui_dir() } // Forward declarations to avoid header dependencies -class LLEventTimer; class LLColor; class LLScrollListCtrl; class LLComboBox; |