OpenSimulator GForge > Projects > realXtend Modules > SVN

Diff of /branches/modrex-0.1.1-rc/ModularRex/RexNetwork/RexLogin/RexLoginModule.cs

-revision 245, Fri Oct 30 10:38:08 2009 UTC
+revision 248, Fri Oct 30 12:43:49 2009 UTC
 Line 269
                  logResponse.AgentID = agentID;
-                 logResponse.Message = "Welcome to ModularRex";
+                 logResponse.Message = m_config.Configs["StandAlone"].GetString("welcome_message", "Welcome to ModularRex");
                  logResponse.SimAddress = m_primaryRegionInfo.ExternalEndPoint.Address.ToString();
                  logResponse.SimPort = (uint)GetPort(m_primaryRegionInfo.RegionHandle);
 Line 287
                  logResponse.SeedCapability = seedcap;
+                 bool newUser = false;
-                 //UserAdminService is null in grid mode
+                 UserProfileData user = m_scenes[0].CommsManager.UserService.GetUserProfile(agentID);
+                 if (user == null)
+                 {
                  m_scenes[0].CommsManager.UserAdminService.AddUser(logResponse.Firstname, logResponse.Lastname, "",
                                                                        account, 1000, 1000, agentID);
+                     user = m_scenes[0].CommsManager.UserService.GetUserProfile(agentID);
+                     newUser = true;
+                 }
-                 UserProfileData user = m_scenes[0].CommsManager.UserService.GetUserProfile(agentID);
                  if (m_scenes[0].CommsManager.UserService is UserManagerBase)
                  {
                      ((UserManagerBase)m_scenes[0].CommsManager.UserService).CreateAgent(user, request);
-Line 311
+Line 315
                      logResponse.SecureSessionID = GetSecureID(account);
                  }
+                 if (newUser)
+                 {
                  if (m_scenes[0].InventoryService != null)
                  {
                      // local service (standalone)
-Line 330
+Line 336
                      //m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory");
                      //m_commsManager.InterServiceInventoryService.CreateNewUserInventory(userProf.ID);
                  }
+                 }
                      LoginService.InventoryData inventData = GetInventorySkeleton(m_scenes[0], agentID);

 Legend:



Removed from v.245
 


changed lines


 
Added in v.248
 Legend:



Removed from v.245
 


changed lines


 
Added in v.248
-Removed from v.245
+Added in v.248

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

realXtend Modules

Diff of /branches/modrex-0.1.1-rc/ModularRex/RexNetwork/RexLogin/RexLoginModule.cs