Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
templates to use display names.
Previously name substitutions were broken, so "[FIRST] [LAST]" was displayed instead of avatar name.
Some of the affected notifications:
* avatar went online/offline notification
* object return notification
* calling card offer
* script dialog
* auto-unmute notification.
See the diff for more details.
The fixes apply to all locales but English (which is already correct).
Besides, I fixed calling card offer notification to display avatar name correctly. It was broken even in English.
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22
DEV-38453 Conversion to 2.0: Modernize and rearrange the nodes of the localized XUI; NO CHANGES TO ENGLISH.
- match the new structures/widget language of the post-skinning work
- restore some strings.xml entries from the former ui_strings.xml file
- copy the Low/Mid/High translations into strings.xml
- strip out all superfluous length= and type= parameters; these default to the EN value anyway
I intentionally did not yet rearrange menu_viewer.xml, since it is still in flux in English
|
|
|
|
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
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
|
|
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
|