diff options
small clean up.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 17 |
2 files changed, 21 insertions, 14 deletions
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 | |||
80 | public event RequestMapBlocks OnRequestMapBlocks; | 80 | public event RequestMapBlocks OnRequestMapBlocks; |
81 | public event TeleportLocationRequest OnTeleportLocationRequest; | 81 | public event TeleportLocationRequest OnTeleportLocationRequest; |
82 | public event DisconnectUser OnDisconnectUser; | 82 | public event DisconnectUser OnDisconnectUser; |
83 | public event RequestAvatarProperties OnRequestAvatarProperties; | ||
83 | 84 | ||
84 | public event CreateNewInventoryItem OnCreateNewInventoryItem; | 85 | public event CreateNewInventoryItem OnCreateNewInventoryItem; |
85 | public event CreateInventoryFolder OnCreateNewInventoryFolder; | 86 | public event CreateInventoryFolder OnCreateNewInventoryFolder; |
@@ -735,7 +736,6 @@ namespace OpenSim.Region.ClientStack | |||
735 | int sunPhase = (phase + 2) / 2; | 736 | int sunPhase = (phase + 2) / 2; |
736 | if ((sunPhase < 12) || (sunPhase > 36)) | 737 | if ((sunPhase < 12) || (sunPhase > 36)) |
737 | { | 738 | { |
738 | |||
739 | viewertime.TimeInfo.SunDirection = new LLVector3(0f, 0.8f, -0.8f); | 739 | viewertime.TimeInfo.SunDirection = new LLVector3(0f, 0.8f, -0.8f); |
740 | //Console.WriteLine("sending night"); | 740 | //Console.WriteLine("sending night"); |
741 | } | 741 | } |
@@ -759,6 +759,22 @@ namespace OpenSim.Region.ClientStack | |||
759 | OutPacket(viewertime); | 759 | OutPacket(viewertime); |
760 | } | 760 | } |
761 | 761 | ||
762 | public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID) | ||
763 | { | ||
764 | AvatarPropertiesReplyPacket avatarReply = new AvatarPropertiesReplyPacket(); | ||
765 | avatarReply.AgentData.AgentID = this.AgentID; | ||
766 | avatarReply.AgentData.AvatarID = avatarID; | ||
767 | avatarReply.PropertiesData.AboutText = Helpers.StringToField(aboutText); | ||
768 | avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn); | ||
769 | avatarReply.PropertiesData.CharterMember = Helpers.StringToField(charterMember); | ||
770 | avatarReply.PropertiesData.FLAboutText = Helpers.StringToField(flAbout); | ||
771 | avatarReply.PropertiesData.Flags = 0; | ||
772 | avatarReply.PropertiesData.FLImageID = flImageID; | ||
773 | avatarReply.PropertiesData.ImageID = imageID; | ||
774 | avatarReply.PropertiesData.ProfileURL = Helpers.StringToField(profileURL); | ||
775 | avatarReply.PropertiesData.PartnerID = partnerID; | ||
776 | OutPacket(avatarReply); | ||
777 | } | ||
762 | #endregion | 778 | #endregion |
763 | 779 | ||
764 | #region Appearance/ Wearables Methods | 780 | #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 | |||
97 | #region Scene/Avatar | 97 | #region Scene/Avatar |
98 | case PacketType.AvatarPropertiesRequest: | 98 | case PacketType.AvatarPropertiesRequest: |
99 | AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; | 99 | AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; |
100 | AvatarPropertiesReplyPacket avatarReply = new AvatarPropertiesReplyPacket(); | 100 | if (OnRequestAvatarProperties != null) |
101 | avatarReply.AgentData.AgentID = this.AgentID; | 101 | { |
102 | avatarReply.AgentData.AvatarID = avatarProperties.AgentData.AvatarID; | 102 | OnRequestAvatarProperties(this, avatarProperties.AgentData.AvatarID); |
103 | avatarReply.PropertiesData.AboutText = Helpers.StringToField( "OpenSim crash test dummy"); | 103 | } |
104 | avatarReply.PropertiesData.BornOn = Helpers.StringToField("Before now"); | ||
105 | avatarReply.PropertiesData.CharterMember = new byte[0]; | ||
106 | avatarReply.PropertiesData.FLAboutText = Helpers.StringToField("First life? What is one of those? OpenSim is my life!"); | ||
107 | avatarReply.PropertiesData.Flags = 0; | ||
108 | avatarReply.PropertiesData.FLImageID = LLUUID.Zero; | ||
109 | avatarReply.PropertiesData.ImageID = LLUUID.Zero; | ||
110 | avatarReply.PropertiesData.ProfileURL = new byte[0]; | ||
111 | avatarReply.PropertiesData.PartnerID = new LLUUID("11111111-1111-0000-0000-000100bba000"); | ||
112 | OutPacket(avatarReply); | ||
113 | break; | 104 | break; |
114 | case PacketType.ChatFromViewer: | 105 | case PacketType.ChatFromViewer: |
115 | ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; | 106 | ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; |