Age | Commit message (Collapse) | Author |
|
# 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
|
|
|
|
|
|
|
|
|
|
|
|
DRTVWR-481
Merge
|
|
|
|
upload prices for different asset types. Also added a confirmation dialog for bulk upload.
|
|
|
|
|
|
proper icon
Add entries to strings.xml for all langs for the "settings" string.
|
|
|
|
|
|
|
|
|
|
|
|
(Region/Parcel/Local)
|
|
|
|
|
|
|
|
needed. Remove pointless in-progress notice
|
|
changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested
|
|
not display in system information.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
are too long
|
|
Waiting for the revert of commit c924d3adeead
|
|
|
|
|
|
|
|
|