Commit Graph

43416 Commits (94ce45441d3e00a8ff2dac6c41be23fa04cee31b)

Author SHA1 Message Date
Andrey Kleshchev 74c3b7a0ee Merged master (DRTVWR-507) into DRTVWR-514-keymappings 2020-11-11 22:16:04 +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
Brad Payne (Vir Linden) c79e648aac SL-14015 - possible fix for phantom animesh attachments on mac 2020-11-04 16:07:10 +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
Callum Prentice 727b89e94c fix for SL-14227 The 'Fatal error detected' message is displayed while downloading a new version of the SL Viewer 2020-10-29 12:21:11 -07: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
Callum Prentice f39b334dee Remove reference to SQLite 3P package since we are no longer using it 2020-10-28 09:39:57 -07: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
Callum Prentice aae7259a0a Fix for meta issue: SL-14210 Prune descriptive tag from new cache filenames 2020-10-27 14:02:24 -07:00
Callum Prentice 391ada1150 Fix for meta issue: SL-14211 Determine optimum cache size for VFS replacement cache 2020-10-27 13:53:17 -07:00
Maxim Nikolenko 581cb0a0e9 Merged in DRTVWR-519 (pull request #359)
SL-14182 remove old script asset file after saving changes and allow renaming files if destination file exists

Approved-by: Callum Linden
2020-10-27 15:19:44 +00:00
Brad Payne (Vir Linden) 8b9ed94a35 SL-14183, SL-14142 - impostor management improvements, animesh attachments update on frames when their parent does 2020-10-27 16:04:19 +01:00
Mnikolenko Productengine 3b4bd86a1d SL-14182 remove old script asset file after saving changes and allow renaming files if destination file exists 2020-10-27 16:46:31 +02:00
Maxim Nikolenko 1c94c929ea Merged in DRTVWR-519 (pull request #356)
SL-14148 remove redundant zeroing of the file

Approved-by: Callum Linden
2020-10-26 19:49:45 +00:00
Mnikolenko Productengine c66c426d6b SL-14148 remove redundant zeroing of the file 2020-10-26 20:01:12 +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
Brad Payne (Vir Linden) 263c4c341f SL-14142 - cleanup and fixes for non-functioning impostors, status tracking in debug view 2020-10-22 16:32:31 +01: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
Brad Payne (Vir Linden) caea7260c7 SL-14142 - impostor management cleanup 2020-10-20 18:56:44 +01: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
Brad Payne (Vir Linden) b6b3e30df3 merge 2020-10-19 16:10:30 +01:00
Mnikolenko Productengine 3f51c04239 SL-14139 disallow Gestures from being bound to Ctrl+F10 2020-10-19 14:54:57 +03:00
Andrey Kleshchev 9618df484b SL-14130 Jellydolls have wrong appearance when non-impostors is uncapped 2020-10-16 23:16:04 +03:00
Andrey Lihatskiy 7bdaeca019 Merge branch 'SL-13705' into DRTVWR-507-maint 2020-10-15 20:50:18 +03:00
Brad Payne (Vir Linden) 96f4571f4c Merge remote-tracking branch 'origin/master' into DRTVWR-517 2020-10-15 18:34:37 +01:00
Brad Payne (Vir Linden) 00ab8eb6e6 SL-14130 - WIP, notes on impostor state management 2020-10-15 18:34:15 +01: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
Callum Prentice 1cdcc00319 Mostly automatic merge with canonical viewer after release 2020-10-14 13:47:26 -07:00
Andrey Kleshchev 89f8877613 SL-13980 Fixed preview cleanup 2020-10-14 23:19:56 +03:00