diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-17 16:21:54 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-17 16:21:54 -0800 |
| commit | b29b9c961900f98121ba80447e1e737cff0d4331 (patch) | |
| tree | 0635965e3cbce94bd686de873d8a0b85f5755172 /indra/newview/llviewermenufile.cpp | |
| parent | abe0eb2ba72d644c3e4b717b391ca9cbcead162c (diff) | |
| parent | 6580d70412220d9536196da9fe1f1f5b79f6f828 (diff) | |
Merge
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" |