diff options
| author | seth_productengine <none@none> | 2011-08-08 15:43:00 +0300 |
|---|---|---|
| committer | seth_productengine <none@none> | 2011-08-08 15:43:00 +0300 |
| commit | df353a6746f6261ac238d29a418962bbab62ec5b (patch) | |
| tree | 113a11702c5de5fa0e9097f3129927b249aa2781 /indra/newview/llviewerregion.cpp | |
| parent | ef6e51db22ad3aec42b19bcf3e077ff000ba8929 (diff) | |
| parent | 575c7f85b20fca57fcd97a2a18bd7ad0c030a935 (diff) | |
Merge with 8582496d7733948e19396167df9b4d2d4cd35f0c
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 7ebfcc2b5a..822127c0b3 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1484,8 +1484,6 @@ void LLViewerRegion::unpackRegionHandshake() void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) { - capabilityNames.append("AccountingParcel"); - capabilityNames.append("AccountingSelection"); capabilityNames.append("AttachmentResources"); capabilityNames.append("AvatarPickerSearch"); capabilityNames.append("ChatSessionRequest"); @@ -1525,6 +1523,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("ProvisionVoiceAccountRequest"); capabilityNames.append("RemoteParcelRequest"); capabilityNames.append("RequestTextureDownload"); + capabilityNames.append("ResourceCostSelected"); capabilityNames.append("SearchStatRequest"); capabilityNames.append("SearchStatTracking"); capabilityNames.append("SendPostcard"); @@ -1550,10 +1549,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) 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. |