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

apply objectSlamSale to all roots of coalescence objects. replace the 

single object condition for renaming
avinationmerge
UbitUmarov 2014-08-05 23:25:08 +01:00
parent 3c321e5bb3
commit e1a5a1f829
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1034,16 +1034,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// Only do these for the first object if we are rezzing a coalescence. // Only do these for the first object if we are rezzing a coalescence.
// nahh dont mess with coalescence objects, // nahh dont mess with coalescence objects,
// the name in inventory can be change for inventory purpuses only // the name in inventory can be change for inventory purpuses only
if (i == 0 && objlist.Count == 1) if (objlist.Count == 1)
{ {
rootPart.Name = item.Name; rootPart.Name = item.Name;
rootPart.Description = item.Description; rootPart.Description = item.Description;
// this should be done only on first or all ??? }
if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
{ if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
rootPart.ObjectSaleType = item.SaleType; {
rootPart.SalePrice = item.SalePrice; rootPart.ObjectSaleType = item.SaleType;
} rootPart.SalePrice = item.SalePrice;
} }
so.FromFolderID = item.Folder; so.FromFolderID = item.Folder;

2
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -919,7 +919,7 @@ namespace OpenSim.Region.Framework.Scenes
// Only do these for the first object if we are rezzing a coalescence. // Only do these for the first object if we are rezzing a coalescence.
// nahh dont mess with coalescence objects, // nahh dont mess with coalescence objects,
// the name in inventory can be change for inventory purpuses only // the name in inventory can be change for inventory purpuses only
if (i == 0 && objlist.Count == 1) if (objlist.Count == 1)
{ {
rootPart.Name = item.Name; rootPart.Name = item.Name;
rootPart.Description = item.Description; rootPart.Description = item.Description;