aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMW2007-07-01 21:04:33 +0000
committerMW2007-07-01 21:04:33 +0000
commit2852cda727f86567c18c6fab193ed31195c9934c (patch)
treeddb899dbef28d3267f0a439ec84d48a676a6365d /OpenSim/Region/ClientStack
parent* replaced some more of those butt-fuggly attr constructs with nice Get<> cal... (diff)
downloadopensim-SC_OLD-2852cda727f86567c18c6fab193ed31195c9934c.zip
opensim-SC_OLD-2852cda727f86567c18c6fab193ed31195c9934c.tar.gz
opensim-SC_OLD-2852cda727f86567c18c6fab193ed31195c9934c.tar.bz2
opensim-SC_OLD-2852cda727f86567c18c6fab193ed31195c9934c.tar.xz
More work on SceneObject/Primitive and building (Linking is a work in progress as is all). Committing now as I've finished for the night and will be continued tomorrow.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 7a9c6cf..51f02da 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -629,7 +629,7 @@ namespace OpenSim.Region.ClientStack
629 } 629 }
630 630
631 631
632 public void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID) 632 public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID)
633 { 633 {
634 ObjectUpdatePacket outPacket = new ObjectUpdatePacket(); 634 ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
635 outPacket.RegionData.RegionHandle = regionHandle; 635 outPacket.RegionData.RegionHandle = regionHandle;
@@ -639,6 +639,8 @@ namespace OpenSim.Region.ClientStack
639 outPacket.ObjectData[0].ID = localID; 639 outPacket.ObjectData[0].ID = localID;
640 outPacket.ObjectData[0].FullID = objectID; 640 outPacket.ObjectData[0].FullID = objectID;
641 outPacket.ObjectData[0].OwnerID = ownerID; 641 outPacket.ObjectData[0].OwnerID = ownerID;
642 outPacket.ObjectData[0].Text = enc.GetBytes(text);
643 outPacket.ObjectData[0].ParentID = parentID;
642 byte[] pb = pos.GetBytes(); 644 byte[] pb = pos.GetBytes();
643 Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); 645 Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
644 byte[] rot = rotation.GetBytes(); 646 byte[] rot = rotation.GetBytes();
@@ -646,7 +648,7 @@ namespace OpenSim.Region.ClientStack
646 OutPacket(outPacket); 648 OutPacket(outPacket);
647 } 649 }
648 650
649 public void SendPrimitiveToClient2(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID) 651 public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLUUID textureID, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID)
650 { 652 {
651 ObjectUpdatePacket outPacket = new ObjectUpdatePacket(); 653 ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
652 outPacket.RegionData.RegionHandle = regionHandle; 654 outPacket.RegionData.RegionHandle = regionHandle;
@@ -656,6 +658,8 @@ namespace OpenSim.Region.ClientStack
656 outPacket.ObjectData[0].ID = localID; 658 outPacket.ObjectData[0].ID = localID;
657 outPacket.ObjectData[0].FullID = objectID; 659 outPacket.ObjectData[0].FullID = objectID;
658 outPacket.ObjectData[0].OwnerID = ownerID; 660 outPacket.ObjectData[0].OwnerID = ownerID;
661 outPacket.ObjectData[0].Text = enc.GetBytes(text);
662 outPacket.ObjectData[0].ParentID = parentID;
659 byte[] pb = pos.GetBytes(); 663 byte[] pb = pos.GetBytes();
660 Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); 664 Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
661 665
@@ -876,6 +880,7 @@ namespace OpenSim.Region.ClientStack
876 LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID); 880 LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);
877 objectData.TextureEntry = ntex.ToBytes(); 881 objectData.TextureEntry = ntex.ToBytes();
878 objectData.OwnerID = primData.OwnerID; 882 objectData.OwnerID = primData.OwnerID;
883 objectData.ParentID = primData.ParentID;
879 objectData.PCode = primData.PCode; 884 objectData.PCode = primData.PCode;
880 objectData.PathBegin = primData.PathBegin; 885 objectData.PathBegin = primData.PathBegin;
881 objectData.PathEnd = primData.PathEnd; 886 objectData.PathEnd = primData.PathEnd;
@@ -889,7 +894,6 @@ namespace OpenSim.Region.ClientStack
889 objectData.Scale = primData.Scale; 894 objectData.Scale = primData.Scale;
890 objectData.PathCurve = primData.PathCurve; 895 objectData.PathCurve = primData.PathCurve;
891 objectData.ProfileCurve = primData.ProfileCurve; 896 objectData.ProfileCurve = primData.ProfileCurve;
892 objectData.ParentID = primData.ParentID;
893 objectData.ProfileHollow = primData.ProfileHollow; 897 objectData.ProfileHollow = primData.ProfileHollow;
894 objectData.PathRadiusOffset = primData.PathRadiusOffset; 898 objectData.PathRadiusOffset = primData.PathRadiusOffset;
895 objectData.PathRevolutions = primData.PathRevolutions; 899 objectData.PathRevolutions = primData.PathRevolutions;
@@ -916,7 +920,6 @@ namespace OpenSim.Region.ClientStack
916 objectData.Scale = primData.Scale; 920 objectData.Scale = primData.Scale;
917 objectData.PathCurve = primData.PathCurve; 921 objectData.PathCurve = primData.PathCurve;
918 objectData.ProfileCurve = primData.ProfileCurve; 922 objectData.ProfileCurve = primData.ProfileCurve;
919 objectData.ParentID = primData.ParentID;
920 objectData.ProfileHollow = primData.ProfileHollow; 923 objectData.ProfileHollow = primData.ProfileHollow;
921 objectData.PathRadiusOffset = primData.PathRadiusOffset; 924 objectData.PathRadiusOffset = primData.PathRadiusOffset;
922 objectData.PathRevolutions = primData.PathRevolutions; 925 objectData.PathRevolutions = primData.PathRevolutions;