From 87f116ab3a23e662813fe35992db1169d350618c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 16 Aug 2009 19:51:16 -0700
Subject: Remove the call to ResetAttachments upon login. The info in the DB
 should always have {itemID, assetID}.

---
 OpenSim/Framework/Communications/Services/LoginService.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Communications/Services/LoginService.cs')

diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 9709975..1b4c016 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -205,6 +205,7 @@ namespace OpenSim.Framework.Communications.Services
                     // Otherwise...
                     // Create a new agent session
 
+                    // XXYY we don't need this
                     m_userManager.ResetAttachments(userProfile.ID);
 
                     CreateAgent(userProfile, request);
@@ -462,7 +463,8 @@ namespace OpenSim.Framework.Communications.Services
                     // Otherwise...
                     // Create a new agent session
 
-                    m_userManager.ResetAttachments(userProfile.ID);
+                    // XXYY We don't need this
+                    //m_userManager.ResetAttachments(userProfile.ID);
 
                     CreateAgent(userProfile, request);
 
-- 
cgit v1.1


From 67a629081eaf28176aa7920e4a4aba8497905cfb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 16 Aug 2009 19:54:49 -0700
Subject: uh. how about *really* removing it, and not just write a comment
 above, hey diva?

---
 OpenSim/Framework/Communications/Services/LoginService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Communications/Services/LoginService.cs')

diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 1b4c016..8a8108b 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.Communications.Services
                     // Create a new agent session
 
                     // XXYY we don't need this
-                    m_userManager.ResetAttachments(userProfile.ID);
+                    //m_userManager.ResetAttachments(userProfile.ID);
 
                     CreateAgent(userProfile, request);
 
-- 
cgit v1.1


From 806f48d81a4d47779aef217ace2e141b590055ed Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 17 Aug 2009 17:00:27 -0700
Subject: Added one conditional missing on login, for creating inventory if it
 doesn't exist already. This hopefully fixes the master avatar problems on
 standalone.

---
 OpenSim/Framework/Communications/Services/LoginService.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Communications/Services/LoginService.cs')

diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 8a8108b..cac6616 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -1131,7 +1131,18 @@ namespace OpenSim.Framework.Communications.Services
                 // tools are creating the user profile directly in the database without creating the inventory.  At
                 // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already
                 // exist.
-                if ((m_interInventoryService != null) && !m_interInventoryService.CreateNewUserInventory(userID))
+                if (m_interInventoryService != null)
+                {
+                    if (!m_interInventoryService.CreateNewUserInventory(userID))
+                    {
+                        throw new Exception(
+                            String.Format(
+                                "The inventory creation request for user {0} did not succeed."
+                                + "  Please contact your inventory service provider for more information.",
+                                userID));
+                    }
+                }
+                else if ((m_InventoryService != null) && !m_InventoryService.CreateUserInventory(userID))
                 {
                     throw new Exception(
                         String.Format(
@@ -1140,6 +1151,7 @@ namespace OpenSim.Framework.Communications.Services
                             userID));
                 }
 
+
                 m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID);
 
                 if (m_InventoryService != null)
-- 
cgit v1.1