summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.h
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2011-05-12 17:08:20 -0700
committerbrad kittenbrink <brad@lindenlab.com>2011-05-12 17:08:20 -0700
commitf7a01d7b338bcd9c7ee09022a6179b3c6710237d (patch)
treeff8b8f6b741d3b016570ef3f5809ae45ca270493 /indra/llui/llbutton.h
parent6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff)
parent2661a4c2c9359f2c2cabce6f48704dc8fb481994 (diff)
Merge.
Diffstat (limited to 'indra/llui/llbutton.h')
-rw-r--r--indra/llui/llbutton.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 16aa49b653..0cfc393e05 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -27,7 +27,6 @@
#ifndef LL_LLBUTTON_H
#define LL_LLBUTTON_H
-#include "lluuid.h"
#include "llcontrol.h"
#include "lluictrl.h"
#include "v4color.h"
@@ -53,6 +52,8 @@ S32 round_up(S32 grid, S32 value);
class LLUICtrlFactory;
+class LLUIImage;
+class LLUUID;
//
// Classes