From 1b3d330f85e987c51544ae49c1203fbdbbac797e Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 7 May 2011 16:53:39 -0500 Subject: [PATCH] Allow opening files from within Firestorm on OS X. Fixes FIRE-720 for OS X users. --- indra/llwindow/llwindowmacosx.cpp | 12 ++++++++++++ indra/llwindow/llwindowmacosx.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 25a2e891f6..f8c3b3b6f8 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -3234,6 +3234,18 @@ void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url, bool async) } } +void LLWindowMacOSX::openFile(const std::string& file_name ) +{ + llinfos << "Opening file " << file_name << llendl; + FSRef appRef; + OSStatus os_result = FSPathMakeRef((UInt8*)file_name.c_str(), + &appRef,NULL); + if(os_result >= 0) + { + os_result = LSOpenFSRef(&appRef, NULL); + } +} + LLSD LLWindowMacOSX::getNativeKeyData() { LLSD result = LLSD::emptyMap(); diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 0e8be166e5..e4d19183c1 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -111,7 +111,7 @@ public: /*virtual*/ void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b); /*virtual*/ void interruptLanguageTextInput(); /*virtual*/ void spawnWebBrowser(const std::string& escaped_url, bool async); - + /*virtual*/ void openFile(const std::string& file_name); /*virtual*/ void setTitle(const std::string& title); static std::vector getDynamicFallbackFontList();