summaryrefslogtreecommitdiff
path: root/indra/newview/character
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-08 14:46:00 -0400
committerOz Linden <oz@lindenlab.com>2013-05-08 14:46:00 -0400
commit1b984d8f40d805341b8c1fc670c29b32c25ce227 (patch)
treefb73a6224dfe7ff7d5bf4619a799b0ededffcb64 /indra/newview/character
parent21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff)
parent1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff)
merge changes for 3.5.1-release
Diffstat (limited to 'indra/newview/character')
-rw-r--r--indra/newview/character/avatar_lad.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 41080818c9..284e9c44b2 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -1084,7 +1084,8 @@
scale="0 0 .5" />
</param_skeleton>
</param>
- <param
+
+ <param
id="11001"
group="0"
name="Hover"
@@ -12307,7 +12308,7 @@ render_pass="bump">
<param_driver />
</param>
- <param
+ <param
id="11000"
group="0"
name="AppearanceMessage_Version"