Age | Commit message (Collapse) | Author |
|
|
|
# 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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
light contributions
(engages AMBIENT_KILL, SUNLIGHT_KILL, and LOCAL_LIGHT_KILL defines in shaders to accomplish
those tasks as required by each render mode).
|
|
|
|
|
|
reanimate a day cycle when setting a fixed sky. Add new floater for setting the shared environment to local and allowing modifications.
|
|
|
|
|
|
|