summaryrefslogtreecommitdiff
path: root/indra/newview/res
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-08-26 17:09:10 -0700
committerMark Palange (Mani) <palange@lindenlab.com>2010-08-26 17:09:10 -0700
commit66500c7ad5d799eb56f8f56924a00744f4a90e3d (patch)
treefcd42e2c1853cdd897128d79b5b18eebbe32a32a /indra/newview/res
parent225dd434cfeb6a67c5878b41538dafe2a7f4a284 (diff)
parent1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff)
merge
Diffstat (limited to 'indra/newview/res')
-rw-r--r--indra/newview/res/have_artwork_bundle.marker1
-rw-r--r--indra/newview/res/viewerRes.rc2
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/res/have_artwork_bundle.marker b/indra/newview/res/have_artwork_bundle.marker
new file mode 100644
index 0000000000..1dbb238d53
--- /dev/null
+++ b/indra/newview/res/have_artwork_bundle.marker
@@ -0,0 +1 @@
+If this file exists then you have the artwork bundle installed, which is packaged separately from the Viewer source in the open-source tree. This marker is for the benefit of the build system so it can warn you properly if it's not there. :)
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index a575aabbca..5e8cee1f5f 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -149,7 +149,7 @@ BEGIN
VALUE "FileDescription", "Second Life"
VALUE "FileVersion", "2.1.1.0"
VALUE "InternalName", "Second Life"
- VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc."
+ VALUE "LegalCopyright", "Copyright � 2001-2010, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
VALUE "ProductVersion", "2.1.1.0"