6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
e3ea0378b6
Merge LL 3.7.6
2014-05-17 11:18:52 -07:00
381287b3eb
Merge lgpl with LL breakpad changes.
2014-05-02 17:09:26 +02:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
e5dae42252
Fix for MAINT-5707 bad breakpad behavior with teleport links
2014-04-14 15:11:42 -07:00
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
706ec08deb
Merged in viewer-release
2014-03-13 21:55:22 +00:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
d2bb4dae98
Fixes for crash reporter startup race condition, crash reporter CPU use, Secondlife.log filehandle, XP Crash.
2014-03-07 14:58:22 -08:00
e6c85c46c4
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
...
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
ea7e6a5174
Some cleanup of string to wstring conversion and vice versa.
2014-01-14 15:28:35 -08:00
ce2cd00cc5
Removed debugging code.
2013-12-04 19:57:11 -08:00
6809348125
Creating a cleaner branch
2013-12-03 17:06:06 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
a3dc7915f4
And make it even more obvious...
2014-01-11 19:59:07 +01:00
25605a6fdb
FIRE-12671: Add option to force VRAM if DirectX detection is broken on Windows
2014-01-11 19:49:22 +01:00
91c9cc4c33
Save SL NVAPI profile only when changes have been made.
2013-08-12 11:09:05 -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
c5651d05fd
fix some compiling errors.
2013-07-31 11:18:18 -06:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
edf0a0c7f5
fix modified virtual function names in platform-specific modules
2013-06-04 16:26:11 -04: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
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
e200991553
change initLogging virtual functions to void (returns were ignored anyway)
2013-04-02 15:01:25 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
f3e407ae3f
SH-3852 WIP - removed avatar metrics from ViewerAssetMetrics
2013-02-11 13:50:26 -05:00
6007d1235e
merge snowstorm repo
2013-10-19 23:48:44 -07:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
7491fbd677
MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max performance
...
Reviewed by Simon.
2012-11-19 17:40:43 -06: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
d6e3b0445a
Merge in viewer-development code and fix build
2012-10-15 14:23:29 -07:00
c69855f233
Only enable breakpad error handing if crash reporting is enabled
2012-10-01 16:26:12 -05:00
97d969a338
initial attempt to restore changes that make removing tcmalloc possible; not tested
2012-09-12 14:36:37 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
0f6a6582c9
Load the correct nvidia driver profile on Windows ("Second Life") to be able to ask for max performance mode
2013-03-09 14:33:40 +01:00
d783acd43f
fix for debug on windows asserting on startup (from feedback by Runitai Linden)
2013-02-11 13:42:02 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
1762586923
Merge LL 3.4.4 beta 1, but left tcmalloc enabled.
2012-12-21 01:14:38 -08:00
93d4b47252
Merge LL 3.4.1 beta 10
2012-10-26 09:59:19 -07:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
999bd2130e
Merge LL 3.4.0 release
2012-09-13 15:19:30 -07:00
Tank_Master