Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/newview/llviewermenufile.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llimprocessing.cpp
|
|
# Conflicts:
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewermenufile.cpp
|
|
|
|
|
|
following promotion of DRTVWR-501
|
|
"Ctrl-alt-H" shortcut keys
|
|
|
|
Approved-by: Dave Houlton
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Merge master v6.4.7 to LMR#4 DRTVWR-497
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Merge master 6.4.7 into DRTVWR-510
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
|
|
to reflect previous commit and use correct pool size
|
|
|
|
|
|
|
|
following promotion of DRTVWR-476
|
|
|
|
requestExit() doesn't close CEF, command sets CEF into closing state which will be processed on update()
|
|
than one name is not cached.
|