diff options
author | UbitUmarov | 2014-08-05 22:49:41 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-05 22:49:41 +0100 |
commit | 3c321e5bb37d0430085c361632fb668824e9b500 (patch) | |
tree | 2cb4632bc2a36909ab99cec1146381d1d8fb226f /OpenSim/Region/Framework/Scenes | |
parent | revert to old avn-current code, not using ApplyPermissionsOnRez() till its (diff) | |
download | opensim-SC_OLD-3c321e5bb37d0430085c361632fb668824e9b500.zip opensim-SC_OLD-3c321e5bb37d0430085c361632fb668824e9b500.tar.gz opensim-SC_OLD-3c321e5bb37d0430085c361632fb668824e9b500.tar.bz2 opensim-SC_OLD-3c321e5bb37d0430085c361632fb668824e9b500.tar.xz |
dont mess with names and descriptions on coalescence objects. Inventory
name can change for inventory purposes only.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 400a415..657d7c1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -917,7 +917,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
917 | // in the serialization, transfer the correct name from the inventory to the | 917 | // in the serialization, transfer the correct name from the inventory to the |
918 | // object itself before we rez. | 918 | // object itself before we rez. |
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 | if (i == 0) | 920 | // nahh dont mess with coalescence objects, |
921 | // the name in inventory can be change for inventory purpuses only | ||
922 | if (i == 0 && objlist.Count == 1) | ||
921 | { | 923 | { |
922 | rootPart.Name = item.Name; | 924 | rootPart.Name = item.Name; |
923 | rootPart.Description = item.Description; | 925 | rootPart.Description = item.Description; |