| Age | Commit message (Collapse) | Author |
|---|
|
|
|
# Conflicts:
# indra/newview/llstartup.cpp
|
|
|
|
|
|
|
|
|
|
|
|
DRTVWR-550-mfa
|
|
in an error handling block
|
|
python2 syntax
|
|
python2 syntax
|
|
storage as well.
|
|
"RememberUser" and "RememberPassword" settings
|
|
|
|
|
|
|
|
following promotion of DRTVWR-557
|
|
|
|
|
|
|
|
|
|
|
|
This picks up the change to 32-bit Windows viewer-manager.
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/newview/llappviewer.cpp
# indra/newview/viewer_manifest.py
|
|
Fix template verifier erroneously failing checksum check
Approved-by: Nat Linden
Approved-by: Signal Linden
Approved-by: Andrey Lihatskiy
|
|
|
|
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.
|
|
1. When SL window closes it doesn't mean that process died so gave it a bit more time to terminate
2. Added a retry logic in case first run happened too early for some reason
3. Replaced ok/cancel on locked file with abort/retry/ignorei
|
|
|
|
|
|
This reverts commit 8215fff0c2a1c895ef916837847cf7526ae61ef9.
# Conflicts:
# indra/newview/lltoolpie.cpp
|
|
|
|
|
|
|
|
|
|
existed for a while
|
|
custom floater.
|
