b61dfd131d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-05-26 11:36:16 +02: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
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
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
ef896c1cc3
FIRE-5369: Make sure inspect floater and tooltips don't open partially underneath toolbars
2020-10-28 23:21:48 +01:00
a6c22ec4e7
Help icons stay!
2020-10-19 00:04:43 +02:00
95b4dd072e
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-10-15 11:37:14 +02:00
2b5396a8e8
SL-14050 Remove all Help question marks from Viewer UI
2020-10-02 13:24:00 +03:00
14fb8f66f8
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-24 16:34:12 +02:00
a5c8b1cbe2
SL-13729 Performance of LLUI and LLRender2D #2
2020-09-17 20:39:45 +03:00
e4a12cccbe
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-12 11:29:54 +02:00
e382b06932
FIRE-12802: Prevent floater from getting dragged underneath the utility bar on legacy skins
2020-07-29 21:46:46 +02:00
f7ab3b2f4b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-19 12:26:21 +02:00
1d7810b916
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-04 10:28:09 +02:00
a0d7d87355
Merge branch 'master' into DRTVWR-460
...
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
2020-04-26 21:57:40 +03:00
40b39f9990
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
...
# Conflicts:
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-23 18:13:29 +02:00
0b6b4c7097
Merge Firestorm LGPL
2019-11-15 19:05:26 +01:00
4b261a90ae
Merged in lindenlab/viewer-release
2019-11-14 23:46:15 +02:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
229a6928e9
Merge Firestorm LGPL
2019-11-12 23:22:39 +01:00
b476576697
Merge Firestorm LGPL
2019-11-12 20:07:06 +01:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
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
4e2f5cda29
SL-10727 FIXED Profile windows are not using last set size
2019-03-21 16:10:43 +02:00
ac2fc3029f
Backout tabs v spaces changes.
...
'warn-on-failure:no-tabs'
2019-03-12 08:56:26 -07:00
3e56002245
Tabs -> spaces.
2019-03-11 08:11:09 -07:00
f8ad1551b3
Merge viewer-eep
2019-02-10 13:12:23 +01:00
ac865de287
SL-1945 Day Cycle Editor Copy Track
2019-01-25 22:02:16 +02:00
efa8baca1d
Merge viewer-camus
2018-06-05 13:21:11 +02:00
Ansariel