diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-16 12:15:14 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-16 12:15:14 -0400 |
commit | acc14c472deeb92e0436ac38d16e3f6e049bc546 (patch) | |
tree | b31fd0fd1992c1ea6cad2cc1123ab2422953372f /OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs | |
parent | * ShortVersion, another attempt at fixing the test thread death that randomly... (diff) | |
parent | * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff) | |
download | opensim-SC-acc14c472deeb92e0436ac38d16e3f6e049bc546.zip opensim-SC-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.gz opensim-SC-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.bz2 opensim-SC-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs index 9b684fe..570459a 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs | |||
@@ -39,10 +39,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
39 | private readonly int m_location; | 39 | private readonly int m_location; |
40 | //private readonly UUID m_itemId; | 40 | //private readonly UUID m_itemId; |
41 | private readonly UUID m_assetId; | 41 | private readonly UUID m_assetId; |
42 | |||
43 | private readonly ISecurityCredential m_security; | ||
42 | 44 | ||
43 | public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId) | 45 | public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId, ISecurityCredential security) |
44 | { | 46 | { |
45 | m_rootScene = rootScene; | 47 | m_rootScene = rootScene; |
48 | m_security = security; | ||
46 | //m_parent = self; | 49 | //m_parent = self; |
47 | m_location = location; | 50 | m_location = location; |
48 | //m_itemId = itemId; | 51 | //m_itemId = itemId; |
@@ -55,7 +58,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
55 | { | 58 | { |
56 | get | 59 | get |
57 | { | 60 | { |
58 | return new SOPObject(m_rootScene, m_rootScene.GetSceneObjectPart(m_assetId).LocalId); | 61 | return new SOPObject(m_rootScene, m_rootScene.GetSceneObjectPart(m_assetId).LocalId, m_security); |
59 | } | 62 | } |
60 | } | 63 | } |
61 | } | 64 | } |