6b6b116fd4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-03-03 00:20:02 +01:00
d26567915c
Merge with Master after Viewer release
2021-02-03 09:31:32 -08:00
27117cd8e4
SL-14269 FIXED Textures are corrupt after reducing the cache size.
2020-11-12 20:44:17 +02:00
a0be0371d7
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 01:12:13 +01:00
d07dea27ab
Post-merge leftover cleanup; buildfix
2020-11-11 22:41:32 +02:00
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
af61974386
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-05 09:14:11 +01:00
ac875d1876
SL-14150 Comment for clarity and removed redundant check
2020-10-23 00:17:29 +03:00
31e7c5b97c
SL-14150 Handle more cases of corrupted cache
2020-10-22 22:33:22 +02:00
0bf11e45ea
SL-14150 Handle more cases of corrupted cache
2020-10-22 22:22:17 +03:00
e7c9024d75
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-03 12:28:08 +02:00
2938b8238c
SL-12889 Failed to cache image crashes
2020-05-25 23:59:56 +03:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
797fa6718b
Merge 494-maint-wassail
2019-11-28 17:09:26 +01:00
d3f389a38c
SL-12326 Textures' apr pool crash fix
2019-11-26 17:21:43 +02:00
28eca3aeb4
SL-12326 Textures' apr pool crash fix
2019-11-26 17:21:43 +02:00
bc60d396d5
Merge viewer-neko
2019-06-26 21:20:12 +02:00
185fe0f77b
SL-11418 Mac build fix
2019-06-25 14:48:04 +03:00
7dbadf4c8b
Mac buildfix
2019-06-25 03:32:23 +03:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
baa1c7f6d7
SL-11073
...
Make tex cache not check size logic while performing validation.
2019-05-29 08:17:34 -07:00
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
f9ec853f4a
Merge viewer-neko
2019-01-03 19:07:09 +01:00
323245b00d
Dont crash on failing to save an image to the fast cache, just warn and continue.
2019-01-02 21:06:55 -08:00
aa90985d67
SL-10231 Bug in texture cache size computation
2018-12-12 20:21:21 +02:00
3a99b5e9de
Merge viewer-lynx
2018-07-15 14:00:44 +02:00
41c0a95365
MAINT-8395 Better loging
2018-06-26 20:19:38 +03:00
4c4b76ab37
Merge viewer-neko
2018-06-22 22:22:26 +02:00
6c231ba8a6
MAINT-8395 Rollback part of SL-711 to fix related crashes
2018-06-14 18:30:40 +03:00
31a1ba1701
Merge Firestorm LGPL
2018-05-08 18:31:13 +02:00
7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
ef20e3f523
Replace ARP Mutex and Condition with std::mutx and std::conditional_variable
2018-04-05 12:02:12 +02:00
25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01:00
6e445e82e2
MAINT-8091 Removed deprecated and unused private memory pooling
2018-01-30 14:03:26 +00:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
799309f890
Merge viewer-64
2018-01-04 13:09:03 +01:00
5002bf5660
MAINT-8087: Use env vars from VMP for AppData\Roaming and Local.
...
On Windows, when logged in with a non-ASCII username, every one of the three
documented APIs -- SHGetSpecialFolderPath(), SHGetFolderPath() and
SHGetKnownFolderPath() -- fails to retrieve any pathname at all. We cannot
account for the fact that the oldest of these continues to work with the
release viewer and within a Python script (though not, curiously, from a
Python interactive session). With a non-ASCII username, they consistently fail
when called from an Alex Ivy viewer build: "The filename, directory name, or
volume label syntax is incorrect."
Empirically, with a non-ASCII username, the preset APPDATA and LOCALAPPDATA
environment variables are also useless, e.g. c:\Users\??????\AppData\Roaming
where those are, yup, actual question marks.
Empirically, the VMP is able to successfully call SHGetFolderPath() to
retrieve both AppData\Roaming and AppData\Local. Therefore, we make the VMP
set the APPDATA and LOCALAPPDATA environment variables to the UTF-8 encoded
correct pathnames. Instead of calling SHGetSomethingFolderPath() at all, make
LLDir_Win32 retrieve those environment variables.
Make LLFile::mkdir() treat "directory already exists" as a success case. Every
single call fell into one of two categories: either it didn't check success at
all, or it tested specially to exempt errno == EEXIST. Migrate that test into
mkdir(); eliminate it from call sites.
Make LLDir::append() and add() convenience functions accept variadic
arguments. Replace add(add()...) constructs, as well as clumsy concatenations
of directory names and getDirDelimiter(), with simple variadic add() calls.
2017-12-20 22:51:26 -05:00
083b93d2f9
MAINT-2124 Texture allocation issues
2017-12-05 17:54:17 +02:00
34d3b49d1f
MAINT-2124 Texture allocation issues
2017-12-05 17:54:17 +02:00
c606bc3492
Merge viewer-lynx
2017-11-12 12:28:28 +01:00
7161619d6c
MAINT-7978 - Fixed allocation crash in doRead(), workers should never crash
2017-11-06 16:46:16 +02:00
3af72c575b
Merge viewer-neko
2017-10-24 09:42:19 +02:00
76c7eb7310
Backed out changeset: bfa432c3c7d5 (SL-775)
2017-10-23 17:28:18 +03:00
7697f7f9a6
MAINT-7929 Viewer shouldn't attempt to access unreadable cache indefientely
2017-10-23 17:15:00 +03:00
4e997f9eef
Merge viewer-neko
2017-10-11 22:32:13 +02:00
5ee30b7da5
MAINT-7895 Fix for setHeaderCacheEntry infinite loop
2017-10-11 19:37:35 +03:00
448f344f54
Merge viewer-neko
2017-10-05 21:27:43 +02:00
e0265d3754
build fix
2017-10-03 12:00:11 +03:00
Ansariel