livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,139 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

42139 Commits (8b8a57a977a407dc1fda052d6a6289b5800f48e8)

Author SHA1 Message Date
Andrey Lihatskiy 8b8a57a977 SL-12896 BOM texture settings - replaced isRiggedMesh() call with faster check 2020-05-19 19:56:59 +03:00
Andrey Lihatskiy d9cdef171a SL-12904 Restored the missing code (post-merge) 2020-05-19 12:10:39 +03:00
Andrey Lihatskiy 510574dc14 Merge branch 'master' into DRTVWR-501-maint 
# Conflicts:
#	indra/llxml/llcontrolgroupreader.h
#	indra/newview/llviewerkeyboard.cpp
 2020-05-18 23:41:19 +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
Andrey Lihatskiy ebc629ffc4 Merged in SL-12090 (pull request #105) 
SL-12090 Initialize the joystick only when required

* SL-12090 Initialize the joystick only when required

Approved-by: Andrey Kleshchev
 2020-05-14 07:51:08 +00:00
Andrey Kleshchev 663489493e SL-12970 Fixed char length crash 2020-05-07 21:31:55 +03:00
Dave Houlton c19bb9beee DRTVWR-510 cache vulkan-detect result 2020-05-06 23:01:55 +03:00
Dave Houlton 85a03549f1 DRTVWR-510 add code to report Vulkan capability in stats (Windows-only) 2020-05-06 02:32:47 +03:00
Andrey Lihatskiy 6364e2fff6 Merge branch 'master' into DRTVWR-460 2020-05-04 23:35:54 +03:00
Andrey Lihatskiy 7c0f3db180 Merge branch 'master' into DRTVWR-501-maint 2020-05-04 19:20:59 +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
Brad Payne (Vir Linden) b654330f51 SL-12896 - BOM texture settings 2020-05-01 16:55:34 +03:00
Andrey Kleshchev 9c31597e5e SL-13141 Crashfix contribution 2020-04-30 17:51:46 +03:00
Andrey Lihatskiy b6441bf09b Merge branch 'DRTVWR-500' into DRTVWR-501-maint 2020-04-29 19:34:39 +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
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
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
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
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 f96fb4fe4e SL-12999 Removed unused variables 2020-04-10 15:34:23 +03:00
Dave Houlton 8b3071dd1f Merged in euclid-12975 (pull request #65) 
SL-12975, unfix alpha and undo non-fix magic number of refracted portion of water Fresnel
 2020-04-10 00:40:07 +00:00
Dave Houlton 3c6b666ccd SL-12975, unfix alpha and undo non-fix magic number of refracted portion of water Fresnel 2020-04-09 18:30:33 -06:00
Andrey Kleshchev b1bf8443b2 SL-12999 Some menus allow mouse scroll to zoom camera 2020-04-09 21:39:15 +03:00
Michael Pohoreski 538a6d737d Merged in SL-10449 (pull request #63) 
SL-10449

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-04-07 23:30:48 +00:00
Ptolemy af7563968c SL-10449: Put first shader error on new line for readability 2020-04-07 16:22:25 -07:00
Ptolemy e4f72db20d SL-10449: Add dumping of shader to log file 2020-04-07 16:21:39 -07:00
Dave Houlton 9e8e623197 SL-10449, add missing linkage variable, fix OSX & Intel deferred shaders comp 2020-04-07 14:23:24 -07:00
Ptolemy 0b717e2d1a SL-10449 Cleanup dumping shader without LOG spam on every line when it fails to compile/link 2020-04-07 14:22:24 -07:00
Ptolemy 4051f5754a SL-10449 Fix off-by-one line numbers when dumping shader that failed to compile/link 2020-04-07 14:07:45 -07:00
Ptolemy 1016b9de18 SL-10449 Fix ALM on OSX 2020-04-07 14:02:48 -07:00
Mnikolenko Productengine 40394752f7 SL-12991 [Camera Presets] Sort all Camera preset lists in the same way 2020-04-07 21:26:13 +03:00
Mnikolenko Productengine 3bac0d4283 SL-12991 [Camera Presets] Sort all Camera preset lists in the same way 2020-04-07 19:15:40 +03:00
Andrey Lihatskiy 72aad48427 Merged in DRTVWR-500 (pull request #60) 
SL-10993 Fixed Korean font on OSX Catalina

Approved-by: Andrey Kleshchev
 2020-04-06 20:40:48 +00:00
Andrey Lihatskiy 7d992f2331 SL-10993 Fixed Korean font on OSX Catalina 2020-04-06 20:57:33 +03:00
Mnikolenko Productengine 1f5bb7be28 SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-06 16:03:19 +03:00
Dave Houlton 81c4c76d6d Merged in euclid-11368 (pull request #58) 
SL-11368, fix missing water uniforms for low shader settings

Approved-by: Michael Pohoreski
 2020-04-03 18:06:51 +00:00
Dave Houlton 0524a1a86f SL-11368, fix missing water uniforms for low shader settings 2020-04-03 11:52:18 -06:00