diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
commit | fa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch) | |
tree | 3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/newview/llappviewerlinux.cpp | |
parent | fae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff) | |
parent | d2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff) |
merge up from viewer-pre-beta
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
-rw-r--r-- | indra/newview/llappviewerlinux.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index db11462fcb..48d02dfeaa 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -111,7 +111,6 @@ int main( int argc, char **argv ) } delete viewer_app_ptr; viewer_app_ptr = NULL; - return 0; } |