Age | Commit message (Collapse) | Author |
|
|
|
This reverts commit bf999f2f84dd26844c60d682f563f982a55e8ee8 due to revert of updater, this will be moved to separate 'epic' instead
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
|
|
|
|
|
|
Changes were moved to DRTVWR-514
|
|
|
|
|
|
This reverts commit 1e1707d532560583744bb877adfed11864f2db31.
|
|
|
|
|
|
|
|
According to UX UI engineer. Also adapted it to new system, but it needs a better solution.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
todo: new icons, separator and some repositioning
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
|
|
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|