summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-08-26 22:49:23 +0800
committerErik Kundiman <erik@megapahit.org>2023-08-26 22:49:23 +0800
commit0b62583eb7dd6e193d5daa2e24646bbb9f3c74e5 (patch)
treecc9dee5d964cf60e22ee1e7e9703eabdae4f6fd5 /indra/llwindow
parentb0428375e14c4c9e6bc9dc723bdc94983d3dde6b (diff)
Make using the system browser for links works
First, in order for launch_url.sh to be executable, it needs to be installed as a program. Secondly, the spawn browser command path needs to be adjusted accordingly. And last, add chrome (applies to chromium too on FBSD), to the list of browser commands to try (so chrome wasn't there :/, but dillo has always been XD, and that's why it kept opening Dillo here haha).
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/llwindowsdl.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 293e6ec272..37c4d09a73 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -2656,9 +2656,13 @@ void LLWindowSDL::spawnWebBrowser(const std::string& escaped_url, bool async)
# endif // LL_X11
std::string cmd, arg;
+#ifdef LL_USESYSTEMLIBS
+ cmd = gDirUtilp->getExecutableDir();
+#else
cmd = gDirUtilp->getAppRODataDir();
cmd += gDirUtilp->getDirDelimiter();
cmd += "etc";
+#endif
cmd += gDirUtilp->getDirDelimiter();
cmd += "launch_url.sh";
arg = escaped_url;