Merge pull request #1944 from Ansariel/develop_c4244

Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
index c7fa96edca..0c4ef6f943 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -121,12 +121,12 @@ bool LLTipHandler::processNotification(const LLNotificationPtr& notification, bo
     if (exp_time > cur_time)
     {
         // we have non-default expiration time - keep visible until expires
-        p.lifetime_secs = exp_time.secondsSinceEpoch() - cur_time.secondsSinceEpoch();
+        p.lifetime_secs = (F32)(exp_time.secondsSinceEpoch() - cur_time.secondsSinceEpoch());
     }
     else
     {
         // use default time
-        p.lifetime_secs = gSavedSettings.getS32("NotificationTipToastLifeTime");
+        p.lifetime_secs = (F32)gSavedSettings.getS32("NotificationTipToastLifeTime");
     }
 
     LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());