Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
|
|
llDialog buttons
|
|
2f452d06e6964b0edf26b0b3f6eaa156e3fa2d48
It is necessary to revert commit 326055ba82c22fedde186c6a56bafd4fe87e613a
for 2f452d06e6964b0edf26b0b3f6eaa156e3fa2d48 to work its magic and repair
script dialogs so that they render as they used to before the emojis fonts
introduction.
Note that this revert won't prevent to use the new emojis should scripters
want them in their new scripted dialogs: it just ensures existing scripted
dialogs using special UTF-8 characters (which are not genuine emojis) will
render as they used to, using the monochrome fallback fonts.
|
|
llDialog buttons
|
|
Co-authored-by: Yuzuru Kato <pascal.imac@gmail.com>
Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
|
|
|
|
|
|
|
|
|
|
With help from Jonathan Yap
|
|
moved "chrome" flags to xui
separated hiding floater title from setting chrome
toolbar toggle button now moves floaters to frontmost and doesn't necessarily rely on focus
|
|
back-out the back-out for this branch. yay.
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
allow_html still supported as alternate
|
|
|
|
1.23s UI
reviewed by Leyla
|
|
|
|
https://jira.secondlife.com/browse/EXT-4335
|
|
wrong order
Order of the buttons has been recovered to viewer 1.23 behavior.
--HG--
branch : product-engine
|
|
constantly pollute the localization extraction of real strings.
|
|
creation of dummy icon
removed commented code from XML file
removed from toast notify panel Icon member and a corresponding code
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
[ITEM_SLURL], in notifications.xml"
--HG--
branch : product-engine
|
|
returned necessary attributes to the panel_notification.xml file that was corrupted by Chuck's commit (changeset 3862:a7bf90cddcdb)
--HG--
branch : product-engine
|
|
|
|
http://jira.secondlife.com/browse/EXT-1673
|
|
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
* Bugs: EXT-1293 EXT-1611 EXT-1613 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720
* Dev: EXT-1575 EXT-1770 EXT-1232 EXT-1234
|
|
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231
* Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476
* IM changes
|