diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
| commit | 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 (patch) | |
| tree | c3b9f11fbbfa29cd23b7de22543fd80285ad810d /indra/newview/llviewerregion.cpp | |
| parent | c0af95e18c57a7e0578df780697042f8a6221431 (diff) | |
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 50fe66ea5e..e822c81500 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1420,6 +1420,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("SendUserReportWithScreenshot"); capabilityNames.append("ServerReleaseNotes"); capabilityNames.append("StartGroupProposal"); + capabilityNames.append("UntrustedSimulatorMessage"); capabilityNames.append("UpdateAgentLanguage"); capabilityNames.append("UpdateGestureAgentInventory"); capabilityNames.append("UpdateNotecardAgentInventory"); @@ -1427,8 +1428,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("UpdateGestureTaskInventory"); capabilityNames.append("UpdateNotecardTaskInventory"); capabilityNames.append("UpdateScriptTask"); + capabilityNames.append("UploadBakedTexture"); capabilityNames.append("ViewerStartAuction"); - capabilityNames.append("UntrustedSimulatorMessage"); capabilityNames.append("ViewerStats"); // Please add new capabilities alphabetically to reduce // merge conflicts. |