diff options
| author | Don Kjer <don@lindenlab.com> | 2011-06-13 02:48:52 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-06-13 02:48:52 +0000 |
| commit | 45c6dcbe87fbfc1351e4faa9ef3196a191b7dd69 (patch) | |
| tree | 4fe43929cb518d67e8afbd227db3bc62e4d175e5 /indra/newview/llviewerregion.cpp | |
| parent | 694b0838bc80efc152e7ecda09ffdc7a944b7079 (diff) | |
| parent | 12d9d1d3ef76518171ae87aae2467593218f8413 (diff) | |
Merge
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..590c82856d 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1545,6 +1545,11 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("ViewerMetrics"); capabilityNames.append("ViewerStartAuction"); capabilityNames.append("ViewerStats"); + //prep# Finalize these!!!!!!!!! + //capabilityNames.append("AccountingVO"); + capabilityNames.append("AccountingParcel"); + capabilityNames.append("AccountingRegion"); + // Please add new capabilities alphabetically to reduce // merge conflicts. @@ -1658,3 +1663,4 @@ std::string LLViewerRegion::getDescription() const { return stringize(*this); } + |