493200bca5
Undo Linux updates.
2021-03-09 10:40:01 +01:00
15b13608ba
Merge branch 'master' into linux-updates
2020-07-23 23:40:41 +02:00
e6e66a953e
Merge with viewer-vs2017
2019-06-06 14:37:27 +02:00
ebcfbf277e
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2019-06-05 14:15:15 -04:00
9c9601ce8a
[DRTVWR-476] - fix linking
2019-05-08 18:57:33 -06:00
2fb5022185
Merge with viewer-release_linux. Open issues:
...
- switch back to OpenJPEG2
- Reimplement packaging logic for flatpak/snap/docker.
- Remove libvlc for Linux builds
- Remove gstreamer010 for Linux builds.
2019-03-04 08:04:58 +01:00
9623f835f5
Merge.
2019-03-03 17:44:24 +01:00
606adaffe7
Merge viewer-bugsplat
2018-09-12 18:09:43 +02:00
9fd463bd94
remove only-partially-successful attempt to put teamcity blocks around targets
2018-09-07 09:13:57 -04:00
49c483eeb3
add more block structure to TeamCity log output for components
2018-09-05 18:07:35 -04:00
7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
991a621658
Linux: Link SLPlugin with -Wl,--as-needed
2018-04-06 17:12:00 +02:00
3ea9a01423
Change pointer to member where possible and do a bit of cleanup in lerror (move the mutexex in there and us the LLMutextTryLock rather than a custom class).
2018-04-06 09:49:32 +02:00
3a1fcb9521
Merge Firestorm LGPL
2018-01-17 20:28:45 +01:00
d7c8678c3a
merge 5.1.0-release
2018-01-17 12:43:28 -05:00
4df25505e4
Merge
2017-05-18 17:10:31 +02:00
95c7feba07
Remove the scary 32bit exception handler that patches kernel32.dll since it was (a) scary, (b) didn't work on 64 bit and (c) likely the cause of a lot of anti-virus false positives
2017-04-19 15:54:26 -07:00
915496bbea
Merge viewer-vivox
2017-03-21 22:14:02 +01:00
0a7fd3686a
Look for logcontrol-dev.xml in the user settings directory
2017-02-27 09:52:50 -05:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
0184c2fc83
Merge with https://bitbucket.org/rider_linden/maint-4952-v-t-u
2016-01-25 15:06:34 +01:00
28921896f1
OPEN-312: Removed add_dependency entries for items listed in target_link_libraries. Superfluous.
2016-01-20 16:08:33 -08:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
46d5cd7f24
Merge with https://bitbucket.org/callum_linden/viewer-cef
2015-09-03 14:38:13 +02:00
ab9e830306
Refer to new QuickTime third party package with fixes for VS2013 & re-add QuickTime media plugin
2015-03-24 00:42:42 +01:00
e6bfaa3d5b
Update to build on Xcode 6.0: fix cocoa NSWindow redefinition error
2014-10-17 16:02:50 -07:00
71e2efab16
Merge downstream code - Vivox release
2013-08-05 14:50:40 -07:00
ce9962b338
Merged in viewer-release
2013-07-11 17:49:13 -07:00
8642f57dd9
Removed debugging.
2013-05-16 10:31:33 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
291b387178
Cmake doesn't like me
2013-05-02 15:36:26 -07:00
299433c544
Fix the cmake fix
2013-05-02 15:13:05 -07:00
104f576400
Fix Windows Debug build
2013-04-23 16:27:24 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
b628f54f35
Avoid redefinition of NSWindow by forward declaration
2013-10-12 10:48:59 -06:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
03511c75c3
Merge LL 3.6.2 release
2013-08-05 13:50:45 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
5b1aa51a82
Enabled PDB generation for SLPlugin.exe.
2013-05-05 23:20:26 +02:00
2282d6b11a
Fixed whitespace issues for merge.
2012-12-13 12:24:17 -08:00
eca6199852
Ported slplugin and some other missing components for cocoa.
2012-11-12 18:06:32 -08:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
30e8da41b0
Merging Cocoa UI rework.
2013-01-05 13:55:41 -06:00
b27eead1e1
Disable PreventSetUnhandledExceptionFilter. For once it is dubios. And second if using WriteProcessMemory one of the sure ways to set off antivirus software.
2012-04-02 23:27:30 +02:00
Nicky