diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-11-18 10:45:40 -0500 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-11-18 10:45:40 -0500 |
commit | 3819c3b049abb0771c7129c0a11a8fcd0725f9fd (patch) | |
tree | f0bb1432b1ae475c7d844f278b668e1d76193e96 /indra/newview/llnavigationbar.cpp | |
parent | 620b63a31667d93d9186217eb355d05e71ff245c (diff) | |
parent | 4bcdcd02fb7e83a2754084f2fb599b56ea6c8743 (diff) |
Merge
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" |