diff options
| author | Melanie | 2010-10-05 02:12:35 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-05 02:12:35 +0100 |
| commit | ba0a19c228b8d9bce0a9fc2328e69ba48befab66 (patch) | |
| tree | d20a2049e2b4f49908f60e21988cd6b0bfc02aaa /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
| parent | Make windlight set the default environment on start (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.zip opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.gz opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.bz2 opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -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 | { |