diff options
author | callum <none@none> | 2011-05-13 17:09:40 -0700 |
---|---|---|
committer | callum <none@none> | 2011-05-13 17:09:40 -0700 |
commit | 889f6cc3b3603bc65ba3cfe19f919e87b3f12366 (patch) | |
tree | 7cd1dbda844d3a837df476738dabc255c8951a0a /indra/llui/llfloaterreg.h | |
parent | e4a9704d4157151442accca1116ad70f7f63ae95 (diff) | |
parent | 1e6d1879a01d57e8949add79fa4f3ef5d11c1c43 (diff) |
Merge with tip
Diffstat (limited to 'indra/llui/llfloaterreg.h')
-rw-r--r-- | indra/llui/llfloaterreg.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h index 94387fb41a..8414b92113 100644 --- a/indra/llui/llfloaterreg.h +++ b/indra/llui/llfloaterreg.h @@ -27,14 +27,9 @@ #define LLFLOATERREG_H /// llcommon -#include "llboost.h" #include "llrect.h" -#include "llstl.h" #include "llsd.h" -/// llui -#include "lluictrl.h" - #include <boost/function.hpp> //******************************************************* @@ -43,6 +38,7 @@ // class LLFloater; +class LLUICtrl; typedef boost::function<LLFloater* (const LLSD& key)> LLFloaterBuildFunc; |