diff options
author | Kunnis | 2009-12-05 09:54:33 -0600 |
---|---|---|
committer | Melanie | 2009-12-06 03:57:15 +0000 |
commit | 4c61fcfc401cdf08f5027e3bce21c4b465711c60 (patch) | |
tree | 8f32d613f2eb0ddcc9ec68afa06542a45dbd556d /OpenSim/Framework | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-4c61fcfc401cdf08f5027e3bce21c4b465711c60.zip opensim-SC-4c61fcfc401cdf08f5027e3bce21c4b465711c60.tar.gz opensim-SC-4c61fcfc401cdf08f5027e3bce21c4b465711c60.tar.bz2 opensim-SC-4c61fcfc401cdf08f5027e3bce21c4b465711c60.tar.xz |
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Services/LoginService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/UserProfileData.cs | 8 |
3 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs index b652299..57ca704 100644 --- a/OpenSim/Framework/Communications/Services/LoginService.cs +++ b/OpenSim/Framework/Communications/Services/LoginService.cs | |||
@@ -244,7 +244,6 @@ namespace OpenSim.Framework.Communications.Services | |||
244 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString(); | 244 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString(); |
245 | ArrayList InventoryRoot = new ArrayList(); | 245 | ArrayList InventoryRoot = new ArrayList(); |
246 | InventoryRoot.Add(InventoryRootHash); | 246 | InventoryRoot.Add(InventoryRootHash); |
247 | userProfile.RootInventoryFolderID = inventData.RootFolderID; | ||
248 | 247 | ||
249 | logResponse.InventoryRoot = InventoryRoot; | 248 | logResponse.InventoryRoot = InventoryRoot; |
250 | logResponse.InventorySkeleton = AgentInventoryArray; | 249 | logResponse.InventorySkeleton = AgentInventoryArray; |
@@ -501,7 +500,6 @@ namespace OpenSim.Framework.Communications.Services | |||
501 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString(); | 500 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString(); |
502 | ArrayList InventoryRoot = new ArrayList(); | 501 | ArrayList InventoryRoot = new ArrayList(); |
503 | InventoryRoot.Add(InventoryRootHash); | 502 | InventoryRoot.Add(InventoryRootHash); |
504 | userProfile.RootInventoryFolderID = inventData.RootFolderID; | ||
505 | 503 | ||
506 | 504 | ||
507 | // Inventory Library Section | 505 | // Inventory Library Section |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index bf4f331..4f0af06 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -697,9 +697,6 @@ namespace OpenSim.Framework.Communications | |||
697 | // local service (standalone) | 697 | // local service (standalone) |
698 | m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory"); | 698 | m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory"); |
699 | m_InventoryService.CreateUserInventory(userProf.ID); | 699 | m_InventoryService.CreateUserInventory(userProf.ID); |
700 | InventoryFolderBase rootfolder = m_InventoryService.GetRootFolder(userProf.ID); | ||
701 | if (rootfolder != null) | ||
702 | userProf.RootInventoryFolderID = rootfolder.ID; | ||
703 | } | 700 | } |
704 | else if (m_commsManager.InterServiceInventoryService != null) | 701 | else if (m_commsManager.InterServiceInventoryService != null) |
705 | { | 702 | { |
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; } |