diff options
author | Oz Linden <oz@lindenlab.com> | 2011-02-11 11:38:27 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-02-11 11:38:27 -0500 |
commit | 924be3f25c2fca57a8d6f5f902eaeca5c2dd91e1 (patch) | |
tree | 3ba82720ba6b24830637999bfa605e786d814ced /indra/newview/llviewerinventory.cpp | |
parent | 40abc0fe1e6edd2f018fcdc35ffccdb5475a5fe0 (diff) | |
parent | 547b40bfc8b0139789a2d9c5dcd1591343a2c60b (diff) |
pull back release tag from viewer-beta
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r-- | indra/newview/llviewerinventory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index b3642a2c1e..cc851e676b 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -366,11 +366,11 @@ void LLViewerInventoryItem::fetchFromServer(void) const { if(gAgent.getID() != mPermissions.getOwner()) { - url = region->getCapability("FetchLib"); + url = region->getCapability("FetchLib2"); } else { - url = region->getCapability("FetchInventory"); + url = region->getCapability("FetchInventory2"); } } else @@ -648,7 +648,7 @@ bool LLViewerInventoryCategory::fetch() std::string url; if (gAgent.getRegion()) { - url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents"); + url = gAgent.getRegion()->getCapability("FetchInventoryDescendents2"); } else { @@ -660,7 +660,7 @@ bool LLViewerInventoryCategory::fetch() } else { //Deprecated, but if we don't have a capability, use the old system. - llinfos << "WebFetchInventoryDescendents capability not found. Using deprecated UDP message." << llendl; + llinfos << "FetchInventoryDescendents2 capability not found. Using deprecated UDP message." << llendl; LLMessageSystem* msg = gMessageSystem; msg->newMessage("FetchInventoryDescendents"); msg->nextBlock("AgentData"); |