Added one conditional missing on login, for creating inventory if it doesn't exist already. This hopefully fixes the master avatar problems on standalone.

1 files changed, 13 insertions, 1 deletions

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)