summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-11-22 09:49:05 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-11-22 09:49:05 -0500
commit4b0d2f8209f496f90e2c13643b0307a86797bdb2 (patch)
tree5d520cbd416b5f8a7624239a2a1b1b6e8c55f3bb /indra/newview/llnavigationbar.cpp
parent147b14089916bd2cbb078b0bc47c76458ab31e79 (diff)
parent1dd24cfcf85f4807410bb8d5320a692e2d7e121c (diff)
merge
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r--indra/newview/llnavigationbar.cpp1
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"