aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorDiva Canto2009-08-11 10:51:49 -0700
committerDiva Canto2009-08-11 10:51:49 -0700
commitdc897b228826c5e5c9db62e13fd9cb6872ff15b6 (patch)
treeda499f946125f00291e23c72c468a2bff579551c /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentImproved test for system folders. Removed log messages. (diff)
parentRe-enable TestReplicateArchivePathToUserInventory() but stop it failing on th... (diff)
downloadopensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.zip
opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.gz
opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.bz2
opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.xz
Merged with origin, and resolved one conflict in LoginServiceTests.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3d58839..7633b7b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4954,6 +4954,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4954 UserProfile.FirstLifeAboutText = Utils.BytesToString(Properties.FLAboutText); 4954 UserProfile.FirstLifeAboutText = Utils.BytesToString(Properties.FLAboutText);
4955 UserProfile.FirstLifeImage = Properties.FLImageID; 4955 UserProfile.FirstLifeImage = Properties.FLImageID;
4956 UserProfile.Image = Properties.ImageID; 4956 UserProfile.Image = Properties.ImageID;
4957 UserProfile.ProfileUrl = Utils.BytesToString(Properties.ProfileURL);
4957 4958
4958 handlerUpdateAvatarProperties(this, UserProfile); 4959 handlerUpdateAvatarProperties(this, UserProfile);
4959 } 4960 }