diff options
author | Justin Clark-Casey (justincc) | 2009-08-11 17:29:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-08-11 17:29:15 +0100 |
commit | 655438a59db45fca149d9827d60babe01ea82212 (patch) | |
tree | 0a1f0db5c37a590081788d14a58eba2e561a852a /OpenSim/Region | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-655438a59db45fca149d9827d60babe01ea82212.zip opensim-SC_OLD-655438a59db45fca149d9827d60babe01ea82212.tar.gz opensim-SC_OLD-655438a59db45fca149d9827d60babe01ea82212.tar.bz2 opensim-SC_OLD-655438a59db45fca149d9827d60babe01ea82212.tar.xz |
Apply http://opensimulator.org/mantis/view.php?id=1448
Store and retrieve user profile url at runtime
Not yet persisted
Thanks Fly-Man
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | 3 |
2 files changed, 3 insertions, 1 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 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index 0f5b76a..d3324e4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
111 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, | 111 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, |
112 | Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture), | 112 | Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture), |
113 | charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff), | 113 | charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff), |
114 | profile.FirstLifeImage, profile.Image, String.Empty, profile.Partner); | 114 | profile.FirstLifeImage, profile.Image, profile.ProfileUrl, profile.Partner); |
115 | } | 115 | } |
116 | else | 116 | else |
117 | { | 117 | { |
@@ -130,6 +130,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
130 | Profile.FirstLifeImage = newProfile.FirstLifeImage; | 130 | Profile.FirstLifeImage = newProfile.FirstLifeImage; |
131 | Profile.AboutText = newProfile.AboutText; | 131 | Profile.AboutText = newProfile.AboutText; |
132 | Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText; | 132 | Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText; |
133 | Profile.ProfileUrl = newProfile.ProfileUrl; | ||
133 | } | 134 | } |
134 | else | 135 | else |
135 | { | 136 | { |