diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
commit | de83bd5c6b1e103993ba74321d600f1c413785ce (patch) | |
tree | 7a93bec47e33227541abda9ea80b7b094c8be549 /indra/newview/llinventoryobserver.cpp | |
parent | f57aa3e83f1b4286b1d6b5cc8bca20fb924cb002 (diff) | |
parent | 295536ae98cb88bfa551ac73ae2e19a8c2ddfc88 (diff) |
merge changes for beta fixes
Diffstat (limited to 'indra/newview/llinventoryobserver.cpp')
-rw-r--r-- | indra/newview/llinventoryobserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp index 91ff8c7867..0fd4b2bee5 100644 --- a/indra/newview/llinventoryobserver.cpp +++ b/indra/newview/llinventoryobserver.cpp @@ -203,8 +203,8 @@ void fetch_items_from_llsd(const LLSD& items_llsd) { if (!items_llsd.size() || gDisconnected) return; LLSD body; - body[0]["cap_name"] = "FetchInventory"; - body[1]["cap_name"] = "FetchLib"; + body[0]["cap_name"] = "FetchInventory2"; + body[1]["cap_name"] = "FetchLib2"; for (S32 i=0; i<items_llsd.size();i++) { if (items_llsd[i]["owner_id"].asString() == gAgent.getID().asString()) |