Leyla Farazha
41bee5cfe8
removing windows lind endings
2010-06-10 14:15:06 -07:00
Leyla Farazha
3811815c05
llintrin.h include compile fix for building with windows sdk
...
crafted by richard
2010-06-10 14:13:51 -07:00
palange@pdp47.lindenlab.com
71f3913679
EXT-3780 FIX Fixed CPU MHz to be MHz on all platforms.
2010-06-02 15:24:59 -07:00
Mark Palange (Mani)
8b9a0a9576
EXT-3780 - Fixed up linux errs
2010-06-01 20:27:42 -07:00
Mark Palange (Mani)
7bf5e5c618
EXT-3780 FIX Added llprocessor regression test
2010-06-01 18:39:43 -07:00
Mark Palange (Mani)
183a18f237
Change to Build params to disable server build
2010-05-27 11:33:22 -07:00
Mark Palange (Mani)
0db04cbb67
EXT-3780 WIP Adding newline to linux getCPUFeatureDesc output
2010-05-11 16:27:50 -07:00
Mark Palange (Mani)
1aef4820a5
EXT-3780 Added linux impl - wip
2010-05-03 17:06:14 -07:00
Tofu Linden
7462911bdd
Change Linux fasttimer implementation back to RDTSC - using a reliable syscall was REALLY chewing CPU time. Sigh. I didn't realize how incredibly often this gets called. So, back to the assembly.
...
But be more careful with CPU clock count on linux, so the fasttimer values are much more accurate than they were the last time we were with RDTSC, in absolute terms - back in the right order of magnitude anyway.
Also change many instances of Mhz to MHz.
Also some minor comment fixes.
2010-04-19 12:49:15 +01:00
Mark Palange (Mani)
0f07ec0c69
Pushing processor id windows fixes to working branch.
2010-02-02 14:42:32 -08:00
palange
4665ef7b9c
Added cpu frequency. puching to move to windows. again.
2010-02-01 17:00:21 -08:00
palange
6abecf1228
pushing to private repo to move to windows development.
2010-02-01 11:23:30 -08:00
Tofu Linden
e133a98246
CID-227
...
Checker: STRING_OVERFLOW
Function: CProcessor::AnalyzeIntelProcessor()
File: /indra/llcommon/llprocessor.cpp
2010-01-27 15:49:22 -08:00
palange
03104e6998
intermediate commit, to pass to windows machine
2010-01-11 16:43:06 -08:00
Mark Palange (Mani)
dd500fb1fd
EXT-3780 Rewrote windows processor detection to support cpuid brandstring, and x64.
...
Refactored the CProcessor class into LLProcessorInfo.
Reviewed by brad
2010-01-07 16:15:51 -08:00
Adam Moss
e188badaf2
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
...
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
2009-02-03 17:56:26 +00:00
Aaron Brashears
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
Steven Bennetts
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Steven Bennetts
63e7894148
QAR-570 maint-render-4 merge
...
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
Aaron Brashears
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
Aaron Brashears
4942a7b779
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-10-04 16:31:48 +00:00
Don Kjer
9746cf5310
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
...
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392
ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
2007-07-26 01:22:23 +00:00
Don Kjer
d373dcc7cb
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
...
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-20 20:38:05 +00:00
Bryan O'Sullivan
ce7682c2a4
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
...
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
2007-07-18 21:22:40 +00:00
James Cook
1a33bc19b4
svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software avatar rendering. Visual Studio 2005 project file fixed pending.
2007-07-02 23:52:40 +00:00
Kelly Washington
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
Kelly Washington
3e9872a297
merge -r61423:62602 svn/branches/maintenance --> release
2007-05-30 17:39:09 +00:00
Josh Bell
0277259455
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-11 17:54:18 +00:00
Karen Clark
fceae96eb1
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-20 22:21:42 +00:00
Aaron Brashears
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
Josh Bell
d60f16540d
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
...
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
2007-01-04 02:04:29 +00:00
James Cook
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00