summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/installers/windows/installer_template.nsi7
-rw-r--r--indra/newview/llestateinfomodel.cpp2
-rw-r--r--indra/newview/llfloaterland.cpp2
-rw-r--r--indra/newview/llfloatermodeluploadbase.cpp2
-rw-r--r--indra/newview/llfloaterregiondebugconsole.cpp8
-rw-r--r--indra/newview/llfloaterregioninfo.cpp6
-rw-r--r--indra/newview/llfloaterreporter.cpp4
-rw-r--r--indra/newview/llmeshrepository.cpp2
-rw-r--r--indra/newview/llpanelwearing.cpp2
-rw-r--r--indra/newview/llproductinforequest.cpp2
-rw-r--r--indra/newview/llspeakers.cpp6
-rw-r--r--indra/newview/llviewermenufile.cpp2
-rw-r--r--indra/newview/llviewerparcelmedia.cpp2
-rw-r--r--indra/newview/llvoavatarself.cpp2
-rw-r--r--indra/newview/llwlhandlers.cpp4
15 files changed, 24 insertions, 29 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 89317f2793..6ee330619f 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -300,11 +300,6 @@ CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \
CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
'"$INSTDIR\uninst.exe"' ''
-# Create *.bat file to specify lang params on first run from installer - see MAINT-5259
-FileOpen $9 "$INSTDIR\autorun.bat" w
-FileWrite $9 'start "$INSTDIR\$INSTEXE" "$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM$\r$\n'
-FileClose $9
-
# Write registry
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"
@@ -700,7 +695,7 @@ Call CheckWindowsServPack # Warn if not on the latest SP before asking to launc
Push $R0 # Option value, unused
StrCmp $SKIP_AUTORUN "true" +2;
# Assumes SetOutPath $INSTDIR
- Exec '"$WINDIR\explorer.exe" "$INSTDIR\autorun.bat"'
+ Exec '"$WINDIR\explorer.exe" "$INSTDIR\$INSTSHORTCUT.lnk"'
Pop $R0
FunctionEnd
diff --git a/indra/newview/llestateinfomodel.cpp b/indra/newview/llestateinfomodel.cpp
index e422581129..e56a67f8d1 100644
--- a/indra/newview/llestateinfomodel.cpp
+++ b/indra/newview/llestateinfomodel.cpp
@@ -116,7 +116,7 @@ void LLEstateInfoModel::notifyCommit()
// tries to send estate info using a cap; returns true if it succeeded
bool LLEstateInfoModel::commitEstateInfoCaps()
{
- std::string url = gAgent.getRegion()->getCapability("EstateChangeInfo");
+ std::string url = gAgent.getRegionCapability("EstateChangeInfo");
if (url.empty())
{
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 695b321751..88b3fb7b96 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -503,7 +503,7 @@ BOOL LLPanelLandGeneral::postBuild()
// note: on region change this will not be re checked, should not matter on Agni as
// 99% of the time all regions will return the same caps. In case of an erroneous setting
// to enabled the floater will just throw an error when trying to get it's cap
- std::string url = gAgent.getRegion()->getCapability("LandResources");
+ std::string url = gAgent.getRegionCapability("LandResources");
if (!url.empty())
{
if(mBtnScriptLimits)
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())
{
diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp
index 271fb2f9a3..e817589622 100644
--- a/indra/newview/llfloaterregiondebugconsole.cpp
+++ b/indra/newview/llfloaterregiondebugconsole.cpp
@@ -116,11 +116,11 @@ BOOL LLFloaterRegionDebugConsole::postBuild()
mOutput = getChild<LLTextEditor>("region_debug_console_output");
- std::string url = gAgent.getRegion()->getCapability("SimConsoleAsync");
+ std::string url = gAgent.getRegionCapability("SimConsoleAsync");
if (url.empty())
{
// Fall back to see if the old API is supported.
- url = gAgent.getRegion()->getCapability("SimConsole");
+ url = gAgent.getRegionCapability("SimConsole");
if (url.empty())
{
mOutput->appendText(
@@ -139,11 +139,11 @@ void LLFloaterRegionDebugConsole::onInput(LLUICtrl* ctrl, const LLSD& param)
LLLineEditor* input = static_cast<LLLineEditor*>(ctrl);
std::string text = input->getText() + "\n";
- std::string url = gAgent.getRegion()->getCapability("SimConsoleAsync");
+ std::string url = gAgent.getRegionCapability("SimConsoleAsync");
if (url.empty())
{
// Fall back to the old API
- url = gAgent.getRegion()->getCapability("SimConsole");
+ url = gAgent.getRegionCapability("SimConsole");
if (url.empty())
{
text += CONSOLE_UNAVAILABLE + PROMPT;
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index c330c2ae47..af68a2aae1 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -238,7 +238,7 @@ BOOL LLFloaterRegionInfo::postBuild()
return TRUE;
}
- if(!gAgent.getRegion()->getCapability("RegionExperiences").empty())
+ if(!gAgent.getRegionCapability("RegionExperiences").empty())
{
panel = new LLPanelRegionExperiences;
mInfoPanels.push_back(panel);
@@ -879,7 +879,7 @@ bool LLPanelRegionGeneralInfo::onMessageCommit(const LLSD& notification, const L
void LLFloaterRegionInfo::requestMeshRezInfo()
{
- std::string sim_console_url = gAgent.getRegion()->getCapability("SimConsoleAsync");
+ std::string sim_console_url = gAgent.getRegionCapability("SimConsoleAsync");
if (!sim_console_url.empty())
{
@@ -907,7 +907,7 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
// First try using a Cap. If that fails use the old method.
LLSD body;
- std::string url = gAgent.getRegion()->getCapability("DispatchRegionInfo");
+ std::string url = gAgent.getRegionCapability("DispatchRegionInfo");
if (!url.empty())
{
body["block_terraform"] = getChild<LLUICtrl>("block_terraform_check")->getValue();
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 515c2b0c4b..c0f5e63623 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -438,8 +438,8 @@ void LLFloaterReporter::onClickSend(void *userdata)
LLUploadDialog::modalUploadDialog(LLTrans::getString("uploading_abuse_report"));
// *TODO don't upload image if checkbox isn't checked
- std::string url = gAgent.getRegion()->getCapability("SendUserReport");
- std::string sshot_url = gAgent.getRegion()->getCapability("SendUserReportWithScreenshot");
+ std::string url = gAgent.getRegionCapability("SendUserReport");
+ std::string sshot_url = gAgent.getRegionCapability("SendUserReportWithScreenshot");
if(!url.empty() || !sshot_url.empty())
{
self->sendReportViaCaps(url, sshot_url, self->gatherReport());
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index b65e7ef352..df708013fc 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1892,7 +1892,7 @@ LLMeshUploadThread::LLMeshUploadThread(LLMeshUploadThread::instance_list& data,
mOrigin = gAgent.getPositionAgent();
mHost = gAgent.getRegionHost();
- mWholeModelFeeCapability = gAgent.getRegion()->getCapability("NewFileAgentInventory");
+ mWholeModelFeeCapability = gAgent.getRegionCapability("NewFileAgentInventory");
mOrigin += gAgent.getAtAxis() * scale.magVec();
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index a150007177..3099a6e039 100644
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -416,7 +416,7 @@ bool LLPanelWearing::populateAttachmentsList(bool update)
void LLPanelWearing::requestAttachmentDetails()
{
LLSD body;
- std::string url = gAgent.getRegion()->getCapability("AttachmentResources");
+ std::string url = gAgent.getRegionCapability("AttachmentResources");
if (!url.empty())
{
LLCoros::instance().launch("LLPanelWearing::getAttachmentLimitsCoro",
diff --git a/indra/newview/llproductinforequest.cpp b/indra/newview/llproductinforequest.cpp
index b663df4aae..4abb673555 100644
--- a/indra/newview/llproductinforequest.cpp
+++ b/indra/newview/llproductinforequest.cpp
@@ -41,7 +41,7 @@ LLProductInfoRequestManager::LLProductInfoRequestManager():
void LLProductInfoRequestManager::initSingleton()
{
- std::string url = gAgent.getRegion()->getCapability("ProductInfoRequest");
+ std::string url = gAgent.getRegionCapability("ProductInfoRequest");
if (!url.empty())
{
LLCoros::instance().launch("LLProductInfoRequestManager::getLandDescriptionsCoro",
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 19d1af34f9..abb936c3e5 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -818,7 +818,7 @@ void LLIMSpeakerMgr::toggleAllowTextChat(const LLUUID& speaker_id)
LLPointer<LLSpeaker> speakerp = findSpeaker(speaker_id);
if (!speakerp) return;
- std::string url = gAgent.getRegion()->getCapability("ChatSessionRequest");
+ std::string url = gAgent.getRegionCapability("ChatSessionRequest");
LLSD data;
data["method"] = "mute update";
data["session-id"] = getSessionID();
@@ -844,7 +844,7 @@ void LLIMSpeakerMgr::moderateVoiceParticipant(const LLUUID& avatar_id, bool unmu
// do not send voice moderation changes for avatars not in voice channel
if (!is_in_voice) return;
- std::string url = gAgent.getRegion()->getCapability("ChatSessionRequest");
+ std::string url = gAgent.getRegionCapability("ChatSessionRequest");
LLSD data;
data["method"] = "mute update";
data["session-id"] = getSessionID();
@@ -924,7 +924,7 @@ void LLIMSpeakerMgr::processSessionUpdate(const LLSD& session_update)
void LLIMSpeakerMgr::moderateVoiceSession(const LLUUID& session_id, bool disallow_voice)
{
- std::string url = gAgent.getRegion()->getCapability("ChatSessionRequest");
+ std::string url = gAgent.getRegionCapability("ChatSessionRequest");
LLSD data;
data["method"] = "session update";
data["session-id"] = session_id;
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 8d0c5af314..90355b7166 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -799,7 +799,7 @@ void upload_new_resource(
// uploadInfo->setTransactionId(tid);
- std::string url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
+ std::string url = gAgent.getRegionCapability("NewFileAgentInventory");
if ( !url.empty() )
{
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 0ab3d2b4e7..d31fc0d606 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -461,7 +461,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
// *TODO: I can not find any active code where this method is called...
void LLViewerParcelMedia::sendMediaNavigateMessage(const std::string& url)
{
- std::string region_url = gAgent.getRegion()->getCapability("ParcelNavigateMedia");
+ std::string region_url = gAgent.getRegionCapability("ParcelNavigateMedia");
if (!region_url.empty())
{
// send navigate event to sim for link sharing
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index d62862dfb8..10af524ee7 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -2744,7 +2744,7 @@ bool LLVOAvatarSelf::sendAppearanceMessage(LLMessageSystem *mesgsys) const
//------------------------------------------------------------------------
void LLVOAvatarSelf::sendHoverHeight() const
{
- std::string url = gAgent.getRegion()->getCapability("AgentPreferences");
+ std::string url = gAgent.getRegionCapability("AgentPreferences");
if (!url.empty())
{
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp
index 87e8c3008e..ea65a0c6d9 100644
--- a/indra/newview/llwlhandlers.cpp
+++ b/indra/newview/llwlhandlers.cpp
@@ -74,7 +74,7 @@ void LLEnvironmentRequest::onRegionCapsReceived(const LLUUID& region_id)
// static
bool LLEnvironmentRequest::doRequest()
{
- std::string url = gAgent.getRegion()->getCapability("EnvironmentSettings");
+ std::string url = gAgent.getRegionCapability("EnvironmentSettings");
if (url.empty())
{
LL_INFOS("WindlightCaps") << "Skipping windlight setting request - we don't have this capability" << LL_ENDL;
@@ -162,7 +162,7 @@ bool LLEnvironmentApply::initiateRequest(const LLSD& content)
sLastUpdate = current;
// Send update request.
- std::string url = gAgent.getRegion()->getCapability("EnvironmentSettings");
+ std::string url = gAgent.getRegionCapability("EnvironmentSettings");
if (url.empty())
{
LL_WARNS("WindlightCaps") << "Applying windlight settings not supported" << LL_ENDL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 11:11:52 +0000