Andrey Kleshchev
|
5172f5d6d6
|
SL-14037 BugSplat Crash #646590: Enqueue failed in AIS
|
2020-10-01 22:36:52 +03:00 |
|
Andrey Lihatskiy
|
5cae545e09
|
Updated LLCA to codeticket build 549857
|
2020-10-01 18:34:58 +03:00 |
|
Mnikolenko Productengine
|
f9d90dbf3d
|
SL-14027 Save asset to Settings folder instead of Library
|
2020-10-01 18:07:55 +03:00 |
|
Mnikolenko Productengine
|
0b395f01f9
|
SL-13570 FIXED The name of the item is overlapped by search term in inventory
|
2020-09-30 14:25:21 +03:00 |
|
Andrey Kleshchev
|
9ec688ae4d
|
SL-13500 loadShaderFile crash
|
2020-09-29 23:39:35 +03:00 |
|
Andrey Kleshchev
|
508f4ead59
|
SL-13990 'My last location' sometimes is not applied
|
2020-09-29 19:37:28 +03:00 |
|
Andrey Lihatskiy
|
fbd36e5bf0
|
SL-12743 Restored the commit lost during the merge
|
2020-09-29 16:34:06 +03:00 |
|
Callum Prentice
|
354930014b
|
Merge with tip of Release
|
2020-09-28 15:56:44 -07:00 |
|
Andrey Kleshchev
|
56e427d0eb
|
SL-13995 User Friendly Script Name In External Editor Tab
|
2020-09-28 19:54:00 +00:00 |
|
Andrey Lihatskiy
|
83822fd199
|
Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
# indra/newview/llvocache.cpp
|
2020-09-28 22:39:06 +03:00 |
|
Andrey Lihatskiy
|
32cb17e3bb
|
Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
# indra/newview/llgroupmgr.cpp
|
2020-09-28 22:24:12 +03:00 |
|
Andrey Lihatskiy
|
a2cb61d9f4
|
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# indra/newview/pipeline.cpp
|
2020-09-28 22:08:48 +03:00 |
|
Brad Payne (Vir Linden)
|
376f690f8f
|
Merge remote-tracking branch 'origin/master' into DRTVWR-517
|
2020-09-28 19:51:24 +01:00 |
|
Andrey Kleshchev
|
663a6dc2c3
|
Merged master(DRTVWR-497) into DRTVWR-482
|
2020-09-28 21:21:20 +03:00 |
|
Andrey Kleshchev
|
42fa322e76
|
Merged master (DRTVWR-497) into DRTVWR-514-keymappings
|
2020-09-28 21:21:13 +03:00 |
|
Nat Goodspeed
|
bac6652cdc
|
Increment viewer version to 6.4.10
following promotion of DRTVWR-497
|
2020-09-28 13:21:32 -04:00 |
|
Andrey Kleshchev
|
6d014dde5e
|
SL-14007 Group icon in "About land" displays wrong icon
|
2020-09-26 17:21:17 +03:00 |
|
Andrey Kleshchev
|
4ff5ad507a
|
SL-13132 Fixed missing 'owner' label
|
2020-09-25 19:19:28 +03:00 |
|
Andrey Kleshchev
|
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 |
|
Andrey Kleshchev
|
056c41a408
|
SL-13034 removeMarkerFiles() happens in destructor
Depends onto SL-13979 for proper logging
|
2020-09-25 17:02:21 +03:00 |
|
Andrey Lihatskiy
|
427ed91cf9
|
post-merge cleanup
|
2020-09-25 16:52:43 +03:00 |
|
Mnikolenko Productengine
|
108550e68e
|
SL-13873 update copyright date to 2020
|
2020-09-25 16:29:05 +03:00 |
|
Mnikolenko Productengine
|
6754433478
|
SL-12962 rename remained strings
|
2020-09-25 14:31:09 +03:00 |
|
Andrey Kleshchev
|
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 |
|
Callum Prentice
|
6be1f88a5e
|
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
|
2020-09-24 14:45:39 -07:00 |
|
Andrey Kleshchev
|
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 |
|
Andrey Kleshchev
|
652e845900
|
SL-13986 Validate uuid
|
2020-09-24 21:09:38 +03:00 |
|
Andrey Kleshchev
|
94ebf52edd
|
SL-12435 Crash on mRowPanels.back()
|
2020-09-24 20:56:23 +03:00 |
|
Callum Prentice
|
96e2873bfa
|
Rename lldiskcache.* to llfilesystem.* - i think this is the right name since it's responsible for performing file system operations and (will eventually) delegrate to a separate disk cache component to save/load data and keep track of metadata etc.
|
2020-09-24 10:23:39 -07:00 |
|
Andrey Kleshchev
|
bf8cc6b2f7
|
SL-13986 Validate buffer size to avoid SIGBUS crash on sscanf
|
2020-09-23 22:44:17 +03:00 |
|
Brad Payne (Vir Linden)
|
1cba874abf
|
Merge remote-tracking branch 'origin/master' into DRTVWR-517
|
2020-09-23 20:20:27 +01:00 |
|
Andrey Kleshchev
|
738a651efa
|
Fix line endings
|
2020-09-23 17:53:31 +03:00 |
|
Mnikolenko Productengine
|
8b410efa4f
|
Revert " SL-13823 FIXED "Settings" are not shown in Inventory filter message"
This reverts commit 0048a4cf18.
|
2020-09-23 12:31:47 +03:00 |
|
Mnikolenko Productengine
|
be233707e1
|
Revert "SL-13824 Remove notification when joining a group"
This reverts commit fc74a2df63.
|
2020-09-23 12:31:25 +03:00 |
|
Mnikolenko Productengine
|
baf77b4dd0
|
Revert "SL-13824 Remove notification when both joining a group and leaving a group"
This reverts commit 34786ac221.
|
2020-09-23 12:31:18 +03:00 |
|
Mnikolenko Productengine
|
10a2519e73
|
Revert "SL-13852 Add visibility options to inventory search results"
This reverts commit 18566c5023.
|
2020-09-23 12:30:59 +03:00 |
|
Mnikolenko Productengine
|
f392ddab98
|
Revert "SL-13852 Show menu below the button"
This reverts commit bac27a9d74.
|
2020-09-23 12:30:47 +03:00 |
|
Mnikolenko Productengine
|
d435e2ee26
|
Revert "SL-11867 Show “Unable to buy” message via notification"
This reverts commit 7e2e2503c5.
|
2020-09-23 12:29:54 +03:00 |
|
Mnikolenko Productengine
|
fc7b518694
|
Revert "SL-13814 Clarify dialog for insufficient L$ balance"
This reverts commit f150600ffb.
|
2020-09-23 12:28:34 +03:00 |
|
Mnikolenko Productengine
|
f51c6608e1
|
Revert "SL-13814 mac build fix"
This reverts commit 85d90ce6bd.
|
2020-09-23 12:28:15 +03:00 |
|
Mnikolenko Productengine
|
74f8fd5721
|
Revert "SL-13814 Updated label text"
This reverts commit 1557cd8fe2.
|
2020-09-23 12:27:38 +03:00 |
|
Andrey Kleshchev
|
1ef4591381
|
SL-13821 Fixed checkbox not disabling
|
2020-09-23 12:10:06 +03:00 |
|
Callum Prentice
|
5858bb87c7
|
Add SQLite third package to this viewer and pull in the most recent build (3.33)
|
2020-09-22 16:52:10 -07:00 |
|
Dave Houlton
|
364ba9978b
|
Merged in DV497-merge-6.4.9 (pull request #312)
Merge 6.4.9 into DRTVWR-497
|
2020-09-22 22:22:21 +00:00 |
|
Dave Houlton
|
86e7cc3d35
|
Merge branch 'master' v6.4.9 into DRTVWR-497
|
2020-09-22 15:28:13 -06:00 |
|
Dave Houlton
|
b62d7c2f06
|
Merged in euclid-13522 (pull request #309)
SL-13522 remove injected character lights to improve alpha lighting in edit mode
Approved-by: Michael Pohoreski
|
2020-09-22 20:37:08 +00:00 |
|
Andrey Lihatskiy
|
fa887f18e1
|
follow-up build fix
|
2020-09-22 23:31:22 +03:00 |
|
Andrey Lihatskiy
|
825cfc2b6a
|
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
|
2020-09-22 23:30:12 +03:00 |
|
Callum Prentice
|
38faec3b11
|
Merge branch 'master' into DRTVWR-519
|
2020-09-22 13:07:39 -07:00 |
|
Andrey Kleshchev
|
c2b55c4362
|
Merged master(DRTVWR-503) into DRTVWR-514-keymappings
|
2020-09-22 22:54:36 +03:00 |