Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
|
|
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
|
# Conflicts:
# README.md
|
|
drag in EQR preview window
|
|
orthogonal throughout
|
|
|
|
internal repo to public one.
|
|
|
|
|
|
|
|
|
|
|
|
handled correctly now
|
|
screw ups)
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
|
|
|
|
|
|
|
|
|
|
|
|
in the list
|
|
in the list as disabled when complexity is not limited
|
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
|
|
|
|
|
|
|
|
panels
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# doc/contributions.txt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
enabled proxy - there isn't an obvious way to set proxy information for CEF alone and QA asserts that the system setting is used so we are removing the proxy UI from the preferences floater. I purposely left everything else in place (config floater, media plugin messages etc.) so we can consider adding CEF specific support one day.
|
|
|
|
|
|
|