Merge remote-tracking branch 'imprudence/exp' into exp

Conflicts (for future reference):
	linden/indra/llcommon/llstring.cpp
	linden/indra/newview/llpanelnetwork.cpp
	linden/indra/newview/llselectmgr.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/lltoolmgr.cpp
	linden/indra/newview/llvoavatar.cpp

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()
                 // it's daylight savings time there.
                 internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
         }
-        
+
+        if(NULL == internal_time)
+        {
+                llwarns << "internal_time == NULL - Kaboom!" << llendl;
+                return;
+        }
+
         mMinute = internal_time->tm_min;
         mSecond = internal_time->tm_sec;
         S32 hour = internal_time->tm_hour;