Commit Graph

42330 Commits (3bc3233a0bc5cf39058caaccb1e3aaf89db1d025)

Author SHA1 Message Date
Kitty Barnett 3bc3233a0b Merge branch 'viewer/build' into viewer/build 2020-06-09 15:34:00 +02:00
Kitty Barnett 1bc3d1a186 Merge branch 'lindenlab/release' into viewer/build 2020-06-09 15:33:40 +02:00
Kitty Barnett 2fa3ad363a Merge branch 'viewer/build' into viewer/build 2020-06-09 15:29:37 +02:00
Andrey Kleshchev 4c710e2878 SL-13329 Misalligned checkboxes in inventory filters 2020-05-28 23:25:21 +03:00
Andrey Kleshchev 952ec4bcda SL-12607 Bar color to blue 2020-05-28 20:50:11 +03:00
Andrey Kleshchev 1fe92a9df9 SL-13340 Restored status display for login 2020-05-28 18:22:17 +03:00
Andrey Kleshchev 2e238f0ba8 SL-12665 Readjusted all logos 2020-05-28 17:17:54 +03:00
Andrey Kleshchev 36c27bf5ec SL-12664 readjusted logo #2 2020-05-28 15:34:56 +03:00
Andrey Kleshchev 205546730e SL-12664 readjusted logo 2020-05-28 12:09:08 +03:00
Andrey Kleshchev c47516c442 SL-12607 Reverted to original logos 2020-05-28 11:25:04 +03:00
Andrey Kleshchev d23e649169 Merged master into DRTVWR-508 2020-05-18 23:29:31 +03:00
Nat Goodspeed ed3d9abdd0 Increment viewer version to 6.4.3
following promotion of DRTVWR-460
2020-05-18 16:26:52 -04:00
Kitty Barnett e7e0ae63bd CATZ-561: Move /MP compiler switch to the build-variables variables file 2020-05-16 15:40:51 +02:00
Andrey Kleshchev 53da10525e SL-11445 pulled in fresh fmod studio package 2020-05-05 20:24:17 +03:00
Andrey Kleshchev 05bc927dd8 SL-12607 Revert changes to no longer necessary packages
This packages were needed for icons, but since icons are no longer needed, neither should packages change.
2020-05-05 20:24:17 +03:00
Kitty Barnett fa01947caa Merge branch 'lindenlab/release' into viewer/build 2020-05-05 13:29:53 +02:00
Kitty Barnett a5f4e8dd09 Merge branch 'lindenlab/maint' into viewer/build 2020-05-05 01:21:14 +02:00
Andrey Lihatskiy 6364e2fff6 Merge branch 'master' into DRTVWR-460 2020-05-04 23:35:54 +03:00
Andrey Kleshchev 13f501b333 Merged master into DRTVWR-508 2020-05-04 19:34:48 +03:00
Nat Goodspeed 4a7fd0117a Increment viewer version to 6.4.2
following promotion of DRTVWR-500
2020-05-04 12:15:30 -04:00
Kitty Barnett 8e4017c76d Merge branch 'lindenlab/release' into viewer/build 2020-05-04 13:34:38 +02:00
Andrey Kleshchev 2bddce7cab SL-12678 Removed auto login retry 2020-05-01 18:08:10 +03:00
Andrey Kleshchev a6b3b98e52 SL-12898 Added https to allowed audio links 2020-04-30 22:11:34 +03:00
Andrey Lihatskiy d3b10072f4 Merged in DRTVWR-460 (pull request #91)
SL-13133 Numerical camera preset names sorting order fix

Approved-by: Maxim Nikolenko
2020-04-28 17:31:50 +00:00
Andrey Lihatskiy ec77b2e0ea SL-13133 Numerical camera preset names sorting order fix 2020-04-28 19:07:55 +03:00
Andrey Kleshchev 49db074be4 SL-12678 Removed auto login retry 2020-04-27 17:36:47 +03:00
Andrey Lihatskiy a0d7d87355 Merge branch 'master' into DRTVWR-460
# Conflicts:
#	indra/llmath/llquaternion.h
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/lljoystickbutton.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/skins/default/textures/textures.xml
2020-04-26 21:57:40 +03:00
Mnikolenko Productengine 2ea5c5986a SL-12904 Temporarily use LLSD to avoid crashes on older viewers 2020-04-23 13:22:27 +03:00
Andrey Lihatskiy f20b22e325 AMD CPUs list update 2020-04-21 00:35:19 +03:00
Andrey Kleshchev 231b51f40f Restored SL-12732 after merge conflict 2020-04-20 22:20:16 +03:00
Andrey Kleshchev d9783adba7 SL-13040 Fixed crash at EnvironmentPersistAcrossLogin 2020-04-20 22:03:06 +03:00
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500
# Conflicts:
#	indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
Andrey Kleshchev 9634bcf488 Merged master into DRTVWR-508 2020-04-20 18:14:37 +00:00
Nat Goodspeed d7f1c88c35 Increment viewer version to 6.4.1
following promotion of DRTVWR-440
2020-04-20 14:09:16 -04:00
Mnikolenko Productengine 74d6e6b65c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-20 14:27:22 +03:00
Andrey Kleshchev de17c53ae3 SL-12607 Removed spacer 2020-04-16 17:34:29 +03:00
Andrey Kleshchev c49e9baa48 SL-12607 Rearrange login panel 2020-04-15 22:52:28 +03:00
Dave Houlton 693791f4ff Merged in euclid-13019 (pull request #70)
SL-13019, fix broken varying linkage on MacOS

Approved-by: Michael Pohoreski
2020-04-14 19:00:25 +00:00
Dave Houlton ff27f6c8f7 SL-13019, fix broken varying linkage on MacOS 2020-04-14 12:56:40 -06:00
Andrey Kleshchev 032c4a1b49 SL-12607 WIP, take pre-sized icons from repo instead of package 2020-04-14 21:32:10 +03:00
Andrey Kleshchev 347c53855b SL-12607 Added more icons and draw methods to draw them 2020-04-13 22:41:55 +03:00
Mnikolenko Productengine 70d340a1bf SL-12993 Focus on avatar after saving new preset 2020-04-13 20:02:58 +03:00
Andrey Kleshchev ee88ebf9e9 SL-13029 Fixed load order 2020-04-13 17:16:10 +03:00
Kitty Barnett 4b31748301 Merge branch 'lindenlab/viewer-eep' into viewer/build 2020-04-12 22:23:51 +02:00
Kitty Barnett 39a5e77e22 Merge branch 'lindenlab/viewer-eep' into viewer/build 2020-04-12 14:15:50 +02:00
Kitty Barnett 47ffc30005 Fix for some origin files showing up as changed due to incorrect line endings 2020-04-12 13:16:31 +02:00
Andrey Kleshchev 483c459e2e SL-13029 Environment update was not applying properly 2020-04-12 12:02:38 +03:00
Mnikolenko Productengine 944b908be1 SL-12994 FIXED [Camera Presets] Zoom fraction should be saved as a part of Camera preset, not as separate setting 2020-04-10 18:38:56 +03:00
Andrey Kleshchev 1ec8c7a68a SL-12999 List can go out of floater's rect, so it should consume scroll events 2020-04-10 17:06:14 +03:00
Andrey Kleshchev 2542a3ed79 SL-11445 Provide 'name' for Pulse Audio 2020-04-10 17:00:22 +03:00