diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
| commit | 11fe124ae96721b0d0f960732e8628fe0e2f84c4 (patch) | |
| tree | a8525988388de004be72251c0d7783a61d314888 /indra/newview/character | |
| parent | cebde0a32b4a8163010d9cbf5e6b3036865ed943 (diff) | |
| parent | b40fad02de170b5da179cacc22f32f5f25ffd7cb (diff) | |
merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
Diffstat (limited to 'indra/newview/character')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/character/avatar_lad.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 99dbfcae51..2b090c4fa4 100644..100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -12291,6 +12291,17 @@ render_pass="bump"> <param_driver /> </param> + <param + id="11000" + group="0" + name="AppearanceMessage_Version" + label="AppearanceMessage Version" + value_default="0" + value_min="0" + value_max="255"> + <param_driver /> + </param> + </driver_parameters> <morph_masks> |