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

small clean up.

afrisby
MW 2007-08-19 14:55:43 +00:00
parent c89db49f3c
commit 3dffc3e3f6
7 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/General/Interfaces/IClientAPI.cs
View File

@ -44,6 +44,7 @@ namespace OpenSim.Framework.Interfaces
public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY); public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);
public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags); public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
public delegate void DisconnectUser(); public delegate void DisconnectUser();
public delegate void RequestAvatarProperties(IClientAPI remoteClient, LLUUID avatarID);
public delegate void GenericCall(IClientAPI remoteClient); public delegate void GenericCall(IClientAPI remoteClient);
public delegate void GenericCall2(); public delegate void GenericCall2();
@ -103,6 +104,7 @@ namespace OpenSim.Framework.Interfaces
event RequestMapBlocks OnRequestMapBlocks; event RequestMapBlocks OnRequestMapBlocks;
event TeleportLocationRequest OnTeleportLocationRequest; event TeleportLocationRequest OnTeleportLocationRequest;
event DisconnectUser OnDisconnectUser; event DisconnectUser OnDisconnectUser;
event RequestAvatarProperties OnRequestAvatarProperties;
event GenericCall4 OnDeRezObject; event GenericCall4 OnDeRezObject;
event GenericCall OnRegionHandShakeReply; event GenericCall OnRegionHandShakeReply;
@ -226,5 +228,6 @@ namespace OpenSim.Framework.Interfaces
bool AddMoney( int debit ); bool AddMoney( int debit );
void SendViewerTime(int phase); void SendViewerTime(int phase);
void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID);
} }
} }

2
OpenSim/Framework/General/NullClientAPI.cs
View File

@ -22,6 +22,7 @@ namespace OpenSim.Framework
public event RequestMapBlocks OnRequestMapBlocks; public event RequestMapBlocks OnRequestMapBlocks;
public event TeleportLocationRequest OnTeleportLocationRequest; public event TeleportLocationRequest OnTeleportLocationRequest;
public event DisconnectUser OnDisconnectUser; public event DisconnectUser OnDisconnectUser;
public event RequestAvatarProperties OnRequestAvatarProperties;
public event GenericCall4 OnDeRezObject; public event GenericCall4 OnDeRezObject;
public event GenericCall OnRegionHandShakeReply; public event GenericCall OnRegionHandShakeReply;
@ -158,6 +159,7 @@ namespace OpenSim.Framework
} }
public void SendViewerTime(int phase) { } public void SendViewerTime(int phase) { }
public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID) { }
} }
} }

18
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -80,6 +80,7 @@ namespace OpenSim.Region.ClientStack
public event RequestMapBlocks OnRequestMapBlocks; public event RequestMapBlocks OnRequestMapBlocks;
public event TeleportLocationRequest OnTeleportLocationRequest; public event TeleportLocationRequest OnTeleportLocationRequest;
public event DisconnectUser OnDisconnectUser; public event DisconnectUser OnDisconnectUser;
public event RequestAvatarProperties OnRequestAvatarProperties;
public event CreateNewInventoryItem OnCreateNewInventoryItem; public event CreateNewInventoryItem OnCreateNewInventoryItem;
public event CreateInventoryFolder OnCreateNewInventoryFolder; public event CreateInventoryFolder OnCreateNewInventoryFolder;
@ -735,7 +736,6 @@ namespace OpenSim.Region.ClientStack
int sunPhase = (phase + 2) / 2; int sunPhase = (phase + 2) / 2;
if ((sunPhase < 12) || (sunPhase > 36)) if ((sunPhase < 12) || (sunPhase > 36))
{ {
viewertime.TimeInfo.SunDirection = new LLVector3(0f, 0.8f, -0.8f); viewertime.TimeInfo.SunDirection = new LLVector3(0f, 0.8f, -0.8f);
//Console.WriteLine("sending night"); //Console.WriteLine("sending night");
} }
@ -759,6 +759,22 @@ namespace OpenSim.Region.ClientStack
OutPacket(viewertime); OutPacket(viewertime);
} }
public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID)
{
AvatarPropertiesReplyPacket avatarReply = new AvatarPropertiesReplyPacket();
avatarReply.AgentData.AgentID = this.AgentID;
avatarReply.AgentData.AvatarID = avatarID;
avatarReply.PropertiesData.AboutText = Helpers.StringToField(aboutText);
avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn);
avatarReply.PropertiesData.CharterMember = Helpers.StringToField(charterMember);
avatarReply.PropertiesData.FLAboutText = Helpers.StringToField(flAbout);
avatarReply.PropertiesData.Flags = 0;
avatarReply.PropertiesData.FLImageID = flImageID;
avatarReply.PropertiesData.ImageID = imageID;
avatarReply.PropertiesData.ProfileURL = Helpers.StringToField(profileURL);
avatarReply.PropertiesData.PartnerID = partnerID;
OutPacket(avatarReply);
}
#endregion #endregion
#region Appearance/ Wearables Methods #region Appearance/ Wearables Methods

