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

120 Commits (0514918bedc494ff039498cc5ade6324d1ed4c94)

Author SHA1 Message Date
Ansariel 5c357d3690 Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/stdtypes.h
#	indra/newview/llimprocessing.cpp
 2023-06-27 11:44:12 +02:00
PanteraPolnocy 3fbdc6cca6 FIRE-32396 Play the 'inventory offer' UI sound when both 'auto-accept new inventory items' and 'log auto-accepted inventory items to chat' are enabled 
Playing the sound without logging to chat (a visual indication) would be confusing for the user
 2023-06-25 12:37:00 +02:00
Andrey Kleshchev 5c420babdc SL-19860 Fixed messages from muted objects being shown upon login 2023-06-20 20:45:48 +03:00
Ansariel 50341b9735 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
 2023-03-07 13:20:32 +01:00
Andrey Kleshchev 0c2b00efaa SL-19346 PERMISSION_DEBIT remove warning for Linden owned content 2023-03-06 22:53:04 +02:00
Ansariel 86253a8d8a Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/lllogchat.cpp
 2023-02-14 23:23:36 +01:00
simon f257ee7d3c SL-18268 - Viewer update to read group chat history. 
Feature described at https://community.secondlife.com/blogs/entry/12652-coming-soon-to-a-viewer-near-you-group-chat-history/
 2023-02-13 15:19:27 -08: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
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
 2022-12-12 20:53:11 +02:00
Ansariel 7732257ea5 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-11-02 13:05:00 +01:00
Rye Mutt d0e07c770b Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type. 2022-10-30 06:56:16 -04:00
Ansariel e9e62b798d Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-17 19:31:17 +02:00
Mnikolenko Productengine 8e8c68720b SL-17973 updated inappropriate arg 2022-08-17 20:12:09 +03:00
Mnikolenko Productengine 0191ee5f6f SL-17973 FIXED region name is not shown in the IM chat 2022-08-17 14:50:03 +03:00
Ansariel 7f91fa0b40 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 13:15:10 +02:00
Ansariel 065bde8514 Fix muted avatars without lastname being able to send group invites 2021-04-20 20:26:53 +02:00
Ansariel 339c3c5df4 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-18 18:55:37 +01:00
Mnikolenko Productengine 03921adb12 SL-2202 Add exception handling around boost::regex_match() calls in the viewer 2021-01-11 17:07:03 +02:00
Ansariel aa0706abc4 FIRE-9115: Send autorespond messages also when receiving TP offers/requests (but deliberately do not send autorespond inventory items in this case) 2020-10-27 14:49:40 +01:00
Ansariel 2ee77678a7 FIRE-29677 / SL-13720: Work around broken IM_GROUP_NOTICE_REQUESTED instant message type until this might get fixed by LL at some point - maybe... 2020-10-25 23:41:41 +01:00
Ansariel d0fb2a173d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-20 19:50:03 +02:00
Kitty Barnett cddc7cb040 Merge branch 'rlva/development' 2020-09-19 13:31:34 +02:00
Kitty Barnett aebcd1855d Change RLVa string constants over to opt-in constexpr string_views (but keep char* by default) 2020-09-16 01:35:44 +02:00
Kitty Barnett 9b03257a1e Merge branch 'appearance/misc' into rlva/feature/eep 2020-09-14 15:26:13 +02:00
Ansariel d5dd2c8aeb Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-08-11 19:52:44 +02:00
Andrey Lihatskiy 9406b757a3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/cmake/DirectX.cmake
#	indra/newview/llviewerparcelmedia.cpp
#	indra/newview/viewer_manifest.py
 2020-08-11 01:34:13 +03:00
Kitty Barnett a46ebe6436 Merge branch 'appearance/misc' into rlva/development 2020-08-02 20:07:43 +02:00
Ansariel 0f4933e2fc FIRE-29943: Fix item shared messaged logging to wrong IM logfile if user is offline 2020-07-31 14:03:04 +02:00
Ansariel 67255f5d64 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-07-29 13:23:00 +02:00
Ansariel a01747f446 FIRE-24171: Ignore group chats on startup until mute list is loaded to prevent showing unwanted group chats 2020-07-26 21:16:58 +02:00
Andrey Lihatskiy 7bbf3f5f7f Merge branch 'master' into DRTVWR-501-maint 
# Conflicts:
#	autobuild.xml
#	indra/newview/llimprocessing.cpp
 2020-07-20 22:24:10 +03: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 3884e4b6dd Merge offline IM fixes 2020-07-19 17:42:28 +02:00
Andrey Lihatskiy 4ac0ab2af3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 2020-07-06 21:48:11 +03:00
Andrey Kleshchev fa1ae9fa1a SL-13540 Fix line endings 2020-07-06 13:47:24 +03:00
Nat Goodspeed 5ab0ff486b DRTVWR-476, SL-11430: Merge branch 'SL-9756' into d476 2020-07-02 13:24:29 -04:00
Andrey Kleshchev bf5585c0ec SL-13540 Offline scripted inventory offers not shown on non drtsim-451 2020-07-02 19:05:12 +03:00
Rider Linden 766b21a0a6 SL-13533: Use the old name for from_agent_name 
SL-13540: Do not fail if binary bucket is too large, attempt to extract the asset type from the old style bucket. Notification still not shown.
 2020-07-02 19:05:12 +03:00
Andrey Kleshchev 7c122757f9 SL-13540 Offline scripted inventory offers not shown on non drtsim-451 2020-07-02 19:00:23 +03:00
Rider Linden 3379259ffb SL-13533: Use the old name for from_agent_name 
SL-13540: Do not fail if binary bucket is too large, attempt to extract the asset type from the old style bucket. Notification still not shown.
 2020-07-02 19:00:23 +03:00
Nat Goodspeed a075a73920 DRTVWR-476: Merge branch 'SL-9756' into d476. 2020-06-30 16:59:17 -04:00
Rider Linden 01f2308c85 SL-9756: Get the LLSD names right. 2020-06-30 23:13:05 +03:00
Rider Linden f72759c16d SL-9756: IM_TASK_INVENTORY_OFFERED bucket offline format conforms to the online format. 2020-06-30 23:13:05 +03:00
Rider Linden f8e53adce7 SL-9756: Get session_id/transaction id from aux if session is missing. 2020-06-30 23:13:04 +03:00
Rider Linden c8b7466c19 SL-11430, SL-9756: Take transaction-id from offline messages. Correct LLSD names. Use offline flag rather than implicit tests of session_id and aux_id. 2020-06-30 23:13:04 +03:00
Rider Linden e2dd15397c SL-9756: Take the "session_id" from the offline message that was passed. 2020-06-30 23:13:04 +03:00
Rider Linden 52f888b8d3 SL-9756: Get the LLSD names right. 2020-06-30 02:38:53 +03:00
Rider Linden 8bf2078e90 SL-9756: IM_TASK_INVENTORY_OFFERED bucket offline format conforms to the online format. 2020-06-30 02:38:53 +03:00
Rider Linden 5f9a18c88f SL-9756: Get session_id/transaction id from aux if session is missing. 2020-06-30 02:38:53 +03:00
Rider Linden 9887af162b SL-11430, SL-9756: Take transaction-id from offline messages. Correct LLSD names. Use offline flag rather than implicit tests of session_id and aux_id. 2020-06-30 02:38:53 +03:00