Age | Commit message (Collapse) | Author |
|
|
|
|
|
This reverts commit bf999f2f84dd26844c60d682f563f982a55e8ee8 due to revert of updater, this will be moved to separate 'epic' instead
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
|
|
# Conflicts:
# autobuild.xml
|
|
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
|
|
|
|
|
|
Change was moved to DRTVWR-514
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llcommon/llkeybind.cpp
# indra/llcommon/llkeybind.h
|
|
Changes were moved to DRTVWR-514
|
|
|
|
|
|
According to UX UI engineer. Also adapted it to new system, but it needs a better solution.
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
|
|
# Conflicts:
# indra/llaudio/llaudioengine_fmodex.cpp
|
|
|
|
|
|
|
|
|
|
Outfit" for any type that does not already exist
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|