diff options
| author | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
| commit | 83bb4b9518da813a42e49366cea15e5ae9dc7507 (patch) | |
| tree | 395372dc049dc2ea06dcd977a8b71befbda37fe0 /indra/newview/llbottomtray.h | |
| parent | 1911993cc7761216c70b95e77b49da383c9e162d (diff) | |
fixed merge
Diffstat (limited to 'indra/newview/llbottomtray.h')
| -rw-r--r-- | indra/newview/llbottomtray.h | 1 |
1 files changed, 1 insertions, 0 deletions
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; |