diff options
author | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
commit | cf74a9438aae7ab1b10c7ffa77c6509e588869a0 (patch) | |
tree | 79c2714ba2bb2e0d526b5644f5b832c911fe6900 /indra/newview/llfloatermodeluploadbase.cpp | |
parent | 24ed3844afe2d54a03975c1704c595cf02e5643f (diff) | |
parent | 5754493cdcfeac76d0576abc19bdf5a03717780d (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloatermodeluploadbase.cpp')
-rw-r--r-- | indra/newview/llfloatermodeluploadbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodeluploadbase.cpp b/indra/newview/llfloatermodeluploadbase.cpp index 7cdfd56d9a..4427e913e3 100644 --- a/indra/newview/llfloatermodeluploadbase.cpp +++ b/indra/newview/llfloatermodeluploadbase.cpp @@ -41,7 +41,7 @@ LLFloaterModelUploadBase::LLFloaterModelUploadBase(const LLSD& key) void LLFloaterModelUploadBase::requestAgentUploadPermissions() { std::string capability = "MeshUploadFlag"; - std::string url = gAgent.getRegion()->getCapability(capability); + std::string url = gAgent.getRegionCapability(capability); if (!url.empty()) { |