diff options
author | Rider Linden <rider@lindenlab.com> | 2015-09-18 16:36:49 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-09-18 16:36:49 -0700 |
commit | cf835a80cd2bb5d02cc03034009919e0d9eb73b6 (patch) | |
tree | 83430bb0a17229b57968d4f26b8fc65b9420e670 /indra/newview | |
parent | 96c87f326aee7b6499aae5ff3f6e208f2db6cd0e (diff) |
Pref instance() over getInstance()
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/llaisapi.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llviewerassetupload.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index 5b7380a175..afc6e208e6 100755 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -367,7 +367,7 @@ void AISAPI::UpdateItem(const LLUUID &itemId, const LLSD &updates, completion_t void AISAPI::EnqueueAISCommand(const std::string &procName, LLCoprocedureManager::CoProcedure_t proc) { std::string procFullName = "AIS(" + procName + ")"; - LLCoprocedureManager::getInstance()->enqueueCoprocedure("AIS", procFullName, proc); + LLCoprocedureManager::instance().enqueueCoprocedure("AIS", procFullName, proc); } diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index e8f9809ee7..ea3d81c2f6 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -174,7 +174,7 @@ S32 LLResourceUploadInfo::getEconomyUploadCost() getAssetType() == LLAssetType::AT_ANIMATION || getAssetType() == LLAssetType::AT_MESH) { - return LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(); + return LLGlobalEconomy::Singleton::instance().getPriceUpload(); } return 0; @@ -666,7 +666,7 @@ LLUUID LLViewerAssetUpload::EnqueueInventoryUpload(const std::string &url, const { std::string procName("LLViewerAssetUpload::AssetInventoryUploadCoproc("); - LLUUID queueId = LLCoprocedureManager::getInstance()->enqueueCoprocedure("Upload", + LLUUID queueId = LLCoprocedureManager::instance().enqueueCoprocedure("Upload", procName + LLAssetType::lookup(uploadInfo->getAssetType()) + ")", boost::bind(&LLViewerAssetUpload::AssetInventoryUploadCoproc, _1, _2, url, uploadInfo)); |