diff options
author | Richard Linden <none@none> | 2013-08-16 12:39:11 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-08-16 12:39:11 -0700 |
commit | f8e3a34348ab98ecd56d53360b8f2b6512ad6bba (patch) | |
tree | c0042514f1242d58cea031be84c23d493f39bb6a /indra/llmessage/llassetstorage.h | |
parent | 52640b85c497e8b0a900ff3f1e051021b5485277 (diff) | |
parent | 25937040de9a787c221aae7f178f43827c799028 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llmessage/llassetstorage.h')
-rwxr-xr-x | indra/llmessage/llassetstorage.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmessage/llassetstorage.h b/indra/llmessage/llassetstorage.h index 6ffd7ad309..6ed1027cee 100755 --- a/indra/llmessage/llassetstorage.h +++ b/indra/llmessage/llassetstorage.h @@ -119,8 +119,8 @@ public: BOOL mIsTemp; BOOL mIsLocal; BOOL mIsUserWaiting; // We don't want to try forever if a user is waiting for a result. - F64 mTime; // Message system time - F64 mTimeout; // Amount of time before timing out. + F64Seconds mTime; // Message system time + F64Seconds mTimeout; // Amount of time before timing out. BOOL mIsPriority; BOOL mDataSentInFirstPacket; BOOL mDataIsInVFS; @@ -163,7 +163,7 @@ public: void *mUserData; LLHost mHost; BOOL mIsTemp; - F64 mTime; // Message system time + F64Seconds mTime; // Message system time BOOL mIsPriority; BOOL mDataSentInFirstPacket; BOOL mDataIsInVFS; @@ -193,7 +193,7 @@ public: void *mUserData; LLHost mHost; BOOL mIsTemp; - F64 mTime; // Message system time + F64Seconds mTime; // Message system time BOOL mIsPriority; BOOL mDataSentInFirstPacket; BOOL mDataIsInVFS; |