diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-23 13:47:28 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-23 13:47:28 -0400 |
| commit | 4da6ccf37f08c0188b7d5185e0f795d3fd9d9b5a (patch) | |
| tree | 16ca415d7261ae5f284c8031f471d9311640d430 /indra/newview/llappviewer.cpp | |
| parent | 19b93cb8c57ac043ff0c795e931f7863b0aa07a7 (diff) | |
| parent | f15b6396ecf1a14802cd4977986af2bec30c76b5 (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"); |