Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
This commit is contained in:
Melanie
2013-05-08 21:51:48 +01:00
10 changed files with 208 additions and 11 deletions

View File

@@ -679,6 +679,9 @@
; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).
ResendAppearanceUpdates = true
; Turning this on responds to CachedTexture packets to possibly avoid rebaking the avatar
; on every login
ReuseTextures = false
[Attachments]
; Controls whether avatar attachments are enabled.