diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/User/UserServiceConnector.cs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Services/Connectors/User/UserServiceConnector.cs index 12afb29..fb03844 100644 --- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs +++ b/OpenSim/Services/Connectors/User/UserServiceConnector.cs | |||
@@ -39,7 +39,7 @@ using OpenMetaverse; | |||
39 | 39 | ||
40 | namespace OpenSim.Services.Connectors | 40 | namespace OpenSim.Services.Connectors |
41 | { | 41 | { |
42 | public class UserServicesConnector : IUserDataService | 42 | public class UserServicesConnector : IUserAccountDataService |
43 | { | 43 | { |
44 | private static readonly ILog m_log = | 44 | private static readonly ILog m_log = |
45 | LogManager.GetLogger( | 45 | LogManager.GetLogger( |
@@ -81,10 +81,10 @@ namespace OpenSim.Services.Connectors | |||
81 | m_ServerURI = serviceURI; | 81 | m_ServerURI = serviceURI; |
82 | } | 82 | } |
83 | 83 | ||
84 | public UserData GetUserData(UUID scopeID, string firstName, string lastName) | 84 | public UserAccountData GetUserAccountData(UUID scopeID, string firstName, string lastName) |
85 | { | 85 | { |
86 | string uri = m_ServerURI + "/users/"; | 86 | string uri = m_ServerURI + "/users/"; |
87 | UserData data = new UserData(); | 87 | UserAccountData data = new UserAccountData(); |
88 | data.FirstName = firstName; | 88 | data.FirstName = firstName; |
89 | data.LastName = lastName; | 89 | data.LastName = lastName; |
90 | data.ScopeID = scopeID; | 90 | data.ScopeID = scopeID; |
@@ -93,7 +93,7 @@ namespace OpenSim.Services.Connectors | |||
93 | try | 93 | try |
94 | { | 94 | { |
95 | data = SynchronousRestObjectRequester. | 95 | data = SynchronousRestObjectRequester. |
96 | MakeRequest<UserData, UserData>("POST", uri, data); | 96 | MakeRequest<UserAccountData, UserAccountData>("POST", uri, data); |
97 | } | 97 | } |
98 | catch (Exception e) | 98 | catch (Exception e) |
99 | { | 99 | { |
@@ -107,10 +107,10 @@ namespace OpenSim.Services.Connectors | |||
107 | return data; | 107 | return data; |
108 | } | 108 | } |
109 | 109 | ||
110 | public UserData GetUserData(UUID scopeID, UUID userID) | 110 | public UserAccountData GetUserAccountData(UUID scopeID, UUID userID) |
111 | { | 111 | { |
112 | string uri = m_ServerURI + "/users/"; | 112 | string uri = m_ServerURI + "/users/"; |
113 | UserData data = new UserData(); | 113 | UserAccountData data = new UserAccountData(); |
114 | data.FirstName = String.Empty; | 114 | data.FirstName = String.Empty; |
115 | data.LastName = String.Empty; | 115 | data.LastName = String.Empty; |
116 | data.ScopeID = scopeID; | 116 | data.ScopeID = scopeID; |
@@ -119,7 +119,7 @@ namespace OpenSim.Services.Connectors | |||
119 | try | 119 | try |
120 | { | 120 | { |
121 | data = SynchronousRestObjectRequester. | 121 | data = SynchronousRestObjectRequester. |
122 | MakeRequest<UserData, UserData>("POST", uri, data); | 122 | MakeRequest<UserAccountData, UserAccountData>("POST", uri, data); |
123 | } | 123 | } |
124 | catch (Exception e) | 124 | catch (Exception e) |
125 | { | 125 | { |
@@ -133,12 +133,12 @@ namespace OpenSim.Services.Connectors | |||
133 | return data; | 133 | return data; |
134 | } | 134 | } |
135 | 135 | ||
136 | public bool SetHomePosition(UserData data, UUID regionID, UUID regionSecret) | 136 | public bool SetHomePosition(UserAccountData data, UUID regionID, UUID regionSecret) |
137 | { | 137 | { |
138 | string uri = m_ServerURI + "/user/"; | 138 | string uri = m_ServerURI + "/user/"; |
139 | bool result = false; | 139 | bool result = false; |
140 | 140 | ||
141 | UserDataMessage msg = new UserDataMessage(); | 141 | UserAccountDataMessage msg = new UserAccountDataMessage(); |
142 | 142 | ||
143 | msg.Data = data; | 143 | msg.Data = data; |
144 | msg.RegionID = regionID; | 144 | msg.RegionID = regionID; |
@@ -147,7 +147,7 @@ namespace OpenSim.Services.Connectors | |||
147 | try | 147 | try |
148 | { | 148 | { |
149 | result = SynchronousRestObjectRequester. | 149 | result = SynchronousRestObjectRequester. |
150 | MakeRequest<UserDataMessage, bool>("POST", uri, msg); | 150 | MakeRequest<UserAccountDataMessage, bool>("POST", uri, msg); |
151 | } | 151 | } |
152 | catch (Exception e) | 152 | catch (Exception e) |
153 | { | 153 | { |
@@ -158,12 +158,12 @@ namespace OpenSim.Services.Connectors | |||
158 | return result; | 158 | return result; |
159 | } | 159 | } |
160 | 160 | ||
161 | public bool SetUserData(UserData data, UUID principalID, UUID sessionID) | 161 | public bool SetUserAccountData(UserAccountData data, UUID principalID, UUID sessionID) |
162 | { | 162 | { |
163 | string uri = m_ServerURI + "/user/"; | 163 | string uri = m_ServerURI + "/user/"; |
164 | bool result = false; | 164 | bool result = false; |
165 | 165 | ||
166 | UserDataMessage msg = new UserDataMessage(); | 166 | UserAccountDataMessage msg = new UserAccountDataMessage(); |
167 | 167 | ||
168 | msg.Data = data; | 168 | msg.Data = data; |
169 | msg.PrincipalID = principalID; | 169 | msg.PrincipalID = principalID; |
@@ -172,7 +172,7 @@ namespace OpenSim.Services.Connectors | |||
172 | try | 172 | try |
173 | { | 173 | { |
174 | result = SynchronousRestObjectRequester. | 174 | result = SynchronousRestObjectRequester. |
175 | MakeRequest<UserDataMessage, bool>("POST", uri, msg); | 175 | MakeRequest<UserAccountDataMessage, bool>("POST", uri, msg); |
176 | } | 176 | } |
177 | catch (Exception e) | 177 | catch (Exception e) |
178 | { | 178 | { |
@@ -183,12 +183,12 @@ namespace OpenSim.Services.Connectors | |||
183 | return result; | 183 | return result; |
184 | } | 184 | } |
185 | 185 | ||
186 | public bool CreateUserData(UserData data, UUID principalID, UUID sessionID) | 186 | public bool CreateUserAccountData(UserAccountData data, UUID principalID, UUID sessionID) |
187 | { | 187 | { |
188 | string uri = m_ServerURI + "/newuser/"; | 188 | string uri = m_ServerURI + "/newuser/"; |
189 | bool result = false; | 189 | bool result = false; |
190 | 190 | ||
191 | UserDataMessage msg = new UserDataMessage(); | 191 | UserAccountDataMessage msg = new UserAccountDataMessage(); |
192 | 192 | ||
193 | msg.Data = data; | 193 | msg.Data = data; |
194 | msg.PrincipalID = principalID; | 194 | msg.PrincipalID = principalID; |
@@ -197,7 +197,7 @@ namespace OpenSim.Services.Connectors | |||
197 | try | 197 | try |
198 | { | 198 | { |
199 | result = SynchronousRestObjectRequester. | 199 | result = SynchronousRestObjectRequester. |
200 | MakeRequest<UserDataMessage, bool>("POST", uri, msg); | 200 | MakeRequest<UserAccountDataMessage, bool>("POST", uri, msg); |
201 | } | 201 | } |
202 | catch (Exception e) | 202 | catch (Exception e) |
203 | { | 203 | { |
@@ -208,18 +208,18 @@ namespace OpenSim.Services.Connectors | |||
208 | return result; | 208 | return result; |
209 | } | 209 | } |
210 | 210 | ||
211 | public List<UserData> GetAvatarPickerData(UUID scopeID, string query) | 211 | public List<UserAccountData> GetUserAccountData(UUID scopeID, string query) |
212 | { | 212 | { |
213 | string uri = m_ServerURI + "/userlist/"; | 213 | string uri = m_ServerURI + "/userlist/"; |
214 | UserData data = new UserData(); | 214 | UserAccountData data = new UserAccountData(); |
215 | data.FirstName = query; | 215 | data.FirstName = query; |
216 | data.ScopeID = scopeID; | 216 | data.ScopeID = scopeID; |
217 | List<UserData> result; | 217 | List<UserAccountData> result; |
218 | 218 | ||
219 | try | 219 | try |
220 | { | 220 | { |
221 | result = SynchronousRestObjectRequester. | 221 | result = SynchronousRestObjectRequester. |
222 | MakeRequest<UserData, List<UserData>>("POST", uri, data); | 222 | MakeRequest<UserAccountData, List<UserAccountData>>("POST", uri, data); |
223 | } | 223 | } |
224 | catch (Exception e) | 224 | catch (Exception e) |
225 | { | 225 | { |