diff options
| author | UbitUmarov | 2012-04-01 11:20:11 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-04-01 11:20:11 +0100 |
| commit | d5e123c1064df424f377ed7511e7dd3721c7be8b (patch) | |
| tree | e0fb702dc1d5e3d26e6a108d47d2e7c898cd1907 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | reduced instability in vertical atractor with eficiency of 1 and banking (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-d5e123c1064df424f377ed7511e7dd3721c7be8b.zip opensim-SC-d5e123c1064df424f377ed7511e7dd3721c7be8b.tar.gz opensim-SC-d5e123c1064df424f377ed7511e7dd3721c7be8b.tar.bz2 opensim-SC-d5e123c1064df424f377ed7511e7dd3721c7be8b.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -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 ac44ce9..a2649ee 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -815,7 +815,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 815 | 815 | ||
| 816 | group.ResetIDs(); | 816 | group.ResetIDs(); |
| 817 | 817 | ||
| 818 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 818 | SceneObjectPart rootPart = group.GetPart(group.UUID); |
| 819 | 819 | ||
| 820 | // Since renaming the item in the inventory does not affect the name stored | 820 | // Since renaming the item in the inventory does not affect the name stored |
| 821 | // in the serialization, transfer the correct name from the inventory to the | 821 | // in the serialization, transfer the correct name from the inventory to the |