Ansariel
|
a831237e29
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llimage/llimage.h
# indra/llkdu/llimagej2ckdu.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# scripts/messages/message_template.msg.sha1
|
2024-02-06 17:58:20 +01:00 |
|
Alexander Gavriliuk
|
74c8b028d4
|
SL-20743 Use LLMutex in LLImageBase for internal data thread-safety
|
2023-12-21 19:12:52 +01:00 |
|
Ansariel
|
d927ba575a
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llqueuedthread.h
# indra/llcommon/lluuid.cpp
# indra/llcommon/llworkerthread.cpp
# indra/llimage/llimageworker.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
|
2023-05-17 21:40:54 +02:00 |
|
Brad Linden
|
2f44377b3e
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-05-17 11:17:48 -07:00 |
|
Ansariel
|
8d154eaa8c
|
Merge branch 'contribute' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llappearance/lldriverparam.cpp
# indra/llappearance/llwearable.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/newview/app_settings/settings.xml
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/skins/default/xui/de/floater_flickr.xml
# indra/newview/skins/default/xui/de/panel_flickr_photo.xml
# indra/newview/skins/default/xui/en/floater_about_land.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/fr/floater_flickr.xml
# indra/newview/skins/default/xui/fr/panel_flickr_account.xml
# indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
# indra/newview/skins/default/xui/it/floater_flickr.xml
# indra/newview/skins/default/xui/it/panel_flickr_photo.xml
# indra/newview/skins/default/xui/ja/floater_flickr.xml
# indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml
# indra/newview/skins/default/xui/pl/floater_ban_duration.xml
# indra/newview/skins/default/xui/pl/floater_camera_presets.xml
# indra/newview/skins/default/xui/pl/floater_classified.xml
# indra/newview/skins/default/xui/pl/floater_create_landmark.xml
# indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml
# indra/newview/skins/default/xui/pl/floater_flickr.xml
# indra/newview/skins/default/xui/pl/floater_linkreplace.xml
# indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_my_environments.xml
# indra/newview/skins/default/xui/pl/floater_my_scripts.xml
# indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml
# indra/newview/skins/default/xui/pl/floater_pick_track.xml
# indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preview_trash.xml
# indra/newview/skins/default/xui/pl/floater_profile.xml
# indra/newview/skins/default/xui/pl/floater_settings_picker.xml
# indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml
# indra/newview/skins/default/xui/pl/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/panel_progress.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/ru/floater_flickr.xml
# indra/newview/skins/default/xui/ru/panel_flickr_account.xml
# indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
|
2023-01-13 15:19:29 +01:00 |
|
Ansariel
|
f7063cecdd
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llappviewer.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
|
2022-12-14 10:13:07 +01:00 |
|
Brad Linden
|
eb526fec0a
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2022-12-12 17:59:34 -08:00 |
|
Nat Goodspeed
|
12f66fda13
|
DRTVWR-565: Merge branch 'origin/contribute' into DRTVWR-565
|
2022-12-12 13:27:57 -05:00 |
|
Brad Kittenbrink
|
22f6adefb8
|
DRTVWR-575 fix LLWorkerThread subclasses to be compatiblie with recent size_t changes in base class
|
2022-11-11 17:07:52 -08:00 |
|
Ansariel
|
a1090f5f5d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/quickprefs.cpp
|
2022-10-24 19:54:30 +02:00 |
|
Ansariel
|
1ca8584322
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-10-22 15:48:47 +02:00 |
|
Andrey Kleshchev
|
24fb2f8336
|
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
|
2022-10-21 18:19:27 +03:00 |
|
Andrey Lihatskiy
|
97b676b60f
|
Merge branch 'master' into DRTVWR-565-maint-P
|
2022-10-20 21:43:54 +03:00 |
|
Ansariel
|
9c4c27a56f
|
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
|
2022-08-01 22:07:39 +02:00 |
|
Andrey Kleshchev
|
6db39a6f1d
|
SL-17778 'Application not responding' popup while cleaning cache on startup
|
2022-07-21 20:52:54 +03:00 |
|
Ansariel
|
cfb6c083fe
|
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/llfilesystem/lldiskcache.cpp
# indra/llwindow/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
|
2022-06-24 22:18:44 +02:00 |
|
Cosmic Linden
|
0d250e632c
|
SL-17329: Fix texture cache not respecting DiskCachePercentOfTotal
|
2022-06-22 13:28:26 -07:00 |
|
Ansariel
|
c5d9c3c2a7
|
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/cmake/Tracy.cmake
# indra/llcommon/llprofiler.h
# indra/llcommon/llqueuedthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llimagej2coj/llimagej2coj.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
|
2022-06-03 15:07:06 +02:00 |
|
Dave Parks
|
b6841d75c2
|
SL-17219 WIP - Texture pipeline overhaul
|
2022-04-15 19:02:07 -05:00 |
|
Callum Prentice
|
168d177197
|
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
|
2021-03-09 14:39:51 -08:00 |
|
Brad Payne (Vir Linden)
|
c83e740ef9
|
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
|
2021-03-08 13:56:16 +00:00 |
|
Ansariel
|
6b6b116fd4
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
|
2021-03-03 00:20:02 +01:00 |
|
Callum Prentice
|
d26567915c
|
Merge with Master after Viewer release
|
2021-02-03 09:31:32 -08:00 |
|
Mnikolenko Productengine
|
27117cd8e4
|
SL-14269 FIXED Textures are corrupt after reducing the cache size.
|
2020-11-12 20:44:17 +02:00 |
|
Ansariel
|
a0be0371d7
|
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-11-12 01:12:13 +01:00 |
|
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 |
|
Ansariel
|
af61974386
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-05 09:14:11 +01:00 |
|
Andrey Kleshchev
|
ac875d1876
|
SL-14150 Comment for clarity and removed redundant check
|
2020-10-23 00:17:29 +03:00 |
|
Andrey Kleshchev
|
31e7c5b97c
|
SL-14150 Handle more cases of corrupted cache
|
2020-10-22 22:33:22 +02:00 |
|
Andrey Kleshchev
|
0bf11e45ea
|
SL-14150 Handle more cases of corrupted cache
|
2020-10-22 22:22:17 +03:00 |
|
Ansariel
|
e7c9024d75
|
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-06-03 12:28:08 +02:00 |
|
Andrey Kleshchev
|
2938b8238c
|
SL-12889 Failed to cache image crashes
|
2020-05-25 23:59:56 +03:00 |
|
Dave Houlton
|
f61a5c4642
|
Merge viewer-release 6.3.6 into viewwer-eep repo
|
2019-12-16 12:47:19 -07:00 |
|
Ansariel
|
da365b227e
|
Merge Firestorm LGPL
|
2019-12-13 18:15:19 +01:00 |
|
Ansariel
|
797fa6718b
|
Merge 494-maint-wassail
|
2019-11-28 17:09:26 +01:00 |
|
andreykproductengine
|
d3f389a38c
|
SL-12326 Textures' apr pool crash fix
|
2019-11-26 17:21:43 +02:00 |
|
andreykproductengine
|
28eca3aeb4
|
SL-12326 Textures' apr pool crash fix
|
2019-11-26 17:21:43 +02:00 |
|
Ansariel
|
bc60d396d5
|
Merge viewer-neko
|
2019-06-26 21:20:12 +02:00 |
|
andreykproductengine
|
185fe0f77b
|
SL-11418 Mac build fix
|
2019-06-25 14:48:04 +03:00 |
|
AndreyL ProductEngine
|
7dbadf4c8b
|
Mac buildfix
|
2019-06-25 03:32:23 +03:00 |
|
Ansariel
|
ccea567c08
|
Merge viewer-eep
|
2019-06-19 20:20:14 +02:00 |
|
Graham Linden
|
baa1c7f6d7
|
SL-11073
Make tex cache not check size logic while performing validation.
|
2019-05-29 08:17:34 -07:00 |
|
Ansariel
|
536a3f6c8e
|
Merge viewer-neko
|
2019-01-18 23:41:21 +01:00 |
|
andreykproductengine
|
26fae750ba
|
SL-10291 Replace apr_mutex with standard C++11 functionality
|
2019-01-14 22:04:44 +02:00 |
|
Ansariel
|
f9ec853f4a
|
Merge viewer-neko
|
2019-01-03 19:07:09 +01:00 |
|
Liny
|
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 |
|
andreykproductengine
|
aa90985d67
|
SL-10231 Bug in texture cache size computation
|
2018-12-12 20:21:21 +02:00 |
|
Ansariel
|
3a99b5e9de
|
Merge viewer-lynx
|
2018-07-15 14:00:44 +02:00 |
|
andreykproductengine
|
41c0a95365
|
MAINT-8395 Better loging
|
2018-06-26 20:19:38 +03:00 |