c25a786640
Pulled merge from viewer-tiger
2014-09-19 10:54:55 -07:00
b12e241751
Merged with windows fixes.
2014-08-15 18:51:20 -07:00
370aa671c6
Allegedly hides voice position on teleport. Needs testing.
2014-08-15 18:49:54 -07:00
7060527bbc
Added delay to Windows shutdown to let SLVoice die a good death.
2014-08-15 17:30:09 -07:00
7540664183
Ported from defective branch.
2014-08-13 18:12:25 -07:00
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -07:00
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
47a5e1c751
MAINT-4009: Ensuring that the local bitmaps are cleaned up on app exit.
2014-06-05 23:15:43 +01:00
98720c3cec
Merge
2014-06-05 06:31:30 -07:00
a7b523b36a
MAINT-4071 FIXED Use LLViewerStats::instance().getRecording() to get correct stats.
2014-05-29 13:49:25 +03:00
babd89b770
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2014-05-19 22:19:55 +01:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
37d620463b
MAINT-4009: Cleaning up the error callstacks memory before app quit.
2014-04-28 19:18:47 +01:00
5e225213f6
MAINT-4009: Adding an ares cleanup call to free the allocated memory.
2014-04-23 17:57:23 +01:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
b4ca93cadc
merge up to 3.7.6-release
2014-04-22 13:05:26 -04:00
b1a7137ba6
merge changes for 3.7.6-release
2014-04-21 16:21:31 -04:00
a5a0a0b136
Merge downstream code
2014-04-21 12:48:50 -07:00
0b9a777bfd
Merge downstream code updating version to 3.7.7
2014-04-21 12:36:35 -07:00
e5dae42252
Fix for MAINT-5707 bad breakpad behavior with teleport links
2014-04-14 15:11:42 -07:00
375c05ac43
merge changes for 3.7.5-release
2014-04-08 11:41:12 -04:00
32bbb07f0a
merge changes for 3.7.5-release
2014-04-08 11:36:22 -04:00
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
c9620e24d3
Merge downstream code
2014-04-07 14:29:18 -07:00
991636d57b
Merge in viewer-release and version update to 3.7.6
2014-04-07 14:26:15 -07:00
1d15ac293b
Double init of logging probably due to merge fail.
2014-03-26 05:26:10 -07:00
9ea2694c0e
Not ideal but sufficient.
2014-03-26 02:07:29 -07:00
5b7929364b
Still wasn't doing the right thing with log files.
2014-03-25 18:30:39 -07:00
0893b49ebd
The simple approach has not worked. This hybrid solution should avoid the Windows issues and get us per-run logfiles.
2014-03-24 22:44:51 -07:00
35ab71d8ea
Returned Secondlife.log to main directory due to unforeseen LLErrorThread complexities.
2014-03-20 12:04:39 -07:00
bd4f4ee793
logging cleanup in support of debugging text editor problems
2014-03-19 14:17:13 -04:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -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
800409bdfc
Maint-3135 Discovered apple made this change in 10.6.8 not 10.7.0
2014-02-18 14:11:17 -08:00
262f8b8473
Was not using correct name for results of file search.
2014-01-26 02:56:23 -08:00
ea7e6a5174
Some cleanup of string to wstring conversion and vice versa.
2014-01-14 15:28:35 -08:00
ddd6b8f91b
Mac Fullscreen fix for MAINT-3288 and MAINT-3135
2013-12-17 00:12:26 -08:00
6b84d40558
added some comments and changed calls from get_master_thread_recorder()
...
over to get_thread_recorder() to be agnostic about which thread we're running on
2013-12-05 21:58:45 -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
391ac367d6
SH-4634 FIX Interesting: Viewer crashes when receiving teleport offer
...
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
2013-11-19 17:40:44 -08:00
89d5d01c41
MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated fields
...
moved viewer information strings into LLAppViewer
replaced Help>Report a Bug with direct use of Jira link
2013-11-11 18:41:25 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
Aura Linden