diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
| commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
| tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/newview/lleventinfo.cpp | |
| parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) | |
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
Diffstat (limited to 'indra/newview/lleventinfo.cpp')
| -rw-r--r-- | indra/newview/lleventinfo.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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; |