summaryrefslogtreecommitdiff
path: root/indra/newview/res
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-12 13:22:58 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-12 13:22:58 -0700
commit4a1ef20c317897e7e509c7f599e97fcc90ffaefc (patch)
treec496bd8785b94bb60bca33ea59758c5929341451 /indra/newview/res
parent895e8ad446ab383e1211f759e8b55aa0fff2efc1 (diff)
parentd4b2897700c66354413af42ab055bd1aaa47f91c (diff)
merge
Diffstat (limited to 'indra/newview/res')
-rw-r--r--indra/newview/res/toolbuy.curbin2238 -> 0 bytes
-rw-r--r--indra/newview/res/toolopen.curbin2238 -> 0 bytes
-rw-r--r--indra/newview/res/toolsit.curbin2238 -> 0 bytes
-rw-r--r--indra/newview/res/viewerRes.rc14
4 files changed, 5 insertions, 9 deletions
diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur
deleted file mode 100644
index c61cd76bef..0000000000
--- a/indra/newview/res/toolbuy.cur
+++ /dev/null
Binary files differ
diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur
deleted file mode 100644
index 8408f7c7eb..0000000000
--- a/indra/newview/res/toolopen.cur
+++ /dev/null
Binary files differ
diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur
deleted file mode 100644
index 60b0e773e5..0000000000
--- a/indra/newview/res/toolsit.cur
+++ /dev/null
Binary files differ
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 87a8bd5787..4ac48c1857 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -123,10 +123,6 @@ TOOLPICKOBJECT3 CURSOR "toolpickobject3.cur"
ARROWCOPY CURSOR "arrowcop.cur"
ARROWDRAGMULTI CURSOR "llarrowdragmulti.cur"
ARROWCOPYMULTI CURSOR "arrowcopmulti.cur"
-TOOLSIT CURSOR "toolsit.cur"
-TOOLBUY CURSOR "toolbuy.cur"
-TOOLPAY CURSOR "toolpay.cur"
-TOOLOPEN CURSOR "toolopen.cur"
TOOLPIPETTE CURSOR "toolpipette.cur"
TOOLPLAY CURSOR "toolplay.cur"
TOOLPAUSE CURSOR "toolpause.cur"
@@ -138,8 +134,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,0,0,2639
+ PRODUCTVERSION 2,0,0,2639
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -156,12 +152,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "2.0.0.0"
+ VALUE "FileVersion", "2.0.0.2639"
VALUE "InternalName", "Second Life"
- VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
+ VALUE "LegalCopyright", "Copyright � 2001-2008, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "2.0.0.0"
+ VALUE "ProductVersion", "2.0.0.2639"
END
END
BLOCK "VarFileInfo"