diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
| commit | 9cf8c3e654f38745c8a94cbd85609a17f482266a (patch) | |
| tree | 8cd1586fef29a307b9ab2bbe3711d289efdeb871 /indra/newview/llnavigationbar.cpp | |
| parent | 1f7bf9216869682aa88c9c92b6c15d2d5278902d (diff) | |
| parent | 77aa787c019615d2fe68d31aa07434301535c992 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 08bc1fac8b..cdab3b2310 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -34,10 +34,12 @@ #include "llnavigationbar.h" -#include <llfloaterreg.h> -#include <llfocusmgr.h> -#include <lliconctrl.h> -#include <llmenugl.h> +#include "llregionhandle.h" + +#include "llfloaterreg.h" +#include "llfocusmgr.h" +#include "lliconctrl.h" +#include "llmenugl.h" #include "llagent.h" #include "llviewerregion.h" |