diff options
| author | RevolutionSmythe | 2010-10-20 16:31:09 -0500 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-01 16:58:02 -0700 |
| commit | af6877fbfe94e80948c559cf77f008049f8168dc (patch) | |
| tree | 4fe687aaec6a1b964a0e989d3c03c143b4ab07f6 /linden/indra/newview/viewertime.h | |
| parent | Merge remote branch 'thickbrick/weekly' into weekly (diff) | |
| download | meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.zip meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.gz meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.bz2 meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.xz | |
Finishes the OpenRegionSettings module, adds a new panel to Region/Estate for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/viewertime.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/viewertime.h b/linden/indra/newview/viewertime.h index 525a2bc..f7a80a6 100644 --- a/linden/indra/newview/viewertime.h +++ b/linden/indra/newview/viewertime.h | |||
| @@ -59,6 +59,9 @@ public: | |||
| 59 | 59 | ||
| 60 | static bool sUse24HourTime; | 60 | static bool sUse24HourTime; |
| 61 | static bool sUseUTCTime; | 61 | static bool sUseUTCTime; |
| 62 | static bool sUseTimeOffset; | ||
| 63 | static S32 sTimeOffset; | ||
| 64 | static bool sTimeOffsetDST; | ||
| 62 | 65 | ||
| 63 | void updateTimeFormat(const U32& index); | 66 | void updateTimeFormat(const U32& index); |
| 64 | 67 | ||