diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-26 22:49:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-26 22:49:23 +0800 |
| commit | 0b62583eb7dd6e193d5daa2e24646bbb9f3c74e5 (patch) | |
| tree | cc9dee5d964cf60e22ee1e7e9703eabdae4f6fd5 /indra/newview | |
| parent | b0428375e14c4c9e6bc9dc723bdc94983d3dde6b (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/newview')
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 6 | ||||
| -rwxr-xr-x | indra/newview/linux_tools/launch_url.sh | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 43d3060bb9..8cbe8bd186 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -2,7 +2,11 @@ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME} DESTINATION bin ) -install(DIRECTORY skins app_settings linux_tools fonts +install(PROGRAMS linux_tools/launch_url.sh + DESTINATION libexec/${VIEWER_BINARY_NAME} + ) + +install(DIRECTORY skins app_settings fonts DESTINATION share/${VIEWER_BINARY_NAME} PATTERN ".svn" EXCLUDE ) diff --git a/indra/newview/linux_tools/launch_url.sh b/indra/newview/linux_tools/launch_url.sh index 404ea36f26..7c4ebf2291 100755 --- a/indra/newview/linux_tools/launch_url.sh +++ b/indra/newview/linux_tools/launch_url.sh @@ -61,6 +61,7 @@ fi # will be tried first, which is a debian alternative. BROWSER_COMMANDS=" \ x-www-browser \ + chrome \ firefox \ mozilla-firefox \ iceweasel \ |