Age | Commit message (Collapse) | Author |
|
following promotion of DRTVWR-550
|
|
|
|
lost in case of crash
|
|
|
|
following promotion of DRTVWR-540
|
|
failure
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llstartup.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DRTVWR-540-maint
|
|
DRTVWR-550-mfa
|
|
DRTVWR-540-maint
|
|
in an error handling block
|
|
python2 syntax
|
|
|
|
python2 syntax
|
|
storage as well.
|
|
"RememberUser" and "RememberPassword" settings
|
|
before first login
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Due to changes in SL-16715
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
|
|
following promotion of DRTVWR-557
|
|
|
|
|
|
There shouldn't be any differences for 'None' between normal objects and attachments
|
|
# Conflicts:
# autobuild.xml
# indra/newview/llappviewer.cpp
# indra/newview/viewer_manifest.py
|
|
end-to-end to avoid confusion
|
|
|
|
(cherry picked from commit 5fcb811aa2b455cebf18830cf0cdef14025dacdb)
|
|
|
|
'from __future__ import print_function' not only makes the print() function
available, it also makes the Python 2 print statement invalid syntax. Until we
merge with the Python 3 branch (soon!), don't import print_function: instead
revert to 'print >> sys.stderr' statements.
|
|
Instead we have a new bundled executable SLVersionChecker, so that must be
signed instead of _greenlet.so.
|
|
On Mac, execute the packaged SLVersionChecker directly rather than invoking
system Python on our manually-bundled scripts.
|