Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
This commit is contained in:
Melanie
2011-10-11 23:14:23 +01:00
5 changed files with 66 additions and 7 deletions

View File

@@ -150,7 +150,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
{
if (!m_Enabled)
return;
}
#endregion