integrate up to latest viewer-development

indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl

 /** 
  * @file avatarF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 void default_lighting();

indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl

 /** 
  * @file avatarSkinV.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 attribute vec4 weight;  //1

indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl

 /** 
  * @file avatarV.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);

indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl

 /** 
  * @file eyeballF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 void default_lighting();

indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl

 /** 
  * @file eyeballV.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 vec4 calcLightingSpecular(vec3 pos, vec3 norm, vec4 color, inout vec4 specularColor, vec4 baseCol);

indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl

 /** 
  * @file pickAvatarF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 uniform sampler2D diffuseMap;

indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl

 /** 
  * @file pickAvatarV.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 mat4 getSkinnedTransform();

indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl

 /** 
  * @file alphaF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 #extension GL_ARB_texture_rectangle : enable

indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl

 /** 
  * @file alphaV.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);

indra/newview/app_settings/shaders/class1/deferred/avatarAlphaF.glsl

 /** 
  * @file avatarAlphaF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 uniform sampler2D diffuseMap;

indra/newview/app_settings/shaders/class1/deferred/avatarAlphaV.glsl

 /** 
  * @file avatarAlphaV.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);

indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl

 /** 
  * @file avatarF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 uniform sampler2D diffuseMap;

indra/newview/app_settings/shaders/class1/deferred/avatarShadowF.glsl

 /** 
  * @file avatarShadowF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 uniform sampler2D diffuseMap;

indra/newview/app_settings/shaders/class1/deferred/avatarShadowV.glsl

 /** 
  * @file avatarShadowV.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 mat4 getSkinnedTransform();

indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl

 /** 
  * @file avatarV.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 mat4 getSkinnedTransform();

indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl

 /** 
  * @file blurLightF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 #extension GL_ARB_texture_rectangle : enable

indra/newview/app_settings/shaders/class1/deferred/blurLightV.glsl

 /** 
  * @file blurLightF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 varying vec2 vary_fragcoord;

indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl

 /** 
  * @file bumpF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 uniform sampler2D diffuseMap;

indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl

 /** 
  * @file bumpV.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 varying vec3 vary_mat0;

indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl

 /** 
  * @file diffuseF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
 
 uniform sampler2D diffuseMap;