diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-11-23 12:04:27 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-11-23 12:04:27 -0500 |
| commit | d49d1def45482bccf4600a34bc2fd5693e05d329 (patch) | |
| tree | e6eadcf9db118b5ab1fe240011df981a77a09103 /indra/llcommon | |
| parent | b8a0549ac2be032d33a4fa427c8e430cd6df0cc6 (diff) | |
| parent | e3df3baff7aebd247737fd3dbcb382f3b12df10b (diff) | |
automated merge from mesh-development
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lleventtimer.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h index 62586dd92f..7f42623d01 100644 --- a/indra/llcommon/lleventtimer.h +++ b/indra/llcommon/lleventtimer.h @@ -33,7 +33,7 @@ #include "lltimer.h" // class for scheduling a function to be called at a given frequency (approximate, inprecise) -class LL_COMMON_API LLEventTimer : protected LLInstanceTracker<LLEventTimer> +class LL_COMMON_API LLEventTimer : public LLInstanceTracker<LLEventTimer> { public: LLEventTimer(F32 period); // period is the amount of time between each call to tick() in seconds diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 67cc707a01..f3cbfab77a 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -33,7 +33,12 @@ #include <iostream> #include "apr_base64.h" -#include "zlib/zlib.h" // for davep's dirty little zip functions + +#ifdef LL_STANDALONE +# include <zlib.h> +#else +# include "zlib/zlib.h" // for davep's dirty little zip functions +#endif #if !LL_WINDOWS #include <netinet/in.h> // htonl & ntohl |