diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-19 12:53:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-19 12:53:18 -0400 |
| commit | 1c65b8fa44cecea8f38b9944930cbed60d075528 (patch) | |
| tree | 2074515c6ed03c0d8fa2b7e5a912d3bb810bf520 /indra/newview/llmeshrepository.h | |
| parent | d8183a71d40da61635c05b933368f43b7d4f2a80 (diff) | |
| parent | 66554e2124dc87f61089bf96e2fe9ee5c32613d7 (diff) | |
automated merge mesh-development -> mesh-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; |