diff options
| author | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
| commit | 8f1acb890ac49ea004bf43065ce8d3472bb27708 (patch) | |
| tree | 07e4e5fc77f764232c958bdbf8f93f2651da1663 /OpenSim/Region/CoreModules/Avatar/Attachments | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-8f1acb890ac49ea004bf43065ce8d3472bb27708.zip opensim-SC-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.gz opensim-SC-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.bz2 opensim-SC-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 28c50ab..457e0bb 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 307 | /// <param name="remoteClient"></param> | 307 | /// <param name="remoteClient"></param> |
| 308 | /// <param name="itemID"></param> | 308 | /// <param name="itemID"></param> |
| 309 | /// <param name="AttachmentPt"></param> | 309 | /// <param name="AttachmentPt"></param> |
| 310 | /// <returns></returns> | 310 | /// <returns></returns> |
| 311 | protected UUID ShowAttachInUserInventory( | 311 | protected UUID ShowAttachInUserInventory( |
| 312 | SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | 312 | SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) |
| 313 | { | 313 | { |