diff options
| author | Richard Linden <none@none> | 2011-11-07 15:05:12 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-07 15:05:12 -0800 |
| commit | 648ce247d693daa0b9479286ea2acf4064fb2336 (patch) | |
| tree | 3530147824e1f782b8a53a842bd9c135857a5912 /indra/newview/llnavigationbar.cpp | |
| parent | 5dcdb2dd02ac7e7626e03ab7b4f4bb0aaad72742 (diff) | |
| parent | 1941d75eb09ca9ade819578f25960f1a302b2836 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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" |