Age | Commit message (Collapse) | Author |
|
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.
|
|
|
|
|
|
|
|
Do not set capability when disconnected, it creates new coroutines that will do nothing and region might be invalid resulting in a crash. Do not initilize LLWorld.
|
|
|
|
|
|
following promotion of DRTVWR-554
|
|
|
|
|
|
|
|
|
|
|
|
entitlements
|
|
entitlements
|
|
|
|
+ post merge conflict fix
|
|
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
|
|
|
|
|
|
naming.
|
|
|
|
|
|
|
|
|
|
There shouldn't be any differences for 'None' between normal objects and attachments
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
|
|
following promotion of DRTVWR-552
|
|
|
|
|
|
failed
also cleaned up some xui warnings
|