From 58e2d58daf603824872308245a451c2e32394706 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 30 Oct 2014 04:20:12 -0400 Subject: SL-93 - WIP on managing pelvis fixups using new joint offset framework --- indra/newview/llaisapi.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llaisapi.cpp') 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; } -- cgit v1.2.3 From 535e24c7e8913db447d90a949f6b2f6b92927f48 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 30 Oct 2014 14:04:18 -0400 Subject: SL-93 WIP - missing include --- indra/newview/llaisapi.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llaisapi.cpp') diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index 9842bf2a66..19793b6583 100755 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -34,6 +34,7 @@ #include "llsdutil.h" #include "llviewerregion.h" #include "llinventoryobserver.h" +#include "llviewercontrol.h" ///---------------------------------------------------------------------------- /// Classes for AISv3 support. -- cgit v1.2.3 From 90aca8f95af4c73e592d9657d0eba4d9a709244c Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 31 Oct 2014 13:24:20 -0400 Subject: settings.xml update --- indra/newview/llaisapi.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llaisapi.cpp') diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index 19793b6583..9d887a61f1 100755 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -125,8 +125,7 @@ bool AISCommand::isAPIAvailable() { if (gAgent.getRegion()) { - bool force_disable = gSavedSettings.getBOOL("InventoryDisableAISv3"); - return gAgent.getRegion()->isCapabilityAvailable("InventoryAPIv3") && !force_disable; + return gAgent.getRegion()->isCapabilityAvailable("InventoryAPIv3"); } return false; } -- cgit v1.2.3