diff options
| author | McCabe Maxsted | 2010-11-02 21:32:04 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-02 21:32:04 -0700 |
| commit | b5074f1a8e3306f1be9e93172d26c97ff088cea0 (patch) | |
| tree | a53d5cc54a1f339b7637a9d7d8248eca42995af2 /linden/indra/newview/llpaneldirgroups.cpp | |
| parent | Revert "Fix Bug #671 (aka VWR-1603): Duckwalk is too fast" (diff) | |
| parent | Uploaded the linux64 libraries created by Aleric to imprudenceviewer.org (diff) | |
| download | meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.zip meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.gz meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.bz2 meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.xz | |
Merged webkit_plugins into weekly. Huzzah! The weekly branch now has browser/media plugin support
Diffstat (limited to 'linden/indra/newview/llpaneldirgroups.cpp')
| -rw-r--r-- | linden/indra/newview/llpaneldirgroups.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llpaneldirgroups.cpp b/linden/indra/newview/llpaneldirgroups.cpp index 1aa2e86..4119514 100644 --- a/linden/indra/newview/llpaneldirgroups.cpp +++ b/linden/indra/newview/llpaneldirgroups.cpp | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include "llqueryflags.h" | 41 | #include "llqueryflags.h" |
| 42 | #include "llviewercontrol.h" | 42 | #include "llviewercontrol.h" |
| 43 | #include "llviewerwindow.h" | 43 | #include "llviewerwindow.h" |
| 44 | #include "llmediactrl.h" | ||
| 44 | 45 | ||
| 45 | LLPanelDirGroups::LLPanelDirGroups(const std::string& name, LLFloaterDirectory* floater) | 46 | LLPanelDirGroups::LLPanelDirGroups(const std::string& name, LLFloaterDirectory* floater) |
| 46 | : LLPanelDirBrowser(name, floater) | 47 | : LLPanelDirBrowser(name, floater) |