diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
| commit | 9cf8c3e654f38745c8a94cbd85609a17f482266a (patch) | |
| tree | 8cd1586fef29a307b9ab2bbe3711d289efdeb871 /indra/newview/llwldaycycle.cpp | |
| parent | 1f7bf9216869682aa88c9c92b6c15d2d5278902d (diff) | |
| parent | 77aa787c019615d2fe68d31aa07434301535c992 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/
Diffstat (limited to 'indra/newview/llwldaycycle.cpp')
| -rw-r--r-- | indra/newview/llwldaycycle.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp index fcc43c2b1f..000d50795f 100644 --- a/indra/newview/llwldaycycle.cpp +++ b/indra/newview/llwldaycycle.cpp @@ -33,11 +33,13 @@ #include "llviewerprecompiledheaders.h" #include "llwldaycycle.h" -#include "llsdserialize.h" -#include "llwlparammanager.h" + #include "llnotificationsutil.h" +#include "llsdserialize.h" #include "llxmlnode.h" +#include "llwlparammanager.h" + #include <map> LLWLDayCycle::LLWLDayCycle() : mDayRate(120) |