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

526 Commits (455b750cdec5749eeca69418daa81d238fddf59f)

Author SHA1 Message Date
Ansariel 455b750cde Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llviewermenu.cpp
 2022-03-02 12:04:09 +01:00
Ansariel 9c3cdd37f3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-16 13:43:53 +01:00
Ansariel 453c99af39 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-10 23:15:08 +01:00
Ansariel 9c0973f787 FIRE-31179: Fix double-clicking on friend list item might execute underlying URL in opened IM window 2022-01-04 15:00:41 +01:00
Ansariel 969762f162 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 16:29:50 +01:00
Ansariel be25e64888 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 13:54:22 +01:00
Ansariel 7bef9a1605 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-10-12 13:34:36 +02:00
Andrey Kleshchev bdb4a90e7c SL-16157 Crash at LLFontGL::maxDrawableChars 2021-10-08 02:12:36 +03:00
Ansariel 3c1d189bb8 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-25 09:26:10 +02:00
Ansariel 40e8c0a192 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-08 18:58:22 +02:00
Zi Ree a52eff1b89 Workaround for broken participant list: always show group moderation tools regardless of user permissions, change toggle mute chat to explicit mute and unmute so accidents can no longer happen 2021-06-08 15:37:16 +02: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 4841acd297 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-17 22:44:52 +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 914f8988db Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-04 09:12:20 +01:00
Ansariel e3cb162f51 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-03 22:05:58 +01:00
Ansariel f3961a9510 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-03 20:17:57 +01:00
Ansariel 148e6eede7 FIRE-30805: Replace "agentself" with "agent" when copying SLUrls 2021-03-03 19:52:34 +01:00
Ansariel 35781178ec Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-02 21:19:39 +01:00
Ansariel be546fc9a1 Fix some XUI parser warnings 2021-02-19 10:30:55 +01:00
Ansariel fd06acc270 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 21:22:24 +01:00
Ansariel 47d9576f04 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 19:16:15 +01:00
Ansariel e4f0270887 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 11:41:48 +01:00
Zi Ree edc771b71a FIRE-30725 - Add more group functions to group URL context menu 2021-02-10 14:36:56 +01:00
Ansariel daec926a54 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 17:02:25 +01:00
Ansariel 602a82dc33 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 10:11:43 +01:00
Ansariel 22b2d0d4e0 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-04 15:33:34 +01:00
Beq 571cf0d5cf FIRE-23523 Notifications with embeded URLs not clickable 2020-10-29 15:42:38 +00: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 9f93f28aab Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-15 13:07:37 +02:00
Andrey Lihatskiy b39ad7724f Merge branch 'master' into DRTVWR-515-maint 2020-10-14 22:00:20 +03:00
Andrey Lihatskiy 1d458de949 Merge branch 'master' into DRTVWR-515-maint 
# Conflicts:
#	indra/newview/llpanelprimmediacontrols.cpp
 2020-09-28 22:29:19 +03:00
Ansariel e6e844a0b9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 14:01:45 +02:00
Ansariel efbb274251 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 07:33:20 +02:00
Ansariel 41ac9cb015 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 06:52:54 +02:00
Andrey Kleshchev 730af5d488 Merged master (DRTVWR-503) into DRTVWR-482 2020-09-22 22:51:33 +03:00
Ansariel 240757c0d0 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-20 16:52:04 +02:00
Ansariel b67e99e18a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-08-20 10:44:28 +02:00
Ansariel 5f309fdcf7 More banging at name SLURL underlining on hover in chat history 2020-08-20 00:32:27 +02:00
Andrey Kleshchev e67e9f63c3 SL-13293 Fixed reshape behavior for scale change 2020-08-14 01:06:48 +03: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 db68f49ab5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-07-28 21:01:43 +02:00
Ansariel 6578b9420d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-07-28 20:01:43 +02:00
Ansariel 1dfcb2ddf6 Fix chat header color selection 2020-07-17 08:38:09 +02:00
Ansariel 6f32a43f08 Make avatar names in chat history use default URL font style except it's a moderator in group chat not using default font style 2020-07-16 17:51:59 +02:00
Ansariel a879e86b8e Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-19 21:53:26 +02:00
Ansariel b8f781d2ca Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-19 14:01:14 +02:00
Ansariel f7ab3b2f4b Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-19 12:26:21 +02:00