diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-15 23:01:12 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-15 23:01:12 +0300 |
| commit | 03f07b3eccd5f57563720807760681ebc25a568a (patch) | |
| tree | df2514e5a551c9c59ac7f06dea060be480471239 /indra/newview/app_settings | |
| parent | 64f000c73299596adcfb60e59c8baa79a11bceca (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
Merge downstream code, version 3.8.6
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f05836742a..e04d03c832 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14233,7 +14233,7 @@ <key>MaxFPS</key> <map> <key>Comment</key> - <string>Yield some time to the local host if we reach a threshold framerate.</string> + <string>OBSOLETE UNUSED setting.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl index 6cd38d8ef5..3060307b21 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl @@ -37,8 +37,7 @@ mat4 getObjectSkinnedTransform() index = min(index, vec4(51.0)); index = max(index, vec4( 0.0)); - float scale = 1.0/(w.x+w.y+w.z+w.w); - w *= scale; + w *= 1.0/(w.x+w.y+w.z+w.w); int i1 = int(index.x); int i2 = int(index.y); |