diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-05-02 14:48:47 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-05-02 14:48:47 -0400 |
| commit | e5d23969b9ad75ca535182ccbe76ff2b80d00605 (patch) | |
| tree | 3f7c27476a95da3a8a7eeffc228541a86a1eaaac /indra/newview/llviewerinventory.cpp | |
| parent | af1431731802320e241037486b8bff0003a4d827 (diff) | |
| parent | 2f1f7c86bd7f366be5d5ccf64cf1af1300bc57a0 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rwxr-xr-x | indra/newview/llviewerinventory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 3eab85b8b3..f9afdee4f9 100755 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1189,7 +1189,7 @@ void remove_inventory_item( if(obj) { std::string cap; - if (gAgent.getRegion()) + if (gAgent.getRegion() && gSavedSettings.getBOOL("UseAISv3Inventory")) { cap = gAgent.getRegion()->getCapability("InventoryAPIv3"); } @@ -1267,7 +1267,7 @@ void remove_inventory_category( } std::string cap; - if (gAgent.getRegion()) + if (gAgent.getRegion() && gSavedSettings.getBOOL("UseAISv3Inventory")) { cap = gAgent.getRegion()->getCapability("InventoryAPIv3"); } @@ -1409,7 +1409,7 @@ void purge_descendents_of(const LLUUID& id, LLPointer<LLInventoryCallback> cb) else { std::string cap; - if (gAgent.getRegion()) + if (gAgent.getRegion() && gSavedSettings.getBOOL("UseAISv3Inventory")) { cap = gAgent.getRegion()->getCapability("InventoryAPIv3"); } |