From 3dffc3e3f647faa3e82126f5107ce13fbd610ffb Mon Sep 17 00:00:00 2001 From: MW Date: Sun, 19 Aug 2007 14:55:43 +0000 Subject: small clean up. --- OpenSim/Region/ClientStack/ClientView.API.cs | 18 +++++++++++++++++- .../Region/ClientStack/ClientView.ProcessPackets.cs | 17 ++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) (limited to 'OpenSim/Region/ClientStack') diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index c67ecb5..beb83af 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs @@ -80,6 +80,7 @@ namespace OpenSim.Region.ClientStack public event RequestMapBlocks OnRequestMapBlocks; public event TeleportLocationRequest OnTeleportLocationRequest; public event DisconnectUser OnDisconnectUser; + public event RequestAvatarProperties OnRequestAvatarProperties; public event CreateNewInventoryItem OnCreateNewInventoryItem; public event CreateInventoryFolder OnCreateNewInventoryFolder; @@ -735,7 +736,6 @@ namespace OpenSim.Region.ClientStack int sunPhase = (phase + 2) / 2; if ((sunPhase < 12) || (sunPhase > 36)) { - viewertime.TimeInfo.SunDirection = new LLVector3(0f, 0.8f, -0.8f); //Console.WriteLine("sending night"); } @@ -759,6 +759,22 @@ namespace OpenSim.Region.ClientStack 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 #region Appearance/ Wearables Methods diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index e73b2e2..a6cb281 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs @@ -97,19 +97,10 @@ namespace OpenSim.Region.ClientStack #region Scene/Avatar case PacketType.AvatarPropertiesRequest: AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; - AvatarPropertiesReplyPacket avatarReply = new AvatarPropertiesReplyPacket(); - avatarReply.AgentData.AgentID = this.AgentID; - avatarReply.AgentData.AvatarID = 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); + if (OnRequestAvatarProperties != null) + { + OnRequestAvatarProperties(this, avatarProperties.AgentData.AvatarID); + } break; case PacketType.ChatFromViewer: ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; -- cgit v1.1