diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-10-22 00:09:06 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-10-22 01:34:59 +0300 |
| commit | d567465ea17a2523b200fbf6213adaacfccd23da (patch) | |
| tree | 803edb357b594135c918a7f16b1a3a48239de933 | |
| parent | 14539cf4ad4e3cbcb345f062f400c1fc2d1f9afc (diff) | |
#6489 Mac viewer does not list any previously logged in users
| -rw-r--r-- | indra/llfilesystem/lldir.cpp | 2 | ||||
| -rw-r--r-- | indra/llfilesystem/lldir_mac.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp index cfbf4361d1..cfbdb7be3b 100644 --- a/indra/llfilesystem/lldir.cpp +++ b/indra/llfilesystem/lldir.cpp @@ -1162,6 +1162,8 @@ const char* const LLDir::PORTABLE_USER_DATA_DIRNAME = "UserData"; // static bool LLDir::isPortableInstall(const std::string& install_root) { + // Todo: portable mac builds don't have a .portable marker file. + // Fix mac portable builds to include one. if (install_root.empty()) { return false; diff --git a/indra/llfilesystem/lldir_mac.cpp b/indra/llfilesystem/lldir_mac.cpp index 5c64beca78..da2289ceb1 100644 --- a/indra/llfilesystem/lldir_mac.cpp +++ b/indra/llfilesystem/lldir_mac.cpp @@ -163,9 +163,8 @@ LLDir_Mac::LLDir_Mac() // viewer is unaffected.if (!is_dmg && !is_translocated && !is_applications_install && !install_root.empty()) // macos doesn't have the .portable marker , but check it just in case. + // Todo: fix this, portable installs should have a marker file. bool is_portable = isPortableInstall(install_root); - // For a velopack build, assume that running nor from a dmg means 'portable'. - is_portable |= !is_dmg && !is_translocated && !is_applications_install && !install_root.empty(); if (is_portable) { @@ -213,6 +212,10 @@ LLDir_Mac::LLDir_Mac() mRunContextDescription = "Portable (extracted archive, " + install_root + ")"; } #endif // LL_VELOPACK + else if (!is_dmg && !is_translocated && !is_applications_install && !install_root.empty()) + { + mRunContextDescription = "Running from a non-standard folder (" + install_root + ")"; + } else if (!install_root.empty()) { // Bundle is present on local disk, intact, and not translocated |