summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-09-01 16:15:36 -0700
committerRider Linden <rider@lindenlab.com>2015-09-01 16:15:36 -0700
commitd7672d80cf6c92f1720f8e7596c705bedcbd4a0f (patch)
tree2a4c332f6c476dff900baed36af879700254fbe0 /indra/newview/llagent.cpp
parent02c3262ac8e7f27b0effb546ad235e103c9581cf (diff)
parent96e343b49b0b5a0951ffab0beb2e1d09c37bbdc5 (diff)
Merge
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-xindra/newview/llagent.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index e7dd378edd..3316f1e654 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -953,6 +953,15 @@ BOOL LLAgent::inPrelude()
}
+std::string LLAgent::getRegionCapability(const std::string &name)
+{
+ if (!mRegionp)
+ return std::string();
+
+ return mRegionp->getCapability(name);
+}
+
+
//-----------------------------------------------------------------------------
// canManageEstate()
//-----------------------------------------------------------------------------