Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor

This commit is contained in:
Diva Canto
2009-12-27 08:40:43 -08:00

View File

@@ -4857,9 +4857,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;
UserProfile.Flags &= ~3;
UserProfile.Flags |= Properties.AllowPublish ? 1 : 0;
UserProfile.Flags |= Properties.MaturePublish ? 2 : 0;
handlerUpdateAvatarProperties(this, UserProfile);
}