summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
AgeCommit message (Collapse)Author
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-559Andrey Kleshchev
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-06-28SL-17379 More complete integration of material asset typeDave Parks
2022-05-31SL-15312 Tweaks and fixesAndrey Kleshchev
- Allowed resizing text fields for classifieds in profiles - Fixed mislabeled floater from picks to classifieds - Fixed classified floater's title - Added support to see multiple classifieds - Removed obsolete panels - Fixed pick requests for various menus - Fixed pick creation from landmarks - Improved online status handling - Updated headers in files
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-04-20SL-17242 Use proper cap for setting pathfinding attributesMnikolenko Productengine
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-03-25SL-16937 New Profile capability, image uploader cap #5Andrey Kleshchev
2022-03-21SL-17040 Crash when looking for a region by handle or positionAndrey Kleshchev
Might be a better idea to turn LLWorld back into an LLSingleton. Too many things to track.
2022-03-10SL-16937 New Profile capability, GET method #1Andrey Kleshchev
in progress, will change as cap changes
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-11-25SL-16412 More region coroutine crashesAndrey Kleshchev
LLViewerRegionImpl (mImpl) exists only so long as region does, and regions get cleaned before coroutines are cleaned.
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-08-18SL-15759 Crash in setCapabilityAndrey Kleshchev
Different subcase of same crash, this one for losing connection
2021-08-11SL-15798 Crash in clearCachedVisibleObjectsMnikolenko Productengine
2021-08-09SL-15759 Crash in requestBaseCapabilitiesCoroAndrey Kleshchev
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-07-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-07-07SL-10388 use new cap to get a complete list of region objectsMnikolenko Productengine
2021-04-10SL-15082 regexp fixMnikolenko Productengine
2021-04-08SL-15082 fix for app/region SLURLSMnikolenko Productengine
2021-03-18SL-14927 Some avatar names not resolvingAndrey Kleshchev
2021-02-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2021-01-13SL-13313 Remove changes from LLViewerRegionMnikolenko Productengine
2021-01-12SL-13313 Support RegionInfo5 block in RegionInfo message, and add log messageMnikolenko Productengine
2020-11-13SL-14312 Show simulator host names for AWS hosted regionsMnikolenko Productengine
2020-10-15Merge branch 'SL-14081' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llviewerregion.cpp
2020-10-14SL-14081 - more teleport loggingBrad Payne (Vir Linden)
2020-10-09SL-14078 Caps request should log region they are requested forAndrey Kleshchev
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-08-22SL-13830 One more coroutine exit crashAndrey Kleshchev
LLWorld is supposed to first remove region from list, then delete the region, but in case of this crash region was returned by handle from llworld yet was mDead and cleaned up, all in main thread.
2020-07-09SL-13443 Reduced viewer stalls after teleportAndrey Kleshchev
Eliminates stall from saveObjectCache() on region deletion
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-02-24SL-12733 FIXED Default Creation Permissions for Objects is ignored after a relogmaxim_productengine
2020-01-29SL-12587 - debug logging option to see list of requested capsBrad Payne (Vir Linden)
2020-01-16SL-12587 - added ViewerBenefits to requested caps.Brad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 04:56:10 +0000