diff options
| author | Melanie | 2010-10-06 00:27:10 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-06 00:27:10 +0100 |
| commit | d8149373c15d9ec39c0f836a337e58b633f45829 (patch) | |
| tree | 3678027b5eb7f1cdfb29b1c0c80bd0c3d7a62ae6 /OpenSim/Region/CoreModules/Avatar/Attachments | |
| parent | Avoid throwing errors when adding existing meshes to the render scene (diff) | |
| parent | Remove sirikata project (diff) | |
| download | opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.zip opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.gz opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.bz2 opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 9807ea5..87c9100 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -316,7 +316,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 316 | /// <param name="remoteClient"></param> | 316 | /// <param name="remoteClient"></param> |
| 317 | /// <param name="itemID"></param> | 317 | /// <param name="itemID"></param> |
| 318 | /// <param name="AttachmentPt"></param> | 318 | /// <param name="AttachmentPt"></param> |
| 319 | /// <returns></returns> | 319 | /// <returns></returns> |
| 320 | protected UUID ShowAttachInUserInventory( | 320 | protected UUID ShowAttachInUserInventory( |
| 321 | SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | 321 | SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) |
| 322 | { | 322 | { |