diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-06-08 14:53:00 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-06-08 14:53:00 -0700 |
| commit | 484a4733b7b361d87c6092f4f399951e84c2aacd (patch) | |
| tree | 3031f4f041ffbe87f57d3a58e8ecf3bc988f439b /indra/newview/llmeshrepository.h | |
| parent | 3dfb4944ed916f9a251078a2614a854b9de0315d (diff) | |
| parent | 68a7c4cb83aca58e6ad9162be9e5022d6f801eac (diff) | |
Merge latest from lindenlab/viewer-development/
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 802e3e1aba..f859e29c07 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -387,7 +387,8 @@ public: LLHost mHost; std::string mUploadObjectAssetCapability; std::string mNewInventoryCapability; - std::string mWholeModelUploadCapability; + std::string mWholeModelFeeCapability; + std::string mWholeModelUploadURL; std::queue<LLMeshUploadData> mUploadQ; std::queue<LLMeshUploadData> mConfirmedQ; |