summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.h
diff options
context:
space:
mode:
authorsimon <none@none>2013-05-09 13:21:22 -0700
committersimon <none@none>2013-05-09 13:21:22 -0700
commit8895e795763d14c3dae495b3648da3d4a52ba30a (patch)
treeefdb765ff9c99ab179bf252aa0cee87e6ac410e7 /indra/newview/llappviewerwin32.h
parent35f7a750836b72cb116e60b315ca32664911001b (diff)
parentc7f7c4bc4d9155f5e9cd83265e189f689739da62 (diff)
Merge downstream code / viewer-beta
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);