aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs40
1 files changed, 22 insertions, 18 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 6786ac5..d3bb0bc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -595,21 +595,25 @@ namespace OpenSim.Region.ClientStack.Linden
595 Vector3 scale = inner_instance_list["scale"].AsVector3(); 595 Vector3 scale = inner_instance_list["scale"].AsVector3();
596 Quaternion rotation = inner_instance_list["rotation"].AsQuaternion(); 596 Quaternion rotation = inner_instance_list["rotation"].AsQuaternion();
597 597
598// no longer used - begin ------------------------
598// int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger(); 599// int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger();
599// int material = inner_instance_list["material"].AsInteger(); 600// int material = inner_instance_list["material"].AsInteger();
600// int mesh = inner_instance_list["mesh"].AsInteger(); 601// int mesh = inner_instance_list["mesh"].AsInteger();
601 602
602 OSDMap permissions = (OSDMap)inner_instance_list["permissions"]; 603// OSDMap permissions = (OSDMap)inner_instance_list["permissions"];
603 int base_mask = permissions["base_mask"].AsInteger(); 604// int base_mask = permissions["base_mask"].AsInteger();
604 int everyone_mask = permissions["everyone_mask"].AsInteger(); 605// int everyone_mask = permissions["everyone_mask"].AsInteger();
605 UUID creator_id = permissions["creator_id"].AsUUID(); 606// UUID creator_id = permissions["creator_id"].AsUUID();
606 UUID group_id = permissions["group_id"].AsUUID(); 607// UUID group_id = permissions["group_id"].AsUUID();
607 int group_mask = permissions["group_mask"].AsInteger(); 608// int group_mask = permissions["group_mask"].AsInteger();
608// bool is_owner_group = permissions["is_owner_group"].AsBoolean(); 609// bool is_owner_group = permissions["is_owner_group"].AsBoolean();
609// UUID last_owner_id = permissions["last_owner_id"].AsUUID(); 610// UUID last_owner_id = permissions["last_owner_id"].AsUUID();
610 int next_owner_mask = permissions["next_owner_mask"].AsInteger(); 611// int next_owner_mask = permissions["next_owner_mask"].AsInteger();
611 UUID owner_id = permissions["owner_id"].AsUUID(); 612// UUID owner_id = permissions["owner_id"].AsUUID();
612 int owner_mask = permissions["owner_mask"].AsInteger(); 613// int owner_mask = permissions["owner_mask"].AsInteger();
614// no longer used - end ------------------------
615
616 UUID owner_id = m_HostCapsObj.AgentID;
613 617
614 SceneObjectPart prim 618 SceneObjectPart prim
615 = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero); 619 = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero);
@@ -619,19 +623,19 @@ namespace OpenSim.Region.ClientStack.Linden
619 rotations.Add(rotation); 623 rotations.Add(rotation);
620 positions.Add(position); 624 positions.Add(position);
621 prim.UUID = UUID.Random(); 625 prim.UUID = UUID.Random();
622 prim.CreatorID = creator_id; 626 prim.CreatorID = owner_id;
623 prim.OwnerID = owner_id; 627 prim.OwnerID = owner_id;
624 prim.GroupID = group_id; 628 prim.GroupID = UUID.Zero;
625 prim.LastOwnerID = prim.OwnerID; 629 prim.LastOwnerID = prim.OwnerID;
626 prim.CreationDate = Util.UnixTimeSinceEpoch(); 630 prim.CreationDate = Util.UnixTimeSinceEpoch();
627 prim.Name = assetName; 631 prim.Name = assetName;
628 prim.Description = ""; 632 prim.Description = "";
629 633
630 prim.BaseMask = (uint)base_mask; 634// prim.BaseMask = (uint)base_mask;
631 prim.EveryoneMask = (uint)everyone_mask; 635// prim.EveryoneMask = (uint)everyone_mask;
632 prim.GroupMask = (uint)group_mask; 636// prim.GroupMask = (uint)group_mask;
633 prim.NextOwnerMask = (uint)next_owner_mask; 637// prim.NextOwnerMask = (uint)next_owner_mask;
634 prim.OwnerMask = (uint)owner_mask; 638// prim.OwnerMask = (uint)owner_mask;
635 639
636 if (grp == null) 640 if (grp == null)
637 grp = new SceneObjectGroup(prim); 641 grp = new SceneObjectGroup(prim);
@@ -1123,4 +1127,4 @@ namespace OpenSim.Region.ClientStack.Linden
1123 } 1127 }
1124 } 1128 }
1125 1129
1126} 1130} \ No newline at end of file