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

150 Commits (9abf29e9955b2ca039482ca2cb3fcffbe7375175)

Author SHA1 Message Date
Ansariel adae99b144 Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llcallingcard.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llinventorybridge.cpp
 2023-01-12 12:26:06 +01:00
Andrey Kleshchev 73933fe778 SL-18894 The change of 'modify rights' is not recorded in IM history if the user is in DND mode 
Revert of commit for SL-15401. Messages are supposed to handle 'mute' on their own.
 2023-01-05 18:21:53 +02:00
Andrey Kleshchev 6f522084ed SL-18426 At log in only a part friends reported to chat as online 
Server sends updates in bulk now, so notify per agent instead of per update
 2022-12-20 02:03:03 +02:00
Beq 286c390262 [FIRE-32324] Fix for online/offline batched chat notications failing 2022-10-22 20:25:20 +01:00
Ansariel 401fa5a4e4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-10-21 01:51:04 +02:00
Brad Payne (Vir Linden) 3994101549 SL-18119 - more ViewerStats logs for NUX 2022-09-21 20:52:27 +01:00
Brad Payne (Vir Linden) 9c903e7fa8 SL-18119 - logCommand() for friend operations 2022-09-20 21:53:56 +01:00
Ansariel b61dfd131d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-26 11:36:16 +02:00
Andrey Lihatskiy 2ed401882e Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
 2022-05-26 02:56:29 +03:00
Ansariel 410704b5c6 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-05-03 11:37:50 +02:00
Mnikolenko Productengine 9c0ebc5469 SL-17301 FIXED Friends are not showing in friendslist 2022-04-28 11:39:58 +03:00
Ansariel 0afd0f0028 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-20 13:08:41 +02:00
Ansariel b8b0c8ec3b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 15:42:14 +02:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Andrey Lihatskiy 65ea8e1351 Merge branch 'master' into DRTVWR-483 2022-04-18 20:39:18 +03:00
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 25f974d77d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 10:00:36 +01:00
Ansariel 08fe29a658 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-22 11:46:16 +01:00
Ansariel 227cfe37c9 Don't half-way apply RLVa name filter to names in online/offline status notifications 2022-01-17 13:17:29 +01:00
Ansariel 1896d304dc Fix contact list being empty after login 2021-11-15 17:55:57 +01:00
Ansariel 7427b46ea5 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	.gitignore
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llerror.cpp
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthread.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llprimitive/llmodel.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpoolavatar.h
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llskinningutil.cpp
#	indra/newview/llskinningutil.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llteleporthistory.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/llvovolume.cpp
 2021-11-12 15:21:52 +01:00
Mnikolenko Productengine 6ecf8f2c01 SL-16184 FIXED Frame stall when friend comes online. 2021-10-20 14:53:55 +03:00
Ansariel 603e04ee3c Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 13:18:55 +02:00
Andrey Kleshchev 537585a75e SL-15401 The grants modified rights toast ignores DND mode 2021-06-18 23:29:57 +03:00
Ansariel 69f14e2f29 Initial merge of viewer-legacy-profiles 
For the time being, use the Firestorm legacy profiles. Can be switched via FSUseOwnProfiles debug setting
 2019-07-19 11:21:54 +02:00
maxim_productengine 38a0a95431 SL-11554 [Legacy Profiles] The avatar permissions values are not saved/shown correctly in some cases 2019-07-08 13:47:21 +03:00
Ansariel bff6a3af15 Merge viewer-neko 2017-02-23 09:02:58 +01:00
andreykproductengine 605160d501 MAINT-7118 Swapping legacy people API with new cache 2017-02-15 20:40:03 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Ansariel a8c86be51a Fix friendlist showing wrong online status grant when changing map rights: 
Online status right apparently only provided as part of login response in
idle_startup (response["buddy-list"]), so we can only keep current grant.
 2015-11-22 17:51:34 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
Ansariel 5b46c7e2d2 Refactor code for controlling friendship button in IM floater 2015-08-09 00:07:02 +02:00
andreykproductengine 11b48840c7 MAINT-5250 Viewer should handle large number of calling cards better 2015-06-16 20:18:27 +03:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Mnikolenko ProductEngine 8f04b738d2 MAINT-2742 FIXED Duplicate Display Names appear once in share picker 2015-01-12 11:54:24 +02: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
Northspring 06454bc5da Reverting faulty "option to display group chats, IM sessions and nearby chat always in uppercase" (58312a3a514f) because of the links/slurls breaking and implementing experimental all-caps Deja Vu font variant instead 
Chooseing this font in selector would also turn not only chats, but all other strings in the viewer uppercase (UI, hovertext etc.)
 2014-09-06 19:02:34 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Ansariel 429599f8bc Refactor display name handling based on display name and username visibility setting 2014-05-16 10:05:54 +02:00
Ansariel f662c413c5 FIRE-13756: Friends avatar picker only shows display name; Patch by Cinder Roxley 2014-05-16 09:30:40 +02:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
simon 2ccebebece More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Baker Linden a72e34a345 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown 
- Added clear() after DeletePointer() call to hopfully fix this...
 2014-02-14 13:56:36 -08:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Baker Linden d7b902d575 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown 
- Added clear() after DeletePointer() call to hopfully fix this...
 2014-02-14 13:56:36 -08:00
Ansariel 4516247b02 FIRE-12416: Fix display of clickable online status notifications in logs and growl 2013-12-05 23:18:43 +01:00
Ansariel 197419a949 FIRE-6460: Make names in online status notifications clickable 2013-12-01 03:34:01 +01:00
Richard Linden e340009fc5 second phase summer cleaning 
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
 2013-08-09 17:11:19 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00