diff options
| author | skolb <> | 2009-12-18 10:54:16 -0800 |
|---|---|---|
| committer | skolb <> | 2009-12-18 10:54:16 -0800 |
| commit | d5b53eb483ec042d83859ec957dce7699c7469aa (patch) | |
| tree | 289ff588bf8f35bc94fbdf3844279bc8cd299b1a /indra/newview/llviewermenufile.cpp | |
| parent | eb7bd0a214ad794db9cb2acb33c45b9d7f46b981 (diff) | |
| parent | ad6d0e3bb766c737b1e9bbd9d006391cc8bcc085 (diff) | |
Merge viewer 2 into media
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 48794bbc1a..6bad8843fd 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -40,12 +40,12 @@ #include "llfloaterreg.h" #include "llfloaterbuycurrency.h" #include "llfloatersnapshot.h" -#include "llimage.h"
-#include "llimagebmp.h"
-#include "llimagepng.h"
-#include "llimagej2c.h"
-#include "llimagejpeg.h"
-#include "llimagetga.h"
+#include "llimage.h" +#include "llimagebmp.h" +#include "llimagepng.h" +#include "llimagej2c.h" +#include "llimagejpeg.h" +#include "llimagetga.h" #include "llinventorymodel.h" // gInventory #include "llresourcedata.h" #include "llfloaterperms.h" |