summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-12-17 14:14:03 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-12-17 14:14:03 -0500
commitcc9a7a70b1971def1c53c70c96e8ce88fc5a7b86 (patch)
tree5cbe1f1387bc8cf2929249bda2a0c832aa0bbfb7 /indra/newview/llviewerregion.cpp
parent9acc63001023c31d67e20d61d5ef2c67905a5c7c (diff)
merge fix
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-xindra/newview/llviewerregion.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index fa7af4f48e..e6cc75f1ce 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1673,6 +1673,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("ProductInfoRequest");
capabilityNames.append("ProvisionVoiceAccountRequest");
capabilityNames.append("RemoteParcelRequest");
+ capabilityNames.append("RenderMaterials");
capabilityNames.append("RequestTextureDownload");
capabilityNames.append("ResourceCostSelected");
capabilityNames.append("RetrieveNavMeshSrc");