394c8e17d5
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llfontfreetype.cpp
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/lltextbase.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llinventorygallery.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/floater_emoji_picker.xml
2024-01-26 00:32:06 +01:00
cc43f42e6b
SL-20416 Fix Crash Report 1409376 (update)
2024-01-24 21:25:11 +03:00
fea01389c9
SL-20416 Fix Crash Report 1409376
2024-01-23 23:13:00 +01:00
f6ceafee5b
SL-20416 Avoid of taking focus by EmojiPicker
2024-01-24 00:07:10 +03:00
548faf2966
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llfloater.cpp
2023-11-15 16:38:15 +01:00
1e7643eea5
SL-20438 Emoji picker will dock with edge of screen if the Conversations floater is dragged there
2023-11-09 18:40:08 +01:00
f594beab17
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-07-29 13:17:01 +02:00
64e2a68c56
Fix closing floater not erroneously closing all other same-type floaters when tapping shift inside a floater a couple of times before closing the floater with the X and no shift pressed
2023-07-27 13:48:36 +02:00
719a2d31dc
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llui/llscrolllistctrl.h
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/textures/textures.xml
2023-04-22 12:02:23 +02:00
97b0ba2a6d
SL-19575 LLFloaterEmojiPicker - Add filter by category
2023-04-20 03:55:02 +02:00
9825c45335
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/ViewerMiscLibs.cmake
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-04-05 10:56:12 +02:00
28b240fd7f
DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
2023-04-03 14:58:58 -07:00
f7f941ae5b
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llfilesystem/lldiskcache.cpp
2023-02-03 13:06:40 +01:00
6dec98a14c
SL-17425 Crash when having more than one dependent floater #2
2023-01-24 21:51:43 +02:00
9e3079f859
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontregistry.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/widgets/chat_editor.xml
2023-01-23 16:49:24 +01:00
7ebaa2d2e5
Merge branch contribution/emoji into DRTVWR-489-emoji
2022-11-09 23:25:02 +01:00
17a3924a28
Add proper mouse down handler to the emoji complete panel
...
-> the previous commit didn't properly set mFrontChild after restoring the topmost floaters
-> additionally we don't want mouse clicks in "can't steal focus from frontmost" floaters to set focus to them
2022-11-08 01:10:09 +01:00
f6f52d327b
Provide a way for a floater to remain the topmost floater, even when focus is given to a different floater
2022-10-23 16:28:54 +02:00
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
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
9300613edc
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-06-29 21:57:31 +02:00
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
b61dfd131d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-05-26 11:36:16 +02:00
2ed401882e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-05-26 02:56:29 +03:00
d1265cda36
SL-17425 Crash when closing two dependent floaters
...
dependent_it in llfloater was not valid after dependent floater removed itself from the list
2022-05-20 01:35:40 +03:00
f19311bf7a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-20 12:45:10 +01:00
6663bc6f85
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llviewercontrol.cpp
2021-12-16 09:49:35 +01:00
90004065e6
FIRE-31318: Fix copy&paste error
2021-12-11 23:42:45 +01:00
b74b826140
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-29 19:17:09 +01:00
0916f45254
FIRE-24125: Better close the current floater last in case of unexpected results when closing it while still iterating over the list of floaters
2021-11-29 14:30:42 +01:00
09d55793ac
FIRE-24125: Add option to close all floaters of a group (Ctrl-Shift-W or Shift + click on X-symbol)
2021-11-29 14:23:18 +01:00
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
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
638fe87576
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelpicks.h
# indra/newview/llviewerfloaterreg.cpp
2021-07-23 07:10:26 +03:00
962be69e71
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-15 18:19:56 +02:00
9563ab543b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-25 11:56:38 +02:00
3c1d189bb8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-25 09:26:10 +02:00
a4c6c7059f
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
2021-06-25 00:51:02 +03:00
6b71b19150
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2021-05-31 10:20:00 +02:00
3917de54db
SL-15245 Multiple guide books open, but cannot close them all
...
Opening and closing single-instance floaters rapidly and multiple times could result in cleaning instance from floaterreg twice, thus removing new isntance instead of current one
2021-05-12 20:25:04 +03:00
618057fa04
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2021-05-01 00:29:48 +02:00
a91e227319
SL-15174 set Starting Guidebook location on-screen
2021-04-28 13:14:51 +03:00
89bd426901
SL-14862 - use nested LLSD for widget info, condensed to the two leaf-most elements of the path. Simplified floater logging.
2021-03-10 16:23:20 +00:00
2057fa9716
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-03 18:10:48 +01:00
7041d80d74
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 13:34:58 +01:00
d203a23644
Merge branch 'master' into DRTVWR-483
2021-02-01 22:16:46 +02:00
cd831c4228
Merge branch 'master' into DRTVWR-516-maint
2021-02-01 22:11:04 +02:00
caf7f6c1d2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 17:53:39 +01:00
602a82dc33
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 10:11:43 +01:00
af2abe17cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 00:51:42 +01:00
Ansariel