summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
AgeCommit message (Collapse)Author
2020-10-14Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-09-22SL-13971 [Cleanup] Viewer complains about missing VertexShaderEnableAndrey Kleshchev
2020-08-20SL-13565, clean up now-orphaned throttling variable and handling codeDave Houlton
2020-08-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-08-11SL-13626 Renamed PoolSizeAssetStorage to PoolSizeVAssetStorageAndrey Kleshchev
to reflect previous commit and use correct pool size
2020-06-24Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-06-02Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512Callum Prentice
2020-06-02Merged master into DRTVWR-482Andrey Kleshchev
2020-05-20Fix for SL-13125 Update MediaRollOff values for greater range and less ↵Callum Prentice
attenuation
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-19Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-05-18Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp
2020-05-18Merged master into DRTVWR-508Andrey Kleshchev
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-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-04-26Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
2020-04-23SL-12904 Temporarily use LLSD to avoid crashes on older viewersMnikolenko Productengine
2020-04-22SL-13077 remove floater specific variables from settings.xmlAndrey Kleshchev
2020-04-21Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/shaders/class1/objects/previewV.glsl # indra/newview/lldynamictexture.cpp # indra/newview/llfloatermodelpreview.cpp
2020-04-20Merged master into DRTVWR-508Andrey Kleshchev
2020-04-20SL-12904 FIXED Camera Preset does not restore correctly when sittingMnikolenko Productengine
2020-03-19SL-12871 'Only Friends and Groups can call or IM me' setting should be ↵Mnikolenko Productengine
account based.
2020-03-16SL-4495 Add setting to ignore Hover height when setting Camera positionmaxim_productengine
2020-02-05Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-02-05Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-02-04SL-11445 Couple small fixesAndrey Kleshchev
2020-02-03Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-01-29SL-12594, remove settings-file references to VertexShaderEnableDave Houlton
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-12-18SL-12424 WIP Save mousewheel zoom fraction in presetmaxim_productengine
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-12-10SL-12429 Use different setting name to prevent crash on old viewermaxim_productengine
2019-11-14SL-12186 Buildfix and update for creation of default presetsmaxim_productengine
2019-11-12SL-12186 WIP Added ability to reset default presets and updated item list in ↵maxim_productengine
'My camera presets' floater
2019-11-04SL-12186 WIP Updating UI for camera controls, including presetsMnikolenko Productengine
2019-10-29Fix crash on startup and restore missing settingsMnikolenko Productengine
2019-10-15Downstream merge from lindenlab/viewer-manulAndreyL ProductEngine
2019-10-02SL-6109 Removed obsolete control, moved table init to xml, cleanupandreykproductengine
2019-09-26SL-6109 Conflict resolutionandreykproductengine
2019-09-18SL-11984 Correct status page URLsSteven Harrison (steven)
2019-09-17SL-11779 Resolved perfomance drop with negative RenderShadowResolutionScaleandreykproductengine
2019-09-05SL-11315 Viewer asks to play media and retains selected choiceandreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 04:16:15 +0000