diff options
author | callum <none@none> | 2009-12-15 17:53:03 -0800 |
---|---|---|
committer | callum <none@none> | 2009-12-15 17:53:03 -0800 |
commit | b7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch) | |
tree | 7edef8c608cc99cb0e657694d259598294858851 /indra/newview/llnavigationbar.cpp | |
parent | f923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff) | |
parent | fc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff) |
Merge with tip before push
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" |