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

168 Commits (a831237e29c650146b6870b568feddcda310ab29)

Author SHA1 Message Date
Ansariel 70db255e02 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	.github/workflows/build.yaml
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llcommon/tests/workqueue_test.cpp
#	indra/newview/VIEWER_VERSION.txt
 2023-10-27 11:52:59 +02:00
Ansariel 39a6735fc9 Merge branch 'main' of https://github.com/secondlife/viewer 
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/cmake/APR.cmake
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/viewer_manifest.py
#	indra/test/namedtempfile.h
 2023-10-26 15:49:12 +02:00
Ansariel becc1af2ec Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llvovolume.cpp
 2023-10-11 12:58:24 +02:00
Alexander Gavriliuk c6f469a2b4 SL-20420 Emoji - Increase nearby chat history buffer size 2023-10-06 23:10:35 +02:00
Nat Goodspeed 42c69448da SL-18837: Don't include a version-specific Boost.Regex header. 
Let the umbrella <regex.hpp> header make that decision.
 2023-06-02 17:32:31 -04: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 7f91fa0b40 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 13:15:10 +02:00
Andrey Lihatskiy e00edbeb4a Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	doc/contributions.txt
 2021-04-30 03:04:06 +03:00
Ansariel 339c3c5df4 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-18 18:55:37 +01:00
Ansariel 1461e9bbb0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-01-17 19:24:26 +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 c5835b95b7 FIRE-30582: Fix out of range crash 2020-12-12 00:12:08 +01:00
Andrey Lihatskiy 0bba892bb0 Merge branch 'master' into DRTVWR-515-maint 
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
 2020-11-13 18:22:43 +02:00
Ansariel daec926a54 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 17:02:25 +01:00
Andrey Lihatskiy 1d458de949 Merge branch 'master' into DRTVWR-515-maint 
# Conflicts:
#	indra/newview/llpanelprimmediacontrols.cpp
 2020-09-28 22:29:19 +03:00
Ansariel e6e844a0b9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 14:01:45 +02:00
Ansariel b5635da9e9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 10:08:11 +02:00
Andrey Lihatskiy 825cfc2b6a Merge branch 'master' into DRTVWR-507-maint 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterconversationpreview.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.h
#	indra/newview/llvoicevivox.cpp
 2020-09-22 23:30:12 +03:00
Ansariel 240757c0d0 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-20 16:52:04 +02:00
Andrey Kleshchev cc25193af9 SL-12795 Fix existance of multiple chatlog files after name change 2020-08-01 01:26:04 +03:00
Ansariel 0007ff2660 Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-07 12:29:58 +02:00
Ansariel 6afd505fa8 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-05 15:24:10 +02:00
Mnikolenko Productengine ac2611b380 SL-13018 FIXED Chat Transcripts not showing on right click when encoding of text file is UTF-8 with BOM 2020-04-27 19:10:31 +03:00
Ansariel 1599fe0a3f FIRE-28990: Add explanatory comment why it's done the way it is 2020-04-10 22:37:23 +02:00
Ansariel ad7877fca6 FIRE-28990: Unable to open chat transcript if file is UTF-8-BOM encoded 2020-04-10 02:27:58 +02:00
maxim_productengine 57b32eb01c SL-12805 FIXED The Group Chat history can't be opened from the conversations floater 2020-03-06 16:49:23 +02:00
AndreyL ProductEngine 56056aa198 Upstream merge from viewer-neko 2019-11-27 23:20:03 +02:00
Ansariel fd4b8a7bb1 Merge Firestorm LGPL 2019-11-12 18:45:02 +01:00
AndreyL ProductEngine 5f731d84cb Downstream merge from 494-maint-wassail 2019-11-12 02:37:15 +02:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine 0ea0b98084 DRTVWR-493 LLLogChat to singleton 2019-09-16 20:32:25 +03:00
Ansariel fd29941479 Merge viewer-neko 2019-08-24 02:19:52 +02:00
maxim_productengine 9773e06cc1 SL-11753 FIXED Group & Resident with the same name share chat history. 2019-08-21 16:22:43 +03:00
Beq 4e86486129 Fix unreachable code warning 2019-05-23 14:09:38 +01:00
maxim_productengine 6f1e08f22d SL-10505 FIXED Right clicking on any name in Friends list accesses every chat .txt file stored 2019-02-12 11:24:37 +02:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
Ansariel c764079389 Merge viewer-neko 2019-02-14 21:21:38 +01:00
Ansariel 536a3f6c8e Merge viewer-neko 2019-01-18 23:41:21 +01:00
Nicky 7cc408a5cd Merge. 2018-04-10 12:33:45 +02:00
Nicky ef20e3f523 Replace ARP Mutex and Condition with std::mutx and std::conditional_variable 2018-04-05 12:02:12 +02:00
Nicky c4d7f25bac Merge with phoenix-firestorm-lgpl. 2017-05-23 14:09:46 +02:00
Nat Goodspeed fe64db61d6 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-05-22 21:30:26 -04:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
andreykproductengine 9e426f5340 MAINT-6283 Fixing line enfings 2017-04-10 16:10:59 +03:00
andreykproductengine 10213f994f MAINT-6283 Names that contain 'http:' or 'https:' were causing new line in chat history 2017-04-07 20:29:24 +03:00
Nicky 6d3df79ea9 Merge #3 with lgpl. 2017-02-06 12:07:45 +01:00
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Nat Goodspeed c992a6df9f DRTVWR-418: std::string::find() returns std::string::size_type. 
Storing it in a U32 and then comparing it to std::string::npos isn't going to
work in 64 bit land.
 2016-12-20 09:20:38 -05:00