diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2015-10-26 12:59:05 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2015-10-26 12:59:05 -0700 |
| commit | 40cc8e863ef6bb8b6c8e12a603cb9dd7db5169dd (patch) | |
| tree | c2543f91466e906eb715574d501a834a65f64703 /indra | |
| parent | c828378235f3b67e6b8fe1398a471c9ae5ea7680 (diff) | |
| parent | 3b702b6616854d19c9432e568197dc60fc772d9c (diff) | |
SL-113: merge up to bento trunk
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llcharacter/lljoint.h | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index de61d56101..113742ad74 100755 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -42,7 +42,7 @@ const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15; // BENTO JOINT COUNT LIMIT const U32 LL_CHARACTER_MAX_JOINTS = 152; // must be divisible by 4! -const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 152; +const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 132; // FIXME BENTO - these should be higher than the joint_num of any // other joint, to avoid conflicts in updateMotionsByType() diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ab027ac600..cf62d6ff3b 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -10346,6 +10346,14 @@ Not enough script resources available to attach object! </notification> <notification + icon="alertmodal.tga" + name="IllegalAttachment" + type="notify"> + <tag>fail</tag> + The attachment has requested a nonexistent point on the avatar. It has been attached to the chest instead. + </notification> + + <notification icon="alertmodal.tga" name="CantDropItemTrialUser" type="notify"> |