aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs11
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs5
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs1
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs12
-rw-r--r--OpenSim/Data/UserDataBase.cs1
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs8
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs15
-rw-r--r--OpenSim/Framework/IUserData.cs4
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs52
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs1
11 files changed, 1 insertions, 115 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 5185659..69fd862 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -741,17 +741,6 @@ namespace OpenSim.Data.MSSQL
741 #region Other public methods 741 #region Other public methods
742 742
743 /// <summary> 743 /// <summary>
744 /// STUB ! Update current region
745 /// </summary>
746 /// <param name="avatarid">avatar uuid</param>
747 /// <param name="regionuuid">region uuid</param>
748 /// <param name="regionhandle">region handle</param>
749 override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
750 {
751 //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
752 }
753
754 /// <summary>
755 /// 744 ///
756 /// </summary> 745 /// </summary>
757 /// <param name="queryID"></param> 746 /// <param name="queryID"></param>
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index f203a66..14d178b 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -409,11 +409,6 @@ namespace OpenSim.Data.MySQL
409 409
410 #endregion 410 #endregion
411 411
412 public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
413 {
414 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
415 }
416
417 public override List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query) 412 public override List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
418 { 413 {
419 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>(); 414 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 1bb2b14..3a22dc3 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -249,7 +249,6 @@ namespace OpenSim.Data.NHibernate
249 } 249 }
250 250
251 // TODO: actually implement these 251 // TODO: actually implement these
252 public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) { return; }
253 public override void StoreWebLoginKey(UUID agentID, UUID webLoginKey) { return; } 252 public override void StoreWebLoginKey(UUID agentID, UUID webLoginKey) { return; }
254 public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { return; } 253 public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { return; }
255 public override void RemoveUserFriend(UUID friendlistowner, UUID friend) { return; } 254 public override void RemoveUserFriend(UUID friendlistowner, UUID friend) { return; }
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index b8f1a68..ebc58c1 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -358,18 +358,6 @@ namespace OpenSim.Data.SQLite
358 #endregion 358 #endregion
359 359
360 /// <summary> 360 /// <summary>
361 /// STUB, Update the user's current region
362 /// </summary>
363 /// <param name="avatarid">UUID of the user</param>
364 /// <param name="regionuuid">UUID of the region</param>
365 /// <param name="regionhandle">region handle</param>
366 /// <remarks>DO NOTHING</remarks>
367 override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
368 {
369 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
370 }
371
372 /// <summary>
373 /// 361 ///
374 /// </summary> 362 /// </summary>
375 /// <param name="queryID"></param> 363 /// <param name="queryID"></param>
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index c1b320b..eaad7ae 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -47,7 +47,6 @@ namespace OpenSim.Data
47 public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey); 47 public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
48 public abstract void AddNewUserProfile(UserProfileData user); 48 public abstract void AddNewUserProfile(UserProfileData user);
49 public abstract bool UpdateUserProfile(UserProfileData user); 49 public abstract bool UpdateUserProfile(UserProfileData user);
50 public abstract void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
51 public abstract void AddNewUserAgent(UserAgentData agent); 50 public abstract void AddNewUserAgent(UserAgentData agent);
52 public abstract void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms); 51 public abstract void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
53 public abstract void RemoveUserFriend(UUID friendlistowner, UUID friend); 52 public abstract void RemoveUserFriend(UUID friendlistowner, UUID friend);
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 178b5a0..ecbbd32 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -115,14 +115,6 @@ namespace OpenSim.Framework.Communications
115 List<FriendListItem> GetUserFriendList(UUID friendlistowner); 115 List<FriendListItem> GetUserFriendList(UUID friendlistowner);
116 116
117 /// <summary> 117 /// <summary>
118 /// Updates the current region the User is in
119 /// </summary>
120 /// <param name="avatarid">User Region the Avatar is IN</param>
121 /// <param name="regionuuid">User Region the Avatar is IN</param>
122 /// <param name="regionhandle">User region handle</param>
123 void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
124
125 /// <summary>
126 /// Get's the User Appearance 118 /// Get's the User Appearance
127 // AvatarAppearance GetUserAppearance(UUID user); 119 // AvatarAppearance GetUserAppearance(UUID user);
128 120
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index a929317..a5ca654 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -265,21 +265,6 @@ namespace OpenSim.Framework.Communications
265 return null; 265 return null;
266 } 266 }
267 267
268 public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
269 {
270 foreach (IUserDataPlugin plugin in _plugins)
271 {
272 try
273 {
274 plugin.UpdateUserCurrentRegion(avatarid, regionuuid, regionhandle);
275 }
276 catch (Exception e)
277 {
278 m_log.Info("[USERSTORAGE]: Unable to updateuser location via " + plugin.Name + "(" + e.ToString() + ")");
279 }
280 }
281 }
282
283 /// <summary> 268 /// <summary>
284 /// Loads a user's friend list 269 /// Loads a user's friend list
285 /// </summary> 270 /// </summary>
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index 0936495..4653255 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -92,14 +92,12 @@ namespace OpenSim.Framework
92 /// <param name="user">UserProfile to add</param> 92 /// <param name="user">UserProfile to add</param>
93 void AddNewUserProfile(UserProfileData user); 93 void AddNewUserProfile(UserProfileData user);
94 94
95 /// <summary> 95 /// <summary></summary>
96 /// Updates an existing user profile 96 /// Updates an existing user profile
97 /// </summary> 97 /// </summary>
98 /// <param name="user">UserProfile to update</param> 98 /// <param name="user">UserProfile to update</param>
99 bool UpdateUserProfile(UserProfileData user); 99 bool UpdateUserProfile(UserProfileData user);
100 100
101
102 void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
103 /// <summary> 101 /// <summary>
104 /// Adds a new agent to the database 102 /// Adds a new agent to the database
105 /// </summary> 103 /// </summary>
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 06534be..084a9e9 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -120,11 +120,6 @@ namespace OpenSim.Region.Communications.Hypergrid
120 return GetUserProfile(firstName + " " + lastName); 120 return GetUserProfile(firstName + " " + lastName);
121 } 121 }
122 122
123 public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
124 {
125 m_remoteUserServices.UpdateUserCurrentRegion(avatarid, regionuuid, regionhandle);
126 }
127
128 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query) 123 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
129 { 124 {
130 return m_remoteUserServices.GenerateAgentPickerRequestResponse(queryID, query); 125 return m_remoteUserServices.GenerateAgentPickerRequestResponse(queryID, query);
@@ -150,7 +145,6 @@ namespace OpenSim.Region.Communications.Hypergrid
150 return m_remoteUserServices.GetUserProfile(avatarID); 145 return m_remoteUserServices.GetUserProfile(avatarID);
151 } 146 }
152 147
153
154 public void ClearUserAgent(UUID avatarID) 148 public void ClearUserAgent(UUID avatarID)
155 { 149 {
156 m_remoteUserServices.ClearUserAgent(avatarID); 150 m_remoteUserServices.ClearUserAgent(avatarID);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index af8d53e..0e74f34 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -285,58 +285,6 @@ namespace OpenSim.Region.Communications.OGS1
285 return GetUserProfile(firstName + " " + lastName); 285 return GetUserProfile(firstName + " " + lastName);
286 } 286 }
287 287
288 public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
289 {
290 Hashtable param = new Hashtable();
291 param.Add("avatar_id", avatarid.ToString());
292 param.Add("region_uuid", regionuuid.ToString());
293 param.Add("region_handle", regionhandle.ToString());
294 IList parameters = new ArrayList();
295 parameters.Add(param);
296 XmlRpcRequest req = new XmlRpcRequest("update_user_current_region", parameters);
297
298 XmlRpcResponse resp;
299
300 try
301 {
302 resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
303 }
304 catch(WebException)
305 {
306 m_log.Warn("[OSG1 USER SERVICES]: Grid not responding. Retrying.");
307
308 try
309 {
310 resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
311 }
312 catch (WebException)
313 {
314 m_log.Warn("[OSG1 USER SERVICES]: Grid not responding. Failed.");
315 return;
316 }
317 }
318
319 if (resp == null)
320 {
321 m_log.Warn("[OSG1 USER SERVICES]: Got no response, Grid server may not be updated.");
322 return;
323 }
324
325 Hashtable respData = (Hashtable)resp.Value;
326
327 if (respData == null || !respData.ContainsKey("returnString"))
328 {
329 m_log.Error("[OSG1 USER SERVICES]: Error updating user record, Grid server may not be updated.");
330 }
331 else
332 {
333 if ((string) respData["returnString"] != "TRUE")
334 {
335 m_log.Error("[OSG1 USER SERVICES]: Error updating user record");
336 }
337 }
338 }
339
340 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query) 288 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
341 { 289 {
342 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); 290 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 610d442..0e11764 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -798,7 +798,6 @@ namespace OpenSim.Region.Environment.Scenes
798 m_pendingObjects = null; 798 m_pendingObjects = null;
799 799
800 m_scene.EventManager.TriggerOnMakeRootAgent(this); 800 m_scene.EventManager.TriggerOnMakeRootAgent(this);
801 m_scene.CommsManager.UserService.UpdateUserCurrentRegion(UUID, m_scene.RegionInfo.RegionID, m_scene.RegionInfo.RegionHandle);
802 } 801 }
803 802
804 /// <summary> 803 /// <summary>