diff options
author | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:42:44 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:42:44 -0800 |
commit | 3fbaff17bf65a826dd8b9bd50dc460aacaa3cb00 (patch) | |
tree | 05916e8997e5133af6d16ce9754a29b2aa0fc760 /indra/newview/llviewerregion.cpp | |
parent | 160bb09e775bc3c165cafefa4d80d861d4c39f2c (diff) | |
parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) |
Pull merge from viewer-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 f56a2dd04f..796d8fcae2 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 @@ -1602,6 +1602,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("GetDisplayNames"); capabilityNames.append("GetMesh"); + capabilityNames.append("GetMesh2"); capabilityNames.append("GetObjectCost"); capabilityNames.append("GetObjectPhysicsData"); capabilityNames.append("GetTexture"); |