diff options
| author | Melanie | 2012-07-12 08:55:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-12 08:55:16 +0100 |
| commit | d632fd7124e3962534fc34f9c7749615dbb62108 (patch) | |
| tree | 84ece06822680bfd5b639d9c3fd046ecbb7a154e /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Many explanitory comments added to the link and delink code in (diff) | |
| download | opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.zip opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.tar.gz opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.tar.bz2 opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.tar.xz | |
Merge branch 'master' into careminster
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
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index e7b9ba5..410eda0 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
| @@ -97,7 +97,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 97 | 97 | ||
| 98 | // Same as above, but also load script states from a separate doc | 98 | // Same as above, but also load script states from a separate doc |
| 99 | ISceneEntity RezSingleAttachmentFromInventory( | 99 | ISceneEntity RezSingleAttachmentFromInventory( |
| 100 | IScenePresence presence, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc); | 100 | IScenePresence presence, UUID itemID, uint AttachmentPt, XmlDocument doc); |
| 101 | 101 | ||
| 102 | /// <summary> | 102 | /// <summary> |
| 103 | /// Rez multiple attachments from a user's inventory | 103 | /// Rez multiple attachments from a user's inventory |