livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix opening log transcripts and folders on linux. FIRE-11533

meow-7.2.2
ziree 2013-09-02 22:04:05 +02:00
parent 976fcc6d10
commit 338ae29e8f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llwindow/llwindow.cpp
View File

@ -50,8 +50,17 @@ LLSplashScreen *gSplashScreenp = NULL;
BOOL gDebugClicks = FALSE;
BOOL gDebugWindowProc = FALSE;
// <FS:Zi> Allow file: links to open folders, chat history etc. on Linux systems
#if LL_LINUX
const S32 gURLProtocolWhitelistCount = 5;
const std::string gURLProtocolWhitelist[] = { "secondlife:", "http:", "https:", "data:", "file:" };
#else
// </FS:Zi>
const S32 gURLProtocolWhitelistCount = 4;
const std::string gURLProtocolWhitelist[] = { "secondlife:", "http:", "https:", "data:" };
// <FS:Zi> Allow file: links to open folders, chat history etc. on Linux systems
#endif
// </FS:Zi>
// CP: added a handler list - this is what's used to open the protocol and is based on registry entry
// only meaningful difference currently is that file: protocols are opened using http:

2
indra/llwindow/llwindowsdl.cpp
View File

@ -2634,7 +2634,7 @@ void LLWindowSDL::spawnWebBrowser(const std::string& escaped_url, bool async)
void LLWindowSDL::openFile(const std::string& file_name)
{
spawnWebBrowser(file_name,TRUE);
spawnWebBrowser("file://"+file_name,TRUE);
}
void *LLWindowSDL::getPlatformWindow()