diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-25 09:12:36 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-25 09:12:36 -0400 |
| commit | e03f25d51a5840d9d4f29d0ee238ed4b881b8cee (patch) | |
| tree | 7d8ad6f2fd58abc004388c8174293ee78bb927bd /indra/newview/llviewerregion.cpp | |
| parent | bc0df31d1beaa6eddd48431eb9e42d38d3698673 (diff) | |
| parent | cb797532c0bd7ca0ab4caf66c48aa55ec99160a0 (diff) | |
automated merge mesh-development -> mesh-development
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index f835351c04..fb608b3a4f 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1508,6 +1508,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("LandResources"); capabilityNames.append("MapLayer"); capabilityNames.append("MapLayerGod"); + capabilityNames.append("NewAccountingEnabled"); capabilityNames.append("NewFileAgentInventory"); capabilityNames.append("NewFileAgentInventoryVariablePrice"); capabilityNames.append("ObjectAdd"); @@ -1545,6 +1546,10 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("ViewerMetrics"); capabilityNames.append("ViewerStartAuction"); capabilityNames.append("ViewerStats"); + //prep# Finalize these!!!!!!!!! + capabilityNames.append("AccountingParcel"); + capabilityNames.append("AccountingSelection"); + // Please add new capabilities alphabetically to reduce // merge conflicts. @@ -1658,3 +1663,4 @@ std::string LLViewerRegion::getDescription() const { return stringize(*this); } + |