| Age | Commit message (Collapse) | Author |
|---|
|
Cielo avanzado > Editor del ciclo de un día. \"Configuración del fotograma clav\" should be \"Configuración del fotograma clave\".)
- Some redesign of floater_day_cycle.
- Main changes:
increased view_border size;
moved controls to the right of increased view_border to the right;
increased spinner width to see all its content;
moved 'Play' and 'Stop!' buttons in one row with 'Use estate time' button.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/258/
--HG--
branch : product-engine
|
|
but still need PE fix to redesign/widen border to fit translation in; removing old overrides
|
|
|
|
|
|
|
|
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
|
