Hecklezz
|
882fc91b0c
|
Added missing opacity overrides for filter editors in the conversations floater
|
2025-08-26 22:05:06 +10:00 |
Ansariel
|
58d68b3cf9
|
Refactor some stuff I stumbled upon
|
2025-08-09 03:05:10 +02:00 |
Ansariel
|
565158ac14
|
Refactor contact list
|
2025-07-16 20:49:12 +02:00 |
Ansariel
|
2725c7d0c7
|
Fix incorrect use cases of LLAvatarNameCache::get callback-overload: If name is in cache, callback is fired immediately and the returned connection is a default, not-connected connection which will be dangling in the callback connection maps
|
2025-06-19 01:48:43 +02:00 |
Ansariel
|
6473ba38bf
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
# Conflicts:
# indra/newview/llpanelpeople.cpp
|
2024-08-16 12:28:12 +02:00 |
Ansariel
|
eb5db773aa
|
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llpanelpeople.cpp
|
2024-08-16 12:26:03 +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
|
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
|
9a044f4a52
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llappearance/llavatarappearance.h
# indra/llappearance/lldriverparam.h
# indra/llappearance/llviewervisualparam.cpp
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llcharacter/llcharacter.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/llagent.cpp
# indra/newview/llcallbacklist.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llpanelnearbymedia.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
|
2024-02-13 00:54:24 +01:00 |
Ansariel
|
376fe00f8f
|
Add CTRL-F accelerator key support
|
2021-05-10 12:39:56 +02:00 |
Ansariel
|
834f8d48b7
|
FIRE-24146: Don't actually need this extra method
|
2021-05-10 12:30:00 +02:00 |
Ansariel
|
fc6b6d0622
|
FIRE-24146: Add filter editor for groups in contacts floater
|
2021-05-10 12:19:31 +02:00 |
Ansariel
|
0c55380882
|
Make the RLVa changes actually have an effect...
|
2020-09-19 23:34:27 +02:00 |
Kitty Barnett
|
cddc7cb040
|
Merge branch 'rlva/development'
|
2020-09-19 13:31:34 +02:00 |
Ansariel
|
92d774b975
|
Merge viewer-neko
|
2019-12-01 12:15:10 +01:00 |
Ansariel
|
d79b79fbe2
|
Merge viewer-ordered-shutdown
|
2019-10-19 03:16:10 +02:00 |
Ansariel
|
d7aa36abe0
|
Add some context cones for contacts floater
|
2019-02-10 14:08:29 +01:00 |
Ansariel
|
0a5d7650bd
|
FIRE-20461: Ctrl+W does not close the Conversations floater while it has focus
|
2016-12-05 18:16:57 +01:00 |
Ansariel
|
e057285ecd
|
Use CTRL-F focus the local search editor of a window if available (can be disabled via FSSelectLocalSearchEditorOnShortcut)
|
2016-10-11 09:45:49 +02:00 |
Ansariel
|
3d3b769778
|
Screw this...
|
2016-01-29 23:32:40 +01:00 |
Ansariel
|
6b74ed04e5
|
FIRE-14083: Add a (optional) search filter for the legacy friend list (can be disabled via right-click context menu or preferences)
|
2016-01-15 12:24:13 +01:00 |
Ansariel
|
4e8467a807
|
More cleanup in FSFloaterContacts
|
2015-11-24 23:56:35 +01:00 |
Ansariel
|
6ca857225a
|
Refactor FSFloaterContacts and say goodbye to LLLocalFriendsObserver
|
2015-11-23 14:52:00 +01:00 |
Ansariel
|
7387996a32
|
FIRE-1134 / FIRE-17195: Add missing friend permissions to contact list / friend list because it's in Alchemy and Singularity as well
|
2015-10-31 19:50:30 +01:00 |
Ansariel
|
453f316ff8
|
Merge recent changes from LGPL
|
2015-10-12 21:21:41 +02:00 |
Ansariel
|
76ae36c781
|
Update names on legacy friend list every 5 minutes in case somebody's display name changed
|
2015-10-10 19:08:04 +02:00 |
Ansariel
|
a5be232feb
|
Fix legacy friendlist not loading due to changes from MAINT-5250
|
2015-08-22 03:25:16 +02:00 |
Ansariel
|
d23be30019
|
FIRE-4970: Allow inventory DaD to the friend list
|
2015-08-08 19:21:47 +02:00 |
Ansariel
|
22f4c7b051
|
FIRE-16524: Friend list sometimes isn't correctly sorted after login; found by Thickbrick Sleaford
|
2015-07-26 15:39:23 +02:00 |
Ansariel
|
7a81e57a34
|
Open request friendship dialog on dropping an agent onto the legacy contacts list via DaD
|
2015-07-13 17:38:06 +02:00 |
Ansariel
|
80d71f004c
|
Use refactored FSScrollListCtrl to get rid of FSAreaSearchListCtrl, FSAvatarSearchListCtrl, FSBlockListCtrl and FSContactsFriendsCtrl to reduce code duplication
|
2015-02-16 12:29:45 +01:00 |
Ansariel
|
e818df525a
|
Fix friendlist counter in legacy contact list showing [COUNT] placeholder if agent has an empty friendlist
|
2014-12-16 21:01:44 +01:00 |
Ansariel
|
c3322b2b72
|
On a second thought, let's reset mRightsChangeNotificationTriggered in the dialog callback
|
2014-12-16 15:45:44 +01:00 |
Ansariel
|
6c2d0240bc
|
Fix annoyance of duplicated rights confirmation dialog when checking a checkbox prior selecting the row in legacy friend list
|
2014-12-16 15:36:05 +01:00 |
Ansariel
|
c8c3809817
|
Always show complete avatar name instead of displayname when changing avatar permissions etc. to avoid spoofing
|
2014-12-16 14:35:18 +01:00 |
Ansariel
|
8228c1636e
|
FIRE-14617: Only issue a simple resort of contact list instead of re-applying default sort when refreshing the UI
|
2014-09-15 23:12:36 +02:00 |
Ansariel
|
296eb54d07
|
FIRE-14575: Add option to hide permission columns to contact list; exposed option (as well as all other options) in the context menu
|
2014-09-12 23:43:07 +02:00 |
Ansariel
|
93c347bc48
|
FIRE-13821: Opening undocked friends, contact sets, or groups, does not bring the contacts window to the foreground
|
2014-09-07 20:16:12 +02:00 |
Ansariel
|
f554795cc5
|
Protect name cache requests in contacts panel
|
2014-09-04 13:18:10 +02:00 |
Ansariel
|
b8258885f6
|
Simplify friends counter in contacts panel
|
2014-09-04 12:53:35 +02:00 |
Ansariel
|
f4ed3777ce
|
Add calls to FSScrollListCtrl::refreshLineHeight() where it might make sense
|
2014-09-03 13:04:36 +02:00 |
Ansariel
|
e04c73214c
|
Sort contact list after name format update
|
2014-08-12 20:50:21 +02:00 |
Ansariel
|
ab2e6f8a09
|
FIRE-14330: Better fix
|
2014-08-12 20:19:22 +02:00 |
Ansariel
|
32a2cb9197
|
FIRE-14330: "Trim 'Resident' from legacy names" option does not work for people without last name and that have no display name set
|
2014-08-12 20:08:20 +02:00 |
Ansariel
|
dfa44707bb
|
FIRE-14329: Disabling display names makes people with display names show their legacy names twice in the contact list
|
2014-08-12 19:51:02 +02:00 |
Ansariel
|
b504192083
|
FIRE-14328: Fix crash when toggling legacy username options
|
2014-08-12 16:28:42 +02:00 |
Ansariel
|
66ac54aea9
|
Clean up FSFloaterContacts
|
2014-08-12 12:28:00 +02:00 |
Ansariel
|
dbf4e1e61f
|
Let's just create a type definition for std::vector<LLScrollListItem*>
|
2014-08-12 11:56:55 +02:00 |