diff options
| author | Melanie | 2012-01-06 21:41:36 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-06 21:41:36 +0000 |
| commit | 11c48ac80708051a7d5b32ced81712b5c1be77aa (patch) | |
| tree | 3a1e0fdd41b7c8a47072b84037828a9f4db31f27 /OpenSim/Capabilities/LLSDInventoryItem.cs | |
| parent | Replaced llRot2Euler function. (diff) | |
| parent | eliminate a few tabs from OpenSimDefaults.ini (diff) | |
| download | opensim-SC_OLD-11c48ac80708051a7d5b32ced81712b5c1be77aa.zip opensim-SC_OLD-11c48ac80708051a7d5b32ced81712b5c1be77aa.tar.gz opensim-SC_OLD-11c48ac80708051a7d5b32ced81712b5c1be77aa.tar.bz2 opensim-SC_OLD-11c48ac80708051a7d5b32ced81712b5c1be77aa.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
Diffstat (limited to 'OpenSim/Capabilities/LLSDInventoryItem.cs')
| -rw-r--r-- | OpenSim/Capabilities/LLSDInventoryItem.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/LLSDInventoryItem.cs b/OpenSim/Capabilities/LLSDInventoryItem.cs index cce18d7..426a6cb 100644 --- a/OpenSim/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Capabilities/LLSDInventoryItem.cs | |||
| @@ -95,4 +95,11 @@ namespace OpenSim.Framework.Capabilities | |||
| 95 | public UUID owner_id; | 95 | public UUID owner_id; |
| 96 | public int version; | 96 | public int version; |
| 97 | } | 97 | } |
| 98 | } | 98 | |
| 99 | [OSDMap] | ||
| 100 | public class LLSDFetchInventory | ||
| 101 | { | ||
| 102 | public UUID agent_id; | ||
| 103 | public OSDArray items = new OSDArray(); | ||
| 104 | } | ||
| 105 | } \ No newline at end of file | ||