aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Services/LoginService.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-18 11:09:43 -0400
committerTeravus Ovares (Dan Olivares)2009-08-18 11:09:43 -0400
commit311b51a1843f43daa7796a46961b65fe702e1b85 (patch)
tree756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Framework/Communications/Services/LoginService.cs
parent* Some Physics Scene Changes to prepare for larger regions (diff)
parentFixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff)
downloadopensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip
opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz
opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2
opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz
*remove conflicts
Diffstat (limited to 'OpenSim/Framework/Communications/Services/LoginService.cs')
-rw-r--r--OpenSim/Framework/Communications/Services/LoginService.cs20
1 files changed, 17 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 9709975..cac6616 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -205,7 +205,8 @@ namespace OpenSim.Framework.Communications.Services
205 // Otherwise... 205 // Otherwise...
206 // Create a new agent session 206 // Create a new agent session
207 207
208 m_userManager.ResetAttachments(userProfile.ID); 208 // XXYY we don't need this
209 //m_userManager.ResetAttachments(userProfile.ID);
209 210
210 CreateAgent(userProfile, request); 211 CreateAgent(userProfile, request);
211 212
@@ -462,7 +463,8 @@ namespace OpenSim.Framework.Communications.Services
462 // Otherwise... 463 // Otherwise...
463 // Create a new agent session 464 // Create a new agent session
464 465
465 m_userManager.ResetAttachments(userProfile.ID); 466 // XXYY We don't need this
467 //m_userManager.ResetAttachments(userProfile.ID);
466 468
467 CreateAgent(userProfile, request); 469 CreateAgent(userProfile, request);
468 470
@@ -1129,7 +1131,18 @@ namespace OpenSim.Framework.Communications.Services
1129 // tools are creating the user profile directly in the database without creating the inventory. At 1131 // tools are creating the user profile directly in the database without creating the inventory. At
1130 // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already 1132 // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already
1131 // exist. 1133 // exist.
1132 if ((m_interInventoryService != null) && !m_interInventoryService.CreateNewUserInventory(userID)) 1134 if (m_interInventoryService != null)
1135 {
1136 if (!m_interInventoryService.CreateNewUserInventory(userID))
1137 {
1138 throw new Exception(
1139 String.Format(
1140 "The inventory creation request for user {0} did not succeed."
1141 + " Please contact your inventory service provider for more information.",
1142 userID));
1143 }
1144 }
1145 else if ((m_InventoryService != null) && !m_InventoryService.CreateUserInventory(userID))
1133 { 1146 {
1134 throw new Exception( 1147 throw new Exception(
1135 String.Format( 1148 String.Format(
@@ -1138,6 +1151,7 @@ namespace OpenSim.Framework.Communications.Services
1138 userID)); 1151 userID));
1139 } 1152 }
1140 1153
1154
1141 m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID); 1155 m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID);
1142 1156
1143 if (m_InventoryService != null) 1157 if (m_InventoryService != null)