Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
The reason: overridden width attributes in localized files.
Fix: remove overrides in 'es', 'fr', 'it', 'pt' locales.
But override tab width for 'it' locale to accommodate "Mute when minimized" checkbox on Sound & Media panel.
NOTE: there is no enough room for "Mute when minimized" checkbox on Sound & Media panel in 'nl' locale.
It requires too much space, about 117 extra px and issue should be moved into separate ticket.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/171/
--HG--
branch : product-engine
|
|
|
|
|
|
1.23s UI
reviewed by Leyla
|
|
|
|
|
|
|
|
|
|
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
|
|
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
|