OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Remove unused and largely unimplemented UpdateUserCurrentRegion() 

* please say if this causes you a problem
0.6.1-post-fixes
Justin Clarke Casey 2008-11-27 19:43:26 +00:00
parent 1cd727614d
commit 45c50998c2
11 changed files with 1 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Data/MSSQL/MSSQLUserData.cs
View File

@ -740,17 +740,6 @@ namespace OpenSim.Data.MSSQL
#region Other public methods
/// <summary>
/// STUB ! Update current region
/// </summary>
/// <param name="avatarid">avatar uuid</param>
/// <param name="regionuuid">region uuid</param>
/// <param name="regionhandle">region handle</param>
override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
{
//m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
}
/// <summary>
///
/// </summary>

5
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@ -409,11 +409,6 @@ namespace OpenSim.Data.MySQL
#endregion
public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
{
//m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
}
public override List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
{
List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();

1
OpenSim/Data/NHibernate/NHibernateUserData.cs
View File

@ -249,7 +249,6 @@ namespace OpenSim.Data.NHibernate
}
// TODO: actually implement these
public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) { return; }
public override void StoreWebLoginKey(UUID agentID, UUID webLoginKey) { return; }
public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { return; }
public override void RemoveUserFriend(UUID friendlistowner, UUID friend) { return; }

12
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

@ -357,18 +357,6 @@ namespace OpenSim.Data.SQLite
#endregion
/// <summary>
/// STUB, Update the user's current region
/// </summary>
/// <param name="avatarid">UUID of the user</param>
/// <param name="regionuuid">UUID of the region</param>
/// <param name="regionhandle">region handle</param>
/// <remarks>DO NOTHING</remarks>
override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
{
//m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
}
/// <summary>
///
/// </summary>

1
OpenSim/Data/UserDataBase.cs
View File

@ -47,7 +47,6 @@ namespace OpenSim.Data
public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
public abstract void AddNewUserProfile(UserProfileData user);
public abstract bool UpdateUserProfile(UserProfileData user);
public abstract void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
public abstract void AddNewUserAgent(UserAgentData agent);
public abstract void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
public abstract void RemoveUserFriend(UUID friendlistowner, UUID friend);

8
OpenSim/Framework/Communications/IUserService.cs
View File

@ -114,14 +114,6 @@ namespace OpenSim.Framework.Communications
/// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
List<FriendListItem> GetUserFriendList(UUID friendlistowner);
/// <summary>
/// Updates the current region the User is in
/// </summary>
/// <param name="avatarid">User Region the Avatar is IN</param>
/// <param name="regionuuid">User Region the Avatar is IN</param>
/// <param name="regionhandle">User region handle</param>
void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
/// <summary>
/// Get's the User Appearance
// AvatarAppearance GetUserAppearance(UUID user);

15
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -265,21 +265,6 @@ namespace OpenSim.Framework.Communications
return null;
}
public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
{
foreach (IUserDataPlugin plugin in _plugins)
{
try
{
plugin.UpdateUserCurrentRegion(avatarid, regionuuid, regionhandle);
}
catch (Exception e)
{
m_log.Info("[USERSTORAGE]: Unable to updateuser location via " + plugin.Name + "(" + e.ToString() + ")");
}
}
}
/// <summary>
/// Loads a user's friend list
/// </summary>

4
OpenSim/Framework/IUserData.cs
View File

@ -92,14 +92,12 @@ namespace OpenSim.Framework
/// <param name="user">UserProfile to add</param>
void AddNewUserProfile(UserProfileData user);
/// <summary>
/// <summary></summary>
/// Updates an existing user profile
/// </summary>
/// <param name="user">UserProfile to update</param>
bool UpdateUserProfile(UserProfileData user);
void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
/// <summary>
/// Adds a new agent to the database
/// </summary>

6
OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
View File

@ -120,11 +120,6 @@ namespace OpenSim.Region.Communications.Hypergrid
return GetUserProfile(firstName + " " + lastName);
}
public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
{
m_remoteUserServices.UpdateUserCurrentRegion(avatarid, regionuuid, regionhandle);
}
public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
{
return m_remoteUserServices.GenerateAgentPickerRequestResponse(queryID, query);
@ -150,7 +145,6 @@ namespace OpenSim.Region.Communications.Hypergrid
return m_remoteUserServices.GetUserProfile(avatarID);
}
public void ClearUserAgent(UUID avatarID)
{
m_remoteUserServices.ClearUserAgent(avatarID);

52
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -285,58 +285,6 @@ namespace OpenSim.Region.Communications.OGS1
return GetUserProfile(firstName + " " + lastName);
}
public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
{
Hashtable param = new Hashtable();
param.Add("avatar_id", avatarid.ToString());
param.Add("region_uuid", regionuuid.ToString());
param.Add("region_handle", regionhandle.ToString());
IList parameters = new ArrayList();
parameters.Add(param);
XmlRpcRequest req = new XmlRpcRequest("update_user_current_region", parameters);
XmlRpcResponse resp;
try
{
resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
}
catch(WebException)
{
m_log.Warn("[OSG1 USER SERVICES]: Grid not responding. Retrying.");
try
{
resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
}
catch (WebException)
{
m_log.Warn("[OSG1 USER SERVICES]: Grid not responding. Failed.");
return;
}
}
if (resp == null)
{
m_log.Warn("[OSG1 USER SERVICES]: Got no response, Grid server may not be updated.");
return;
}
Hashtable respData = (Hashtable)resp.Value;
if (respData == null || !respData.ContainsKey("returnString"))
{
m_log.Error("[OSG1 USER SERVICES]: Error updating user record, Grid server may not be updated.");
}
else
{
if ((string) respData["returnString"] != "TRUE")
{
m_log.Error("[OSG1 USER SERVICES]: Error updating user record");
}
}
}
public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
{
List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();

1
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -798,7 +798,6 @@ namespace OpenSim.Region.Environment.Scenes
m_pendingObjects = null;
m_scene.EventManager.TriggerOnMakeRootAgent(this);
m_scene.CommsManager.UserService.UpdateUserCurrentRegion(UUID, m_scene.RegionInfo.RegionID, m_scene.RegionInfo.RegionHandle);
}
/// <summary>