diff options
| author | UbitUmarov | 2014-08-05 23:25:08 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-08-05 23:25:08 +0100 |
| commit | e1a5a1f829ad7b82fa8dc5b81248dff45b586f40 (patch) | |
| tree | f1dfe7a0570368fcbb0e243a4c03b8cb1eff2ca3 /OpenSim/Region/Framework/Scenes | |
| parent | dont mess with names and descriptions on coalescence objects. Inventory (diff) | |
| download | opensim-SC-e1a5a1f829ad7b82fa8dc5b81248dff45b586f40.zip opensim-SC-e1a5a1f829ad7b82fa8dc5b81248dff45b586f40.tar.gz opensim-SC-e1a5a1f829ad7b82fa8dc5b81248dff45b586f40.tar.bz2 opensim-SC-e1a5a1f829ad7b82fa8dc5b81248dff45b586f40.tar.xz | |
apply objectSlamSale to all roots of coalescence objects. replace the
single object condition for renaming
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 657d7c1..a6a963b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -919,7 +919,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 919 | // Only do these for the first object if we are rezzing a coalescence. | 919 | // Only do these for the first object if we are rezzing a coalescence. |
| 920 | // nahh dont mess with coalescence objects, | 920 | // nahh dont mess with coalescence objects, |
| 921 | // the name in inventory can be change for inventory purpuses only | 921 | // the name in inventory can be change for inventory purpuses only |
| 922 | if (i == 0 && objlist.Count == 1) | 922 | if (objlist.Count == 1) |
| 923 | { | 923 | { |
| 924 | rootPart.Name = item.Name; | 924 | rootPart.Name = item.Name; |
| 925 | rootPart.Description = item.Description; | 925 | rootPart.Description = item.Description; |