diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 15:13:07 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 15:13:07 -0700 |
commit | e413f4b335a2f4f5a1ca151c8ab67324a72ebaee (patch) | |
tree | 23c5343dea45f63ca2069d28d782614fd2bc6698 /indra/newview/character | |
parent | 6074f65991f4a9e928ef9609e90d8e9570350e63 (diff) |
Fixup merge diffs
Diffstat (limited to 'indra/newview/character')
-rwxr-xr-x | indra/newview/character/avatar_lad.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 41080818c9..e5b385f4aa 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1084,7 +1084,7 @@ scale="0 0 .5" /> </param_skeleton> </param> - <param + <param id="11001" group="0" name="Hover" |