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/llpacketack.h | |
| parent | 52640b85c497e8b0a900ff3f1e051021b5485277 (diff) | |
| parent | 25937040de9a787c221aae7f178f43827c799028 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llmessage/llpacketack.h')
| -rwxr-xr-x | indra/llmessage/llpacketack.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llmessage/llpacketack.h b/indra/llmessage/llpacketack.h index 2ef3c48e44..0a5604f74f 100755 --- a/indra/llmessage/llpacketack.h +++ b/indra/llmessage/llpacketack.h @@ -28,6 +28,7 @@ #define LL_LLPACKETACK_H #include "llhost.h" +#include "llunit.h" class LLReliablePacketParams { @@ -35,7 +36,7 @@ public: LLHost mHost; S32 mRetries; BOOL mPingBasedRetry; - F32 mTimeout; + F32Seconds mTimeout; void (*mCallback)(void **,S32); void** mCallbackData; char* mMessageName; @@ -63,7 +64,7 @@ public: const LLHost& host, S32 retries, BOOL ping_based_retry, - F32 timeout, + F32Seconds timeout, void (*callback)(void**,S32), void** callback_data, char* name) { @@ -98,7 +99,7 @@ protected: LLHost mHost; S32 mRetries; BOOL mPingBasedRetry; - F32 mTimeout; + F32Seconds mTimeout; void (*mCallback)(void**,S32); void** mCallbackData; char* mMessageName; @@ -108,7 +109,7 @@ protected: TPACKETID mPacketID; - F64 mExpirationTime; + F64Seconds mExpirationTime; }; #endif |