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.h | |
| 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.h')
| -rw-r--r-- | indra/newview/lleventinfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lleventinfo.h b/indra/newview/lleventinfo.h index 6d76b0c74d..4d0687f81c 100644 --- a/indra/newview/lleventinfo.h +++ b/indra/newview/lleventinfo.h @@ -44,7 +44,7 @@ class LLEventInfo { public: LLEventInfo() {} - LLEventInfo(F32 global_x, F32 global_y, const char* name, U32 id, S32 unix_time, U32 event_flags); + LLEventInfo(F32 global_x, F32 global_y, const char* name, U32 id, time_t unix_time, U32 event_flags); void unpack(LLMessageSystem *msg); @@ -60,7 +60,7 @@ public: LLUUID mRunByID; LLString mSimName; LLVector3d mPosGlobal; - U32 mUnixTime; // seconds from 1970 + time_t mUnixTime; // seconds from 1970 BOOL mHasCover; U32 mCover; U32 mEventFlags; |