diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
| commit | e1c1428569b03bbb20e7597ebec7d707151ce802 (patch) | |
| tree | 69ca6d0fd05300346ddc14664b6d44bd4206a8b4 /indra/newview/llappviewerwin32.h | |
| parent | f356d7eb9fd730f5f6f5a29fb0706e20876ad3bd (diff) | |
| parent | ab4104d2d785199722f93d027e72af40d16f5703 (diff) | |
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
Diffstat (limited to 'indra/newview/llappviewerwin32.h')
| -rwxr-xr-x | indra/newview/llappviewerwin32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h index 67594aea48..d95174dd1d 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); |