diff options
| author | James Cook <james@lindenlab.com> | 2009-12-16 16:40:06 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-16 16:40:06 -0800 |
| commit | 3c06dc4df2d9ee11e7d346f902d34eaee17161a5 (patch) | |
| tree | 40c5342da322116d093268e0437736f860d62e0d /indra/newview/llfloaterauction.cpp | |
| parent | 4c0d5200bc7a53537f9ee7028e74c1feb4abc52e (diff) | |
| parent | c08699f900bf1560f61ea05e44449e90bb02c708 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterauction.cpp')
| -rw-r--r-- | indra/newview/llfloaterauction.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp index b63bcccf6b..698ccec9c1 100644 --- a/indra/newview/llfloaterauction.cpp +++ b/indra/newview/llfloaterauction.cpp @@ -35,7 +35,6 @@ #include "llfloaterauction.h" #include "llfloaterregioninfo.h" -#include "lldir.h" #include "llgl.h" #include "llimagej2c.h" #include "llimagetga.h" @@ -43,12 +42,12 @@ #include "llvfile.h" #include "llvfs.h" #include "llwindow.h" +#include "message.h" #include "llagent.h" #include "llcombobox.h" #include "llnotifications.h" #include "llnotificationsutil.h" -#include "llnotify.h" #include "llsavedsettingsglue.h" #include "llviewertexturelist.h" #include "llviewerparcelmgr.h" |