aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/UserProfileData.cs
diff options
context:
space:
mode:
authorMelanie2009-12-07 14:14:00 +0000
committerMelanie2009-12-07 14:14:00 +0000
commit9155c9ee3742ff3d79554779b32a8fe1b19aaaf3 (patch)
tree23fd52b8cd3bd0e1caafa52dc393111cd762e93a /OpenSim/Framework/UserProfileData.cs
parentMerge branch 'careminster' of ssh://TOR/home/kitto/opensim/ into careminster (diff)
parentStop AuthorizationService from throwing an error if it's not configured. (diff)
downloadopensim-SC-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.zip
opensim-SC-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.tar.gz
opensim-SC-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.tar.bz2
opensim-SC-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/UserProfileData.cs8
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 413f152..9bac739 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -119,8 +119,6 @@ namespace OpenSim.Framework
119 /// </summary> 119 /// </summary>
120 private string m_profileUrl; 120 private string m_profileUrl;
121 121
122 private UUID m_rootInventoryFolderId;
123
124 /// <summary> 122 /// <summary>
125 /// The second component of a users account name 123 /// The second component of a users account name
126 /// </summary> 124 /// </summary>
@@ -312,12 +310,6 @@ namespace OpenSim.Framework
312 set { m_lastLogin = value; } 310 set { m_lastLogin = value; }
313 } 311 }
314 312
315 public UUID RootInventoryFolderID
316 {
317 get { return m_rootInventoryFolderId; }
318 set { m_rootInventoryFolderId = value; }
319 }
320
321 public string UserInventoryURI 313 public string UserInventoryURI
322 { 314 {
323 get { return m_userInventoryUri; } 315 get { return m_userInventoryUri; }