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

1383 Commits (cef7c023257ecf4ef7aa696a64428a9cf71616c1)

Author SHA1 Message Date
Ansariel 3f1f5e884b Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-07-29 13:35:01 +02:00
Ansariel 67255f5d64 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-07-29 13:23:00 +02:00
Ansariel 350cf703a1 Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer 2020-07-24 00:44:20 +02:00
Andrey Lihatskiy b17e2aaff1 SL-13642 Updated contributions.txt 2020-07-22 06:48:15 +03:00
Andrey Lihatskiy 3c564f5afc SL-11625 Fix for skewed baked texture offset values 2020-07-02 21:20:13 +03:00
Ansariel a879e86b8e Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-19 21:53:26 +02:00
Ansariel 13086737cc Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-05-19 21:50:44 +02:00
Andrey Lihatskiy aaaf3189c4 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 2020-05-19 22:37:41 +03:00
Ansariel 05ad4de150 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 
# Conflicts:
#	indra/llxml/llcontrolgroupreader.h
#	indra/newview/llviewerkeyboard.cpp
 2020-05-19 10:20:31 +02: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
Mnikolenko Productengine 9c3368bbf6 SL-13178 Improve initial opening time of the landmarks floater 2020-05-05 19:08:55 +03:00
Ansariel 6afd505fa8 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-05 15:24:10 +02:00
Andrey Lihatskiy ec9b989863 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
 2020-05-05 00:37:16 +03:00
Andrey Lihatskiy 6364e2fff6 Merge branch 'master' into DRTVWR-460 2020-05-04 23:35:54 +03:00
Ansariel 66523963fd Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-04 21:00:08 +02:00
Ansariel 1d7810b916 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-04 10:28:09 +02:00
Andrey Kleshchev 9c31597e5e SL-13141 Crashfix contribution 2020-04-30 17:51:46 +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
Ansariel 75cdb94de3 Merge branch 'master' of D:/Dev/phoenix-firestorm-camus 2020-04-23 19:14:47 +02:00
Ansariel dbf00cf036 Merge branch 'master' 2020-04-23 17:40:31 +02:00
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500 
# Conflicts:
#	indra/newview/pipeline.cpp
 2020-04-20 21:23:34 +03:00
maxim_productengine 44fe667661 SL-12396 Triple clicking text in a textbox / textarea should only select the current line 2020-04-11 22:48:18 +02:00
Andrey Kleshchev 85fb2b81d8 SL-11360 Viewer floods the server with GroupProfileRequest 2020-02-14 18:37:25 +00:00
maxim_productengine b9f0eb54ce SL-12396 Triple clicking text in a textbox / textarea should only select the current line 2020-02-12 12:45:56 +02:00
Ansariel da365b227e Merge Firestorm LGPL 2019-12-13 18:15:19 +01:00
Ansariel 4d09c68e4c Merge Firestorm LGPL 2019-12-13 15:35:54 +01:00
AndreyL ProductEngine b371c5a35d Merged in lindenlab/viewer-release 2019-10-31 21:13:12 +02:00
Ansariel 6e340961c0 Merge viewer-neko 2019-10-30 18:05:01 +01:00
andreykproductengine 1b4d5492c6 SL-11727 Fix build warnings 2019-10-23 16:37:15 +03:00
Ansariel 9b173f0b6e Merge Firestorm LGPL 2019-10-17 22:55:13 +02:00
Ansariel 0cb17cd365 Merge Firestorm LGPL 2019-10-16 23:31:52 +02:00
Brad Payne (Vir Linden) c7747d2a1b merge 2019-10-16 22:24:03 +01:00
Ansariel 9f005065d0 Merge Firestorm LGPL 2019-09-10 23:40:54 +02:00
Ansariel df79950138 Merge Firestorm LGPL 2019-09-10 21:55:47 +02: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
Ansariel 4087c4c077 Merge Firestorm LGPL 2019-08-13 20:17:51 +02:00
Ansariel 3d1a765c61 Merge Firestorm LGPL 2019-07-12 19:21:10 +02:00
Graham Linden f03b696c3d Merge viewe-release 6.2 2019-07-12 08:34:25 -07:00
Ansariel 25d83975f4 Merge Firestorm LGPL 2019-06-22 20:54:01 +02: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
Ansariel 768c3570ab Merge Firestorm LGPL 2019-06-20 23:21:49 +02:00
Ansariel e0ca19d8ab Merge LL viewer-release 6.2.3 2019-06-20 23:14:11 +02:00
Graham Linden 9313bc50c4 Merge the Rainbow 2019-06-20 13:42:00 -07:00
Ansariel 89a6a001fc Merge viewer-neko 2019-06-17 21:48:11 +02: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
Ansariel e6970af7a1 Merge Firestorm LGPL 2019-05-09 19:52:27 +02:00
Ansariel 428c15acfb Merge Firestorm LGPL 2019-05-08 20:54:26 +02:00