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

148 Commits (5e75273b49c1f79436174bfff12ef2e2b1488f28)

Author SHA1 Message Date
Ansariel 5e75273b49 Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/llagent.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvoicevivox.h
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
 2024-03-19 17:09:42 +01:00
Beq 6b3339609e support user selected b&w/colour in fallback rendering.+ emoji button 
Allow emoji in button text on emoji picker (visually shows the mono/colour mode)
debug setting allows user to pic a custom label cos why not.
 2024-03-10 02:57:50 +00:00
Ansariel 09b52ab823 Fix the emoji buttons the intended way as seen on the LL viewer 2024-03-03 01:24:09 +01:00
Ansariel 77c3b05a17 Apply missing changes 2024-02-14 19:14:15 +01:00
Ansariel 394c8e17d5 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/lltextbase.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2024-01-26 00:32:06 +01:00
Ansariel 548faf2966 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llfloater.cpp
 2023-11-15 16:38:15 +01:00
Ansariel 478cbd595b Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llpanelemojicomplete.cpp
#	indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
 2023-10-04 16:17:22 +02:00
Ansariel 19c64ebfda Transplant (some) recent changes 2023-09-22 11:16:07 +02:00
Ansariel b118128e83 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2023-09-20 14:18:43 +02:00
Ansariel 888a7bc35c Make the emoji picker floater toggle properly and in reasonable manner 2023-09-05 02:47:18 +02:00
Ansariel fc466df54e Fix crash when selecting emoji after closing the IM floater the picker belongs to 2023-09-04 23:52:01 +02:00
Ansariel ade7d26061 Update recently used emojis on the fly 2023-09-04 23:33:45 +02:00
Ansariel e7549d3951 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2023-08-30 19:04:09 +02:00
Ansariel 478c3c83a1 Transplant emoji button changes 2023-07-29 13:51:08 +02:00
Ansariel d3c3df624b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/fsfloaterim.h
 2023-07-13 09:22:50 +02:00
Zi Ree 4e0d8f82c3 Add a distinct color for server side group chat replay 2023-06-26 14:51:06 +02:00
Ansariel c8b7e97b45 More of "What is all this old crap?" 2023-06-25 18:37:32 +02:00
Ansariel 1e4f4dea32 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	README.md
#	indra/llcommon/llsdserialize.h
#	indra/llui/lltextbase.cpp
 2023-05-18 13:23:19 +02:00
Ansariel f4681346ee Add emoji dictionary to FS chat input 2023-04-22 16:05:34 +02:00
Ansariel e9e62b798d Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-17 19:31:17 +02:00
Nicky 29cd344789 Revert "Remove unmaintained starlight skin." 
This reverts commit a89f29a343.
 2022-04-30 13:19:32 +02:00
Nicky a89f29a343 Remove unmaintained starlight skin. 2022-04-22 07:47:39 +02:00
Zi Ree fb1d3dbee3 Revised - FIRE-24133 - Redirect chat channel messages 2021-02-13 01:35:56 +01:00
Zi Ree 685cd792e0 Revert "FIRE-24133 - Redirect chat channel messages typed into IMs, conferences or group chats" 
This reverts commit c7448a0fa4.
 2021-02-13 01:02:48 +01:00
Zi Ree c7448a0fa4 FIRE-24133 - Redirect chat channel messages typed into IMs, conferences or group chats 2021-02-12 19:12:01 +01:00
Kitty Barnett cddc7cb040 Merge branch 'rlva/development' 2020-09-19 13:31:34 +02:00
Nicky Dasmijn 7c7e3ae8ba Merge remote-tracking branch 'fs/master' into fs-eep-vs2017-d476 2020-06-03 19:28:05 +02:00
Tonya Souther 3d6204f484 FIRE-29578: Update "specify build" in Preview group to toggle blank instead of version. Patch by Chaser Zaks. 2020-05-19 22:37:01 -05:00
Nicky Dasmijn a4aff377e6 Merge branch 'master' into fs-vs2017 2020-04-29 20:02:19 +02:00
Chaser Zaks be671fba7b FIRE-24134 Add text mode indicator to support version string 2020-04-13 13:53:08 +02:00
Testy 25433cd153 Added a search button to nearby chat and IM session floaters. 2020-03-08 20:25:44 -03:00
Nicky 9335eded97 Merge with viewer-vs2107 2019-12-08 17:18:43 +01:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
Ansariel e644ed5e51 INT-142: Renamed notification to force display. Commented out language versions that are not updated yet or they would provide false information 2019-06-23 11:14:52 +02:00
Ansariel a8d16aecf3 INT-142: Nudge setting name to force re-commitment to transferring support infos 2019-06-23 10:52:20 +02:00
Tonya Souther 930c74bd9b INT-142: Make sure testing groups have their wn opt-in. PAtch form Chaser Zaks. 2019-06-22 17:01:04 -05:00
Ansariel 82f6c71bdd Skip redundant FSData check 2019-06-20 23:02:07 +02:00
Ansariel c4dc084f2f Refactor this a bit 2019-06-19 16:49:19 +02:00
Liny e95fc10271 INT-142 - add build number to 'Specify version' in Firestorm groupchats 
Patch by Chaser Zaks
 2019-06-18 16:28:59 -07:00
Ansariel 7fdf88130b Merge Firestorm LGPL 2018-06-21 17:29:14 +02:00
Ansariel 07c549b935 Add refresh for IM session titles to reflect display name changes and fix a bug for updating timeout timers (draw is only called for visible docked floaters!) 2018-06-19 01:25:08 +02:00
Ansariel b980bd1e31 Merge Firestorm LGPL Lynx 2018-05-01 17:03:27 +02:00
Ansariel 161ff56431 More whitespaces for everyone! 2018-04-29 19:47:41 +02:00
Ansariel 328b832bd7 Simplify version indicator code for Firestorm support groups 2018-04-29 17:37:15 +02:00
Ansariel e30cabff93 Merge viewer-neko 2018-04-13 00:27:27 +02:00
Ansariel 0c139fe5da FIRE-22394: Allow QA to request sysinfo too 2018-03-14 19:25:17 +01:00
Ansariel 6d6111814a Merge Firestorm LGPL 2018-01-16 22:55:49 +01:00
Ansariel 38171944dc FIRE-5459 / FIRE-5686: Fix for torn-off IM floaters jumping when clicking on IM chiclets and floaters not persisting positions 2018-01-16 20:03:41 +01:00
Nicky 688bf1e547 Synchronize with viewer64 source. 2017-01-11 15:36:33 +01:00
Ansariel 949e7ace31 FIRE-20193: Bringing IM window with large number of unread messages into focus might lead to viewer disconnect 2016-10-05 11:18:38 +02:00