diff options
| author | Anchor <none@none> | 2019-06-06 01:51:38 -0700 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 18:40:45 -0400 |
| commit | 16453005bb8373d7228262bf79c5882f311380e9 (patch) | |
| tree | 93dc90edc31b6068caf9c42d2b81ffe73b2d512d | |
| parent | f0b07eafa2814c26e9a11b35d0f31dc2988579b2 (diff) | |
[DRTVWR-476] - update cef, fix merge
| -rw-r--r-- | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 6 | ||||
| -rw-r--r-- | indra/llmessage/llcoproceduremanager.cpp | 2 | ||||
| -rw-r--r-- | indra/llmessage/tests/llcoproceduremanager_test.cpp | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index e1e3fc74a4..c4b5469477 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ <key>archive</key> <map> <key>hash</key> - <string>c0456d23b8dce071eb20f07c4f4b97c2</string> + <string>c1cd0a6a08f71f357a01fba55e0a6b16</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34195/285056/dullahan-1.1.1080_3.3325.1750.gaabe4c4-darwin64-525430.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38605/326402/dullahan-1.1.1320_3.3626.1895.g7001d56-darwin64-527866.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -592,9 +592,9 @@ <key>archive</key> <map> <key>hash</key> - <string>53eefec74510d5de118855aba3f908b6</string> + <string>c0129834f8995f9c354def141cf0e12b</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34194/285057/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows-525430.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38602/326395/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-527866.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -604,9 +604,9 @@ <key>archive</key> <map> <key>hash</key> - <string>7422f84b21b5c3c262bc0f7bcea125bf</string> + <string>0e2206a105b1e48ee89951d310b21025</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34196/285066/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows64-525430.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38601/326388/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-527866.tar.bz2</string> </map> <key>name</key> <string>windows64</string> diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index d463fc9d65..5628a05b00 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -31,6 +31,10 @@ #include "lltrace.h" #include "lltreeiterators.h" +#if LL_WINDOWS +#include <intrin.h> +#endif + #define LL_FAST_TIMER_ON 1 #define LL_FASTTIMER_USE_RDTSC 1 @@ -85,6 +89,8 @@ public: // return __rdtsc(); //} + + // shift off lower 8 bits for lower resolution but longer term timing // on 1Ghz machine, a 32-bit word will hold ~1000 seconds of timing #if LL_FASTTIMER_USE_RDTSC diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp index 579ab097e0..fa8e9c3ebf 100644 --- a/indra/llmessage/llcoproceduremanager.cpp +++ b/indra/llmessage/llcoproceduremanager.cpp @@ -25,6 +25,8 @@ * $/LicenseInfo$ */ +#include "llwin32headers.h" + #include "linden_common.h" #include "llcoproceduremanager.h" diff --git a/indra/llmessage/tests/llcoproceduremanager_test.cpp b/indra/llmessage/tests/llcoproceduremanager_test.cpp index 17535abd1e..9b0ef93b13 100644 --- a/indra/llmessage/tests/llcoproceduremanager_test.cpp +++ b/indra/llmessage/tests/llcoproceduremanager_test.cpp @@ -26,6 +26,8 @@ * $/LicenseInfo$ */ +#include "llwin32headers.h" + #include "linden_common.h" #include "llsdserialize.h" |