d6480e2b7f
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelavatar.cpp
2020-11-11 22:54:23 +02:00
04c473ab46
Increment viewer version to 6.4.12
...
following promotion of DRTVWR-507
2020-11-11 15:05:42 -05:00
87ef00bf9b
Merge branch 'SL-14264' into DRTVWR-507-maint
2020-11-04 22:42:16 +02:00
2c2578213e
SL-14264 - BOM texture
2020-11-04 18:32:26 +00:00
11a9332fa7
SL-12889 Failed to cache image crashes
...
Scaled down avatar or group image was getting into cache.
2020-11-03 19:35:43 +02:00
597d777c9f
Updated LLCA to codeticket build 551526
2020-11-02 17:54:41 +02:00
e5e45d08f6
SL-14226 Cleanup teleport requests
2020-10-29 16:10:40 +02:00
3ea50baaac
Merge branch 'SL-14081' into DRTVWR-507-maint
2020-10-26 17:06:37 +02:00
6e20fc99e7
SL-14181 Fix missing message when deleting last classified
2020-10-23 18:42:57 +03:00
5bfa73a12e
SL-14161 FIXED an item persists in inventory after dragging it to the marketplace listings
2020-10-22 18:05:33 +03:00
4b2a611596
Updated LLCA to codeticket build 550026
2020-10-21 16:20:47 +03:00
3ebf3b7182
SL-13733 Verify window handle
2020-10-20 18:43:51 +03:00
7bdaeca019
Merge branch 'SL-13705' into DRTVWR-507-maint
2020-10-15 20:50:18 +03:00
89f8877613
SL-13980 Fixed preview cleanup
2020-10-14 23:19:56 +03:00
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
107af833ab
merge
2020-10-14 20:52:16 +01:00
3866b62700
SL-14081 - changed debug level for one message
2020-10-14 20:50:19 +01:00
9edb2fb6a7
SL-14081 - detail on viewer-initiated timeout
2020-10-14 20:50:19 +01:00
6cbb59e13a
SL-14081 - more teleport logging
2020-10-14 20:50:19 +01:00
d06db587b2
SL-14081 - more detailed logging of teleport process
2020-10-14 20:50:19 +01:00
6299326bed
build fix
2020-10-14 22:35:16 +03:00
42330f2008
Merge branch 'master' into DRTVWR-483
2020-10-14 22:01:05 +03:00
35708568d6
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/llfloatermodelpreview.cpp
2020-10-14 21:58:43 +03:00
a2c8c8238c
Increment viewer version to 6.4.11
...
following promotion of DRTVWR-482
2020-10-14 14:55:31 -04:00
d8168fa720
SL-14081 - detail on viewer-initiated timeout
2020-10-14 14:52:36 +01:00
d95d9713dd
SL-14081 - more teleport logging
2020-10-13 21:24:02 +01:00
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
a5dd5037f8
SL-13830 One more crash when quiting on startup or right after teleport
2020-10-12 22:26:50 +03:00
d9c779d59c
SL-14093 Show the amount of saved categories and items
2020-10-12 19:04:54 +03:00
f45ba33ff8
SL-14081 - more detailed logging of teleport process
2020-10-09 16:18:19 +01:00
31c7b08c86
SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window.
2020-10-07 11:14:14 +03:00
5172f5d6d6
SL-14037 BugSplat Crash #646590 : Enqueue failed in AIS
2020-10-01 22:36:52 +03:00
5cae545e09
Updated LLCA to codeticket build 549857
2020-10-01 18:34:58 +03:00
9ec688ae4d
SL-13500 loadShaderFile crash
2020-09-29 23:39:35 +03:00
fbd36e5bf0
SL-12743 Restored the commit lost during the merge
2020-09-29 16:34:06 +03:00
a9f70ec80e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/lltexturectrl.h
2020-09-28 22:21:50 +03:00
a2cb61d9f4
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-09-28 22:08:48 +03:00
663a6dc2c3
Merged master(DRTVWR-497) into DRTVWR-482
2020-09-28 21:21:20 +03:00
bac6652cdc
Increment viewer version to 6.4.10
...
following promotion of DRTVWR-497
2020-09-28 13:21:32 -04:00
6d014dde5e
SL-14007 Group icon in "About land" displays wrong icon
2020-09-26 17:21:17 +03:00
4ff5ad507a
SL-13132 Fixed missing 'owner' label
2020-09-25 19:19:28 +03:00
6a32a7551e
SL-13034 Last string in logs should say 'Goodbye'
...
These logs were not logging for very long due to supressed logging system, no point showing them now
2020-09-25 17:02:22 +03:00
056c41a408
SL-13034 removeMarkerFiles() happens in destructor
...
Depends onto SL-13979 for proper logging
2020-09-25 17:02:21 +03:00
427ed91cf9
post-merge cleanup
2020-09-25 16:52:43 +03:00
108550e68e
SL-13873 update copyright date to 2020
2020-09-25 16:29:05 +03:00
6754433478
SL-12962 rename remained strings
2020-09-25 14:31:09 +03:00
3424a1f965
SL-13979 Crash of logging system at LLError::Settings::getInstance()
...
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks
2020-09-25 13:54:06 +03:00
89839721ea
SL-13888 Restore back face culling being accidently removed in SL-12781
...
Due to conflicts picked up ptolemy's fix manually
2020-09-24 23:52:53 +03:00
738a651efa
Fix line endings
2020-09-23 17:53:31 +03:00
1ef4591381
SL-13821 Fixed checkbox not disabling
2020-09-23 12:10:06 +03:00
Andrey Lihatskiy