diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llassetuploadqueue.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llcompilequeue.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llassetuploadqueue.cpp b/indra/newview/llassetuploadqueue.cpp index c52c189d56..34dc65f168 100644 --- a/indra/newview/llassetuploadqueue.cpp +++ b/indra/newview/llassetuploadqueue.cpp @@ -150,7 +150,7 @@ void LLAssetUploadQueue::request(LLAssetUploadQueueSupplier** supplier) LLViewerObject* object = gObjectList.findObject(data.mTaskId); if (object) { - url = object->getRegion()->getCapability("UpdateScriptTaskInventory"); + url = object->getRegion()->getCapability("UpdateScriptTask"); LLHTTPClient::post(url, body, new LLAssetUploadChainResponder( body, data.mFilename, data.mQueueId, diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp index 30d5dc206f..d3041c6206 100644 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -422,7 +422,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id, LLViewerObject* object = gObjectList.findObject(data->mTaskId); if (object) { - std::string url = object->getRegion()->getCapability("UpdateScriptTaskInventory"); + std::string url = object->getRegion()->getCapability("UpdateScriptTask"); if(!url.empty()) { // Read script source in to buffer. diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 71733e5cd7..c6c0fb21a8 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -142,7 +142,7 @@ const F32 LIVE_HELP_REFRESH_TIME = 1.f; static bool have_script_upload_cap(LLUUID& object_id) { LLViewerObject* object = gObjectList.findObject(object_id); - return object && (! object->getRegion()->getCapability("UpdateScriptTaskInventory").empty()); + return object && (! object->getRegion()->getCapability("UpdateScriptTask").empty()); } /// --------------------------------------------------------------------------- @@ -1291,7 +1291,7 @@ void LLPreviewLSL::saveIfNeeded() const LLInventoryItem *inv_item = getItem(); // save it out to asset server - std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgentInventory"); + std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgent"); if(inv_item) { getWindow()->incBusyCount(); @@ -2131,7 +2131,7 @@ void LLLiveLSLEditor::saveIfNeeded() fp = NULL; // save it out to asset server - std::string url = object->getRegion()->getCapability("UpdateScriptTaskInventory"); + std::string url = object->getRegion()->getCapability("UpdateScriptTask"); getWindow()->incBusyCount(); mPendingUploads++; BOOL is_running = getChild<LLCheckBoxCtrl>( "running")->get(); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 52cbcf85a9..af16bdd201 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6513,7 +6513,7 @@ class LLEditableSelectedMono : public view_listener_t LLViewerRegion* region = gAgent.getRegion(); if(region && gMenuHolder && gMenuHolder->findControl(userdata["control"].asString())) { - bool have_cap = (! region->getCapability("UpdateScriptTaskInventory").empty()); + bool have_cap = (! region->getCapability("UpdateScriptTask").empty()); bool selected = is_editable_selected() && have_cap; gMenuHolder->findControl(userdata["control"].asString())->setValue(selected); return true; diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 42ea36baec..bfb082885c 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1408,10 +1408,10 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("UpdateAgentLanguage"); capabilityNames.append("UpdateGestureAgentInventory"); capabilityNames.append("UpdateNotecardAgentInventory"); - capabilityNames.append("UpdateScriptAgentInventory"); + capabilityNames.append("UpdateScriptAgent"); capabilityNames.append("UpdateGestureTaskInventory"); capabilityNames.append("UpdateNotecardTaskInventory"); - capabilityNames.append("UpdateScriptTaskInventory"); + capabilityNames.append("UpdateScriptTask"); capabilityNames.append("ViewerStartAuction"); capabilityNames.append("UntrustedSimulatorMessage"); capabilityNames.append("ViewerStats"); |