diff options
author | dolphin <dolphin@lindenlab.com> | 2014-02-26 14:04:43 -0800 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-02-26 14:04:43 -0800 |
commit | fa88239bd00fcb6d58f20a0c23699f108acbfcbc (patch) | |
tree | ed978c9dedf1905f5b0f6b2d2346600fd6e48ff3 /indra/newview/llviewerregion.cpp | |
parent | 95523616b89dadd697eb6cfa3a466feadc1e1208 (diff) | |
parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) |
Merge with 3.7.2-release
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-x | indra/newview/llviewerregion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 28fa93c442..49f378dd4c 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 @@ -1612,6 +1612,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("IsExperienceContributor"); capabilityNames.append("RegionExperiences"); capabilityNames.append("GetMesh"); + capabilityNames.append("GetMesh2"); capabilityNames.append("GetMetadata"); capabilityNames.append("GetObjectCost"); capabilityNames.append("GetObjectPhysicsData"); |