Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
|
|
|
|
|
|
|
|
# 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
|
|
|
|
current line
|
|
|
|
DRTVWR-481
Merge
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
browser behind menu
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Completely removed matching of the URLs w/o a protocol
+ Some unit tests
|
|
|
|
|
|
|
|
|
|
|
|
popups and payment popups
|
|
of the link always appears.
|
|
for non-Linden URLs
|
|
no other changes made
|
|
(long long round) in VS2013
|
|
notecard window
|