diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-24 16:08:36 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-24 16:08:36 -0400 |
| commit | a8470df2c433d2ce0376dde4f1a54b46ba9b01d7 (patch) | |
| tree | 8f05bd3512209d0e4b0f189d4e4f95f06c622514 /indra/newview/llappviewer.cpp | |
| parent | 10c45691c7c48557f183cc9686f6a5c13c21a29d (diff) | |
| parent | 79131e8a480ab3611ce739717ed84c6ad76aa234 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 746d2480b8..75b6c18c57 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -308,7 +308,7 @@ BOOL gLogoutInProgress = FALSE; //////////////////////////////////////////////////////////// // Internal globals... that should be removed. -static std::string gArgs = "Mesh Beta"; +static std::string gArgs; const std::string MARKER_FILE_NAME("SecondLife.exec_marker"); const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker"); |