ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.

Browse Source 
BTW, the Meshing files want to be committed too -- EOFs.
This commit is contained in:
Diva Canto
2010-05-07 21:29:56 -07:00
parent eb6d63ab8e
commit a58859a0d4
44 changed files with 3798 additions and 3724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@@ -46,7 +46,7 @@ namespace OpenSim.Services.UserAccountService
protected IGridService m_GridService;
protected IAuthenticationService m_AuthenticationService;
protected IPresenceService m_PresenceService;
protected IGridUserService m_GridUserService;
protected IInventoryService m_InventoryService;
public UserAccountService(IConfigSource config)
@@ -69,9 +69,9 @@ namespace OpenSim.Services.UserAccountService
if (authServiceDll != string.Empty)
m_AuthenticationService = LoadPlugin<IAuthenticationService>(authServiceDll, new Object[] { config });
string presenceServiceDll = userConfig.GetString("PresenceService", string.Empty);
string presenceServiceDll = userConfig.GetString("GridUserService", string.Empty);
if (presenceServiceDll != string.Empty)
m_PresenceService = LoadPlugin<IPresenceService>(presenceServiceDll, new Object[] { config });
m_GridUserService = LoadPlugin<IGridUserService>(presenceServiceDll, new Object[] { config });
string invServiceDll = userConfig.GetString("InventoryService", string.Empty);
if (invServiceDll != string.Empty)
@@ -333,8 +333,8 @@ namespace OpenSim.Services.UserAccountService
if (defaultRegions != null && defaultRegions.Count >= 1)
home = defaultRegions[0];
if (m_PresenceService != null && home != null)
m_PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
if (m_GridUserService != null && home != null)
m_GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
else
m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set home for account {0} {1}.",
firstName, lastName);