diff options
| author | Melanie | 2009-12-27 15:49:09 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-27 15:49:09 +0000 |
| commit | 769dad278373c0b945aa01a75365c0d658c98540 (patch) | |
| tree | 601347095dd91b365a5fdcbec8a1f693048faa03 /OpenSim/Region | |
| parent | Change the signature of the forms requester data in preparation to getting (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-769dad278373c0b945aa01a75365c0d658c98540.zip opensim-SC_OLD-769dad278373c0b945aa01a75365c0d658c98540.tar.gz opensim-SC_OLD-769dad278373c0b945aa01a75365c0d658c98540.tar.bz2 opensim-SC_OLD-769dad278373c0b945aa01a75365c0d658c98540.tar.xz | |
Merge branch 'master' 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 | } |