Undo a bit of regression in llphysicsmotion
Decoupled rlva/setting based z-offset from param based z-offset. This reverts questionable changes introduced in the recent rlva merge.
Merge remote-tracking branch 'shyotl/master'
Fix ups for 6525ccc384ca8ae6fe4f3fda6b7bb57156691706

If log_path is empty, we shouldn't setChatLogsDir to it.
In fact, this may have been the cause of something Nomade Zhao brought up.

Also, InstantMessageLogPathAnyAccount was accidentally being set as a PerAccount
First re-apply "SH-3941 SH-3954 FIX local appearance does not update properly"
SH-4001 FIX - made local texture loading universal.

Conflicts:

	indra/newview/llvoavatarself.cpp
SUN-57 SH-4039 FIX bake fail on non-ssb regions

We were getting the texture ID from the type,index couple, but were not
passing in index, which defaulted to 0. texture ID is available from the
texture object itself, so using that and removing the index parameter
to prevent future confusion.

Conflicts:

	indra/newview/llvoavatarself.cpp
Stabbed some blendfunc state issues. This fixes some ui flicker which popped up recently (perhaps after merging, or I just never noticed it before then)
Clamp LLMeshSkinInfo::mJointNames to a max of 64 entries. Also checking size in lldrawpoolavatar(Redundant checks added to just match similar logic LLRiggedVolume::update more closely.)
Added blendfunc checks when RenderDebugGL is TRUE.
Commented out a spammy llinfos message.
Merge remote-tracking branch 'aleric/master'
Merge remote-tracking branch 'shyotl/master'
Align whitespace with upstream in hope of avoiding future merge conflicts
Merge remote-tracking branch 'lirusaito/master'
Fix Issue 726

Instead of focusing the chat bar when the chat history floater is visible, focus it onFocusReceived
This avoids the floater grabbing focus when returning from mouselook.
SH-4044 FIX voice dot is offset vertically if using avatar height offset

Added the height offset in one too many places. fixing.
SH-4050 FIX camera goes below ground when avatar offset set to 0

Added a constraint to ensure that the avatar's height (with offset)
does not go below 0.1 meters. Camera was getting confused since the avatar's
effective height was negative.

Note the avatar is mostly underground/contorted even at 0.1 meters, but
most users setting values this low will be making ultra-tinies and would
be hiding the avatar mesh. Camera stays above ground when height is at 0.1.

Conflicts:

	indra/llappearance/llavatarappearance.cpp
SH-4059 FIX other's hover parameters affects your avatar's setting

Added an additional sanity check to make sure that other avatars don't
affect your wearables.
Merge remote-tracking branch 'lirusaito/master'