Commit Graph

933 Commits (5dcd81c15507ad8f487e5727bc7a94de82f6fb45)

Author SHA1 Message Date
Oz Linden bea18c933b merge changes for buildscripts 2016-06-29 15:24:58 -04:00
Oz Linden 97f11bc635 move build number informative output to stdout 2016-06-09 10:03:07 -04:00
Nicky bebfe34aac Linux: Use media_plugin_libvlc for media playback. 2016-06-01 22:33:30 +02:00
Nicky b78f19f82e Linux: SDL has a dependency on X11 -> Link against it. 2016-06-01 22:31:00 +02:00
callum_linden 70a38880fa Put back QuickTime plugin code for OS X only (untested - moving code to OS X dev) 2016-05-26 12:50:54 -07:00
callum_linden 05fcb7c812 Automated merge with tip of viewer-release 2016-05-23 16:50:56 -07:00
callum_linden 09e68a4953 Additional set of changes to use vlc-bin package 2016-05-13 16:43:18 -07:00
callum_linden e11ab0240a Moving to a private repo 2016-05-06 17:43:47 -07:00
callum_linden 5a55ba8ce3 Remove references to quicktime from the plain old viewer-release build 2016-04-19 15:04:50 -07:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Oz Linden 7bbf2ec9f8 correct exception thrown for unknown system 2016-03-22 16:35:47 -04:00
Oz Linden 4fd57774dd OPEN-297 simplify build number generation 2016-02-07 14:58:47 -08:00
Oz Linden 867ef882fd merge changes for OPEN-292 2016-02-07 13:41:41 -08:00
Oz Linden b46627ffc4 add build configuration to the About box if it is not Release
remove some superfluous other information from About
2016-02-04 23:32:42 -05:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Rider Linden 3edc3c5554 CMake fixes for Linux build 2015-12-21 14:26:41 -08:00
Rider Linden 7900e2ee77 Another rt link for linux 2015-12-18 15:06:24 -08:00
Rider Linden 909e409743 Merge 2015-12-18 14:10:02 -08:00
Rider Linden b98469bd7d Disable unit test on Linux only 2015-12-18 13:53:03 -08:00
Rider Linden 6dd80980cf Merge 2015-12-18 10:16:26 -08:00
Rider Linden 9210dcb328 Reorder the rt library for Linux build 2015-12-18 08:52:39 -08:00
Rider Linden 4e8edebe13 MAINT-5977: Update cmake file to always include boost with LLCommon 2015-12-17 17:12:11 -08:00
Cinder Biscuits cc235cdcc4 Merged lindenlab/viewer-tools-update into default 2015-11-29 20:14:22 -07:00
Rider Linden 5d897443a9 Merge from Vivox Repo 2015-11-23 13:04:01 -08:00
callum_linden ec55f2cd10 MAINT-5862 Fix Provide a way for new Linux users to accept ToS 2015-11-13 16:19:16 -08:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Bjoseph Wombat 9c4202f2f8 merged changes from viewer-xcode-7 2015-10-06 22:39:07 +01:00
Oz Linden 22e3e8461c merge changes for XCODE-7 2015-10-06 11:32:00 -04:00
Rider Linden cb7f84a470 MAINT-5687: Remove old webkit from the make files and the repo. Ensure that it is no longer meaningfully referenced. 2015-10-02 11:14:28 -07:00
rider ca81b19e80 Merge for Xcode 7 2015-10-01 12:36:52 -07:00
callum_linden 6765d66637 Merge with viewer-xcode-7 for Xcode 7 patches 2015-09-29 13:35:41 -07:00
Rider Linden 2d2c90157d Remove ares dependency from build. 2015-09-23 15:48:06 -07:00
callum_linden 9ad8b86613 Turn off (for now) the warnings/errors that result from Boost.Units usage 2015-09-18 14:19:51 -07:00
callum_linden 5ec6d2cfd4 Update version of Xcode (7.0) and SDKs (10.11) 2015-09-18 13:26:16 -07:00
Rider Linden 7e1efcd474 Reenable and correct link issue on linux llappearanceutility. 2015-08-25 16:41:25 -07:00
Rider Linden 7d2ed8e606 Remove forgotten paren 2015-08-20 08:58:41 -07:00
Rider Linden 2ed82d6cce Found another ref that had escaped me! 2015-08-19 17:09:12 -07:00
Rider Linden 8adb6997b1 I must be losing my mind... 2015-08-19 16:44:47 -07:00
Rider Linden 48d75444ef Try commenting out the entire darn file. 2015-08-19 16:24:41 -07:00
Rider Linden 19afd18234 Try disabling LLAppearanceUtility.cmake just for the moment. 2015-08-19 16:04:57 -07:00
Rider Linden be7ed4acd4 Previous try didn't work. What about this? 2015-08-19 15:38:12 -07:00
Rider Linden 62317167b9 Shot in the dark 2015-08-19 15:27:09 -07:00
Rider Linden 7bc1a453f2 Try attaching the bost libraries directly to CoreHttp 2015-08-19 12:04:23 -07:00
Rider Linden fc2e9ec3db swap common and core? 2015-08-17 14:45:52 -07:00
Rider Linden efbbbca9b0 Get unit tests (Integration and project) compiling and linking again. 2015-08-17 10:25:11 -07:00
rider e3b429cd85 These tests are just causing a cascade of errors.. 2015-08-14 21:39:07 -07:00
Rider Linden aa3042ea33 MAINT-5506: Converted llmessage untrusted sim message responder to coroutine.
Removed HTTPSender, HTTPNullSender, HTTPCapSender.
Moved UntrustedMessageCap storage into LLHost
Added boost libraries to PROJECT_x_TEST linkage.
2015-08-14 16:45:26 -07:00
simon 3e25fe9c04 Merge viewer-release and become 3.7.31 2015-06-16 15:58:41 -07:00
Oz Linden fa1913ea67 merge changes for STORM-2109 2015-06-16 14:42:31 -04:00
Callum Prentice 9c67c531cd Merge with head of viewer-release 2015-06-15 09:55:17 -07:00