diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-24 17:21:25 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-24 17:21:25 -0400 |
| commit | bdede955c3ccffb163fa010e01eb4eca71c36b11 (patch) | |
| tree | d1c2c89de569ee3d2ba83fa758b9fd9024481fb4 /indra/newview/character | |
| parent | be731a31de18b10c6d2cf8cfd4187a34fbe117fd (diff) | |
| parent | f89bbd3baa6dd87b0477a240e7cde09c6aed3293 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release/
Diffstat (limited to 'indra/newview/character')
| -rw-r--r-- | indra/newview/character/avatar_lad.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 9564236ad2..a9b4ff02c5 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -11533,7 +11533,7 @@ render_pass="bump"> <param id="1071" - group="0" + group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_red" @@ -11566,7 +11566,7 @@ render_pass="bump"> <param id="1072" - group="0" + group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_green" @@ -11599,7 +11599,7 @@ render_pass="bump"> <param id="1073" - group="0" + group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_blue" |