Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
|
|
|
|
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
|
|
|
|
|
|
internal repo to public one.
|
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
|
|
1. Clean list before requesting
2. Don't trigger onOpen from menu if already open
|
|
|
|
|
|
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
|
|
|
|
|
|
|
|
|
|
Remapped debugging avatar textures (requires godlike agent) to Ctrl+Shift+Alt+K
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
"Ctrl-alt-H" shortcut keys
|
|
|
|
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DRTVWR-481
Merge
|
|
|
|
|
|
|
|
|
|
|
|
upload prices for different asset types. Also added a confirmation dialog for bulk upload.
|
|
|
|
|
|
|
|
|
|
|