diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-04-26 16:03:03 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-04-26 16:03:03 +0300 |
| commit | 79c9a8a4b79124baa06cb6630be3113906f1e342 (patch) | |
| tree | 84e73c23280a42f5fff630a05e23cf914ae289bf /indra/newview/lllogininstance.cpp | |
| parent | e5e710a1e6e0f74cd60647e3dae7d037076351ff (diff) | |
| parent | bafa869c21cb8b329f94be6fa930a43d11699082 (diff) | |
Merge branch 'DRTVWR-546' into DRTVWR-539
Diffstat (limited to 'indra/newview/lllogininstance.cpp')
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index e81d2cc082..531f0b172d 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -165,13 +165,12 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia //requested_options.append("inventory-meat"); //requested_options.append("inventory-skel-targets"); #if (!defined LL_MINIMIAL_REQUESTED_OPTIONS) - if(FALSE == gSavedSettings.getBOOL("NoInventoryLibrary")) - { - requested_options.append("inventory-lib-root"); - requested_options.append("inventory-lib-owner"); - requested_options.append("inventory-skel-lib"); + + // Not requesting library will trigger mFatalNoLibraryRootFolder + requested_options.append("inventory-lib-root"); + requested_options.append("inventory-lib-owner"); + requested_options.append("inventory-skel-lib"); // requested_options.append("inventory-meat-lib"); - } requested_options.append("initial-outfit"); requested_options.append("gestures"); |