diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-09-20 17:51:27 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-09-20 17:51:27 +0000 |
| commit | 9b9769b76e1bbaa14c6b3bc5064e97e498c8e985 (patch) | |
| tree | 724d49ba34371ef25825dd2142879111f1590685 /indra/llcommon/llversionviewer.h | |
| parent | 2add0e15d7d50d1ca238c027f4ca7d56a8af08de (diff) | |
svn merge -r 69597:70080 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
* SL-55085 Login hangs if optional update is declined.
* SL-55123 Mac app icon missing from open source tarball
* SL-55121 Mac mouse cursors missing from open source tarball
* SL-54978 Remove duplicate code that snuck in during a patch merge
* SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update
* Release notes/version numbers
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index c6405a1b01..282e8a18c5 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -12,7 +12,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 18; const S32 LL_VERSION_PATCH = 3; -const S32 LL_VERSION_BUILD = 3; +const S32 LL_VERSION_BUILD = 4; const char * const LL_CHANNEL = "Second Life Release"; |