diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
| commit | d60f16540dba5616cd8260046b44ebc2a1047065 (patch) | |
| tree | ab241efaf58ba4eeb1916763cef337a04bc15d64 /indra/newview/llfilepicker.cpp | |
| parent | 0434d35c160bcd0d78b8f4e795a62155f50a6fb8 (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 776a2e4dc2..587f1eb253 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -130,7 +130,7 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter) // don't provide default file selection mFilesW[0] = '\0'; - mOFN.hwndOwner = llwindow_get_hwnd(gViewerWindow->getWindow()); + mOFN.hwndOwner = (HWND)gViewerWindow->getPlatformWindow(); mOFN.lpstrFile = mFilesW; mOFN.nMaxFile = SINGLE_FILENAME_BUFFER_SIZE; mOFN.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR ; @@ -167,7 +167,7 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter) // don't provide default file selection mFilesW[0] = '\0'; - mOFN.hwndOwner = llwindow_get_hwnd(gViewerWindow->getWindow()); + mOFN.hwndOwner = (HWND)gViewerWindow->getPlatformWindow(); mOFN.lpstrFile = mFilesW; mOFN.nFilterIndex = 1; mOFN.nMaxFile = FILENAME_BUFFER_SIZE; @@ -238,7 +238,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename) { mFilesW[0] = '\0'; } - mOFN.hwndOwner = llwindow_get_hwnd(gViewerWindow->getWindow()); + mOFN.hwndOwner = (HWND)gViewerWindow->getPlatformWindow(); switch( filter ) { |