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/lldirpicker.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/lldirpicker.cpp')
| -rw-r--r-- | indra/newview/lldirpicker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp index 5a01bfdc84..0628d54449 100644 --- a/indra/newview/lldirpicker.cpp +++ b/indra/newview/lldirpicker.cpp @@ -56,7 +56,7 @@ BOOL LLDirPicker::getDir(LLString* filename) memset(&bi, 0, sizeof(bi)); bi.ulFlags = BIF_USENEWUI; - bi.hwndOwner = llwindow_get_hwnd(gViewerWindow->getWindow());; + bi.hwndOwner = (HWND)gViewerWindow->getPlatformWindow(); bi.lpszTitle = NULL; ::OleInitialize(NULL); |