6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
f7dc3937cd
SH-4641 FIX Interesting: Incorrect amount of system memory detected on Mac
2013-12-03 20:27:41 -08:00
34ff2fc46b
merge with release
2013-12-02 14:57:29 -08:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
10705b4360
Merge 3.6.11 for RC-ability
2013-11-11 15:50:01 -08:00
970ee73e9a
Fix release merge issues (included upstream changes not yet in release from bear)
2013-10-25 11:48:43 -07:00
420a1af0c8
SH-4774 FIX: textures are blurry on Mac
2013-09-11 16:26:03 -07:00
ddd9d1396c
merge
2013-09-09 20:19:36 -07:00
21ab67416d
SH-4774 FIX: textures are blurry on Mac
2013-09-09 20:18:12 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
e2019e8a3b
Merge downstream code with viewer-release
2013-09-09 16:17:16 -07:00
f515c132e4
MAINT-2850 Fix for linux build
2013-08-22 11:38:42 +03:00
37626bb4a2
BUILDFIX: gcc build fixes
2013-08-21 14:45:04 -07:00
ce6d63be47
Fix file EOL format
2013-08-21 20:41:30 +00:00
87add5bfb6
MAINT-2850 FIXED Windows 8.1 detected as running in windows 8 compatibility mode always
2013-08-20 20:49:36 +03:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
25937040de
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
converted many values over to units system in effort to track down
source of 0 ping
2013-08-16 12:38:12 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
e40065f82c
BUILDFIX: #include and dependency cleanup
2013-07-19 15:03:05 -07:00
862cdf3061
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
fixed ostream precision munging in llsys
2013-07-18 15:08:46 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c38204f5e0
Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat
2013-06-05 14:26:27 -07:00
50689a13ba
BOOG2707 uncomment cleared suspects
2013-06-05 06:14:27 -07:00
ea24612561
BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
2013-06-04 07:51:27 -07:00
1f9137ed5f
BUG-2707 fix unref'd var
2013-06-02 19:52:59 -07:00
a1888e72fa
BUG-2707 eliminate debug message and memory dump from FrameWatcher, which appears to be going off on login for some
2013-06-02 17:08:01 -07:00
c19200eb00
BUG-2707 add some logging to help narrow down what part of login instance handling is going awry
2013-05-30 17:01:28 -07:00
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
98e02a5d76
Merge new boost and add OS X 10.8 mods
2013-02-22 09:49:58 -08:00
a6672034b8
MAINT-2850 Fix for linux build
2013-08-22 11:38:42 +03:00
6fe5edf031
Backed out changeset: 3c7acadcdfd9 - pull in proper fix from LL
2013-10-14 12:05:28 -07:00
d901c427f8
Fix build on the cool operating systems.
2013-10-14 12:47:45 -06:00
5d9823f084
Fix file EOL format
2013-08-21 20:41:30 +00:00
e213feb56c
MAINT-2850 FIXED Windows 8.1 detected as running in windows 8 compatibility mode always
2013-08-20 20:49:36 +03:00
2c880e6cce
Remove functionally not used since month (op. new/delete/pool) or that was the same as LL's (*_aligned_*)
2013-10-09 20:40:27 +02:00
2a4bafc3dd
Rework allocation logging so other parts can hook into it to report their stats too.
2013-10-07 16:59:46 +02:00
c69f3acef8
Merge LL 3.6.5
2013-09-09 19:07:03 -06:00
29e747c4f1
And thus, the demonic mouse position conversions from view space to screen space were tamed.
2013-01-22 15:37:01 -05:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
300a2577c7
State Windows 8.1 instead of its codname of Windows Blue for NT 6.3
2013-05-15 14:50:48 -07:00
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
a36b66bd14
MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. Disable private memory pools. Make viewer large address aware on windows.
...
Reviewed by Kelly
2012-11-07 16:03:54 -06:00
b3338955ba
linux version number fixes
2013-02-22 19:57:02 +00:00
3b8092e31f
add OS version string
2013-02-21 13:19:39 -05:00
9b5cc28e76
Refactor code. All nd*.cpp/h files are now in their own subdirectory.
2013-01-27 18:53:56 +01:00
7d92ffc094
add detection for Windows Blue OS
2013-01-21 15:37:50 -08:00
7748496319
Sanitize namespaces.
2013-01-05 20:25:04 +01:00
Tank_Master