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

arthursv
Diva Canto 2009-08-17 17:00:27 -07:00
parent d7aa622050
commit 806f48d81a
1 changed files with 13 additions and 1 deletions

View File

@ -1131,7 +1131,9 @@ namespace OpenSim.Framework.Communications.Services
// tools are creating the user profile directly in the database without creating the inventory. At // 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 // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already
// exist. // exist.
if ((m_interInventoryService != null) && !m_interInventoryService.CreateNewUserInventory(userID)) if (m_interInventoryService != null)
{
if (!m_interInventoryService.CreateNewUserInventory(userID))
{ {
throw new Exception( throw new Exception(
String.Format( String.Format(
@ -1139,6 +1141,16 @@ namespace OpenSim.Framework.Communications.Services
+ " Please contact your inventory service provider for more information.", + " Please contact your inventory service provider for more information.",
userID)); userID));
} }
}
else if ((m_InventoryService != null) && !m_InventoryService.CreateUserInventory(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));
}
m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID); m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID);