diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
| commit | 4942a7b77917f9a163453ecdd040993965672cc0 (patch) | |
| tree | 3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/llmessage/mean_collision_data.h | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llmessage/mean_collision_data.h')
| -rw-r--r-- | indra/llmessage/mean_collision_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/mean_collision_data.h b/indra/llmessage/mean_collision_data.h index 7d3f90cde6..48df699561 100644 --- a/indra/llmessage/mean_collision_data.h +++ b/indra/llmessage/mean_collision_data.h @@ -10,8 +10,8 @@ #ifndef LL_MEAN_COLLISIONS_DATA_H #define LL_MEAN_COLLISIONS_DATA_H -#include <time.h> #include "lldbstrings.h" +#include "lluuid.h" const F32 MEAN_COLLISION_TIMEOUT = 5.f; const S32 MAX_MEAN_COLLISIONS = 5; |