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
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
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
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
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
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
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
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
2b5396a8e8
SL-14050 Remove all Help question marks from Viewer UI
2020-10-02 13:24:00 +03:00
a5c8b1cbe2
SL-13729 Performance of LLUI and LLRender2D #2
2020-09-17 20:39:45 +03:00
05800a402b
Merge branch 'master' into DRTVWR-483
2020-05-19 10:42:26 +03: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
4cf4243573
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/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/ru/floater_preview_texture.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-21 15:37:25 +03: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
f83ada32f7
Merged in lindenlab/viewer-release
2019-11-13 10:50:25 +02:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03: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
ac865de287
SL-1945 Day Cycle Editor Copy Track
2019-01-25 22:02:16 +02:00
149d4ce795
remove cross-library reference (needs to be moved to newview)
2018-01-30 09:22:23 -05:00
527388694a
STORM-2145 Added a small floater
2018-01-13 12:18:40 -05:00
1e586749ef
STORM-2145 Merge up to viewer-release
2018-01-12 09:08:49 -05:00
252ca2542b
MAINT-7890 Floater position drifts across logins after snapping to another floater
2017-10-13 17:54:32 +03:00
5c4ae5b11a
STORM-2145 Camera Presets -- some initial work
2017-02-23 17:50:36 -05:00
e48af9ba0f
MAINT-7020 llui/llfloater.cpp should not access settings
2016-12-21 06:57:49 +02:00
74ec1116a2
MAINT-6461 crash due to invalid menu pointer during visibility change
2016-09-02 19:20:31 +03:00
9e73d04811
MAINT-6461 crash due to invalid menu pointer during visibility change
2016-09-02 19:20:31 +03:00
7ea2f091a6
MAINT-6511 Buildfix
2016-08-25 17:33:54 +03:00
534bffb257
MAINT-6511 Crash in LLFloaterView::restoreAll - exception handling
2016-08-23 17:58:36 +03:00
b4ee80b91b
MAINT-6511 Crash in LLFloaterView::restoreAll - exception handling
2016-08-23 17:58:36 +03:00
974e5e5868
MAINT-6511 Replaced c-style casts with dynamic_cast in llfloater.cpp
2016-07-28 00:15:49 +03:00
2b287b6bf7
MAINT-6511 Added a null check in LLFloaterView::restoreAll
2016-06-16 23:27:39 +03:00
fb598cd380
MAINT-2583 Minimized floaters cannot brought back to foreground anymore
2016-05-25 12:39:27 +03:00
9ffc67ef84
MAINT-2583 Minimized floaters cannot brought back to foreground anymore
2016-05-23 12:25:27 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
28d3bb0975
[MAINT-3555][MAINT-3703]
...
- Removed logging for MAINT-3555
- Added NULL guard to fix MAINT-3703 (hopefully)
2014-03-03 11:53:57 -08:00
0a46023db5
Fix linux build - make default check in switch statement
2014-02-26 23:52:34 +00:00
483ad8dc55
MAINT-3555 FIXED crash in LLPanel::~LLPanel() on shutdown:
...
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
2014-02-26 20:14:41 +02:00
100b9154dd
MAINT-3555 : crash in LLPanel::~LLPanel() on shutdown. Fixes to be paranoid
...
about the return type for calls to LLView::getParent(): never assume a down
cast is possible.
2014-02-26 12:49:29 -08:00
bd73465e51
[MAINT-3784] - Viewer takes too long to shut down
...
- Removed a lot of logging code to reduce application close time
2014-02-25 16:41:23 -08:00
Andrey Lihatskiy