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

1183 Commits (087c294e01de8d44cdcbbc04d26276904da45bb3)

Author SHA1 Message Date
Andrey Lihatskiy 6364e2fff6 Merge branch 'master' into DRTVWR-460 2020-05-04 23:35:54 +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
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500 
# Conflicts:
#	indra/newview/pipeline.cpp
 2020-04-20 21:23:34 +03:00
AndreyL ProductEngine b371c5a35d Merged in lindenlab/viewer-release 2019-10-31 21:13:12 +02:00
andreykproductengine 1b4d5492c6 SL-11727 Fix build warnings 2019-10-23 16:37:15 +03:00
Brad Payne (Vir Linden) c7747d2a1b merge 2019-10-16 22:24:03 +01:00
Graham Linden 3609eabe54 Merge viewer-release 6.3.2 2019-09-10 12:07:01 -07:00
Graham Linden a97f13e161 Merge viewer-release 6.3.2 2019-09-10 10:19:50 -07:00
Graham Linden f03b696c3d Merge viewe-release 6.2 2019-07-12 08:34:25 -07:00
AndreyL ProductEngine ad64edd9c0 Merged in lindenlab/viewer-lynx 2019-06-22 03:17:43 +03:00
AndreyL ProductEngine 13580377c4 Merged in lindenlab/viewer-release 2019-06-22 03:16:39 +03:00
Graham Linden 9313bc50c4 Merge the Rainbow 2019-06-20 13:42:00 -07:00
AndreyL ProductEngine 0574d03bfa OPEN-345 Fixed enigmatic messages during build 2019-06-17 19:46:20 +03:00
AndreyL ProductEngine b996c95f32 SL-11079 Updated contributions.txt 2019-05-28 23:52:23 +03:00
Graham Linden 65cb4b6d20 Merge 6.2.2 2019-05-08 10:37:34 -07:00
Graham Linden 470d1595cc Merge viewer-release 2019-05-08 09:30:39 -07:00
maxim_productengine be0c609eaf SL-11072 FIXED Crash in LLInventoryAction::doToSelected(2406) 2019-05-02 13:11:18 +03:00
Graham Linden 5f8cca95f8 Merge 6.2.1 2019-04-17 11:24:08 -07:00
Graham Linden f14888b616 Merge 6.2.1 2019-04-17 08:43:14 -07:00
AndreyL ProductEngine 724e3cca96 SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100% 2019-04-11 00:19:58 +03:00
Geenz d7d8a15092 Fullbright + elimination of all references to calcFragAtmospherics. 
--HG--
branch : OPEN-340
 2019-04-10 02:49:25 -07:00
Geenz dcd8117b85 First stab at moving atmospheric var calcs to its own utility shader. 
Still some work to go here.  Largely related to how certain values (i.e., SSAO mix values) are supplied.  But so far, so good.

--HG--
branch : OPEN-340
 2019-04-09 22:35:40 -07:00
AndreyL ProductEngine 457df9cd67 SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100% 2019-04-06 10:12:27 +03:00
Geenz 2013578ca9 Update contributions. 
--HG--
branch : BUG-226620
 2019-04-03 16:07:39 -07:00
Graham Linden f89490c1de Add attributions. 2019-04-02 17:03:35 -07:00
Graham Linden b8115d43c9 Merge 6.1.2 2019-04-02 14:32:59 -07:00
Graham Linden d78ed764b5 Merge 6.1.2 LoveMeRender new hotness 2019-04-02 12:27:34 -07:00
AndreyL ProductEngine 1470e82c89 Merged in lindenlab/viewer-release 2019-04-02 21:51:54 +03:00
Rider Linden 47e3c3aa21 BUG-226611, BUG-226617, BUG-226618: Update contrib file for Geenz Spad 2019-03-29 15:57:22 -07:00
AndreyL ProductEngine 599e081815 Backed out changeset: d5795c04fecc 2019-02-23 20:08:03 +02:00
ruslantproductengine f78ff79508 Update contributions list 2019-02-18 21:55:48 +02:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
AndreyL ProductEngine 09b750483a SL-10293 Firestorm PR: preferences and menu search 2019-01-03 22:59:49 +02:00
AndreyL ProductEngine efa5f24d1b SL-10288 Mesh uploader changes from Firestorm 2019-01-03 00:35:38 +02:00
Graham Linden da60cc476a Merge viewer-release 6.0.2 2018-12-18 09:51:26 -08:00
AndreyL ProductEngine 74a56f30aa Merged in lindenlab/viewer-release 2018-12-14 00:46:11 +02:00
andreykproductengine baeca41027 SL-10089 Logs to see which gSavedSettings.get calls should be cached 2018-11-19 20:20:34 +02:00
AndreyL ProductEngine d757234397 SL-9800 Changed llTextBox to have selectable "message" text 2018-10-10 00:04:13 +03:00
Nat Goodspeed 697d2cdff4 STORM-2116: Add to Cinder Biscuits contributions. 2018-09-12 20:21:13 -04:00
andreykproductengine 3961a9e80a SL-11061 Viewer crashes on launch if serial is either unset or does not return a string 2019-04-30 15:24:49 +03:00
Graham Linden bd7ad9c157 Merge viewer-release 2018-08-02 23:02:42 +01:00
AndreyL ProductEngine 3983f5b1e2 Merged in lindenlab/viewer-release 2018-08-02 23:18:28 +03:00
AndreyL ProductEngine 21f19cb6f0 Merged in lindenlab/viewer-release 2018-06-22 11:08:36 +03:00
Graham Linden 2db71067f2 Merge 5.1.7 2018-06-21 17:39:13 +01:00
AndreyL ProductEngine 253a767fa3 Backed out changeset: 4ce8c663a9a0 
STORM-2122: UDP data bandwidth measuring is off by factor 8
 2018-06-19 21:20:48 +03:00
ruslantproductengine b0e5bee0b4 MAINT-8723 - Selecting mesh objects make several HUD-related items invisible 
FIXED (from FS Ansariel patches)
 2018-06-07 18:46:03 +03:00
Graham Linden 3ed3cfce56 Merge 5.1.6 2018-05-31 20:12:26 +01:00
Graham Linden eb8eaa58a4 Merge storm-2145 dev into lindenlab branch parented from viewer-release 2018-05-31 17:10:48 +01:00
andreykproductengine 9437d1511e merge from viewer-release 2018-06-01 01:18:47 +03:00
AndreyL ProductEngine 64b3473f49 Merged in lindenlab/viewer-release 2018-05-18 03:02:44 +03:00