diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-27 15:33:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-27 15:33:46 -0400 |
| commit | 0c360c5223af6473b701f2f41d525f1f70c2ead5 (patch) | |
| tree | dc59a8390988ece0d340632171f06e0af83507e1 /indra/newview/llviewerregion.cpp | |
| parent | 7a7a0f0c1bd134fa23d734d672ef44a763a9f228 (diff) | |
| parent | 170de8330e3be55794878cefb53f62266c9a029d (diff) | |
merge changes for storm-1210
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); } + |