summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-13 15:28:13 -0400
committerOz Linden <oz@lindenlab.com>2013-06-13 15:28:13 -0400
commit2268bf38339178f93b317693c0a6808807301d64 (patch)
tree0a17c21975babce8422b9b62a1683947f5a58f2c /indra/newview/llappviewerwin32.h
parentd233d8836b610b5e5ca76a1e3bb4d63dc3592e66 (diff)
parentdcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff)
merge changes for 3.5.3-release
Diffstat (limited to 'indra/newview/llappviewerwin32.h')
-rwxr-xr-x[-rw-r--r--]indra/newview/llappviewerwin32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h
index 67594aea48..d95174dd1d 100644..100755
--- a/indra/newview/llappviewerwin32.h
+++ b/indra/newview/llappviewerwin32.h
@@ -44,7 +44,7 @@ public:
virtual bool cleanup();
protected:
- virtual bool initLogging(); // Override to clean stack_trace info.
+ virtual void initLogging(); // Override to clean stack_trace info.
virtual void initConsole(); // Initialize OS level debugging console.
virtual bool initHardwareTest(); // Win32 uses DX9 to test hardware.
virtual bool initParseCommandLine(LLCommandLineParser& clp);