diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-10-31 13:24:20 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-10-31 13:24:20 -0400 |
| commit | 90aca8f95af4c73e592d9657d0eba4d9a709244c (patch) | |
| tree | 9cce477a79a40c91b9e92bf11c928aa45c307fe6 | |
| parent | 535e24c7e8913db447d90a949f6b2f6b92927f48 (diff) | |
settings.xml update
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rwxr-xr-x | indra/newview/llaisapi.cpp | 3 |
2 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3d97d0525e..22d64d4d14 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4731,17 +4731,6 @@ <key>Value</key> <integer>7</integer> </map> - <key>InventoryDisableAISv3</key> - <map> - <key>Comment</key> - <string>Force AISv3 support to off.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>InvertMouse</key> <map> <key>Comment</key> 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; } |