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

567 Commits (fb727de6e331b35028e6c0e9f34a37f1bbb78686)

Author SHA1 Message Date
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
Ansariel a9c29b4b81 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llmenugl.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llfloaterbump.cpp
#	indra/newview/llfloaterbump.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llnetmap.cpp
 2022-10-20 10:51:25 +02:00
Rye Mutt bbd8df15de Fix menu leaks and lazy creation in text editing and scroll lists 2022-10-19 16:28:03 -04:00
Ansariel 2507bc6137 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 20:37:16 +02:00
Ansariel 1f3b96dd9c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 19:56:19 +02:00
Ansariel 22b72a328b Slight optimization 2022-09-14 14:20:40 +02:00
Zi Ree a5cb6dab38 Linux/SDL2 - IME support for composing Japanese, Chinese, etc. input. Tested with ibus/mozc giving over-the-top editing with candidate clause selection, Media pages in the internal web browser do not yet have accurate input placement 2022-09-14 11:19:51 +02:00
Ansariel 3d7c5c52d9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 17:26:51 +02:00
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 16:04:49 +02:00
Ansariel 18341f0d76 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 23:19:12 +02:00
Andrey Lihatskiy 5c18921e9a Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 00:16:09 +03:00
Ansariel ec1ef8c495 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-17 17:50:46 +02:00
Ansariel c85bcbd7de FIRE-29425: User-selectable font and size for notecards 2022-08-16 18:27:13 +02:00
Ansariel 9c4c27a56f Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-01 22:07:39 +02:00
Andrey Kleshchev 4c3f343799 SL-17045 LSL editor cursor position desynchronization 
1. Fixed cursor position calculations
2. Fixed selection rect calculation
 2022-07-26 19:43:04 +03:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
 2022-05-31 01:58:09 +03:00
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
 2022-05-28 23:00:17 +02: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 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 ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-02 10:12:19 +01:00
Ansariel a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +01:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-01 13:41:42 +02:00
Andrey Lihatskiy e70fe3a50d Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewermenu.cpp
 2022-02-28 22:01:18 +02:00
Andrey Lihatskiy 1e0eafd50c Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp
 2022-02-28 21:56:25 +02:00
Ansariel 6638d1d367 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-26 12:31:20 +01:00
Andrey Kleshchev e129986a49 SL-3007 Ability to report abuse from chat 2022-01-24 23:37:21 +02:00
Ansariel 9c3cdd37f3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-16 13:43:53 +01:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy b70614bd87 SL-16606: Add profiler category UI 2022-01-14 11:50:21 -08:00
Ansariel 78f9a28191 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542 2022-01-13 21:12:09 +01:00
Ansariel 453c99af39 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-10 23:15:08 +01:00
Ansariel 9c0973f787 FIRE-31179: Fix double-clicking on friend list item might execute underlying URL in opened IM window 2022-01-04 15:00:41 +01:00
Ansariel c2f8517118 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Ansariel 969762f162 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 16:29:50 +01:00
Ansariel be25e64888 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 13:54:22 +01:00
Andrey Lihatskiy 981cdca0a5 Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/llui/lltextbase.h
#	indra/newview/VIEWER_VERSION.txt
 2021-11-16 01:34:29 +02:00
Andrey Lihatskiy 30c381406c Merge branch 'master' into DRTVWR-530-maint 
# Conflicts:
#	doc/contributions.txt
 2021-11-16 01:09:11 +02:00
Ansariel 63cc972499 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llappearance/lldriverparam.h
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llrender/llvertexbuffer.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawable.cpp
#	indra/newview/lldrawable.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llface.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvowlsky.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2021-11-12 17:31:39 +01:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Ansariel 7bef9a1605 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-10-12 13:34:36 +02:00
Andrey Kleshchev bdb4a90e7c SL-16157 Crash at LLFontGL::maxDrawableChars 2021-10-08 02:12:36 +03:00
Ansariel 3c1d189bb8 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-25 09:26:10 +02:00
Ansariel 40e8c0a192 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-08 18:58:22 +02:00
Zi Ree a52eff1b89 Workaround for broken participant list: always show group moderation tools regardless of user permissions, change toggle mute chat to explicit mute and unmute so accidents can no longer happen 2021-06-08 15:37:16 +02:00
Andrey Kleshchev f655bb1f27 Merge branch master (DRTVWR-515) into DRTVWR-483 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
 2021-05-06 22:13:40 +03:00
Ansariel 9768f25de0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 02:08:40 +02:00
Ansariel bc76d48967 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-30 09:32:45 +02:00
Andrey Lihatskiy e5a428f362 Merge branch 'master' into DRTVWR-521-maint 2021-04-30 03:00:32 +03:00