diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/PickerDlg.cpp b/mozilla/webshell/embed/ActiveX/tests/cbrowse/PickerDlg.cpp
index f48d5ca3185..98611a6dea8 100644
--- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/PickerDlg.cpp
+++ b/mozilla/webshell/embed/ActiveX/tests/cbrowse/PickerDlg.cpp
@@ -42,15 +42,17 @@ CPickerDlg::CPickerDlg(CWnd* pParent /*=NULL*/)
 	//{{AFX_DATA_INIT(CPickerDlg)
 	m_szTestURL = _T("");
 	m_szTestCGI = _T("");
+	m_bDebugging = FALSE;
+	m_sDebugFlags = _T("");
 	//}}AFX_DATA_INIT
 	m_clsid = CLSID_NULL;
 
 	CWinApp *pApp = AfxGetApp();
 	m_szTestURL = pApp->GetProfileString(SECTION_TEST, KEY_TESTURL, KEY_TESTURL_DEFAULTVALUE);
 	m_szTestCGI = pApp->GetProfileString(SECTION_TEST, KEY_TESTCGI, KEY_TESTCGI_DEFAULTVALUE);
+	m_sDebugFlags = _T("NSPR_LOG_MODULES=nsComponentManager:5");
 }
 
-
 void CPickerDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CDialog::DoDataExchange(pDX);
@@ -58,6 +60,8 @@ void CPickerDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_LISTBROWSER, m_lbPicker);
 	DDX_Text(pDX, IDC_TESTURL, m_szTestURL);
 	DDX_Text(pDX, IDC_TESTCGI, m_szTestCGI);
+	DDX_Check(pDX, IDC_CHECK1, m_bDebugging);
+	DDX_Text(pDX, IDC_EDIT1, m_sDebugFlags);
 	//}}AFX_DATA_MAP
 }
 
@@ -104,6 +108,12 @@ void CPickerDlg::OnOk()
 	pApp->WriteProfileString(SECTION_TEST, KEY_TESTURL, m_szTestURL);
 	pApp->WriteProfileString(SECTION_TEST, KEY_TESTCGI, m_szTestCGI);
 
+	if (m_bDebugging)
+	{
+		putenv("NSPR_LOG_FILE=.\\mozilla.log");
+		putenv(m_sDebugFlags);
+	}
+
 	EndDialog(IDOK);
 }
 
diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/PickerDlg.h b/mozilla/webshell/embed/ActiveX/tests/cbrowse/PickerDlg.h
index 8d035d3115b..2d2a75a9ed5 100644
--- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/PickerDlg.h
+++ b/mozilla/webshell/embed/ActiveX/tests/cbrowse/PickerDlg.h
@@ -22,6 +22,8 @@ public:
 	CListBox	m_lbPicker;
 	CString	m_szTestURL;
 	CString	m_szTestCGI;
+	BOOL	m_bDebugging;
+	CString	m_sDebugFlags;
 	//}}AFX_DATA
 
 	CLSID m_clsid;
diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.rc b/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.rc
index 228c011d585..e366f1abf84 100644
--- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.rc
+++ b/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.rc
@@ -214,7 +214,7 @@ IDI_TEST                ICON    DISCARDABLE     "res\\test.ico"
 // Dialog
 //
 
-IDD_PICKBROWSER DIALOG DISCARDABLE  0, 0, 284, 185
+IDD_PICKBROWSER DIALOG DISCARDABLE  0, 0, 284, 223
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Welcome to CBrowse!"
 FONT 8, "MS Sans Serif"
@@ -233,7 +233,11 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,227,24,50,14
     LTEXT           "Some tests also need a CGI URL, enter that here:",
                     IDC_STATIC,7,154,157,8
-    EDITTEXT        IDC_TESTCGI,7,165,213,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_TESTCGI,7,167,213,13,ES_AUTOHSCROLL
+    CONTROL         "Turn on Mozilla debugging (creates a mozilla.log file)",
+                    IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,187,
+                    172,10
+    EDITTEXT        IDC_EDIT1,7,202,213,14,ES_AUTOHSCROLL
 END
 
 IDD_TAB_MESSAGES DIALOG DISCARDABLE  0, 0, 275, 75
@@ -283,7 +287,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 277
         TOPMARGIN, 7
-        BOTTOMMARGIN, 178
+        BOTTOMMARGIN, 216
     END
 
     IDD_TAB_MESSAGES, DIALOG
diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/resource.h b/mozilla/webshell/embed/ActiveX/tests/cbrowse/resource.h
index 0a132b99fa7..8e6b67248ed 100644
--- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/resource.h
+++ b/mozilla/webshell/embed/ActiveX/tests/cbrowse/resource.h
@@ -37,6 +37,8 @@
 #define IDC_TAB_MARKER                  1017
 #define IDC_STATUS                      1019
 #define IDC_PROGRESS                    1020
+#define IDC_CHECK1                      1021
+#define IDC_EDIT1                       1022
 
 // Next default values for new objects
 // 
@@ -44,7 +46,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        138
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1021
+#define _APS_NEXT_CONTROL_VALUE         1023
 #define _APS_NEXT_SYMED_VALUE           107
 #endif
 #endif