diff options
| author | Diva Canto | 2009-12-27 08:47:18 -0800 |
|---|---|---|
| committer | Diva Canto | 2009-12-27 08:47:18 -0800 |
| commit | aa45262c3c0b016999af7992030d964f731af83c (patch) | |
| tree | 46372a2f12d38933bd98e5aa2a18d3b5d3ea6055 /OpenSim | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| parent | One should not copy/paste so much :) (diff) | |
| download | opensim-SC_OLD-aa45262c3c0b016999af7992030d964f731af83c.zip opensim-SC_OLD-aa45262c3c0b016999af7992030d964f731af83c.tar.gz opensim-SC_OLD-aa45262c3c0b016999af7992030d964f731af83c.tar.bz2 opensim-SC_OLD-aa45262c3c0b016999af7992030d964f731af83c.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 6a71540..f02c28b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -4857,9 +4857,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4857 | UserProfile.FirstLifeImage = Properties.FLImageID; | 4857 | UserProfile.FirstLifeImage = Properties.FLImageID; |
| 4858 | UserProfile.Image = Properties.ImageID; | 4858 | UserProfile.Image = Properties.ImageID; |
| 4859 | UserProfile.ProfileUrl = Utils.BytesToString(Properties.ProfileURL); | 4859 | UserProfile.ProfileUrl = Utils.BytesToString(Properties.ProfileURL); |
| 4860 | UserProfile.Flags &= ~3; | 4860 | UserProfile.UserFlags &= ~3; |
| 4861 | UserProfile.Flags |= Properties.AllowPublish ? 1 : 0; | 4861 | UserProfile.UserFlags |= Properties.AllowPublish ? 1 : 0; |
| 4862 | UserProfile.Flags |= Properties.MaturePublish ? 2 : 0; | 4862 | UserProfile.UserFlags |= Properties.MaturePublish ? 2 : 0; |
| 4863 | 4863 | ||
| 4864 | handlerUpdateAvatarProperties(this, UserProfile); | 4864 | handlerUpdateAvatarProperties(this, UserProfile); |
| 4865 | } | 4865 | } |