diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:22:37 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:22:37 -0500 |
commit | bca2b9a053b1358435b57e0c7a59866702644844 (patch) | |
tree | 017eff9fe68352e4dca6db8837b513b78dfa7f47 /indra/newview/llinventoryobserver.cpp | |
parent | ad555098bf599bbb9bdb4db945baef56674c0f2d (diff) | |
parent | a426a4b65b4914c2469a0db1dbde4051b59c289b (diff) |
merge changes for storm-832
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()) |