diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 18:15:07 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 18:15:07 -0400 |
| commit | 0d91c495717ae210aff0248119af6c4ec7ad595d (patch) | |
| tree | 83b6485d150fb6572ad34b7e78ccbcef50ab6dfc /indra/newview/llviewerregion.cpp | |
| parent | 6732f5fbca2dc83ec1cf6fcb31b5a6657e8d040f (diff) | |
Fix for merge breakages
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 415963ff53..a7fac0e29d 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1488,8 +1488,6 @@ void LLViewerRegion::unpackRegionHandshake() void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) { -void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) -{ capabilityNames.append("AttachmentResources"); capabilityNames.append("AvatarPickerSearch"); capabilityNames.append("ChatSessionRequest"); |