diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-09-22 10:34:43 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-09-22 10:34:43 -0400 |
| commit | 12e72e3736457d70f89faa74b81dec50faef65fa (patch) | |
| tree | 51399e32bc3f03eb63dbcfda23637e56dbc63d09 /indra | |
| parent | cf09d6c58a741263cddcf338c2f79836873475b1 (diff) | |
SH-150 FIX - build params changes for mesh beta viewer, flag in window title
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llcommon/llversionviewer.h | 2 | ||||
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index c430a60ff0..235f806c8e 100755 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 1; -const S32 LL_VERSION_PATCH = 1; +const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c07d891800..b989256fd1 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -306,7 +306,7 @@ BOOL gLogoutInProgress = FALSE; //////////////////////////////////////////////////////////// // Internal globals... that should be removed. -static std::string gArgs; +static std::string gArgs = "Mesh Beta"; const std::string MARKER_FILE_NAME("SecondLife.exec_marker"); const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker"); |