diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-29 17:57:29 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-29 17:57:29 -0800 |
| commit | f62a702c2bb912078d2f5481cd7ced819c142f18 (patch) | |
| tree | c82bc7b5639e200501acec9926094505b27b4139 | |
| parent | 992f6bd4cc25c183a02fb66eee6be5c437395ef7 (diff) | |
| parent | 38516a16e4f497b8d0f8213b83b5983c219546f2 (diff) | |
Pull viewer-beta into viewer-development
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/viewer_components/updater/scripts/darwin/update_install | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/viewer_components/updater/scripts/linux/update_install | 0 |
5 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0f946b0f0b..7dbb375a20 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11121,7 +11121,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://update.secondlife.com</string> + <string>https://update.secondlife.com</string> </map> <key>UpdaterServicePath</key> <map> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 3ceee60927..6573822d1a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -181,7 +181,7 @@ label="Transparent Water" layout="topleft" left_delta="0" - name="BumpShiny" + name="TransparentWater" top_pad="7" width="256" /> <check_box diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1bc118139f..6c77f8ec38 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -711,6 +711,11 @@ class DarwinManifest(ViewerManifest): self.run_command('strip -S %(viewer_binary)r' % { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')}) + def copy_finish(self): + # Force executable permissions to be set for scripts + # see CHOP-223 and http://mercurial.selenic.com/bts/issue1802 + for script in 'Contents/MacOS/update_install',: + self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script)) def package_finish(self): channel_standin = 'Second Life Viewer 2' # hah, our default channel is not usable on its own @@ -866,6 +871,12 @@ class LinuxManifest(ViewerManifest): self.path("featuretable_linux.txt") + def copy_finish(self): + # Force executable permissions to be set for scripts + # see CHOP-223 and http://mercurial.selenic.com/bts/issue1802 + for script in 'secondlife', 'bin/update_install': + self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script)) + def package_finish(self): if 'installer_name' in self.args: installer_name = self.args['installer_name'] diff --git a/indra/viewer_components/updater/scripts/darwin/update_install b/indra/viewer_components/updater/scripts/darwin/update_install index b174b3570a..b174b3570a 100644..100755 --- a/indra/viewer_components/updater/scripts/darwin/update_install +++ b/indra/viewer_components/updater/scripts/darwin/update_install diff --git a/indra/viewer_components/updater/scripts/linux/update_install b/indra/viewer_components/updater/scripts/linux/update_install index fef5ef7d09..fef5ef7d09 100644..100755 --- a/indra/viewer_components/updater/scripts/linux/update_install +++ b/indra/viewer_components/updater/scripts/linux/update_install |