Mnikolenko ProductEngine
a1f983f63c
MAINT-4567 FIXED <nolink> is not parsed correctly in viewer-lion
2014-10-10 18:08:05 +03:00
maksymsproductengine
6ea75fd4b0
MAINT-4548 & MAINT-4557 FIXED build issues
2014-10-07 18:59:11 +03:00
Aura Linden
fb7c5efe32
Pulled in fix for maint-4184 blurry textures
2014-08-01 14:26:33 -07:00
Aura Linden
2121ffcdab
Fixed assert in llmemory.h for adjacent memory locations.
2014-07-11 16:46:18 -07:00
Monty Brandenberg
29bea5a6b9
Merge. Refresh from viewer-release after 3.7.11 release.
2014-07-08 17:29:48 -04:00
Monty Brandenberg
903729d5c9
Merge. Refresh from viewer-release after 3.7.9 release.
2014-06-16 16:41:52 -04:00
Oz Linden
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
Ricky Curtice
98720c3cec
Merge
2014-06-05 06:31:30 -07:00
Stinson Linden
8392fde6f6
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
2014-06-02 22:32:16 +01:00
Stinson Linden
fdc787cc06
MAINT-4009: Patching a memory leak of ParamDescriptor objects.
2014-05-24 00:05:02 +01:00
Monty Brandenberg
060c728970
Merge. Pull in viewer-release after release of 3.7.8
2014-05-22 22:08:54 +00:00
Brad Payne (Vir Linden)
67051b26ba
merge
2014-05-19 18:10:45 -04:00
Stinson Linden
babd89b770
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2014-05-19 22:19:55 +01:00
Stinson Linden
08e83a341e
MAINT-4009: Final pass refactoring to eliminate memory allocation related to error reporting that is not properly cleaned up.
2014-05-17 00:41:36 +01:00
Stinson Linden
34b2f2d1f8
MAINT-4009: First pass refactoring to eliminate memory related to error reporting that is not properly cleaned up.
2014-05-16 22:44:25 +01:00
Brad Payne (Vir Linden)
487ca1bad3
v-r -> s-e merge WIP
2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden)
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04: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
b31bfdba37
MAINT-4009: Converting the Globals class within llerror to be derived from LLSingleton so that it may be cleaned up properly on app exit.
2014-04-26 01:47:41 +01:00
Oz Linden
d00d37d23b
merge changes for OPEN-199
2014-04-22 16:03:35 -04:00
Xiaohong Bao
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
Brad Payne (Vir Linden)
d0eb9658f2
merge
2014-04-22 11:19:58 -04:00
simon
0b9a777bfd
Merge downstream code updating version to 3.7.7
2014-04-21 12:36:35 -07:00
Aura Linden
e9976b07f9
Merges in fix for Maint-5707
2014-04-15 10:32:13 -07:00
Aura Linden
e5dae42252
Fix for MAINT-5707 bad breakpad behavior with teleport links
2014-04-14 15:11:42 -07:00
Richard Linden
e36b905395
revived some deleted files to get mac build working
2014-04-08 18:00:54 -07:00
Brad Payne (Vir Linden)
ea7f34d37a
merge
2014-04-08 13:20:23 -04:00
Richard Linden
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
Merov Linden
c9a9ab1b6a
Pull merge from lindenlab/viewer-release
2014-04-07 16:31:32 -07:00
Monty Brandenberg
1422f89612
Linux: Finish new Boost dependencies to get Linux building again.
2014-04-04 21:59:15 +00:00
Monty Brandenberg
469438707d
Library updates and switch to 3d-llqtwebkit2 build products.
...
SDL to 1.2.15, c-ares to latest 1.10.0 build, Boost to 1.55.0
with coroutine updates/fixes, curl to 7.34.0, libpng to 1.6.8,
openssl to 1.0.1e, zlib to latest 1.2.8 build, llqtwebkit
built from 4.7.1 sources refactored and tested in 3p-llqtwebkit2
repository.
Windows is functional with a good number of warning messages
at runtime from libpng and KDU. MoaP/slplugin functioning.
2014-04-04 16:30:50 -04:00
simon
991636d57b
Merge in viewer-release and version update to 3.7.6
2014-04-07 14:26:15 -07:00
Oz Linden
776aadf4ef
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS
2014-03-19 17:30:07 -04:00
Aura Linden
8d5b933ad0
Probable fix for linux hang.
2014-03-13 23:33:12 +00:00
Aura Linden
706ec08deb
Merged in viewer-release
2014-03-13 21:55:22 +00:00
Brad Payne (Vir Linden)
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
Richard Linden
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
Merov Linden
5690becdf4
Pull merge from lindenlab/viewer-release
2014-03-10 16:20:09 -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
simon
6f1df3172e
Merge viewer-release
2014-02-25 16:45:19 -08:00
Brad Payne (Vir Linden)
895d52a399
merge viewer-release to sunshine-external
2014-02-25 13:25:40 -05:00
Richard Linden
80b4a4a1f5
merge with release
2014-02-24 18:45:59 -08:00
obscurestar
8fd270af1c
Pulled from release.
2014-02-24 15:12:04 -08:00
Merov Linden
245de340d7
Pull merge from viewer-release
2014-02-24 13:23:39 -08:00
simon
dd8b32473e
Merge downstream code
2014-02-25 16:47:31 -08:00
maksymsproductengine
5ce3207a6f
Fix build problem
2014-02-20 19:45:47 +02:00
maksymsproductengine
ba0b11fee1
Fix build problem
2014-02-20 19:45:47 +02:00
Richard Linden
a8192fbf60
accidentally left _CrtCheckMemory defined in non-Windows builds
2014-02-06 13:14:40 -08:00