aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorDiva Canto2014-05-22 10:16:19 -0700
committerDiva Canto2014-05-22 10:16:19 -0700
commitb7c7293c7aa7bb37085eaf6740e10a268aecf608 (patch)
tree55022934c63bea8fd9fbd31be2df016cf5593d9a /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentFixed a problem with detaching attachments in situations where the user's ass... (diff)
parentFix mantis 6973. Prevent BOM being prefixed to message XML which was causing ... (diff)
downloadopensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.zip
opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.gz
opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.bz2
opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index fb8ecd5..75e1cbb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -751,7 +751,7 @@ namespace OpenSim.Region.Framework.Scenes
751 Vector3 bbox; 751 Vector3 bbox;
752 float offsetHeight; 752 float offsetHeight;
753 753
754 bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight); 754 m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight);
755 755
756 for (int i = 0; i < objlist.Count; i++) 756 for (int i = 0; i < objlist.Count; i++)
757 { 757 {