summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2020-05-18Merged master into DRTVWR-497Andrey Kleshchev
2020-05-18Merged master into DRTVWR-508Andrey Kleshchev
2020-05-13SL-12007 Toggling 'Transparent water' checkbox has no effectAndrey Kleshchev
Opaque water is not compatible with ALM
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-06SL-13132 Emphasize parcel name over region name in Landmarks and Place ProfilesAndrey Kleshchev
2020-05-05Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
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-05-04Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-05-04Merged master into DRTVWR-508Andrey Kleshchev
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-04-27Merge branch 'master' into DRTVWR-507-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-24SL-307 Improvements to flashing colorAndrey Kleshchev
2020-04-21Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/de/floater_preview_texture.xml # indra/newview/skins/default/xui/es/floater_preview_texture.xml # indra/newview/skins/default/xui/fr/floater_preview_texture.xml # indra/newview/skins/default/xui/it/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/panel_edit_classified.xml # indra/newview/skins/default/xui/ja/panel_me.xml # indra/newview/skins/default/xui/ru/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/floater_picks.xml # indra/newview/skins/default/xui/tr/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/panel_edit_classified.xml # indra/newview/skins/default/xui/tr/panel_me.xml # indra/newview/skins/default/xui/zh/floater_preview_texture.xml
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-20Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-04-20Merged master into DRTVWR-508Andrey Kleshchev
2020-04-17SL-13062 Fixed Scaled-down 'Upload Model' floater having a frame at the bottomAndrey Kleshchev
The way legacy_header_height works is just wrong...
2020-04-16SL-12607 Removed spacerAndrey Kleshchev
2020-04-15SL-12607 Rearrange login panelAndrey Kleshchev
2020-04-14SL-12607 WIP, take pre-sized icons from repo instead of packageAndrey Kleshchev
2020-04-13SL-12607 Added more icons and draw methods to draw themAndrey Kleshchev
2020-04-10SL-12999 List can go out of floater's rect, so it should consume scroll eventsAndrey Kleshchev
2020-04-06SL-10993 Fixed Korean font on OSX CatalinaAndrey Lihatskiy
2020-04-02SL-12962 FIXED Old messages still call a region, "a sim"Mnikolenko Productengine
2020-03-31SL-379 Render selected joint yellow when Avatar tab is openAndrey Kleshchev
2020-03-30SL-307 A separator to see where model loading logs ends and other state startsAndrey Kleshchev
2020-03-30SL-379 Remake Overrides tab into AvatarAndrey Kleshchev
2020-03-28Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-27SL-307 Implemented ability to specify color and changed flashing colorAndrey Kleshchev
2020-03-25SL-11215: Add release notes URLs to update-related notifications.Nat Goodspeed
Add code to login-fail handler to provide release notes URL from SLVersionChecker handshake event.
2020-03-23SL-3475 Add 'Close All Dialogs' option for Script dialogsMnikolenko Productengine
2020-03-19SL-12607 FMOD LogoAndrey Kleshchev
2020-03-19SL-12871 'Only Friends and Groups can call or IM me' setting should be ↵Mnikolenko Productengine
account based.
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18SL-12870 Misleading UI valueAndrey Kleshchev
2020-03-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-03-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-03-18Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-03-18Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-03-18Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
2020-03-17SL-12858 Fixed bad mergeAndrey Kleshchev
2020-03-16SL-12846 OSX fix for missing Thai charactersAndrey Lihatskiy
2020-03-16SL-12846 Thai characters missingAndrey Kleshchev
2020-03-16SL-4495 Add setting to ignore Hover height when setting Camera positionmaxim_productengine
2020-03-10SL-12779 [EEP] Fix for cropped buttons in 'Edit Day Cycle' floaterAndrey Lihatskiy