Andrey Lihatskiy
d07dea27ab
Post-merge leftover cleanup; buildfix
2020-11-11 22:41:32 +02:00
Andrey Lihatskiy
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
Nat Goodspeed
04c473ab46
Increment viewer version to 6.4.12
...
following promotion of DRTVWR-507
2020-11-11 15:05:42 -05:00
Andrey Kleshchev
6154e72d94
reverted part of SL-10625 since it is now obsolete
...
see SL-13565
2020-11-11 20:38:24 +02:00
Andrey Kleshchev
6712ac57ec
Revert "SL-13565, remove SL-10625 throttling erroneously applied to all GPUs"
...
This reverts commit d77b7bdc54 .
2020-11-11 19:37:36 +02:00
Andrey Kleshchev
5ff1b1b5d2
Revert "SL-13565, clean up now-orphaned throttling variable and handling code"
...
This reverts commit 6c1a15d936 .
2020-11-11 19:35:10 +02:00
Brad Payne (Vir Linden)
9d5c64dddc
SL-14264 - ViewerStats added logging of most gGLManager fields
2020-11-10 13:11:08 +00:00
Andrey Kleshchev
561da5bd7f
SL-14270 Crash fix
2020-11-06 23:17:30 +02:00
Andrey Kleshchev
dc136e8dc8
SL-14270 A bit of cleanup #2
2020-11-05 22:54:28 +02:00
Andrey Kleshchev
d17af5f3a6
SL-14270 A bit of cleanup #1
2020-11-05 22:02:26 +02:00
Andrey Kleshchev
281c3d8bee
SL-14270 Crash accessing deleted 'parent' via callback from child
2020-11-05 22:02:21 +02:00
Andrey Lihatskiy
87ef00bf9b
Merge branch 'SL-14264' into DRTVWR-507-maint
2020-11-04 22:42:16 +02:00
Andrey Kleshchev
842d84b8ec
Fix for RelWithDebInfoOS build
2020-11-04 22:17:33 +02:00
Brad Payne (Vir Linden)
2c2578213e
SL-14264 - BOM texture
2020-11-04 18:32:26 +00:00
Andrey Kleshchev
5e7a0a963e
SL-14190 moved sAvatarDictionary
2020-11-03 22:12:39 +02:00
Andrey Lihatskiy
597d777c9f
Updated LLCA to codeticket build 551526
2020-11-02 17:54:41 +02:00
Andrey Kleshchev
e5e45d08f6
SL-14226 Cleanup teleport requests
2020-10-29 16:10:40 +02:00
Mnikolenko Productengine
af3d4fdf4e
SL-14167 FIXED Viewer substitutes agni start locations when logging in to 'My last location' on non-agni grids
2020-10-28 19:05:15 +02:00
Andrey Kleshchev
5a6ef4e85e
SL-14217 Shutdown crash
...
Don't process EventQueueGet responses from server when disconected
2020-10-28 12:34:30 +02:00
Andrey Kleshchev
99d2ae5e02
SL-14190 sAvatarDictionary was not used
2020-10-26 18:47:12 +02:00
Andrey Lihatskiy
3ea50baaac
Merge branch 'SL-14081' into DRTVWR-507-maint
2020-10-26 17:06:37 +02:00
Mnikolenko Productengine
61e27e0f6c
SL-14050 remove references to viewer-help
2020-10-23 21:13:18 +03:00
Andrey Kleshchev
ad6b1b0b7c
SL-14150 Fix spelling
2020-10-23 09:58:17 +03:00
Andrey Kleshchev
ac875d1876
SL-14150 Comment for clarity and removed redundant check
2020-10-23 00:17:29 +03:00
Andrey Kleshchev
0bf11e45ea
SL-14150 Handle more cases of corrupted cache
2020-10-22 22:22:17 +03:00
Mnikolenko Productengine
5bfa73a12e
SL-14161 FIXED an item persists in inventory after dragging it to the marketplace listings
2020-10-22 18:05:33 +03:00
Andrey Lihatskiy
4b2a611596
Updated LLCA to codeticket build 550026
2020-10-21 16:20:47 +03:00
Andrey Kleshchev
3ebf3b7182
SL-13733 Verify window handle
2020-10-20 18:43:51 +03:00
Mnikolenko Productengine
83600bb16a
SL-14108 FIXED Viewer crashes immediately after login
2020-10-20 14:25:54 +03:00
Andrey Lihatskiy
7bdaeca019
Merge branch 'SL-13705' into DRTVWR-507-maint
2020-10-15 20:50:18 +03:00
Andrey Lihatskiy
67a326116b
Merge branch 'SL-14081' into DRTVWR-513-maint
...
# Conflicts:
# indra/newview/llviewerregion.cpp
2020-10-15 20:23:18 +03:00
Andrey Kleshchev
89f8877613
SL-13980 Fixed preview cleanup
2020-10-14 23:19:56 +03:00
Andrey Kleshchev
00764cc236
SL-14079 crash accessing LLHUDText
...
LLHUDObject has a lot of deriveds stored as LLPointer<LLHUDObject>, no-virtual destructor is unlikely to be cause of the crash, but might be related
2020-10-14 23:16:35 +03:00
Brad Payne (Vir Linden)
107af833ab
merge
2020-10-14 20:52:16 +01:00
Brad Payne (Vir Linden)
3866b62700
SL-14081 - changed debug level for one message
2020-10-14 20:50:19 +01:00
Brad Payne (Vir Linden)
9edb2fb6a7
SL-14081 - detail on viewer-initiated timeout
2020-10-14 20:50:19 +01:00
Brad Payne (Vir Linden)
6cbb59e13a
SL-14081 - more teleport logging
2020-10-14 20:50:19 +01:00
Brad Payne (Vir Linden)
d06db587b2
SL-14081 - more detailed logging of teleport process
2020-10-14 20:50:19 +01:00
Andrey Lihatskiy
6299326bed
build fix
2020-10-14 22:35:16 +03:00
Andrey Lihatskiy
14bf268fbb
Merge branch 'master' into DRTVWR-513-maint
2020-10-14 21:59:52 +03:00
Andrey Lihatskiy
35708568d6
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/llfloatermodelpreview.cpp
2020-10-14 21:58:43 +03:00
Nat Goodspeed
a2c8c8238c
Increment viewer version to 6.4.11
...
following promotion of DRTVWR-482
2020-10-14 14:55:31 -04:00
Brad Payne (Vir Linden)
d8168fa720
SL-14081 - detail on viewer-initiated timeout
2020-10-14 14:52:36 +01:00
Andrey Kleshchev
8a64ded50f
SL-14119 Crash at LLVolumeFace::cacheOptimize
2020-10-14 11:48:07 +03:00
Brad Payne (Vir Linden)
d95d9713dd
SL-14081 - more teleport logging
2020-10-13 21:24:02 +01:00
Andrey Kleshchev
131996176f
SL-14078 Small optimization
2020-10-12 22:53:36 +03:00
Andrey Kleshchev
fa52c03939
SL-13980 Crash at cullAvatarsByPixelArea
...
LLVOAvatars and derived classes appear to be stored as LLPointer<LLViewerObject> in a lot of cases, so non-virtual ~LLViewerObject() might be triggered by LLPointer and end up not cleaning sInstances in some cases (animeshes specific?), thus causing broken pointers in sInstances.
2020-10-12 22:26:50 +03:00
Andrey Kleshchev
a5dd5037f8
SL-13830 One more crash when quiting on startup or right after teleport
2020-10-12 22:26:50 +03:00
Andrey Kleshchev
0a2b748705
SL-14078 No point in verifying display name cap each frame #2
2020-10-12 19:40:22 +03:00
Mnikolenko Productengine
d9c779d59c
SL-14093 Show the amount of saved categories and items
2020-10-12 19:04:54 +03:00