summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-30 08:57:29 -0400
committerOz Linden <oz@lindenlab.com>2013-04-30 08:57:29 -0400
commit889d02b52d9d53b59e1bab953b8e19a60c49fd4f (patch)
tree7991f8b9b0972027cc2bc7301a99779e9850141f /indra/newview/llappviewerwin32.cpp
parentca7de31a6c5031bb928d283362e96bb63e37ce85 (diff)
parent2ef8fc41e74b6949e02a7715b2b8399094ebd3ea (diff)
merge changes for CHOP-913
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rwxr-xr-xindra/newview/llappviewerwin32.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 82b93b52a2..0ba3669487 100755
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -509,9 +509,9 @@ bool LLAppViewerWin32::cleanup()
return result;
}
-bool LLAppViewerWin32::initLogging()
+void LLAppViewerWin32::initLogging()
{
- return LLAppViewer::initLogging();
+ LLAppViewer::initLogging();
}
void LLAppViewerWin32::initConsole()