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

133 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel f156e0771f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-03 00:55:58 +01:00
Ansariel 8a31926cd5 Fix uninitialized variable warning 2023-01-17 18:35:00 +01:00
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
 2022-12-12 22:09:54 +01:00
Ansariel 1ca8584322 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-22 15:48:47 +02:00
Ansariel 47964fb28d Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-10-20 16:47:38 +02:00
Zi Ree 07c9d38526 Linux/SDL2 - FIRE-32214 - Add checkbox to Preferences/General to enable or disable IME text input, so regular keyboard input will not be affected 2022-09-26 02:02:12 +02:00
Ansariel 2507bc6137 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 20:37:16 +02:00
Ansariel 1f3b96dd9c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 19:56:19 +02:00
Zi Ree a5cb6dab38 Linux/SDL2 - IME support for composing Japanese, Chinese, etc. input. Tested with ibus/mozc giving over-the-top editing with candidate clause selection, Media pages in the internal web browser do not yet have accurate input placement 2022-09-14 11:19:51 +02:00
Ansariel 0af17f6584 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-09-13 20:23:04 +02:00
Ansariel e9e62b798d Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-17 19:31:17 +02:00
Ansariel fc11575657 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 20:28:29 +02:00
Ansariel 34064a7c28 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-05-19 21:22:11 +02:00
Ansariel 6638d1d367 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-26 12:31:20 +01:00
Ansariel 310a3ada46 Transplant changes from llchathistory to fschathistory 2022-01-14 14:02:03 +01:00
Ansariel c1f1b85243 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-08 15:39:56 +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 b7aa849c06 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-18 11:30:18 +01:00
Ansariel 10738b1447 FIRE-30763: Fix chat header layout 2021-02-17 15:14:32 +01:00
Ansariel 160d874a9c Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llui/llchat.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llviewerinventory.cpp
 2021-02-03 22:09:42 +01:00
Ansariel 5717f38411 FIRE-30611: "You" in transcript is underlined 2020-12-16 11:25:15 +01:00
Ansariel af61974386 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-05 09:14:11 +01:00
Ansariel 5de3241325 Forgot to actually remove this... 2020-10-23 08:43:18 +02:00
Ansariel db0397a629 Chat history context menu memory leak fix, courtesy of Rye Mutt 2020-10-22 23:42:25 +02:00
Ansariel b5635da9e9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 10:08:11 +02:00
Ansariel 1fc2a32285 Fix paste fail 2020-09-19 23:36:23 +02:00
Ansariel 0c55380882 Make the RLVa changes actually have an effect... 2020-09-19 23:34:27 +02:00
Ansariel decc07da57 Fix info icon position in chat history when using chat headers 2020-08-20 00:50:29 +02:00
Ansariel 5f309fdcf7 More banging at name SLURL underlining on hover in chat history 2020-08-20 00:32:27 +02:00
Ansariel 0efda8f28d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-08-18 22:41:20 +02:00
Ansariel 3d4e7b6497 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-08-11 20:06:37 +02:00
Ansariel 2e179112c7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-08-01 09:46:00 +02:00
Ansariel 700af52476 Undo some terrible cruft regarding mini icons in chat history headers 2020-07-30 13:03:42 +02:00
Ansariel 03955f96db Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-07-24 20:12:46 +02:00
Ansariel 5ba9660e42 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-07-24 00:36:12 +02:00
Nicky Dasmijn f116ea4cb7 Merge remote-tracking branch 'fs/master' into fs-vs2017-d476 
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
 2020-07-20 09:58:30 +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 64f80748e7 Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-18 21:50:17 +02:00
Nicky Dasmijn a135b5b428 Merge remote-tracking branch 'origin/ll-vs2017' into fs-vs2017 2019-12-21 13:14:51 +01:00
Ansariel c0f4774089 Transplant missing null-checks 2019-12-01 14:45:17 +01:00
Ansariel 106d34da3a Merge viewer-neko 2018-06-12 21:54:15 +02:00
Ansariel 780c14fcaa Transplant "MAINT-8498 Fixed item offers not appearing after friednship offer" and missing fix "MAINT-2575 FIXED Resident can accept unlimited number of friendship requests if they were sent before his first accept" 2018-05-01 18:53:43 +02:00
Ansariel a71b0584db FIRE-22530: Copy & paste from chat history using chat headers is missing line breaks 2018-04-25 23:11:21 +02:00
Ansariel ae09c687cf FIRE-22241: Copy&paste chat from chat history with chat headers includes unexpected timestamps 2018-02-04 23:11:30 +01:00
Ansariel f26f197088 STAR-25: Fix hard to read color for messages from log in chat history (Starlight Silver / Blue) 2018-01-16 10:30:52 +01:00
Ansariel dcd39ae797 Merge Firestorm LGPL 2017-07-18 19:50:23 +02:00
Ansariel e8a24001aa FIRE-21298: Emotes ignoring display name setting if using V5 style chat history 2017-06-23 15:55:03 +02:00
Ansariel 300db0dacf Merge MAINT-6805 to FSChatHistory 2017-05-25 23:00:50 +02:00
Ansariel 4608aeb505 Transplant MAINT-7118 and fix some bad design on the way 2017-02-23 10:54:25 +01:00