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

slimupdates
Diva Canto 2009-12-27 08:47:18 -08:00
commit aa45262c3c
1 changed files with 3 additions and 3 deletions

View File

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