Ansariel
|
c82141c31a
|
Fix nearby chat floater ignoring 24h clock setting
|
2025-11-05 14:29:56 +01:00 |
|
Hecklezz
|
b4a7ef835c
|
Refactored Conversations opacity override and made the callback to override transparency generic
|
2025-08-26 22:05:06 +10:00 |
|
Hecklezz
|
da395c715c
|
Implemented seperate Conversations opacity options
|
2025-08-26 22:05:03 +10:00 |
|
Ansariel
|
f3a2a42a9a
|
Transplant alternate chat tab flash color for mentions
|
2025-05-08 15:13:26 +02:00 |
|
Ansariel
|
97ddd995d7
|
Transplant emoji picker button toggle behavior and show correct arrow for recent emoji panel toggle button
|
2025-05-05 23:43:30 +02:00 |
|
Ansariel
|
05d5e9f9da
|
Make chat mention work with Firestorm nearby chat / IM floaters
|
2025-04-26 01:39:58 +02:00 |
|
Ansariel
|
cf2f48de06
|
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llflatlistview.cpp
# indra/llui/llstyle.cpp
# indra/llui/llstyle.h
# indra/llui/lltextbase.cpp
# indra/llui/llurlmatch.cpp
# indra/llui/llurlmatch.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlist.h
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/colors.xml
|
2025-04-26 00:31:04 +02:00 |
|
Ansariel
|
83d74614cf
|
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2025-01-22 00:42:22 +01:00 |
|
Ansariel
|
a43e84d1f4
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llcommon/llmemory.cpp
# indra/newview/llviewertexture.cpp
|
2024-07-16 11:30:31 +02:00 |
|
Zi Ree
|
2719c6b3da
|
FIRE-33958 - possible fix for stuck notices when (re)opening local chat while notices are on-screen
|
2024-07-14 03:08:48 +02:00 |
|
Ansariel
|
a17fd2352a
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
|
2024-06-09 16:11:24 +02:00 |
|
Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +02:00 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02:00 |
|
Ansariel
|
b1a271c3aa
|
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/ICU4C.cmake
# indra/llui/lltextbase.h
# indra/llui/llview.h
# indra/newview/CMakeLists.txt
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
|
2024-03-17 17:53:34 +01:00 |
|
Ansariel
|
159ef68fa7
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llfloateremojipicker.cpp
|
2024-03-17 16:41:38 +01:00 |
|
Ansariel
|
0aa1e8ff51
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llrender/llfontbitmapcache.cpp
# indra/llrender/llfontbitmapcache.h
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llui/llbutton.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/llscrollcontainer.cpp
# indra/llui/llscrollingpanellist.cpp
# indra/llui/llscrollingpanellist.h
# indra/llui/llscrolllistctrl.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.cpp
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/newview/fsfloaternearbychat.h
# indra/newview/llchicletbar.h
# indra/newview/llconversationlog.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterimsessiontab.h
# indra/newview/llfloateruipreview.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llpaneltopinfobar.h
# indra/newview/llpathfindingpathtool.h
# indra/newview/lltextureview.cpp
# indra/newview/lltoolbrush.h
# indra/newview/lltoolcomp.h
# indra/newview/lltooldraganddrop.h
# indra/newview/lltoolface.h
# indra/newview/lltoolfocus.h
# indra/newview/lltoolindividual.h
# indra/newview/lltoolobjpicker.h
# indra/newview/lltoolpie.h
# indra/newview/lltoolpipette.h
# indra/newview/lltoolselectland.h
# indra/newview/llviewermediafocus.h
# indra/newview/llviewerparcelmediaautoplay.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoicevivox.h
# indra/newview/llworldmapview.cpp
# indra/newview/qtoolalign.h
# indra/newview/utilitybar.h
|
2024-03-13 02:31:59 +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
|
ac898495ae
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llcommon/llstring.cpp
# indra/llcommon/llstring.h
|
2024-03-04 22:38:34 +01: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
|
b71c7f37ea
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llagent.cpp
# indra/newview/llagent.h
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llattachmentsmgr.cpp
# indra/newview/llattachmentsmgr.h
# indra/newview/llavataractions.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llcompilequeue.cpp
# indra/newview/llcontrolavatar.h
# indra/newview/lldirpicker.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolalpha.h
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfasttimerview.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloateravatarpicker.cpp
# indra/newview/llfloaterbeacons.cpp
# indra/newview/llfloaterbvhpreview.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llfloaterdisplayname.cpp
# indra/newview/llfloatergotoline.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llfloatertools.h
# indra/newview/llfloateruipreview.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgesturemgr.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llhudeffectlookat.cpp
# indra/newview/llhudeffectlookat.h
# indra/newview/llhudicon.cpp
# indra/newview/llhudmanager.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llhudtext.h
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodel.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llmodelpreview.h
# indra/newview/llmutelist.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
# indra/newview/llnotificationlistitem.cpp
# indra/newview/lloutputmonitorctrl.cpp
# indra/newview/llpanelcontents.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelexperiencepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelgrouproles.cpp
# indra/newview/llpanellandaudio.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobject.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaces.cpp
# indra/newview/llpanelpresetspulldown.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llpreviewnotecard.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llpreviewtexture.cpp
# indra/newview/llpreviewtexture.h
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturecache.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltoastimpanel.cpp
# indra/newview/lltoolbarview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/lltoolface.cpp
# indra/newview/lltoolfocus.cpp
# indra/newview/lltoolgrab.cpp
# indra/newview/lltoolgun.cpp
# indra/newview/lltoolgun.h
# indra/newview/lltoolpie.cpp
# indra/newview/lltoolplacer.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/lluploaddialog.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerfoldertype.cpp
# indra/newview/llviewerinput.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewermenu.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerobjectlist.h
# indra/newview/llviewerparcelmgr.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexlayer.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
# indra/newview/llvoiceclient.h
# indra/newview/llvosky.cpp
# indra/newview/llvosurfacepatch.cpp
# indra/newview/llvotree.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/llvowater.cpp
# indra/newview/llworld.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/llworldmipmap.cpp
# indra/newview/pipeline.cpp
|
2024-02-22 11:43:04 +01:00 |
|
Ansariel
|
314639426d
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llchat.h
# indra/llui/llcombobox.cpp
# indra/llui/llcontainerview.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmultifloater.cpp
# indra/llui/llmultifloater.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/llui/llspinctrl.cpp
# indra/llui/llspinctrl.h
# indra/llui/lltabcontainer.cpp
# indra/llui/lltabcontainer.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/llui/llviewereventrecorder.cpp
# indra/llxml/llcontrol.cpp
# indra/llxml/llcontrol.h
# indra/newview/llagentlanguage.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchicletbar.cpp
# indra/newview/llfloaterbuildoptions.cpp
# indra/newview/llfloaterbuildoptions.h
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llfloaterconversationpreview.h
# indra/newview/llfloaterdestinations.h
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterjoystick.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llfloaterpay.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloaterscriptdebug.h
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llfloatersearch.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llmediactrl.h
# indra/newview/llmoveview.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnotificationlistitem.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelprofileclassifieds.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/llsyswellwindow.h
# indra/newview/lltexturectrl.h
# indra/newview/lltoolbarview.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/llwearableitemslist.cpp
|
2024-02-21 13:07:42 +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
|
b7367db706
|
Replace remaining occurrences of NearByChatChannelUUID debug setting
|
2023-10-09 14:07:55 +02: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
|
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
|
7d0d744e34
|
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/featuretable_linux.txt
# indra/newview/llagent.cpp
# indra/newview/llfloatertranslationsettings.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2022-09-13 19:37:45 +02:00 |
|
Testy
|
25433cd153
|
Added a search button to nearby chat and IM session floaters.
|
2020-03-08 20:25:44 -03:00 |
|
Ansariel
|
d79b79fbe2
|
Merge viewer-ordered-shutdown
|
2019-10-19 03:16:10 +02:00 |
|
Tonya Souther
|
b1eaec54f4
|
FIRE-23123: Don't log spammy chat even from the avatar's own attachments.
|
2018-10-11 16:01:44 -05:00 |
|
Ansariel
|
4608aeb505
|
Transplant MAINT-7118 and fix some bad design on the way
|
2017-02-23 10:54:25 +01:00 |
|
Ansariel
|
3356b28ea7
|
RLV fix: @shownames=n might be circumvented via nearby chat history if other avatar is using a display name
|
2016-10-14 14:21:05 +02:00 |
|
Ansariel
|
b28919aa10
|
FIRE-18007: Chat in console not showing if floaters get minimized
|
2016-03-24 01:53:55 +01:00 |
|
Ansariel
|
b0542a1a46
|
Refactor FSCommon
|
2015-11-14 01:36:57 +01:00 |
|
Ansariel
|
c71d29b658
|
Added a collection of purely random and arbitrary options that might be useful to the chat options menu
|
2015-11-13 11:41:46 +01:00 |
|
Ansariel
|
b228cec677
|
Add font size to the chat options menu and add/fix missing stuff on the way
|
2015-11-13 10:34:58 +01:00 |
|
Ansariel
|
c947519b45
|
Add chat options menu to IM floater as well and introduce FSChatOptionsMenu as global handler for them
|
2015-11-13 09:39:30 +01:00 |
|
Ansariel
|
4bc01a9965
|
Remove old junk from FSFloaterNearbyChat and replace it with a nice options menu with more or less useful options to start with
|
2015-11-12 15:48:24 +01:00 |
|
Ansariel
|
513c927517
|
FIRE-4104: Main chat bar doesn't try to send on the channel selected in the nearby chat floater anymore
|
2015-11-12 12:54:04 +01:00 |
|
Ansariel
|
f2dfac8b22
|
Maintenance: Consolidate sendChatFromViewer() methods into FSNearbyChat::sendChatFromViewer()
|
2015-11-12 12:01:34 +01:00 |
|
Ansariel
|
fd08f9e9f2
|
Maintenance: More shooting at code dupes - victims this time: send_chat_from_nearby_floater() and really_send_chat_from_nearby_floater()
|
2015-11-12 10:41:14 +01:00 |