Commit Graph

39337 Commits (405f5c879c44f32635dcb94de2c7dfb9e4a8673a)

Author SHA1 Message Date
Graham Madarasz b9016f99f3 Merged lindenlab/viewer-cougar into default 2018-03-06 09:48:44 -08:00
Graham Linden graham@lindenlab.com 7ba03ede49 Modify use of linkable shader from libatmosphere.
Update to use latest 3p-libatmo build packages.
2018-03-06 17:42:54 +00:00
maxim_productengine 2093275ad5 MAINT-5165 Don't show 'Maketplace listings' folder 2018-03-06 16:23:29 +02:00
Andrey Kleshchev 4156fb832c MAINT-6363 Normal and specular maps should not be downloaded if ALM is off 2018-03-06 12:59:32 +00:00
maxim_productengine 8617e97427 MAINT-8342 FIXED [maint-viewer] Viewer crash when click Take off in Temporary attachments 2018-03-06 11:32:28 +02:00
Graham Linden graham@lindenlab.com 5517eb3f6f Remove MSVC pragmas breaking OSX build. 2018-03-03 01:08:58 +00:00
Graham Linden graham@lindenlab.com 56609e1186 Merge 2018-03-03 01:04:04 +00:00
Graham Linden graham@lindenlab.com 98862a53a7 Fix 16F enum for compat w/ SL gl headers on Mac.
Make density profile/layer parsing handle when
LLSD heard you liked arrays so it put an array
in your array.
2018-03-03 00:53:39 +00:00
callum_linden f3e11510dd Replace start page for media browser with DuckDuckGo.com - Google page was offset at that window size and was irritating 2018-03-02 16:21:53 -08:00
Graham Linden graham@lindenlab.com acdead96cd Replace ifdefs with comments marking legacy atmo params. 2018-03-02 23:29:28 +00:00
AndreyL ProductEngine ff4bf1a00e Merged MAINT-8297 2018-03-02 20:07:22 +02:00
andreykproductengine 5a273d430a MAINT-8297 path fix #2 2018-03-02 19:46:06 +02:00
andreykproductengine 806262c388 MAINT-8297 path fix 2018-03-02 18:47:35 +02:00
AndreyL ProductEngine 59e7217fbe Merged MAINT-8297 Mac fix 2018-03-02 18:31:05 +02:00
andreykproductengine 49b03929bd MAINT-8297 Mac path fix 2018-03-02 15:17:05 +02:00
Graham Linden graham@lindenlab.com 7951001081 Rework density profile validation, eliminate custom LLSettingsSky::settingsValidation
in favor of custom validator functor for each profile type (rayleigh, mie, absorption).
2018-03-02 00:58:04 +00:00
Nat Goodspeed 12ccb65603 Automated merge with ssh://bitbucket.org/lindenlab/viewer-451 2018-03-01 19:38:21 -05:00
Nat Goodspeed 3c7086d4ff Update to viewer-manager build 512994, updated for new viewer-release 2018-03-01 19:37:58 -05:00
AndreyL ProductEngine af9069edbf Merged in lindenlab/viewer-release 2018-03-02 00:47:08 +02:00
callum_linden f4867d032d Automated merge with tip of viewer-release 2018-03-01 14:33:47 -08:00
AndreyL ProductEngine 722547cd51 Merged in lindenlab/viewer-bear 2018-03-02 00:30:35 +02:00
Graham Linden graham@lindenlab.com f8134b152d Point at KDU 512987 w/ comment fix. 2018-03-01 22:23:13 +00:00
Nat Goodspeed 304c53467b Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2018-03-01 17:09:35 -05:00
Graham Linden graham@lindenlab.com 45a7fa8e7a Point repo at KDU 512984 packages with fix for Windows knock-on from OSX fix. 2018-03-01 21:56:45 +00:00
Oz Linden f8c76535a3 increment viewer version to 5.1.3 2018-03-01 16:51:48 -05:00
Oz Linden c31263798c Added tag 5.1.2-release for changeset 2eb917875efd 2018-03-01 16:51:48 -05:00
Graham Linden graham@lindenlab.com c49748ad23 Point autobuild.xml at next round of KDU 64-bit compat fixes. 2018-03-01 20:54:02 +00:00
Graham Linden graham@lindenlab.com aa3522d287 Point viewer at KDU packages at rev 512968 with OSX fixes. 2018-03-01 19:44:46 +00:00
callum_linden 278382abd7 Now CEF supports setting default page background if specifier missing from HTML, set default background color to the Linden default grey (#282828) 2018-03-01 09:34:25 -08:00
callum_linden 5f12e0e63d Pull in newer version of Dullahan (1.1.1050) that is built against newer version of CEF (3282.1741.gcd94615) 2018-03-01 09:33:23 -08:00
Graham Linden graham@lindenlab.com 2ade47ec86 Fix autobuild.xml to point to KDU 512941 packages. 2018-03-01 15:57:34 +00:00
AndreyL ProductEngine 723e0b2e6b Backed out changeset: a1a106a00e0b
due to OSX build issues
2018-03-01 17:29:48 +02:00
andreykproductengine 5100abb778 MAINT-8297 Cleanup 2018-03-01 02:44:08 +02:00
Graham Linden graham@lindenlab.com 73caf6f52d Fix accidental dups/deletes from merge and remove optimize pragmas. 2018-02-28 22:34:43 +00:00
Graham Linden graham@lindenlab.com ccdf55f4ab Merge 2018-02-28 21:57:19 +00:00
Nat Goodspeed 2e87bac8f9 MAINT-8305: Fix longstanding typo in WriteRegStr per Ansariel Hiller. 2018-02-28 16:56:20 -05:00
Graham Linden graham@lindenlab.com aba5777d74 Merge 2018-02-28 21:53:34 +00:00
Graham Linden graham@lindenlab.com 72270213f5 Add 3p package for adv atmospherics to autobuild.
Mark legacy atmospherics code with ifdefs.

Fix up legacy uplift to include new atmospherics settings.
2018-02-28 21:46:30 +00:00
Nat Goodspeed 5bbb78ee22 MAINT-8305: Point SLURLs to viewer, not launcher; suppress warning.
Specifically, when the viewer is run with a URL target argument, suppress the
"do not directly execute viewer, use the launcher instead" warning.
2018-02-28 11:26:11 -05:00
maxim_productengine 052ea47e39 MAINT-3824 FIXED Some unicode chars not appearing in windows viewer display name 2018-02-28 16:14:22 +02:00
maxim_productengine 9ff12db91c MAINT-8181 Save conversation panel width between sessions 2018-02-28 12:44:51 +02:00
Rider Linden 5621fa4853 Fix the return type. 2018-02-27 15:17:18 -08:00
Nat Goodspeed 446291a7ab MAINT-8305: Clean up trailing whitespace in llappviewer.cpp. 2018-02-27 16:09:05 -05:00
Rider Linden 65cffb24e9 More missing 'override's 2018-02-27 13:01:45 -08:00
Rider Linden 09a8b0e501 Need to bring the mac in... 2018-02-27 12:27:21 -08:00
Rider Linden edc12edaae Missed two overrides. 2018-02-27 11:02:37 -08:00
Rider Linden 87f5675455 XCode now gets cranky about override (or lack there of) 2018-02-27 10:46:21 -08:00
Rider Linden 9f2f2a2874 Replace variadic template with more specific expansion. 2018-02-27 09:38:06 -08:00
andreykproductengine d9064d3a4e MAINT-8317 Fixed Local Textures for Advanced Lighting Projectors do not keep the selected texture. 2018-02-27 15:49:15 +02:00
Rider Linden e2e63598d4 Merge 2018-02-26 09:29:38 -08:00