diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:11:24 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:11:24 -0500 |
commit | ccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (patch) | |
tree | 71163fde19389893c8951ebb723ddf9379318518 /indra/newview/llstatusbar.h | |
parent | 2369fa96c24bafbd032c85b58767502cfd37ebaf (diff) | |
parent | 5b5354c933aa7b1ceeb307853c24fba28d4e31bf (diff) |
viewer-2.0 automated merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llstatusbar.h')
-rw-r--r-- | indra/newview/llstatusbar.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index 3ce3549961..bdaacce981 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -34,7 +34,6 @@ #define LL_LLSTATUSBAR_H #include "llpanel.h" -#include <llmenugl.h> // "Constants" loaded from settings.xml at start time extern S32 STATUS_BAR_HEIGHT; |