diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
| commit | b01d567a5d9e2b5dd28bcc7b3f474fabd93e7a2f (patch) | |
| tree | c45377783f53f033d43a4d06d36bbeb2a7f7e79b /indra/llwindow/llwindowmacosx.cpp | |
| parent | a64f283477ea4db09c8b515ab94709e1fb5c82af (diff) | |
EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 943b98e9d5..0a2f9cfb6c 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -70,7 +70,6 @@ const S32 MAX_NUM_RESOLUTIONS = 32; void show_window_creation_error(const char* title) { llwarns << title << llendl; - shell_open( "help/window_creation_error.html"); /* OSMessageBox( "Second Life is unable to run because it can't set up your display.\n" @@ -735,7 +734,6 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits if (check_for_card(RENDERER, CARD_LIST[i])) { close(); - shell_open( "help/unsupported_card.html" ); return FALSE; } } @@ -3200,46 +3198,6 @@ void spawn_web_browser(const char* escaped_url) } } -void shell_open( const char* file_path ) -{ - OSStatus result = noErr; - - llinfos << "Opening " << file_path << llendl; - CFURLRef urlRef = NULL; - - CFStringRef stringRef = CFStringCreateWithCString(NULL, file_path, kCFStringEncodingUTF8); - if (stringRef) - { - // This will succeed if the string is a full URL, including the http:// - // Note that URLs specified this way need to be properly percent-escaped. - urlRef = CFURLCreateWithString(NULL, stringRef, NULL); - - if(urlRef == NULL) - { - // This will succeed if the string is a full or partial posix path. - // This will work even if the path contains characters that would need to be percent-escaped - // in the URL (such as spaces). - urlRef = CFURLCreateWithFileSystemPath(NULL, stringRef, kCFURLPOSIXPathStyle, false); - } - - CFRelease(stringRef); - } - - if (urlRef) - { - result = LSOpenCFURLRef(urlRef, NULL); - - if (result != noErr) - { - llinfos << "Error " << result << " on open." << llendl; - } - CFRelease(urlRef); - } - else - { - llinfos << "Error: couldn't create URL." << llendl; - } -} BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b) { |