Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
|
|
|
|
back into faces
|
|
screw ups)
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Trying out 'sloppy' variant
|
|
|
|
|
|
|
|
|
|
gets overlooked
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llinventorypanel.cpp
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# doc/contributions.txt
|
|
|
|
|
|
|
|
1. Clean list before requesting
2. Don't trigger onOpen from menu if already open
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|