diff options
| author | Tom | 2011-09-14 18:46:42 -0700 |
|---|---|---|
| committer | Tom | 2011-09-14 18:46:42 -0700 |
| commit | cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5 (patch) | |
| tree | f6b8e5a8dbe7d00c1ac1ba1c830c0f8cea4e1325 /OpenSim/Region/Framework/Interfaces | |
| parent | First set of merge fixes (diff) | |
| download | opensim-SC-cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5.zip opensim-SC-cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5.tar.gz opensim-SC-cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5.tar.bz2 opensim-SC-cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5.tar.xz | |
Merge fixes, and fix the build
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -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 6bbdd7d..59c26e7 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
| @@ -103,7 +103,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 103 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus); | 103 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus); |
| 104 | 104 | ||
| 105 | // Same as above, but also load script states from a separate doc | 105 | // Same as above, but also load script states from a separate doc |
| 106 | UUID RezSingleAttachmentFromInventory( | 106 | ISceneEntity RezSingleAttachmentFromInventory( |
| 107 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc); | 107 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc); |
| 108 | 108 | ||
| 109 | /// <summary> | 109 | /// <summary> |