Age | Commit message (Collapse) | Author |
|
|
|
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
|
|
|
|
|
|
This picks up the change to 32-bit Windows viewer-manager.
|
|
|