diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-18 09:52:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-18 09:52:20 -0400 |
| commit | a461aedf2e3495ccbce4c74f7e7f9d8aed90adc0 (patch) | |
| tree | 33d84ed285a100d2288a4eceb6045ffb361b3e35 /indra/newview/llappviewer.cpp | |
| parent | a44a414238bc230a391d764904c71f9195a377e5 (diff) | |
| parent | 644cbc44871992a95bcd5a6854dfc2a4d56a7b62 (diff) | |
merge latest updates from viewer-development
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"); |