diff options
author | lbsa71 | 2007-08-06 12:49:08 +0000 |
---|---|---|
committer | lbsa71 | 2007-08-06 12:49:08 +0000 |
commit | 95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f (patch) | |
tree | a441b5906df6b6a665c91696d38587f3f8c8d615 /OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |
parent | * SimpleApp works again: (diff) | |
download | opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.zip opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.tar.gz opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.tar.bz2 opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.tar.xz |
* Now we have boxes. Yay!
* Removed unused SendPrimitiveToClient that didn't have rot.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index c0c14ee..5ad35ff 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -218,30 +218,7 @@ namespace OpenSim.Region.ClientStack | |||
218 | if (OnAddPrim != null) | 218 | if (OnAddPrim != null) |
219 | { | 219 | { |
220 | ObjectAddPacket addPacket = (ObjectAddPacket) Pack ; | 220 | ObjectAddPacket addPacket = (ObjectAddPacket) Pack ; |
221 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); | 221 | PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket); |
222 | |||
223 | shape.PCode = addPacket.ObjectData.PCode; | ||
224 | shape.PathBegin = addPacket.ObjectData.PathBegin; | ||
225 | shape.PathEnd = addPacket.ObjectData.PathEnd; | ||
226 | shape.PathScaleX = addPacket.ObjectData.PathScaleX; | ||
227 | shape.PathScaleY = addPacket.ObjectData.PathScaleY; | ||
228 | shape.PathShearX = addPacket.ObjectData.PathShearX; | ||
229 | shape.PathShearY = addPacket.ObjectData.PathShearY; | ||
230 | shape.PathSkew = addPacket.ObjectData.PathSkew; | ||
231 | shape.ProfileBegin = addPacket.ObjectData.ProfileBegin; | ||
232 | shape.ProfileEnd = addPacket.ObjectData.ProfileEnd; | ||
233 | shape.Scale = addPacket.ObjectData.Scale; | ||
234 | shape.PathCurve = addPacket.ObjectData.PathCurve; | ||
235 | shape.ProfileCurve = addPacket.ObjectData.ProfileCurve; | ||
236 | shape.ProfileHollow = addPacket.ObjectData.ProfileHollow; | ||
237 | shape.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset; | ||
238 | shape.PathRevolutions = addPacket.ObjectData.PathRevolutions; | ||
239 | shape.PathTaperX = addPacket.ObjectData.PathTaperX; | ||
240 | shape.PathTaperY = addPacket.ObjectData.PathTaperY; | ||
241 | shape.PathTwist = addPacket.ObjectData.PathTwist; | ||
242 | shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin; | ||
243 | LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")); | ||
244 | shape.TextureEntry = ntex.ToBytes(); | ||
245 | 222 | ||
246 | OnAddPrim(this.AgentId, addPacket.ObjectData.RayEnd, shape); | 223 | OnAddPrim(this.AgentId, addPacket.ObjectData.RayEnd, shape); |
247 | } | 224 | } |
@@ -624,5 +601,34 @@ namespace OpenSim.Region.ClientStack | |||
624 | } | 601 | } |
625 | } | 602 | } |
626 | } | 603 | } |
604 | |||
605 | private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket) | ||
606 | { | ||
607 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); | ||
608 | |||
609 | shape.PCode = addPacket.ObjectData.PCode; | ||
610 | shape.PathBegin = addPacket.ObjectData.PathBegin; | ||
611 | shape.PathEnd = addPacket.ObjectData.PathEnd; | ||
612 | shape.PathScaleX = addPacket.ObjectData.PathScaleX; | ||
613 | shape.PathScaleY = addPacket.ObjectData.PathScaleY; | ||
614 | shape.PathShearX = addPacket.ObjectData.PathShearX; | ||
615 | shape.PathShearY = addPacket.ObjectData.PathShearY; | ||
616 | shape.PathSkew = addPacket.ObjectData.PathSkew; | ||
617 | shape.ProfileBegin = addPacket.ObjectData.ProfileBegin; | ||
618 | shape.ProfileEnd = addPacket.ObjectData.ProfileEnd; | ||
619 | shape.Scale = addPacket.ObjectData.Scale; | ||
620 | shape.PathCurve = addPacket.ObjectData.PathCurve; | ||
621 | shape.ProfileCurve = addPacket.ObjectData.ProfileCurve; | ||
622 | shape.ProfileHollow = addPacket.ObjectData.ProfileHollow; | ||
623 | shape.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset; | ||
624 | shape.PathRevolutions = addPacket.ObjectData.PathRevolutions; | ||
625 | shape.PathTaperX = addPacket.ObjectData.PathTaperX; | ||
626 | shape.PathTaperY = addPacket.ObjectData.PathTaperY; | ||
627 | shape.PathTwist = addPacket.ObjectData.PathTwist; | ||
628 | shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin; | ||
629 | LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")); | ||
630 | shape.TextureEntry = ntex.ToBytes(); | ||
631 | return shape; | ||
632 | } | ||
627 | } | 633 | } |
628 | } | 634 | } |