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

Allow opening files from within Firestorm on OS X. Fixes FIRE-720 for OS X users.

master
Tonya Souther 2011-05-07 16:53:39 -05:00
parent c67922719a
commit 1b3d330f85
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llwindow/llwindowmacosx.cpp
View File

@ -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();

2
indra/llwindow/llwindowmacosx.h
View File

@ -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<std::string> getDynamicFallbackFontList();