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/llui.h | |
parent | e4a9704d4157151442accca1116ad70f7f63ae95 (diff) | |
parent | 1e6d1879a01d57e8949add79fa4f3ef5d11c1c43 (diff) |
Merge with tip
Diffstat (limited to 'indra/llui/llui.h')
-rw-r--r-- | indra/llui/llui.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 6a43477693..c583d58d5a 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -33,15 +33,12 @@ #include "llrect.h" #include "llcontrol.h" #include "llcoord.h" -#include "lluiimage.h" // *TODO: break this dependency, need to add #include "lluiimage.h" to all widgets that hold an Optional<LLUIImage*> in their paramblocks #include "llinitparam.h" #include "llregistry.h" #include "lluicolor.h" #include "lluicolortable.h" #include <boost/signals2.hpp> #include "lllazyvalue.h" -#include "llhandle.h" // *TODO: remove this dependency, added as a - // convenience when LLHandle moved to llhandle.h #include "llframetimer.h" // LLUIFactory @@ -265,8 +262,6 @@ private: // Moved LLLocalClipRect to lllocalcliprect.h -// Moved all LLHandle-related code to llhandle.h - //RN: maybe this needs to moved elsewhere? class LLImageProviderInterface { |