diff options
| author | Diva Canto | 2009-12-27 08:38:44 -0800 |
|---|---|---|
| committer | Diva Canto | 2009-12-27 08:38:44 -0800 |
| commit | 2248d2ff32cc098f55cf9f0c9c4bf062eafff0dd (patch) | |
| tree | 319a8f11c155a8d6171246887602395a410527e1 /OpenSim/Region | |
| parent | First pass at the local connector for presence. No cache yet. Just the connec... (diff) | |
| parent | Merge branch 'master' into presence-refactor (diff) | |
| download | opensim-SC_OLD-2248d2ff32cc098f55cf9f0c9c4bf062eafff0dd.zip opensim-SC_OLD-2248d2ff32cc098f55cf9f0c9c4bf062eafff0dd.tar.gz opensim-SC_OLD-2248d2ff32cc098f55cf9f0c9c4bf062eafff0dd.tar.bz2 opensim-SC_OLD-2248d2ff32cc098f55cf9f0c9c4bf062eafff0dd.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index f6c505a..096d5e1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -4857,6 +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; | ||
| 4861 | Userprofile.Flags |= Properties.AllowPublish ? 1 : 0; | ||
| 4862 | Userprofile.Flags |= Properties.MaturePublish ? 2 : 0; | ||
| 4860 | 4863 | ||
| 4861 | handlerUpdateAvatarProperties(this, UserProfile); | 4864 | handlerUpdateAvatarProperties(this, UserProfile); |
| 4862 | } | 4865 | } |