summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
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.cpp
parent35f7a750836b72cb116e60b315ca32664911001b (diff)
parentc7f7c4bc4d9155f5e9cd83265e189f689739da62 (diff)
Merge downstream code / viewer-beta
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()