Oz Linden
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
Oz Linden
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
Oz Linden
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
Oz Linden
e200991553
change initLogging virtual functions to void (returns were ignored anyway)
2013-04-02 15:01:25 -04:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Brad Payne (Vir Linden)
f3e407ae3f
SH-3852 WIP - removed avatar metrics from ViewerAssetMetrics
2013-02-11 13:50:26 -05:00
Dave Parks
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
Dave Parks
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
Dave Parks
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
simon@Simon-PC.lindenlab.com
d6e3b0445a
Merge in viewer-development code and fix build
2012-10-15 14:23:29 -07:00
Dave Parks
c69855f233
Only enable breakpad error handing if crash reporting is enabled
2012-10-01 16:26:12 -05:00
Oz Linden
97d969a338
initial attempt to restore changes that make removing tcmalloc possible; not tested
2012-09-12 14:36:37 -04:00
William Todd Stinson
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
simon@Simon-PC.lindenlab.com
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
simon@Simon-PC.lindenlab.com
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
Dave Parks
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
Brad Payne (Vir Linden)
d1987a3002
SH-2789 FIX - windows debug heap off by default
2012-06-06 14:28:21 -04:00
Brad Payne (Vir Linden)
542975b4c6
merge
2012-06-04 16:19:18 -04:00
callum
6c3d444490
EXP-1889 FIX As a Second Life viewer developer, I would like a tool that helps me find memory leaks.
2012-02-10 14:02:09 -08:00
Richard Linden
d56be1f175
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
Brad Payne (Vir Linden)
c0fffdea88
SH-2789 WIP
2012-01-12 16:11:06 -05:00
Xiaohong Bao
db363104dc
fix for SH-2586: Texture Memory (MB) preference refuses to set above 128mb (when --noprobe switch is used)
2011-10-26 14:35:58 -06:00
Aaron Stone
5f99d30c20
STORM-1482 Always run the crash loggers, they will check what to do and how to clean up.
2011-07-15 16:25:32 -07:00
Aaron Stone
42daa3497b
STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group.
2011-07-12 15:48:02 -07:00
Don Kjer
0a86e39d90
Merge with viewer-development (mesh)
2011-05-17 21:01:36 +00:00
Dave Parks
c591ea35ac
STORM-1210 Disable memory debugging to preserve alignment on debug builds.
2011-05-06 13:39:58 -05:00
Dave SIMmONs
07e3f01389
Removed two log messages commited in error earlier.
2011-03-08 09:46:56 -08:00
Dave SIMmONs
9a9f813c2f
Added some error checking, because s*** happens.
2011-03-07 17:16:16 -08:00
Dave Parks
5fd953df8f
SH-874 Properly detect available video memory on ATI cards and disable vertex buffer objects when available vram is under 256MB.
2011-03-10 00:41:46 -06:00
Oz Linden
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Andrew A. de Laix
1ec7de1b57
Generate windows minidump files on crash for developer (not release for download) builds. SL crash reporter still enabled.
2010-06-29 14:51:26 -07:00
Lynx Linden
05761d7853
Removed the SyncErrorHandler from llapp and llappviewer*.
...
This was only used for the Linux client to dump a stack trace to
stack_trace.log, which is no longer needed now that we are using
Google Breakpad.
I also removed all of the stack printing code from llappviewerlinux.cpp.
2010-05-27 15:04:06 +01:00
Andrew A. de Laix
f24c312f83
so long llwindebug, we hardly knew ye.
2010-05-24 15:59:26 -07:00
Andrew A. de Laix
1077ab49c1
Just enough hackery to get minidumps into Wind'ohs crash reports. Code clean up needed.
2010-05-24 15:19:33 -07:00
Richard Nelson
e50586043b
EXT-3258 - Viewer freezes while external web browser loads page
...
reviewed by Callum
2010-03-29 15:28:48 -07:00
Vadim Savchuk
04e692b3f1
Fixed bug EXT-6007 ([STRING IN EN] - While loading Second Life several messages need to be localized).
...
Reviewed by Richard: https://codereview.productengine.com/secondlife/r/31/
--HG--
branch : product-engine
2010-03-16 14:45:12 +02:00
David Parks
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
Steven Bennetts
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Mark Palange
46f8fb8781
svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
...
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
2009-02-03 21:15:57 +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
Mark Palange
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
Steven Bennetts
afe61eb994
QAR-849 merge maint-viewer-10-merge 96838-97237 -> release
2008-09-23 01:53:11 +00:00
Steven Bennetts
96869c0de4
Fix for VC7 DEBUG build failure
2008-09-15 19:45:18 +00:00
Steven Bennetts
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
Steven Bennetts
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +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
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Christian Goetze
419e13d0ac
fix wassert symbol problem, copied from cmake branch
2008-05-30 23:10:22 +00:00
Eric Tulla
e77de5d685
Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
...
Passed QA as part of QAR-491.
2008-05-14 21:37:13 +00:00