From 9b9769b76e1bbaa14c6b3bc5064e97e498c8e985 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 20 Sep 2007 17:51:27 +0000 Subject: 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 --- indra/llcommon/llversionviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon') 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"; -- cgit v1.2.3