diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-24 14:28:25 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-24 14:28:25 -0700 |
| commit | d6f7526abf223b671b4e17be48dcc1e46e8f2fd8 (patch) | |
| tree | 9ac72b9bfb546e3542442eeff72af78c75f3ca67 /indra/newview/llappviewer.cpp | |
| parent | 0a86e39d90e06f0a690b1ff5caf2dee5fe347f8f (diff) | |
| parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (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 5e3ed4e35f..1246c95d36 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"); |