diff options
Diffstat (limited to 'linden/indra/newview/kowopenregionsettings.cpp')
-rw-r--r-- | linden/indra/newview/kowopenregionsettings.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/linden/indra/newview/kowopenregionsettings.cpp b/linden/indra/newview/kowopenregionsettings.cpp index 8aac87c..0c4bb38 100644 --- a/linden/indra/newview/kowopenregionsettings.cpp +++ b/linden/indra/newview/kowopenregionsettings.cpp | |||
@@ -36,6 +36,8 @@ | |||
36 | #include "llviewerobject.h" | 36 | #include "llviewerobject.h" |
37 | #include "llfloaterregioninfo.h" | 37 | #include "llfloaterregioninfo.h" |
38 | #include "llfloaterworldmap.h" | 38 | #include "llfloaterworldmap.h" |
39 | #include "llvoiceclient.h" | ||
40 | #include "viewertime.h" | ||
39 | 41 | ||
40 | //DEBUG includes | 42 | //DEBUG includes |
41 | //#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string | 43 | //#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string |
@@ -149,12 +151,15 @@ class OpenRegionInfoUpdate : public LLHTTPNode | |||
149 | } | 151 | } |
150 | if ( body.has("OffsetOfUTC") ) | 152 | if ( body.has("OffsetOfUTC") ) |
151 | { | 153 | { |
152 | gSavedSettings.setS32("TimeOffset", body["OffsetOfUTC"].asReal()); | 154 | gSavedSettings.setS32("TimeOffset", body["OffsetOfUTC"].asInteger()); |
153 | gSavedSettings.setBOOL("UseTimeOffset", true); | 155 | gSavedSettings.setBOOL("UseTimeOffset", true); |
156 | ViewerTime::sUseTimeOffset = true; | ||
157 | ViewerTime::sTimeOffset = gSavedSettings.getS32("TimeOffset"); | ||
154 | } | 158 | } |
155 | if ( body.has("OffsetOfUTCDST") ) | 159 | if ( body.has("OffsetOfUTCDST") ) |
156 | { | 160 | { |
157 | 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"); | ||
158 | } | 163 | } |
159 | if ( body.has("RenderWater") ) | 164 | if ( body.has("RenderWater") ) |
160 | { | 165 | { |
@@ -200,6 +205,12 @@ class OpenRegionInfoUpdate : public LLHTTPNode | |||
200 | { | 205 | { |
201 | gHippoLimits->mAllowParcelWindLight = body["AllowParcelWindLight"].asInteger() == 1; | 206 | gHippoLimits->mAllowParcelWindLight = body["AllowParcelWindLight"].asInteger() == 1; |
202 | } | 207 | } |
208 | if ( body.has("Voice") ) | ||
209 | { | ||
210 | gSavedSettings.setString("VoiceModule", body["Voice"].asString()); | ||
211 | //gVoiceClient->close(); | ||
212 | //gVoiceClient->start(); | ||
213 | } | ||
203 | 214 | ||
204 | if (limitschanged) | 215 | if (limitschanged) |
205 | gFloaterTools->updateToolsSizeLimits(); | 216 | gFloaterTools->updateToolsSizeLimits(); |