diff options
| author | Richard Linden <none@none> | 2011-11-10 10:58:11 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-10 10:58:11 -0800 |
| commit | b2fffa74f7fbafba927b731f38681379dfa7c980 (patch) | |
| tree | 00a3dc5d6db3b3cb479a2e3634f599fbcceb14b8 /indra/newview/llnavigationbar.cpp | |
| parent | 5fa125ea0b733b3729208d90777d260db5e331e8 (diff) | |
| parent | 55d282941454199608b15123f0420a1e8c8d0807 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index fc264db5af..146bcbe47b 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -54,7 +54,6 @@ #include "llworldmapmessage.h" #include "llappviewer.h" #include "llviewercontrol.h" -#include "llfloatermediabrowser.h" #include "llweb.h" #include "llhints.h" |