summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewermacosx.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-14 11:58:35 -0500
committerDave Parks <davep@lindenlab.com>2011-10-14 11:58:35 -0500
commitc0ca8e5e2e4d3f591db3175f09c0b64b6b2e10c5 (patch)
tree28ea7a212319b0bd452c68e54f374904bfe6ed8a /indra/newview/llappviewermacosx.cpp
parentfc2929bf4f6366c3a3386e4b79b0fda7bd0466ba (diff)
parent4331c112aba074562e9a8826fe6d271a94f790f0 (diff)
Merge backout of b782a75c99e6
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
-rw-r--r--indra/newview/llappviewermacosx.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index 8929c0c1a4..c2916717bd 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -113,7 +113,6 @@ int main( int argc, char **argv )
}
delete viewer_app_ptr;
viewer_app_ptr = NULL;
-
return 0;
}