aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-12-27 08:40:43 -0800
committerDiva Canto2009-12-27 08:40:43 -0800
commit49d6cfad2b6db15c5f05e6fa9ee3e62e9bf0a084 (patch)
tree53d416f1e65aac0d0ead11fc811a6ce2eeab69ff /OpenSim
parentMerge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
parentFix the spelling :/ (diff)
downloadopensim-SC_OLD-49d6cfad2b6db15c5f05e6fa9ee3e62e9bf0a084.zip
opensim-SC_OLD-49d6cfad2b6db15c5f05e6fa9ee3e62e9bf0a084.tar.gz
opensim-SC_OLD-49d6cfad2b6db15c5f05e6fa9ee3e62e9bf0a084.tar.bz2
opensim-SC_OLD-49d6cfad2b6db15c5f05e6fa9ee3e62e9bf0a084.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.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 096d5e1..6a71540 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.Flags &= ~3;
4861 Userprofile.Flags |= Properties.AllowPublish ? 1 : 0; 4861 UserProfile.Flags |= Properties.AllowPublish ? 1 : 0;
4862 Userprofile.Flags |= Properties.MaturePublish ? 2 : 0; 4862 UserProfile.Flags |= Properties.MaturePublish ? 2 : 0;
4863 4863
4864 handlerUpdateAvatarProperties(this, UserProfile); 4864 handlerUpdateAvatarProperties(this, UserProfile);
4865 } 4865 }