diff options
| author | Melanie | 2009-12-27 15:48:43 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-27 15:48:43 +0000 |
| commit | e3f60ce06fc322ff0963b48ab6f52d41804e3dbb (patch) | |
| tree | 07098f7c4745a2b81aa7ae9a8a1a100ff7643b3f /OpenSim/Region | |
| parent | Merge branch 'master' into casper (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-e3f60ce06fc322ff0963b48ab6f52d41804e3dbb.zip opensim-SC_OLD-e3f60ce06fc322ff0963b48ab6f52d41804e3dbb.tar.gz opensim-SC_OLD-e3f60ce06fc322ff0963b48ab6f52d41804e3dbb.tar.bz2 opensim-SC_OLD-e3f60ce06fc322ff0963b48ab6f52d41804e3dbb.tar.xz | |
Merge branch 'master' into careminster
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 3ac4e5e..aeb97eb 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -4840,6 +4840,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4840 | UserProfile.FirstLifeImage = Properties.FLImageID; | 4840 | UserProfile.FirstLifeImage = Properties.FLImageID; |
| 4841 | UserProfile.Image = Properties.ImageID; | 4841 | UserProfile.Image = Properties.ImageID; |
| 4842 | UserProfile.ProfileUrl = Utils.BytesToString(Properties.ProfileURL); | 4842 | UserProfile.ProfileUrl = Utils.BytesToString(Properties.ProfileURL); |
| 4843 | Userprofile.Flags &= ~3; | ||
| 4844 | Userprofile.Flags |= Properties.AllowPublish ? 1 : 0; | ||
| 4845 | Userprofile.Flags |= Properties.MaturePublish ? 2 : 0; | ||
| 4843 | 4846 | ||
| 4844 | handlerUpdateAvatarProperties(this, UserProfile); | 4847 | handlerUpdateAvatarProperties(this, UserProfile); |
| 4845 | } | 4848 | } |