aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/UserProfileData.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-11 20:32:05 -0400
committerTeravus Ovares (Dan Olivares)2009-08-11 20:32:05 -0400
commit2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3 (patch)
treeb8a0cc747dd73da553d8d3504d3c842d9283be73 /OpenSim/Framework/UserProfileData.cs
parentTry something to help the tests complete. (diff)
parentFixes a race condition in EQ processing that was making EQs pop up again upon... (diff)
downloadopensim-SC-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.zip
opensim-SC-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.gz
opensim-SC-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.bz2
opensim-SC-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/UserProfileData.cs')
-rw-r--r--OpenSim/Framework/UserProfileData.cs11
1 files changed, 11 insertions, 0 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; }