17
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@ -97,19 +97,10 @@ namespace OpenSim.Region.ClientStack
#region Scene/Avatar #region Scene/Avatar
case PacketType.AvatarPropertiesRequest: case PacketType.AvatarPropertiesRequest:
AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack;
AvatarPropertiesReplyPacket avatarReply = new AvatarPropertiesReplyPacket(); if (OnRequestAvatarProperties != null)
avatarReply.AgentData.AgentID = this.AgentID; {
avatarReply.AgentData.AvatarID = avatarProperties.AgentData.AvatarID; OnRequestAvatarProperties(this, avatarProperties.AgentData.AvatarID);
avatarReply.PropertiesData.AboutText = Helpers.StringToField( "OpenSim crash test dummy"); }
avatarReply.PropertiesData.BornOn = Helpers.StringToField("Before now");
avatarReply.PropertiesData.CharterMember = new byte[0];
avatarReply.PropertiesData.FLAboutText = Helpers.StringToField("First life? What is one of those? OpenSim is my life!");
avatarReply.PropertiesData.Flags = 0;
avatarReply.PropertiesData.FLImageID = LLUUID.Zero;
avatarReply.PropertiesData.ImageID = LLUUID.Zero;
avatarReply.PropertiesData.ProfileURL = new byte[0];
avatarReply.PropertiesData.PartnerID = new LLUUID("11111111-1111-0000-0000-000100bba000");
OutPacket(avatarReply);
break; break;
case PacketType.ChatFromViewer: case PacketType.ChatFromViewer:
ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;

14
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@ -757,6 +757,20 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
/// <summary>
///
/// </summary>
/// <param name="remoteClient"></param>
/// <param name="avatarID"></param>
public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID)
{
string about = "OpenSim crash test dummy";
string bornOn = "Before now";
string flAbout = "First life? What is one of those? OpenSim is my life!";
LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
remoteClient.SendAvatarProperties(avatarID, about, bornOn, "", flAbout, 0, LLUUID.Zero, LLUUID.Zero, "", partner);
}
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>

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

@ -711,6 +711,8 @@ namespace OpenSim.Region.Environment.Scenes
client.OnXferReceive += commsManager.TransactionsManager.HandleXfer; client.OnXferReceive += commsManager.TransactionsManager.HandleXfer;
// client.OnRequestXfer += RequestXfer; // client.OnRequestXfer += RequestXfer;
client.OnRequestAvatarProperties += RequestAvatarProperty;
client.OnGrabObject += ProcessObjectGrab; client.OnGrabObject += ProcessObjectGrab;
} }

2
OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
View File

@ -35,6 +35,7 @@ namespace SimpleApp
public event RequestMapBlocks OnRequestMapBlocks; public event RequestMapBlocks OnRequestMapBlocks;
public event TeleportLocationRequest OnTeleportLocationRequest; public event TeleportLocationRequest OnTeleportLocationRequest;
public event DisconnectUser OnDisconnectUser; public event DisconnectUser OnDisconnectUser;
public event RequestAvatarProperties OnRequestAvatarProperties;
public event GenericCall4 OnDeRezObject; public event GenericCall4 OnDeRezObject;
public event GenericCall OnRegionHandShakeReply; public event GenericCall OnRegionHandShakeReply;
@ -216,5 +217,6 @@ namespace SimpleApp
} }
public void SendViewerTime(int phase) { } public void SendViewerTime(int phase) { }
public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID) { }
} }
} }