diff options
author | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
commit | f7a01d7b338bcd9c7ee09022a6179b3c6710237d (patch) | |
tree | ff8b8f6b741d3b016570ef3f5809ae45ca270493 /indra/llui/llviewborder.cpp | |
parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
parent | 2661a4c2c9359f2c2cabce6f48704dc8fb481994 (diff) |
Merge.
Diffstat (limited to 'indra/llui/llviewborder.cpp')
-rw-r--r-- | indra/llui/llviewborder.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp index 89cd34c37c..32d7ea7c25 100644 --- a/indra/llui/llviewborder.cpp +++ b/indra/llui/llviewborder.cpp @@ -28,6 +28,7 @@ #include "llrender.h" #include "llfocusmgr.h" #include "lluictrlfactory.h" +#include "lluiimage.h" static LLDefaultChildRegistry::Register<LLViewBorder> r("view_border"); |