From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Mon, 2 Jun 2008 21:14:31 +0000 Subject: svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers --- indra/newview/lleventinfo.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview/lleventinfo.cpp') diff --git a/indra/newview/lleventinfo.cpp b/indra/newview/lleventinfo.cpp index 0e69891731..91401a048b 100644 --- a/indra/newview/lleventinfo.cpp +++ b/indra/newview/lleventinfo.cpp @@ -41,7 +41,7 @@ LLEventInfo::cat_map LLEventInfo::sCategories; LLEventInfo::LLEventInfo(F32 global_x, F32 global_y, const char* name, U32 id, - S32 unix_time, + time_t unix_time, U32 event_flags) : mName( name ), mID( id ), @@ -91,7 +91,9 @@ void LLEventInfo::unpack(LLMessageSystem *msg) msg->getU32("EventData","Duration",duration); mDuration = duration; - msg->getU32("EventData", "DateUTC", mUnixTime); + U32 date; + msg->getU32("EventData", "DateUTC", date); + mUnixTime = date; msg->getString("EventData", "Desc", MAX_DESC_LENGTH, buffer); mDesc = buffer; -- cgit v1.2.3