From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 4 Jan 2007 02:04:29 +0000
Subject: 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
---
 indra/newview/lldirpicker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/lldirpicker.cpp')

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);
-- 
cgit v1.2.3