Merge branch 'master' into careminster

This commit is contained in:
Melanie
2009-12-27 15:48:43 +00:00
21 changed files with 29821 additions and 0 deletions

View File

@@ -4840,6 +4840,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
UserProfile.FirstLifeImage = Properties.FLImageID;
UserProfile.Image = Properties.ImageID;
UserProfile.ProfileUrl = Utils.BytesToString(Properties.ProfileURL);
Userprofile.Flags &= ~3;
Userprofile.Flags |= Properties.AllowPublish ? 1 : 0;
Userprofile.Flags |= Properties.MaturePublish ? 2 : 0;
handlerUpdateAvatarProperties(this, UserProfile);
}