ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
This commit is contained in:
Melanie
2012-07-12 08:55:16 +01:00
parent 89c9528e38 743437262e
commit d632fd7124
32 changed files with 395 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
View File

@@ -97,7 +97,7 @@ namespace OpenSim.Region.Framework.Interfaces
// Same as above, but also load script states from a separate doc
ISceneEntity RezSingleAttachmentFromInventory(
IScenePresence presence, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc);
IScenePresence presence, UUID itemID, uint AttachmentPt, XmlDocument doc);
/// <summary>
/// Rez multiple attachments from a user's inventory