aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/kowopenregionsettings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/kowopenregionsettings.cpp')
-rw-r--r--linden/indra/newview/kowopenregionsettings.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/kowopenregionsettings.cpp b/linden/indra/newview/kowopenregionsettings.cpp
index ef14d2a..0c4bb38 100644
--- a/linden/indra/newview/kowopenregionsettings.cpp
+++ b/linden/indra/newview/kowopenregionsettings.cpp
@@ -37,6 +37,7 @@
37#include "llfloaterregioninfo.h" 37#include "llfloaterregioninfo.h"
38#include "llfloaterworldmap.h" 38#include "llfloaterworldmap.h"
39#include "llvoiceclient.h" 39#include "llvoiceclient.h"
40#include "viewertime.h"
40 41
41//DEBUG includes 42//DEBUG includes
42//#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string 43//#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string
@@ -150,12 +151,15 @@ class OpenRegionInfoUpdate : public LLHTTPNode
150 } 151 }
151 if ( body.has("OffsetOfUTC") ) 152 if ( body.has("OffsetOfUTC") )
152 { 153 {
153 gSavedSettings.setS32("TimeOffset", body["OffsetOfUTC"].asReal()); 154 gSavedSettings.setS32("TimeOffset", body["OffsetOfUTC"].asInteger());
154 gSavedSettings.setBOOL("UseTimeOffset", true); 155 gSavedSettings.setBOOL("UseTimeOffset", true);
156 ViewerTime::sUseTimeOffset = true;
157 ViewerTime::sTimeOffset = gSavedSettings.getS32("TimeOffset");
155 } 158 }
156 if ( body.has("OffsetOfUTCDST") ) 159 if ( body.has("OffsetOfUTCDST") )
157 { 160 {
158 gSavedSettings.setBOOL("TimeOffsetDST", body["OffsetOfUTCDST"].asInteger() == 1 ? TRUE : FALSE); 161 gSavedSettings.setBOOL("TimeOffsetDST", body["OffsetOfUTCDST"].asInteger() == 1 ? TRUE : FALSE);
162 ViewerTime::sTimeOffsetDST = gSavedSettings.getBOOL("TimeOffsetDST");
159 } 163 }
160 if ( body.has("RenderWater") ) 164 if ( body.has("RenderWater") )
161 { 165 {