diff options
author | Melanie | 2012-09-30 15:46:43 +0100 |
---|---|---|
committer | Melanie | 2012-09-30 15:46:43 +0100 |
commit | b9a883f1cade9070cce97fe94094fe8b7ec05f16 (patch) | |
tree | cfebb1e544f4a0aafc58314d29c2134649dfb623 /OpenSim/Services/UserAccountService | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Revert "Added request.Proxy=null everywhere, as discussed in http://stackover... (diff) | |
download | opensim-SC_OLD-b9a883f1cade9070cce97fe94094fe8b7ec05f16.zip opensim-SC_OLD-b9a883f1cade9070cce97fe94094fe8b7ec05f16.tar.gz opensim-SC_OLD-b9a883f1cade9070cce97fe94094fe8b7ec05f16.tar.bz2 opensim-SC_OLD-b9a883f1cade9070cce97fe94094fe8b7ec05f16.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/UserAccountService')
-rw-r--r-- | OpenSim/Services/UserAccountService/GridUserService.cs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs index ac3d8fd..43fa04b 100644 --- a/OpenSim/Services/UserAccountService/GridUserService.cs +++ b/OpenSim/Services/UserAccountService/GridUserService.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Services.UserAccountService | |||
49 | m_log.Debug("[USER GRID SERVICE]: Starting user grid service"); | 49 | m_log.Debug("[USER GRID SERVICE]: Starting user grid service"); |
50 | } | 50 | } |
51 | 51 | ||
52 | public GridUserInfo GetGridUserInfo(string userID) | 52 | public virtual GridUserInfo GetGridUserInfo(string userID) |
53 | { | 53 | { |
54 | GridUserData d = m_Database.Get(userID); | 54 | GridUserData d = m_Database.Get(userID); |
55 | 55 | ||
@@ -122,17 +122,6 @@ namespace OpenSim.Services.UserAccountService | |||
122 | return m_Database.Store(d); | 122 | return m_Database.Store(d); |
123 | } | 123 | } |
124 | 124 | ||
125 | protected bool StoreGridUserInfo(GridUserInfo info) | ||
126 | { | ||
127 | GridUserData d = new GridUserData(); | ||
128 | |||
129 | d.Data["HomeRegionID"] = info.HomeRegionID.ToString(); | ||
130 | d.Data["HomePosition"] = info.HomePosition.ToString(); | ||
131 | d.Data["HomeLookAt"] = info.HomeLookAt.ToString(); | ||
132 | |||
133 | return m_Database.Store(d); | ||
134 | } | ||
135 | |||
136 | public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt) | 125 | public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt) |
137 | { | 126 | { |
138 | GridUserData d = m_Database.Get(userID); | 127 | GridUserData d = m_Database.Get(userID); |