diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-06-25 09:36:58 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-06-25 09:36:58 -0700 |
| commit | 269519e267cfb1a5d61205684f0030a726deb516 (patch) | |
| tree | a27d0bcd4956f2f5f836f5e2b521cae516452f26 /indra | |
| parent | 363ef9d73d71a9bcf2698525ac5371eb7d3b00a8 (diff) | |
| parent | 7f2ad72fe65a67afb2c72867e765acad7488cf97 (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl b/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl index 2f89b8ed72..0e5dc08183 100644 --- a/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl @@ -23,6 +23,8 @@ * $/LicenseInfo$ */ +#extension GL_ARB_texture_rectangle : enable + #ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_color; #else diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 35451c9621..53a3e732ca 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -172,7 +172,7 @@ class ViewerManifest(LLManifest): def app_name(self): app_suffix='Test' channel_type=self.channel_lowerword() - if channel_type == 'release' : + if channel_type.startswith('release') : app_suffix='Viewer' elif re.match('^(beta|project).*',channel_type) : app_suffix=self.channel_unique() @@ -182,8 +182,8 @@ class ViewerManifest(LLManifest): icon_path="icons/" channel_type=self.channel_lowerword() print "Icon channel type '%s'" % channel_type - if channel_type == 'release' : - icon_path += channel_type + if channel_type.startswith('release') : + icon_path += 'release' elif re.match('^beta.*',channel_type) : icon_path += 'beta' elif re.match('^project.*',channel_type) : @@ -242,7 +242,7 @@ class WindowsManifest(ViewerManifest): def final_exe(self): app_suffix="Test" channel_type=self.channel_lowerword() - if channel_type == 'release' : + if channel_type.startswith('release') : app_suffix='' elif re.match('^(beta|project).*',channel_type) : app_suffix=''.join(self.channel_unique().split()) |