aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorDalien Talbot2008-02-10 22:23:11 +0000
committerDalien Talbot2008-02-10 22:23:11 +0000
commitc935b308e67d4468437fa201a3bf444d9715f377 (patch)
treedb8c309027f243c35c236093c0c0780bb5327284 /OpenSim/Region/ClientStack
parentBugfix to state command: (diff)
downloadopensim-SC_OLD-c935b308e67d4468437fa201a3bf444d9715f377.zip
opensim-SC_OLD-c935b308e67d4468437fa201a3bf444d9715f377.tar.gz
opensim-SC_OLD-c935b308e67d4468437fa201a3bf444d9715f377.tar.bz2
opensim-SC_OLD-c935b308e67d4468437fa201a3bf444d9715f377.tar.xz
The very beginnings of attachments (no detachments! :)
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs20
1 files changed, 19 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index a35c83c..cb076b5 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -515,6 +515,8 @@ namespace OpenSim.Region.ClientStack
515 public event GenericCall2 OnRequestWearables; 515 public event GenericCall2 OnRequestWearables;
516 public event SetAppearance OnSetAppearance; 516 public event SetAppearance OnSetAppearance;
517 public event AvatarNowWearing OnAvatarNowWearing; 517 public event AvatarNowWearing OnAvatarNowWearing;
518 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
519 public event ObjectAttach OnObjectAttach;
518 public event GenericCall2 OnCompleteMovementToRegion; 520 public event GenericCall2 OnCompleteMovementToRegion;
519 public event UpdateAgent OnAgentUpdate; 521 public event UpdateAgent OnAgentUpdate;
520 public event AgentRequestSit OnAgentRequestSit; 522 public event AgentRequestSit OnAgentRequestSit;
@@ -1645,6 +1647,7 @@ namespace OpenSim.Region.ClientStack
1645 public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint) 1647 public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
1646 { 1648 {
1647 ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach); 1649 ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach);
1650 System.Console.WriteLine("Attach object!");
1648 // TODO: don't create new blocks if recycling an old packet 1651 // TODO: don't create new blocks if recycling an old packet
1649 attach.AgentData.AgentID = AgentId; 1652 attach.AgentData.AgentID = AgentId;
1650 attach.AgentData.SessionID = m_sessionId; 1653 attach.AgentData.SessionID = m_sessionId;
@@ -2009,7 +2012,7 @@ namespace OpenSim.Region.ClientStack
2009 /// 2012 ///
2010 /// </summary> 2013 /// </summary>
2011 /// <returns></returns> 2014 /// <returns></returns>
2012 protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry) 2015 public ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
2013 { 2016 {
2014 ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); 2017 ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock();
2015 // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i); 2018 // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
@@ -2858,6 +2861,21 @@ namespace OpenSim.Region.ClientStack
2858 OnAvatarNowWearing(this, wearingArgs); 2861 OnAvatarNowWearing(this, wearingArgs);
2859 } 2862 }
2860 break; 2863 break;
2864 case PacketType.RezSingleAttachmentFromInv:
2865 if (OnRezSingleAttachmentFromInv != null)
2866 {
2867 RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket) Pack;
2868 OnRezSingleAttachmentFromInv(this, rez.ObjectData.ItemID,
2869 rez.ObjectData.AttachmentPt, rez.ObjectData.ItemFlags, rez.ObjectData.NextOwnerMask);
2870 }
2871 break;
2872 case PacketType.ObjectAttach:
2873 if (OnObjectAttach != null)
2874 {
2875 ObjectAttachPacket att = (ObjectAttachPacket) Pack;
2876 OnObjectAttach(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, att.ObjectData[0].Rotation);
2877 }
2878 break;
2861 case PacketType.SetAlwaysRun: 2879 case PacketType.SetAlwaysRun:
2862 SetAlwaysRunPacket run = (SetAlwaysRunPacket)Pack; 2880 SetAlwaysRunPacket run = (SetAlwaysRunPacket)Pack;
2863 2881