Fix a LSL issue and a prim naming issue
parent
3231602b88
commit
dbd1a68b58
|
@ -762,10 +762,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
|
|||
// affect the name stored in the serialization, transfer
|
||||
// the correct name from the inventory to the
|
||||
// object itself before we rez.
|
||||
rootPart.Name = item.Name;
|
||||
rootPart.Description = item.Description;
|
||||
rootPart.ObjectSaleType = item.SaleType;
|
||||
rootPart.SalePrice = item.SalePrice;
|
||||
// On coalesced objects, this has no effect.
|
||||
if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
|
||||
{
|
||||
rootPart.Name = item.Name;
|
||||
rootPart.Description = item.Description;
|
||||
rootPart.ObjectSaleType = item.SaleType;
|
||||
rootPart.SalePrice = item.SalePrice;
|
||||
}
|
||||
|
||||
group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
|
||||
if ((rootPart.OwnerID != item.Owner) ||
|
||||
|
|
|
@ -2187,9 +2187,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
m_host.AddScriptLPS(1);
|
||||
|
||||
// try to let this work as in SL...
|
||||
if (m_host.ParentID == 0)
|
||||
if (m_host.LinkNum < 2)
|
||||
{
|
||||
// special case: If we are root, rotate complete SOG to new rotation
|
||||
// Special case: If we are root, rotate complete SOG to new
|
||||
// rotation.
|
||||
// We are root if the link number is 0 (single prim) or 1
|
||||
// (root prim). ParentID may be nonzero in attachments and
|
||||
// using it would cause attachments and HUDs to rotate
|
||||
// to the wrong positions.
|
||||
SetRot(m_host, Rot2Quaternion(rot));
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue