diff options
| author | Melanie | 2010-10-16 02:27:51 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-16 02:27:51 +0100 |
| commit | 455a2ba7ded01ffce92bf54cb3e11e73ae086e22 (patch) | |
| tree | 9d695e2b8108b3b626ade78c3e65b654076e2074 /OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs | |
| parent | Add a setter to OldItemID so it can be deserialized (diff) | |
| parent | Adding projected light filters to prim propeties (diff) | |
| download | opensim-SC_OLD-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.zip opensim-SC_OLD-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.tar.gz opensim-SC_OLD-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.tar.bz2 opensim-SC_OLD-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs')
| -rw-r--r-- | OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs index 08f14e3..0d6f7f9 100644 --- a/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs +++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs | |||
| @@ -39,4 +39,18 @@ namespace OpenSim.Framework.Capabilities | |||
| 39 | { | 39 | { |
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | |||
| 43 | [OSDMap] | ||
| 44 | public class LLSDNewFileAngentInventoryVariablePriceReplyResponse | ||
| 45 | { | ||
| 46 | public int resource_cost; | ||
| 47 | public string state; | ||
| 48 | public int upload_price; | ||
| 49 | public string rsvp; | ||
| 50 | |||
| 51 | public LLSDNewFileAngentInventoryVariablePriceReplyResponse() | ||
| 52 | { | ||
| 53 | state = "confirm_upload"; | ||
| 54 | } | ||
| 55 | } | ||
| 42 | } \ No newline at end of file | 56 | } \ No newline at end of file |