summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-05-20 10:08:27 -0700
committerdolphin <dolphin@lindenlab.com>2013-05-20 10:08:27 -0700
commit716a963d5544977863d07770c3c6449b3d9897bb (patch)
tree36ce3c4707851bb04f557d790fe410d26a009293 /indra/newview/llappviewerwin32.cpp
parent6308f93c6adddc9d396e8d2527e97e0d02c4aa52 (diff)
parent0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rwxr-xr-x[-rw-r--r--]indra/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 100644..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()