From 83bb4b9518da813a42e49366cea15e5ae9dc7507 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 16 Sep 2010 22:10:30 -0700
Subject: fixed merge

---
 indra/newview/llbottomtray.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llbottomtray.h')

diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 35e00924aa..6225d4c92c 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -29,6 +29,7 @@
 
 #include "llpanel.h"
 #include "llimview.h"
+#include "llbutton.h"
 
 class LLChicletPanel;
 class LLLayoutStack;
-- 
cgit v1.2.3