diff options
author | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
commit | 6e8ffc247fe52668446b8fa1ed7f1547a755076f (patch) | |
tree | 23b6fa5ce6bf6a32944faca54f9a18aca255fd75 /indra/newview/llappviewermacosx.cpp | |
parent | 0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (diff) | |
parent | fcd1ccd21e3ea8f0944537347dd6c9d7972d50ce (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
-rw-r--r-- | indra/newview/llappviewermacosx.cpp | 1 |
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; } |