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

208 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel 3d7c5c52d9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 17:26:51 +02:00
Ansariel 9c4c27a56f Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-01 22:07:39 +02:00
Andrey Kleshchev 4c3f343799 SL-17045 LSL editor cursor position desynchronization 
1. Fixed cursor position calculations
2. Fixed selection rect calculation
 2022-07-26 19:43:04 +03:00
Ansariel 1fbfe48f84 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 18:23:17 +02:00
Ansariel a0837a5298 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-14 13:46:29 +01:00
Andrey Lihatskiy 9a1af101cd Merge branch 'master' into DRTVWR-543-maint 
# Conflicts:
#	indra/newview/llagentwearables.cpp
#	indra/newview/llvoicevivox.cpp
 2021-11-19 04:38:19 +02:00
Ansariel be25e64888 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 13:54:22 +01:00
Mnikolenko Productengine ceb752c133 SL-11690 Parse URLs in Group description and Land description 2021-08-13 16:05:32 +03:00
Ansariel 9768f25de0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 02:08:40 +02:00
Ansariel bc76d48967 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-30 09:32:45 +02:00
Ansariel 6d26efe266 FIRE-30892: Pressing the Home key in the script editor should go to the first non-whitespace character on a line; Contribution by Testicular Slingshot 2021-04-03 09:59:07 +02:00
Ansariel 22b2d0d4e0 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-04 15:33:34 +01:00
Mnikolenko Productengine a74cadff83 SL-14149 FIXED The text is displayed black after double-clicking on it 2020-10-23 16:05:31 +03:00
Ansariel 3c16b5d369 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-15 15:12:16 +02:00
Ansariel 48854f714a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-03-19 10:28:54 +01:00
Ansariel fc5f901ff5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-03-19 09:29:44 +01:00
Andrey Lihatskiy 9ec2aac56c Merge branch 'master' into DRTVWR-482 2020-03-18 21:05:33 +02:00
Ansariel 90cbec4a54 Merge DRTVWR-481 2020-02-08 18:43:22 +01:00
Andrey Lihatskiy 258cc9c61a Merge branch 'master' into DRTVWR-482 2020-02-05 18:31:06 +02:00
Ansariel d55a2e4ebb Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-01-29 17:20:05 +01:00
Ansariel bcc5ecc165 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-01-29 07:29:39 +01:00
Brad Payne (Vir Linden) 38649767a0 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into DRTVWR-481 
Merge
 2020-01-28 21:47:35 +00:00
Ansariel 7613e76fc2 Merge viewer-serval 2020-01-10 16:01:02 +01:00
andreykproductengine b611925357 SL-12484 EXP-696 Remade "Remember Password" checkbox to be multiline 2020-01-02 22:19:21 +02:00
Ansariel 5f1aaa7108 Merge Firestorm LGPL 2019-12-13 22:27:53 +01:00
Ansariel f686d4f329 Merge viewer-legacy-profiles 2019-12-13 00:56:12 +01:00
Ansariel 8f3213d7d4 Merge Firestorm LGPL 2019-12-13 00:14:24 +01:00
maxim_productengine 3d5ffd0af3 SL-12003 FIXED Viewer Icons do not display in Profiles 2019-12-02 16:28:13 +02:00
maxim_productengine 4acfc99fa6 SL-12317 UI Changes to Group limits 2019-11-22 18:26:56 +02:00
Ansariel e8b426d1c2 Merge viewer-neko 2019-09-11 17:34:55 +02:00
andreykproductengine 98b28e5881 SL-11910 [Win] Horizontal scroll 2019-09-10 19:49:15 +03:00
Ansariel 69f14e2f29 Initial merge of viewer-legacy-profiles 
For the time being, use the Firestorm legacy profiles. Can be switched via FSUseOwnProfiles debug setting
 2019-07-19 11:21:54 +02:00
Ansariel a63693b454 Merge mesh upload changes 2019-05-11 13:12:11 +02:00
AndreyL ProductEngine 3175525950 Merged in lindenlab/viewer-release 2019-05-08 21:41:56 +03:00
AndreyL ProductEngine 93f0023efa Merged in lindenlab/viewer-release 2019-05-08 21:41:11 +03:00
andreykproductengine 580b35c8ea SL-307 Display in-viewer all warning messages logged by the mesh uploader 2019-04-01 20:22:25 +03:00
Kadah_Coba 3dea03ed4a Added LLTextBase::setParseHTML 2019-03-02 23:34:31 -08:00
Ansariel dd2636a2c2 Merge viewer-neko 2019-01-10 21:10:36 +01:00
AndreyL ProductEngine 09b750483a SL-10293 Firestorm PR: preferences and menu search 2019-01-03 22:59:49 +02:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
andreykproductengine b7c909367e MAINT-7267 Fixed UI missing last symbol of string on hi-res monitors. 2017-04-06 21:29:43 +03:00
Ansariel dd69a22834 Merge viewer-bear 2017-01-27 09:42:51 +01:00
andreykproductengine 8ef99c38a5 MAINT-918 Newline was not displayed correctly in chat window. 2017-01-04 18:38:52 +02:00
Ansariel f0366fa155 Merge latest fixes from viewer-vob that didn't get into viewer-release yet 2016-09-15 23:32:34 +02:00
andreykproductengine ff118b7d21 MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase 2016-09-12 17:45:12 +03:00
andreykproductengine 50ed0db1ff MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase 2016-09-12 17:45:12 +03:00
Ansariel 71f1707b99 Merge viewer-lion 2016-05-23 17:41:19 +02:00
andreykproductengine efa716b5fc MAINT-2129 "Block" button doesn't become disabled 2016-05-18 19:29:31 +03:00
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00