diff options
author | Melanie | 2012-08-29 03:31:13 +0100 |
---|---|---|
committer | Melanie | 2012-08-29 03:31:13 +0100 |
commit | 899337b4a0584ce2371c3bfcc44387d0f090b792 (patch) | |
tree | 3a3e862951a85889c3c5762d6d30b5dd80868864 /OpenSim/Data | |
parent | Merge branch 'master' into careminster (diff) | |
parent | implementing rule tracking (diff) | |
download | opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.zip opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.gz opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.bz2 opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/IXInventoryData.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs index 85a5c08..e64a828 100644 --- a/OpenSim/Data/IXInventoryData.cs +++ b/OpenSim/Data/IXInventoryData.cs | |||
@@ -40,6 +40,11 @@ namespace OpenSim.Data | |||
40 | public UUID folderID; | 40 | public UUID folderID; |
41 | public UUID agentID; | 41 | public UUID agentID; |
42 | public UUID parentFolderID; | 42 | public UUID parentFolderID; |
43 | |||
44 | public XInventoryFolder Clone() | ||
45 | { | ||
46 | return (XInventoryFolder)MemberwiseClone(); | ||
47 | } | ||
43 | } | 48 | } |
44 | 49 | ||
45 | public class XInventoryItem | 50 | public class XInventoryItem |
@@ -64,6 +69,11 @@ namespace OpenSim.Data | |||
64 | public UUID avatarID; | 69 | public UUID avatarID; |
65 | public UUID parentFolderID; | 70 | public UUID parentFolderID; |
66 | public int inventoryGroupPermissions; | 71 | public int inventoryGroupPermissions; |
72 | |||
73 | public XInventoryItem Clone() | ||
74 | { | ||
75 | return (XInventoryItem)MemberwiseClone(); | ||
76 | } | ||
67 | } | 77 | } |
68 | 78 | ||
69 | public interface IXInventoryData | 79 | public interface IXInventoryData |