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

42034 Commits (d3b10072f4c52b01c8d77ad1990d69dd89fc1310)

Author SHA1 Message Date
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
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
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
Michael Pohoreski eb4ceb533d Merged in SL-12852 (pull request #57) 
SL-12852 Cleanup for readability

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-04-03 16:11:22 +00:00
Ptolemy a3f0913b4b SL-12852 Cleanup for readability 2020-04-03 08:10:36 -07:00
Mnikolenko Productengine 2dde386917 SL-12927 FIXED [Camera Presets] when sitting pressing ESC key causes rotation 2020-04-02 15:32:04 +03:00
Rye Mutt 6058c49bb4 Merged in eep-fix-falloff-edit (pull request #54) 
Fix light falloff being corrupted when editing value via build floater spinner

Approved-by: Dave Houlton
 2020-04-01 00:25:07 +00:00
Rye Mutt c77e4e7a57 Merged in eep-fix-light-color (pull request #53) 
Fix editing light color corrupting intensity and color values

Approved-by: Dave Houlton
 2020-04-01 00:23:57 +00:00
Michael Pohoreski 2cd264f4a8 Merged in SL-12888 (pull request #55) 
SL-12888 Fix space alpha megaprim not using z-test

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-03-31 16:53:58 +00:00
Rye Mutt 516ca23659 Update falloff fix with changes requested in review. 2020-03-30 23:27:04 -04:00
Ptolemy 8c46605c32 SL-12888 Fix space alpha megaprim not using z-test 2020-03-30 16:11:54 -07:00
Rye Mutt 3dc71d1ce9 Fix light falloff being corrupted when editing value via build floater spinner 2020-03-30 12:53:11 -04:00
Rye Mutt 8e436fc396 Fix editing light color corrupting intensity and color values 2020-03-30 10:39:10 -04:00
Dave Parks c28852bd9a Merged in davep/DRTVWR-440 (pull request #52) 
SL-12902 Better fix for light color values in color swatch not matching light color values inworld.
 2020-03-27 22:33:57 +00:00
Runitai Linden e468d80186 SL-12902 Better fix for light color values in color swatch not matching light color values inworld. 2020-03-27 17:32:01 -05:00
Mnikolenko Productengine aefd01bd9c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-03-27 20:00:27 +02:00
Dave Houlton f61474fe5b DRTVWR-440, quick fix, add return value - needed for Mac build 2020-03-27 11:24:22 -06:00
Andrey Kleshchev 6620211bff SL-12911 Add Debug setting EnvironmentPersistAcrossLogin 2020-03-27 00:24:08 +02:00
Andrey Kleshchev a7849c6ec4 Removed obsolete and misleading variable 2020-03-27 00:24:07 +02:00
Dave Parks 964597af05 Merged in davep/DRTVWR-440 (pull request #48) 
SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.
 2020-03-26 22:00:54 +00:00
Runitai Linden d756e18573 SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values. 2020-03-26 16:48:33 -05:00
Dave Houlton a248018d6d Merged in euclid_gDebugGL_inf_loop (pull request #46) 
Fix infinite loop debug message when debugGL flag is enabled.

Approved-by: Michael Pohoreski
 2020-03-26 16:25:53 +00:00
Dave Houlton 126b91f8ee DRTVWR-440, make enabling GLdebug flag slightly less infinite-loopy 2020-03-26 10:24:25 -06:00