Merge branch 'master' into careminster
commit
b9a883f1ca
|
@ -49,7 +49,7 @@ namespace OpenSim.Services.UserAccountService
|
||||||
m_log.Debug("[USER GRID SERVICE]: Starting user grid service");
|
m_log.Debug("[USER GRID SERVICE]: Starting user grid service");
|
||||||
}
|
}
|
||||||
|
|
||||||
public GridUserInfo GetGridUserInfo(string userID)
|
public virtual GridUserInfo GetGridUserInfo(string userID)
|
||||||
{
|
{
|
||||||
GridUserData d = m_Database.Get(userID);
|
GridUserData d = m_Database.Get(userID);
|
||||||
|
|
||||||
|
@ -122,17 +122,6 @@ namespace OpenSim.Services.UserAccountService
|
||||||
return m_Database.Store(d);
|
return m_Database.Store(d);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected bool StoreGridUserInfo(GridUserInfo info)
|
|
||||||
{
|
|
||||||
GridUserData d = new GridUserData();
|
|
||||||
|
|
||||||
d.Data["HomeRegionID"] = info.HomeRegionID.ToString();
|
|
||||||
d.Data["HomePosition"] = info.HomePosition.ToString();
|
|
||||||
d.Data["HomeLookAt"] = info.HomeLookAt.ToString();
|
|
||||||
|
|
||||||
return m_Database.Store(d);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt)
|
public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt)
|
||||||
{
|
{
|
||||||
GridUserData d = m_Database.Get(userID);
|
GridUserData d = m_Database.Get(userID);
|
||||||
|
|
Loading…
Reference in New Issue