From 8808325ced4d380d937c9be1cc81e20a5ebb5f62 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 14 Sep 2012 11:27:04 +0000
Subject: Removed appearance utility from viewer source. Added appearance
utility autobuild package.
---
indra/newview/res/viewerRes.rc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'indra/newview/res')
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index df75f3f697..471a896019 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -135,8 +135,8 @@ TOOLNO CURSOR "llno.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,1,0
- PRODUCTVERSION 2,1,1,0
+ FILEVERSION 3,4,1,264760
+ PRODUCTVERSION 3,4,1,264760
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -153,12 +153,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "2.1.1.0"
+ VALUE "FileVersion", "3.4.1.264760"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright � 2001-2010, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "2.1.1.0"
+ VALUE "ProductVersion", "3.4.1.264760"
END
END
BLOCK "VarFileInfo"
--
cgit v1.2.3
From d7e90f4160aaa81e30206c80047b82833c049482 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 7 Feb 2013 11:56:57 -0500
Subject: derive version number from indra/VIEWER_VERSION.txt
---
indra/newview/res/viewerRes.rc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'indra/newview/res')
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index df75f3f697..5360842134 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -135,8 +135,8 @@ TOOLNO CURSOR "llno.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,1,0
- PRODUCTVERSION 2,1,1,0
+ FILEVERSION ${VIEWER_VERSION_MAJOR},${VIEWER_VERSION_MINOR},${VIEWER_VERSION_PATCH},${VIEWER_VERSION_BUILD}
+ PRODUCTVERSION ${VIEWER_VERSION_MAJOR},${VIEWER_VERSION_MINOR},${VIEWER_VERSION_PATCH},${VIEWER_VERSION_BUILD}
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -153,12 +153,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "2.1.1.0"
+ VALUE "FileVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_BUILD}"
VALUE "InternalName", "Second Life"
- VALUE "LegalCopyright", "Copyright � 2001-2010, Linden Research, Inc."
+ VALUE "LegalCopyright", "Copyright � 2001, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "2.1.1.0"
+ VALUE "ProductVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_BUILD}"
END
END
BLOCK "VarFileInfo"
--
cgit v1.2.3
From f7160b28e24994b8dcf4c228f49685396184bc75 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 13 Feb 2013 12:18:12 -0500
Subject: correct revision number variable name in viewerRes.rc
---
indra/newview/res/viewerRes.rc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'indra/newview/res')
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 5360842134..8587243791 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -135,8 +135,8 @@ TOOLNO CURSOR "llno.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION ${VIEWER_VERSION_MAJOR},${VIEWER_VERSION_MINOR},${VIEWER_VERSION_PATCH},${VIEWER_VERSION_BUILD}
- PRODUCTVERSION ${VIEWER_VERSION_MAJOR},${VIEWER_VERSION_MINOR},${VIEWER_VERSION_PATCH},${VIEWER_VERSION_BUILD}
+ FILEVERSION ${VIEWER_VERSION_MAJOR},${VIEWER_VERSION_MINOR},${VIEWER_VERSION_PATCH},${VIEWER_VERSION_REVISION}
+ PRODUCTVERSION ${VIEWER_VERSION_MAJOR},${VIEWER_VERSION_MINOR},${VIEWER_VERSION_PATCH},${VIEWER_VERSION_REVISION}
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -153,12 +153,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_BUILD}"
+ VALUE "FileVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright � 2001, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_BUILD}"
+ VALUE "ProductVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}"
END
END
BLOCK "VarFileInfo"
--
cgit v1.2.3
From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest
---
indra/newview/res/arrow.cur | Bin
indra/newview/res/arrowcop.cur | Bin
indra/newview/res/arrowcopmulti.cur | Bin
indra/newview/res/arrowdrag.cur | Bin
indra/newview/res/bitmap2.bmp | Bin
indra/newview/res/circleandline.cur | Bin
indra/newview/res/have_artwork_bundle.marker | 0
indra/newview/res/icon1.ico | Bin
indra/newview/res/install_icon.BMP | Bin
indra/newview/res/llarrow.cur | Bin
indra/newview/res/llarrowdrag.cur | Bin
indra/newview/res/llarrowdragmulti.cur | Bin
indra/newview/res/llarrowlocked.cur | Bin
indra/newview/res/llgrablocked.cur | Bin
indra/newview/res/llno.cur | Bin
indra/newview/res/llnolocked.cur | Bin
indra/newview/res/lltoolcamera.cur | Bin
indra/newview/res/lltoolcreate.cur | Bin
indra/newview/res/lltoolfocus.cur | Bin
indra/newview/res/lltoolgrab.cur | Bin
indra/newview/res/lltoolland.cur | Bin
indra/newview/res/lltoolpan.cur | Bin
indra/newview/res/lltoolpathfinding.cur | Bin
indra/newview/res/lltoolpathfindingpathend.cur | Bin
indra/newview/res/lltoolpathfindingpathendadd.cur | Bin
indra/newview/res/lltoolpathfindingpathstart.cur | Bin
indra/newview/res/lltoolpathfindingpathstartadd.cur | Bin
indra/newview/res/lltoolpipette.cur | Bin
indra/newview/res/lltoolrotate.cur | Bin
indra/newview/res/lltoolscale.cur | Bin
indra/newview/res/lltooltranslate.cur | Bin
indra/newview/res/lltoolzoomin.cur | Bin
indra/newview/res/lltoolzoomout.cur | Bin
indra/newview/res/loginbackground.bmp | Bin
indra/newview/res/resource.h | 0
indra/newview/res/toolbuy.cur | Bin
indra/newview/res/toolmediaopen.cur | Bin
indra/newview/res/toolopen.cur | Bin
indra/newview/res/toolpause.cur | Bin
indra/newview/res/toolpickobject.cur | Bin
indra/newview/res/toolpickobject2.cur | Bin
indra/newview/res/toolpickobject3.cur | Bin
indra/newview/res/toolpipette.cur | Bin
indra/newview/res/toolplay.cur | Bin
indra/newview/res/toolsit.cur | Bin
indra/newview/res/uninstall_icon.BMP | Bin
indra/newview/res/viewerRes.rc | 0
47 files changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 indra/newview/res/arrow.cur
mode change 100644 => 100755 indra/newview/res/arrowcop.cur
mode change 100644 => 100755 indra/newview/res/arrowcopmulti.cur
mode change 100644 => 100755 indra/newview/res/arrowdrag.cur
mode change 100644 => 100755 indra/newview/res/bitmap2.bmp
mode change 100644 => 100755 indra/newview/res/circleandline.cur
mode change 100644 => 100755 indra/newview/res/have_artwork_bundle.marker
mode change 100644 => 100755 indra/newview/res/icon1.ico
mode change 100644 => 100755 indra/newview/res/install_icon.BMP
mode change 100644 => 100755 indra/newview/res/llarrow.cur
mode change 100644 => 100755 indra/newview/res/llarrowdrag.cur
mode change 100644 => 100755 indra/newview/res/llarrowdragmulti.cur
mode change 100644 => 100755 indra/newview/res/llarrowlocked.cur
mode change 100644 => 100755 indra/newview/res/llgrablocked.cur
mode change 100644 => 100755 indra/newview/res/llno.cur
mode change 100644 => 100755 indra/newview/res/llnolocked.cur
mode change 100644 => 100755 indra/newview/res/lltoolcamera.cur
mode change 100644 => 100755 indra/newview/res/lltoolcreate.cur
mode change 100644 => 100755 indra/newview/res/lltoolfocus.cur
mode change 100644 => 100755 indra/newview/res/lltoolgrab.cur
mode change 100644 => 100755 indra/newview/res/lltoolland.cur
mode change 100644 => 100755 indra/newview/res/lltoolpan.cur
mode change 100644 => 100755 indra/newview/res/lltoolpathfinding.cur
mode change 100644 => 100755 indra/newview/res/lltoolpathfindingpathend.cur
mode change 100644 => 100755 indra/newview/res/lltoolpathfindingpathendadd.cur
mode change 100644 => 100755 indra/newview/res/lltoolpathfindingpathstart.cur
mode change 100644 => 100755 indra/newview/res/lltoolpathfindingpathstartadd.cur
mode change 100644 => 100755 indra/newview/res/lltoolpipette.cur
mode change 100644 => 100755 indra/newview/res/lltoolrotate.cur
mode change 100644 => 100755 indra/newview/res/lltoolscale.cur
mode change 100644 => 100755 indra/newview/res/lltooltranslate.cur
mode change 100644 => 100755 indra/newview/res/lltoolzoomin.cur
mode change 100644 => 100755 indra/newview/res/lltoolzoomout.cur
mode change 100644 => 100755 indra/newview/res/loginbackground.bmp
mode change 100644 => 100755 indra/newview/res/resource.h
mode change 100644 => 100755 indra/newview/res/toolbuy.cur
mode change 100644 => 100755 indra/newview/res/toolmediaopen.cur
mode change 100644 => 100755 indra/newview/res/toolopen.cur
mode change 100644 => 100755 indra/newview/res/toolpause.cur
mode change 100644 => 100755 indra/newview/res/toolpickobject.cur
mode change 100644 => 100755 indra/newview/res/toolpickobject2.cur
mode change 100644 => 100755 indra/newview/res/toolpickobject3.cur
mode change 100644 => 100755 indra/newview/res/toolpipette.cur
mode change 100644 => 100755 indra/newview/res/toolplay.cur
mode change 100644 => 100755 indra/newview/res/toolsit.cur
mode change 100644 => 100755 indra/newview/res/uninstall_icon.BMP
mode change 100644 => 100755 indra/newview/res/viewerRes.rc
(limited to 'indra/newview/res')
diff --git a/indra/newview/res/arrow.cur b/indra/newview/res/arrow.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/arrowcop.cur b/indra/newview/res/arrowcop.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/arrowcopmulti.cur b/indra/newview/res/arrowcopmulti.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/arrowdrag.cur b/indra/newview/res/arrowdrag.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/bitmap2.bmp b/indra/newview/res/bitmap2.bmp
old mode 100644
new mode 100755
diff --git a/indra/newview/res/circleandline.cur b/indra/newview/res/circleandline.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/have_artwork_bundle.marker b/indra/newview/res/have_artwork_bundle.marker
old mode 100644
new mode 100755
diff --git a/indra/newview/res/icon1.ico b/indra/newview/res/icon1.ico
old mode 100644
new mode 100755
diff --git a/indra/newview/res/install_icon.BMP b/indra/newview/res/install_icon.BMP
old mode 100644
new mode 100755
diff --git a/indra/newview/res/llarrow.cur b/indra/newview/res/llarrow.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/llarrowdrag.cur b/indra/newview/res/llarrowdrag.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/llarrowdragmulti.cur b/indra/newview/res/llarrowdragmulti.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/llarrowlocked.cur b/indra/newview/res/llarrowlocked.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/llgrablocked.cur b/indra/newview/res/llgrablocked.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/llno.cur b/indra/newview/res/llno.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/llnolocked.cur b/indra/newview/res/llnolocked.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolcamera.cur b/indra/newview/res/lltoolcamera.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolcreate.cur b/indra/newview/res/lltoolcreate.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolfocus.cur b/indra/newview/res/lltoolfocus.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolgrab.cur b/indra/newview/res/lltoolgrab.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolland.cur b/indra/newview/res/lltoolland.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolpan.cur b/indra/newview/res/lltoolpan.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolpathfinding.cur b/indra/newview/res/lltoolpathfinding.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolpathfindingpathend.cur b/indra/newview/res/lltoolpathfindingpathend.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolpathfindingpathendadd.cur b/indra/newview/res/lltoolpathfindingpathendadd.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolpathfindingpathstart.cur b/indra/newview/res/lltoolpathfindingpathstart.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolpathfindingpathstartadd.cur b/indra/newview/res/lltoolpathfindingpathstartadd.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolpipette.cur b/indra/newview/res/lltoolpipette.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolrotate.cur b/indra/newview/res/lltoolrotate.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolscale.cur b/indra/newview/res/lltoolscale.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltooltranslate.cur b/indra/newview/res/lltooltranslate.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolzoomin.cur b/indra/newview/res/lltoolzoomin.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/lltoolzoomout.cur b/indra/newview/res/lltoolzoomout.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/loginbackground.bmp b/indra/newview/res/loginbackground.bmp
old mode 100644
new mode 100755
diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolmediaopen.cur b/indra/newview/res/toolmediaopen.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolpause.cur b/indra/newview/res/toolpause.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolpickobject.cur b/indra/newview/res/toolpickobject.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolpickobject2.cur b/indra/newview/res/toolpickobject2.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolpickobject3.cur b/indra/newview/res/toolpickobject3.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolpipette.cur b/indra/newview/res/toolpipette.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolplay.cur b/indra/newview/res/toolplay.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur
old mode 100644
new mode 100755
diff --git a/indra/newview/res/uninstall_icon.BMP b/indra/newview/res/uninstall_icon.BMP
old mode 100644
new mode 100755
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
old mode 100644
new mode 100755
--
cgit v1.2.3