diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-27 15:33:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-27 15:33:46 -0400 |
| commit | 0c360c5223af6473b701f2f41d525f1f70c2ead5 (patch) | |
| tree | dc59a8390988ece0d340632171f06e0af83507e1 /indra/newview/llmeshrepository.h | |
| parent | 7a7a0f0c1bd134fa23d734d672ef44a763a9f228 (diff) | |
| parent | 170de8330e3be55794878cefb53f62266c9a029d (diff) | |
merge changes for storm-1210
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; |