Oz Linden
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
Oz Linden
5c6cf3e7fb
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
2015-04-10 11:02:37 -04:00
Oz Linden
8b42c7898e
replace llifstream and llofstream with std::ifstream and std::ofstream respectively
2015-04-07 17:59:28 -04:00
Oz Linden
3a57b18896
convert llifstream and llofstream to std::ifstream and std::ofstream respectively
2015-04-07 17:28:05 -04:00
Oz Linden
66bc510786
detect xml errors in parsing xml files and remove those files
2015-04-02 21:43:34 -04:00
Oz Linden
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
andreykproductengine
797f221e67
MAINT-4708 better grouping of ack messages between viewer and server
2014-12-18 20:05:36 +02:00
andreykproductengine
35a8938892
MAINT-4690 FIXED forced send_agent_update(TRUE) in idle() results in large amounts of useless UDP traffic
2014-11-25 16:29:40 +02:00
Nat Goodspeed
fbaff6d3a0
Eliminate LLAppViewer::cleanup() dup --analyzeperformance code block.
...
Not sure at what point the redundancy was introduced, but it seems clear we
only want to run performance analysis once per shutdown.
2014-11-12 17:55:52 -05:00
Nat Goodspeed
3920d946c6
Introduce fast_exit() wrapper for _exit() so we can boost::bind() it.
2014-10-14 16:44:29 -04:00
Aura Linden
c25a786640
Pulled merge from viewer-tiger
2014-09-19 10:54:55 -07:00
Aura Linden
b12e241751
Merged with windows fixes.
2014-08-15 18:51:20 -07:00
Aura Linden
370aa671c6
Allegedly hides voice position on teleport. Needs testing.
2014-08-15 18:49:54 -07:00
Aura Linden
7060527bbc
Added delay to Windows shutdown to let SLVoice die a good death.
2014-08-15 17:30:09 -07:00
Aura Linden
7540664183
Ported from defective branch.
2014-08-13 18:12:25 -07:00
simon
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -07:00
simon
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
simon
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
simon
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
Oz Linden
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
Stinson Linden
47a5e1c751
MAINT-4009: Ensuring that the local bitmaps are cleaned up on app exit.
2014-06-05 23:15:43 +01:00
Ricky Curtice
98720c3cec
Merge
2014-06-05 06:31:30 -07:00
Mnikolenko ProductEngine
a7b523b36a
MAINT-4071 FIXED Use LLViewerStats::instance().getRecording() to get correct stats.
2014-05-29 13:49:25 +03:00
Stinson Linden
babd89b770
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2014-05-19 22:19:55 +01:00
simon
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
simon
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
Oz Linden
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
Stinson Linden
37d620463b
MAINT-4009: Cleaning up the error callstacks memory before app quit.
2014-04-28 19:18:47 +01:00
Stinson Linden
5e225213f6
MAINT-4009: Adding an ares cleanup call to free the allocated memory.
2014-04-23 17:57:23 +01:00
Xiaohong Bao
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
Oz Linden
b4ca93cadc
merge up to 3.7.6-release
2014-04-22 13:05:26 -04:00
Oz Linden
b1a7137ba6
merge changes for 3.7.6-release
2014-04-21 16:21:31 -04:00
simon
a5a0a0b136
Merge downstream code
2014-04-21 12:48:50 -07:00
simon
0b9a777bfd
Merge downstream code updating version to 3.7.7
2014-04-21 12:36:35 -07:00
Aura Linden
e5dae42252
Fix for MAINT-5707 bad breakpad behavior with teleport links
2014-04-14 15:11:42 -07:00
Oz Linden
375c05ac43
merge changes for 3.7.5-release
2014-04-08 11:41:12 -04:00
Oz Linden
32bbb07f0a
merge changes for 3.7.5-release
2014-04-08 11:36:22 -04:00
Richard Linden
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
simon
c9620e24d3
Merge downstream code
2014-04-07 14:29:18 -07:00
simon
991636d57b
Merge in viewer-release and version update to 3.7.6
2014-04-07 14:26:15 -07:00
Aura Linden
1d15ac293b
Double init of logging probably due to merge fail.
2014-03-26 05:26:10 -07:00
Aura Linden
9ea2694c0e
Not ideal but sufficient.
2014-03-26 02:07:29 -07:00
Aura Linden
5b7929364b
Still wasn't doing the right thing with log files.
2014-03-25 18:30:39 -07:00
Aura Linden
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
Aura Linden
35ab71d8ea
Returned Secondlife.log to main directory due to unforeseen LLErrorThread complexities.
2014-03-20 12:04:39 -07:00
Oz Linden
bd4f4ee793
logging cleanup in support of debugging text editor problems
2014-03-19 14:17:13 -04:00
Ricky Curtice
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
Aura Linden
706ec08deb
Merged in viewer-release
2014-03-13 21:55:22 +00:00
Richard Linden
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
Aura Linden
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