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

mini-warnings-safari, plus cleanup of IUserServices method naming.

0.6.0-stable
Dr Scofield 2008-07-04 10:19:58 +00:00
parent 382fb8cea6
commit 2dadbc2f70
8 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/AssetBase.cs
View File

@ -36,7 +36,6 @@ namespace OpenSim.Framework
private byte[] _data;
private string _description = String.Empty;
private LLUUID _fullid;
private sbyte _invtype;
private bool _local = false;
private string _name = String.Empty;
private bool _temporary = false;

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

@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications
UserAgentData GetAgentByUUID(LLUUID userId);
void clearUserAgent(LLUUID avatarID);
void ClearUserAgent(LLUUID avatarID);
List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID QueryID, string Query);
UserProfileData SetupMasterUser(string firstName, string lastName);

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

@ -96,7 +96,7 @@ namespace OpenSim.Framework.Communications
if (profile != null)
{
profile.CurrentAgent = getUserAgent(profile.ID);
profile.CurrentAgent = GetUserAgent(profile.ID);
return profile;
}
}
@ -126,7 +126,7 @@ namespace OpenSim.Framework.Communications
if (null != profile)
{
profile.CurrentAgent = getUserAgent(profile.ID);
profile.CurrentAgent = GetUserAgent(profile.ID);
return profile;
}
}
@ -157,7 +157,7 @@ namespace OpenSim.Framework.Communications
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
public bool setUserProfile(UserProfileData data)
public bool SetUserProfile(UserProfileData data)
{
foreach (KeyValuePair<string, IUserData> plugin in _plugins)
{
@ -183,7 +183,7 @@ namespace OpenSim.Framework.Communications
/// </summary>
/// <param name="uuid">The agent's UUID</param>
/// <returns>Agent profiles</returns>
public UserAgentData getUserAgent(LLUUID uuid)
public UserAgentData GetUserAgent(LLUUID uuid)
{
foreach (KeyValuePair<string, IUserData> plugin in _plugins)
{
@ -200,6 +200,51 @@ namespace OpenSim.Framework.Communications
return null;
}
/// <summary>
/// Loads a user agent by name (not called directly)
/// </summary>
/// <param name="name">The agent's name</param>
/// <returns>A user agent</returns>
public UserAgentData GetUserAgent(string name)
{
foreach (KeyValuePair<string, IUserData> plugin in _plugins)
{
try
{
return plugin.Value.GetAgentByName(name);
}
catch (Exception e)
{
m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
return null;
}
/// <summary>
/// Loads a user agent by name (not called directly)
/// </summary>
/// <param name="fname">The agent's firstname</param>
/// <param name="lname">The agent's lastname</param>
/// <returns>A user agent</returns>
public UserAgentData GetUserAgent(string fname, string lname)
{
foreach (KeyValuePair<string, IUserData> plugin in _plugins)
{
try
{
return plugin.Value.GetAgentByName(fname, lname);
}
catch (Exception e)
{
m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
return null;
}
public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
{
foreach (KeyValuePair<string, IUserData> plugin in _plugins)
@ -297,62 +342,19 @@ namespace OpenSim.Framework.Communications
}
}
/// <summary>
/// Loads a user agent by name (not called directly)
/// </summary>
/// <param name="name">The agent's name</param>
/// <returns>A user agent</returns>
public UserAgentData getUserAgent(string name)
{
foreach (KeyValuePair<string, IUserData> plugin in _plugins)
{
try
{
return plugin.Value.GetAgentByName(name);
}
catch (Exception e)
{
m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
return null;
}
/// <summary>
/// Resets the currentAgent in the user profile
/// </summary>
/// <param name="agentID">The agent's ID</param>
public void clearUserAgent(LLUUID agentID)
public void ClearUserAgent(LLUUID agentID)
{
UserProfileData profile = GetUserProfile(agentID);
profile.CurrentAgent = null;
setUserProfile(profile);
SetUserProfile(profile);
}
/// <summary>
/// Loads a user agent by name (not called directly)
/// </summary>
/// <param name="fname">The agent's firstname</param>
/// <param name="lname">The agent's lastname</param>
/// <returns>A user agent</returns>
public UserAgentData getUserAgent(string fname, string lname)
{
foreach (KeyValuePair<string, IUserData> plugin in _plugins)
{
try
{
return plugin.Value.GetAgentByName(fname, lname);
}
catch (Exception e)
{
m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
return null;
}
#endregion
@ -537,7 +539,7 @@ namespace OpenSim.Framework.Communications
// TODO: what is the logic should be?
bool ret = false;
ret = AddUserAgent(profile.CurrentAgent);
ret = ret & setUserProfile(profile);
ret = ret & SetUserProfile(profile);
return ret;
}

20
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -1139,17 +1139,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name="map">heightmap</param>
/// <param name="px">X coordinate for patches 0..12</param>
/// <param name="py">Y coordinate for patches 0..15</param>
private void SendLayerPacket(float[] map, int y, int x)
{
int[] patches = new int[4];
patches[0] = x + 0 + y * 16;
patches[1] = x + 1 + y * 16;
patches[2] = x + 2 + y * 16;
patches[3] = x + 3 + y * 16;
// private void SendLayerPacket(float[] map, int y, int x)
// {
// int[] patches = new int[4];
// patches[0] = x + 0 + y * 16;
// patches[1] = x + 1 + y * 16;
// patches[2] = x + 2 + y * 16;
// patches[3] = x + 3 + y * 16;
Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
OutPacket(layerpack, ThrottleOutPacketType.Land);
}
// Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
// OutPacket(layerpack, ThrottleOutPacketType.Land);
// }
/// <summary>
/// Sends a specified patch to a client

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

@ -388,7 +388,7 @@ namespace OpenSim.Region.Communications.OGS1
}
public void clearUserAgent(LLUUID avatarID)
public void ClearUserAgent(LLUUID avatarID)
{
// TODO: implement
}

2
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -664,7 +664,7 @@ namespace OpenSim.Region.Environment.Scenes
public void ClearUserAgent(LLUUID avatarID)
{
m_commsProvider.UserService.clearUserAgent(avatarID);
m_commsProvider.UserService.ClearUserAgent(avatarID);
}
public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)

2
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs
View File

@ -18656,7 +18656,7 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool
case 1020: { }
break;
case 1064: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
break;
// break;
case 1069: ;
break;
case 1073: ;

2
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -1387,7 +1387,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
public void ApiResetScript()
{
bool running = Running;
// bool running = Running;
RemoveState();