summaryrefslogtreecommitdiff
path: root/indra/newview/llaisapi.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-10-30 04:20:12 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-10-30 04:20:12 -0400
commit58e2d58daf603824872308245a451c2e32394706 (patch)
treef2fb9d23ce92946b6bf75ce4840a67df684aefad /indra/newview/llaisapi.cpp
parent5c8d902c1bab6f0577750e8e2470384a31880947 (diff)
SL-93 - WIP on managing pelvis fixups using new joint offset framework
Diffstat (limited to 'indra/newview/llaisapi.cpp')
-rwxr-xr-xindra/newview/llaisapi.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 96de15bf75..9842bf2a66 100755
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -124,7 +124,8 @@ bool AISCommand::isAPIAvailable()
{
if (gAgent.getRegion())
{
- return gAgent.getRegion()->isCapabilityAvailable("InventoryAPIv3");
+ bool force_disable = gSavedSettings.getBOOL("InventoryDisableAISv3");
+ return gAgent.getRegion()->isCapabilityAvailable("InventoryAPIv3") && !force_disable;
}
return false;
}