aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-08-11 17:29:15 +0100
committerJustin Clark-Casey (justincc)2009-08-11 17:29:15 +0100
commit655438a59db45fca149d9827d60babe01ea82212 (patch)
tree0a1f0db5c37a590081788d14a58eba2e561a852a /OpenSim
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-655438a59db45fca149d9827d60babe01ea82212.zip
opensim-SC-655438a59db45fca149d9827d60babe01ea82212.tar.gz
opensim-SC-655438a59db45fca149d9827d60babe01ea82212.tar.bz2
opensim-SC-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/Framework/UserProfileData.cs11
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs3
3 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index b226bba..f51a199 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -114,6 +114,11 @@ namespace OpenSim.Framework
114 /// </summary> 114 /// </summary>
115 private uint m_profileWantDoMask; // Profile window "I want to" mask 115 private uint m_profileWantDoMask; // Profile window "I want to" mask
116 116
117 /// <summary>
118 /// The profile url for an avatar
119 /// </summary>
120 private string m_profileUrl;
121
117 private UUID m_rootInventoryFolderId; 122 private UUID m_rootInventoryFolderId;
118 123
119 /// <summary> 124 /// <summary>
@@ -349,6 +354,12 @@ namespace OpenSim.Framework
349 set { m_profileFirstText = value; } 354 set { m_profileFirstText = value; }
350 } 355 }
351 356
357 public string ProfileUrl
358 {
359 get { return m_profileUrl; }
360 set { m_profileUrl = value; }
361 }
362
352 public UUID Image 363 public UUID Image
353 { 364 {
354 get { return m_profileImage; } 365 get { return m_profileImage; }
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 {