aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-12-17 22:09:14 +0000
committerMelanie Thielker2008-12-17 22:09:14 +0000
commit6ef64593fd2a0a0a036974d5f894531494da5e1c (patch)
tree57625f5c970f383cc91df7fab8d4796619ddb99c /OpenSim
parentfix a bug with the Grid REST interface that was returning the classname (diff)
downloadopensim-SC_OLD-6ef64593fd2a0a0a036974d5f894531494da5e1c.zip
opensim-SC_OLD-6ef64593fd2a0a0a036974d5f894531494da5e1c.tar.gz
opensim-SC_OLD-6ef64593fd2a0a0a036974d5f894531494da5e1c.tar.bz2
opensim-SC_OLD-6ef64593fd2a0a0a036974d5f894531494da5e1c.tar.xz
Fix attachment persistence which got broken with some inventory
changes a few revs back.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index c1decaa..2c42502 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2130,7 +2130,12 @@ namespace OpenSim.Region.Environment.Scenes
2130 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); 2130 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
2131 if (userInfo != null) 2131 if (userInfo != null)
2132 { 2132 {
2133 if (userInfo.HasReceivedInventory) 2133 // Do NOT use HasReceivedInventory here, this is called
2134 // from within ItemReceive during login for attachments.
2135 // Using HasReceivedInventory here will break attachment
2136 // persistence!
2137 //
2138 if (userInfo.RootFolder != null)
2134 { 2139 {
2135 InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); 2140 InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
2136 2141