diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-11-15 18:30:23 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-11-15 18:30:23 -0500 |
commit | c69ebf3670be0f94235aa85c77451b14b726916e (patch) | |
tree | 2a5ce3a8f71e9bfdf4ac63cf3188307609269366 /indra/newview/llnavigationbar.cpp | |
parent | 6bce3d1b9d05dce77db50f3d2c92a70ad6ac8166 (diff) | |
parent | 7766ccb7731a596d6716e9d0def90b3d7da5fcf3 (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" |