summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2008-08-12 17:54:40 +0000
committerChristian Goetze <cg@lindenlab.com>2008-08-12 17:54:40 +0000
commit0a3b9e8e141a6f38ecbdf6020312e7a89b153bc4 (patch)
tree9c5958572368be494b6302db8b03967a2c67b7ad /indra
parent93328402371424df7a26eefc6b6866a76a4f308d (diff)
Revert excess changes from previous commit - I hate it when that happens.
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llversionserver.h2
-rw-r--r--indra/llcommon/llversionviewer.h2
-rw-r--r--indra/newview/English.lproj/InfoPlist.strings4
-rw-r--r--indra/newview/Info-SecondLife.plist2
-rw-r--r--indra/newview/res/viewerRes.rc8
5 files changed, 9 insertions, 9 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index e766a1d7ca..fd5f6497c2 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 24;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 94081;
+const S32 LL_VERSION_BUILD = 93453;
const char * const LL_CHANNEL = "Second Life Server";
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index c8061166da..0555b9ea3c 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 21;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 94081;
+const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Release";
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 144f85217a..881483e892 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.20.15.94081";
-CFBundleGetInfoString = "Second Life version 1.20.15.94081, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.20.9.87416";
+CFBundleGetInfoString = "Second Life version 1.20.9.87416, Copyright 2004-2008 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 52eb97f7f7..b889d45b9e 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.20.15.94081</string>
+ <string>1.20.9.87416</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index c2c86300ce..a39bb9faf6 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -231,8 +231,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,20,15,94081
- PRODUCTVERSION 1,20,15,94081
+ FILEVERSION 1,20,9,87416
+ PRODUCTVERSION 1,20,9,87416
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -249,12 +249,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "1.20.15.94081"
+ VALUE "FileVersion", "1.20.9.87416"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "1.20.15.94081"
+ VALUE "ProductVersion", "1.20.9.87416"
END
END
BLOCK "VarFileInfo"