summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerlinux.cpp
diff options
context:
space:
mode:
authorRichard@Callum-HP-PC.lindenlab.com <Richard@Callum-HP-PC.lindenlab.com>2011-10-21 14:41:24 -0700
committerRichard@Callum-HP-PC.lindenlab.com <Richard@Callum-HP-PC.lindenlab.com>2011-10-21 14:41:24 -0700
commitf5197b6158bf1b9350fab2dd7877f6c0a4c2f778 (patch)
treeff9c621341b9076fff8a11b66befa6e37183f286 /indra/newview/llappviewerlinux.cpp
parentf2952ded0396e98e1010ebe39de5bba0ae6ba5f7 (diff)
parent255eebf11615a1a8c47003ee24b1696b8ae63e23 (diff)
merge with viewer-dev
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
-rw-r--r--indra/newview/llappviewerlinux.cpp1
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;
}