OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement rezzing coalesced objects

avinationmerge
Melanie 2010-10-07 05:12:39 +02:00
parent 2db0ac74c7
commit ba0afa53d3
1 changed files with 189 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -444,8 +444,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
item.Folder = folder.ID; item.Folder = folder.ID;
item.Owner = userID; item.Owner = userID;
if (objlist.Count > 1) if (objlist.Count > 1)
{
item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems; item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems;
} }
else
{
item.SaleType = objlist[0].RootPart.ObjectSaleType;
item.SalePrice = objlist[0].RootPart.SalePrice;
}
}
AssetBase asset = CreateAsset( AssetBase asset = CreateAsset(
objlist[0].GetPartName(objlist[0].RootPart.LocalId), objlist[0].GetPartName(objlist[0].RootPart.LocalId),
@ -508,7 +515,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
7); // Preserve folded permissions 7); // Preserve folded permissions
} }
// TODO: add the new fields (Flags, Sale info, etc)
item.CreationDate = Util.UnixTimeSinceEpoch(); item.CreationDate = Util.UnixTimeSinceEpoch();
item.Description = asset.Description; item.Description = asset.Description;
item.Name = asset.Name; item.Name = asset.Name;
@ -587,6 +593,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
AssetBase rezAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); AssetBase rezAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
SceneObjectGroup group = null;
if (rezAsset != null) if (rezAsset != null)
{ {
UUID itemId = UUID.Zero; UUID itemId = UUID.Zero;
@ -595,17 +603,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// item that it came from. This allows us to enable 'save object to inventory' // item that it came from. This allows us to enable 'save object to inventory'
if (!m_Scene.Permissions.BypassPermissions()) if (!m_Scene.Permissions.BypassPermissions())
{ {
if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy) if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy && (item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
{ {
itemId = item.ID; itemId = item.ID;
} }
} }
else else
{
if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
{ {
// Brave new fullperm world // Brave new fullperm world
//
itemId = item.ID; itemId = item.ID;
} }
}
if (item.ID == UUID.Zero) if (item.ID == UUID.Zero)
{ {
@ -613,8 +623,79 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
string xmlData = Utils.BytesToString(rezAsset.Data); string xmlData = Utils.BytesToString(rezAsset.Data);
SceneObjectGroup group List<SceneObjectGroup> objlist =
= SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData); new List<SceneObjectGroup>();
List<Vector3> veclist = new List<Vector3>();
XmlDocument doc = new XmlDocument();
doc.LoadXml(xmlData);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
if (e == null || attachment) // Single
{
SceneObjectGroup g =
SceneObjectSerializer.FromOriginalXmlFormat(
itemId, xmlData);
objlist.Add(g);
veclist.Add(new Vector3(0, 0, 0));
float offsetHeight = 0;
pos = m_Scene.GetNewRezLocation(
RayStart, RayEnd, RayTargetID, Quaternion.Identity,
BypassRayCast, bRayEndIsIntersection, true, g.GetAxisAlignedBoundingBox(out offsetHeight), false);
pos.Z += offsetHeight;
}
else
{
XmlElement coll = (XmlElement)e;
float bx = Convert.ToSingle(coll.GetAttribute("x"));
float by = Convert.ToSingle(coll.GetAttribute("y"));
float bz = Convert.ToSingle(coll.GetAttribute("z"));
Vector3 bbox = new Vector3(bx, by, bz);
pos = m_Scene.GetNewRezLocation(RayStart, RayEnd,
RayTargetID, Quaternion.Identity,
BypassRayCast, bRayEndIsIntersection, true,
bbox, false);
pos -= bbox / 2;
XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
foreach (XmlNode n in groups)
{
SceneObjectGroup g =
SceneObjectSerializer.FromOriginalXmlFormat(
itemId, n.OuterXml);
objlist.Add(g);
XmlElement el = (XmlElement)n;
float x = Convert.ToSingle(el.GetAttribute("offsetx"));
float y = Convert.ToSingle(el.GetAttribute("offsety"));
float z = Convert.ToSingle(el.GetAttribute("offsetz"));
veclist.Add(new Vector3(x, y, z));
}
}
int primcount = 0;
foreach (SceneObjectGroup g in objlist)
primcount += g.PrimCount;
if (!m_Scene.Permissions.CanRezObject(
primcount, remoteClient.AgentId, pos)
&& !attachment)
{
// The client operates in no fail mode. It will
// have already removed the item from the folder
// if it's no copy.
// Put it back if it's not an attachment
//
if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
remoteClient.SendBulkUpdateInventory(item);
return null;
}
for (int i = 0 ; i < objlist.Count ; i++ )
{
group = objlist[i];
Vector3 storedPosition = group.AbsolutePosition; Vector3 storedPosition = group.AbsolutePosition;
if (group.UUID == UUID.Zero) if (group.UUID == UUID.Zero)
{ {
@ -632,64 +713,37 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
child.CreateSelected = true; child.CreateSelected = true;
} }
if (!m_Scene.Permissions.CanRezObject(
group.PrimCount, remoteClient.AgentId, pos)
&& !attachment)
{
// The client operates in no fail mode. It will
// have already removed the item from the folder
// if it's no copy.
// Put it back if it's not an attachment
//
if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
remoteClient.SendBulkUpdateInventory(item);
return null;
}
if (group.UUID == UUID.Zero)
{
m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 4");
}
group.ResetIDs(); group.ResetIDs();
if (group.UUID == UUID.Zero)
{
m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 5");
}
if (attachment) if (attachment)
{ {
group.RootPart.Flags |= PrimFlags.Phantom; group.RootPart.Flags |= PrimFlags.Phantom;
group.RootPart.IsAttachment = true; group.RootPart.IsAttachment = true;
} }
// If we're rezzing an attachment then don't ask AddNewSceneObject() to update the client since // If we're rezzing an attachment then don't ask
// we'll be doing that later on. Scheduling more than one full update during the attachment // AddNewSceneObject() to update the client since
// process causes some clients to fail to display the attachment properly. // we'll be doing that later on. Scheduling more than
// one full update during the attachment
// process causes some clients to fail to display the
// attachment properly.
m_Scene.AddNewSceneObject(group, true, false); m_Scene.AddNewSceneObject(group, true, false);
// m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z); // if attachment we set it's asset id so object updates
// if attachment we set it's asset id so object updates can reflect that // can reflect that, if not, we set it's position in world.
// if not, we set it's position in world.
if (!attachment) if (!attachment)
{ {
group.ScheduleGroupForFullUpdate(); group.ScheduleGroupForFullUpdate();
float offsetHeight = 0; group.AbsolutePosition = pos + veclist[i];
pos = m_Scene.GetNewRezLocation(
RayStart, RayEnd, RayTargetID, Quaternion.Identity,
BypassRayCast, bRayEndIsIntersection, true, group.GetAxisAlignedBoundingBox(out offsetHeight), false);
pos.Z += offsetHeight;
group.AbsolutePosition = pos;
// m_log.InfoFormat("rezx point for inventory rezz is {0} {1} {2} and offsetheight was {3}", pos.X, pos.Y, pos.Z, offsetHeight);
} }
else else
{ {
group.SetFromItemID(itemID); group.SetFromItemID(itemID);
} }
if (group.UUID == UUID.Zero)
{
m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 6");
}
SceneObjectPart rootPart = null; SceneObjectPart rootPart = null;
try try
{ {
rootPart = group.GetChildPart(group.UUID); rootPart = group.GetChildPart(group.UUID);
@ -703,18 +757,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment); m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment);
} }
if (group.UUID == UUID.Zero)
{ // Since renaming the item in the inventory does not
m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 7"); // affect the name stored in the serialization, transfer
} // the correct name from the inventory to the
// Since renaming the item in the inventory does not affect the name stored
// in the serialization, transfer the correct name from the inventory to the
// object itself before we rez. // object itself before we rez.
rootPart.Name = item.Name; rootPart.Name = item.Name;
rootPart.Description = item.Description; rootPart.Description = item.Description;
rootPart.ObjectSaleType = item.SaleType;
rootPart.SalePrice = item.SalePrice;
group.SetGroup(remoteClient.ActiveGroupId, remoteClient); group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0) if ((rootPart.OwnerID != item.Owner) ||
(item.CurrentPermissions & 16) != 0)
{ {
//Need to kill the for sale here //Need to kill the for sale here
rootPart.ObjectSaleType = 0; rootPart.ObjectSaleType = 0;
@ -723,23 +778,23 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if (m_Scene.Permissions.PropagatePermissions()) if (m_Scene.Permissions.PropagatePermissions())
{ {
foreach (SceneObjectPart part in group.Parts) foreach (SceneObjectPart part in group.Parts)
{
if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
{ {
part.EveryoneMask = item.EveryOnePermissions; part.EveryoneMask = item.EveryOnePermissions;
part.NextOwnerMask = item.NextPermissions; part.NextOwnerMask = item.NextPermissions;
}
part.GroupMask = 0; // DO NOT propagate here part.GroupMask = 0; // DO NOT propagate here
} }
group.ApplyNextOwnerPermissions(); group.ApplyNextOwnerPermissions();
} }
} }
if (group.UUID == UUID.Zero)
{
m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 8");
}
foreach (SceneObjectPart part in group.Parts) foreach (SceneObjectPart part in group.Parts)
{ {
if ((part.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0) if ((part.OwnerID != item.Owner) ||
(item.CurrentPermissions & 16) != 0)
{ {
part.LastOwnerID = part.OwnerID; part.LastOwnerID = part.OwnerID;
part.OwnerID = item.Owner; part.OwnerID = item.Owner;
@ -749,15 +804,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
part.EveryoneMask = item.EveryOnePermissions; part.EveryoneMask = item.EveryOnePermissions;
part.NextOwnerMask = item.NextPermissions; part.NextOwnerMask = item.NextPermissions;
} }
if (group.UUID == UUID.Zero)
{
m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 9");
}
rootPart.TrimPermissions(); rootPart.TrimPermissions();
if (group.UUID == UUID.Zero)
{
m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 10");
}
if (!attachment) if (!attachment)
{ {
if (group.RootPart.Shape.PCode == (byte)PCode.Prim) if (group.RootPart.Shape.PCode == (byte)PCode.Prim)
@ -775,6 +824,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
rootPart.ScheduleFullUpdate(); rootPart.ScheduleFullUpdate();
} }
}
if (!m_Scene.Permissions.BypassPermissions()) if (!m_Scene.Permissions.BypassPermissions())
{ {
@ -791,13 +841,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
} }
} }
if (group.UUID == UUID.Zero)
{
m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 11");
} }
return group; return group;
} }
}
return null; return null;
} }