summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2014-03-06 09:20:54 -0500
committerJonathan Yap <none@none>2014-03-06 09:20:54 -0500
commita0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (patch)
tree9da9b08465582432d12797951543a30d6c9fc2c1 /indra/newview/llviewerregion.cpp
parent672cc7049777b57a01a61428864ac6e3d10df321 (diff)
parenta5e56067c28298b4df0ef498303f78f67c35782c (diff)
STORM-68 merge
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-xindra/newview/llviewerregion.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index bcc4f46e6f..03e016796e 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2000&license=viewerlgpl$
* Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2010-2013, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -1603,6 +1603,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("GetDisplayNames");
capabilityNames.append("GetMesh");
+ capabilityNames.append("GetMesh2");
capabilityNames.append("GetObjectCost");
capabilityNames.append("GetObjectPhysicsData");
capabilityNames.append("GetTexture");