diff options
author | Armin Weatherwax | 2011-04-17 16:25:48 +0200 |
---|---|---|
committer | Armin Weatherwax | 2011-04-17 16:25:48 +0200 |
commit | 9dfad946197c3f99552c9e90f2e344f105f71966 (patch) | |
tree | 151974a0a4a8e89fada22704c0ea3ffdde435e47 /linden/indra | |
parent | Add HeadFollowsMouse debugsetting + UI in preferences > advanced. Defaults to... (diff) | |
download | meta-impy-9dfad946197c3f99552c9e90f2e344f105f71966.zip meta-impy-9dfad946197c3f99552c9e90f2e344f105f71966.tar.gz meta-impy-9dfad946197c3f99552c9e90f2e344f105f71966.tar.bz2 meta-impy-9dfad946197c3f99552c9e90f2e344f105f71966.tar.xz |
workaround crash seemingly specific for win7/64 on Aurora
todo: find out and fix why internal_time gets 0
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/viewertime.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/newview/viewertime.cpp b/linden/indra/newview/viewertime.cpp index 5ed9465..9892aa5 100644 --- a/linden/indra/newview/viewertime.cpp +++ b/linden/indra/newview/viewertime.cpp | |||
@@ -107,7 +107,13 @@ void ViewerTime::refresh() | |||
107 | // it's daylight savings time there. | 107 | // it's daylight savings time there. |
108 | internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime); | 108 | internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime); |
109 | } | 109 | } |
110 | 110 | ||
111 | if(NULL == internal_time) | ||
112 | { | ||
113 | llwarns << "internal_time == NULL - Kaboom!" << llendl; | ||
114 | return; | ||
115 | } | ||
116 | |||
111 | mMinute = internal_time->tm_min; | 117 | mMinute = internal_time->tm_min; |
112 | mSecond = internal_time->tm_sec; | 118 | mSecond = internal_time->tm_sec; |
113 | S32 hour = internal_time->tm_hour; | 119 | S32 hour = internal_time->tm_hour; |