diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-29 23:50:24 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-29 23:50:24 -0400 |
| commit | 2f40161f38967e3362ac7be43b74d5cbc75564fa (patch) | |
| tree | db14920568864a932a064a4530d006fc67c60a5f /OpenSim/Framework/Capabilities/LLSDInventoryItem.cs | |
| parent | Ok, merging the RegionCombinerModule with master. (diff) | |
| parent | Remove another IAuthentificationInterface user (diff) | |
| download | opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.zip opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.tar.gz opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.tar.bz2 opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Capabilities/LLSDInventoryItem.cs')
| -rw-r--r-- | OpenSim/Framework/Capabilities/LLSDInventoryItem.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs index d0498f6..cce18d7 100644 --- a/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs | |||
| @@ -90,6 +90,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 90 | public UUID agent_id; | 90 | public UUID agent_id; |
| 91 | public int descendents; | 91 | public int descendents; |
| 92 | public UUID folder_id; | 92 | public UUID folder_id; |
| 93 | public OSDArray categories = new OSDArray(); | ||
| 93 | public OSDArray items = new OSDArray(); | 94 | public OSDArray items = new OSDArray(); |
| 94 | public UUID owner_id; | 95 | public UUID owner_id; |
| 95 | public int version; | 96 | public int version; |