Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
This commit is contained in:
Melanie
2013-11-03 21:34:36 +00:00
80 changed files with 17619 additions and 276 deletions

View File

@@ -3158,7 +3158,8 @@ namespace OpenSim.Region.Framework.Scenes
return;
// This was pulled from SceneViewer. Attachments always receive full updates.
// I could not verify if this is a requirement but this maintains existing behavior
// This is needed because otherwise if only the root prim changes position, then
// it looks as if the entire object has moved (including the other prims).
if (ParentGroup.IsAttachment)
{
ScheduleFullUpdate();