Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HTTP inventory fetching enabled.

Browse Source
This commit is contained in:
Shyotl
2012-01-21 02:37:22 -06:00
parent 40400d696b
commit d7d65df9e0
6 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
etc/message.xml
View File

@@ -670,19 +670,19 @@
<key>EstateChangeInfo</key> <key>EstateChangeInfo</key>
<boolean>true</boolean> <boolean>true</boolean>
<key>FetchInventoryDescendents</key> <key>FetchInventoryDescendents2</key>
<boolean>false</boolean> <boolean>false</boolean>
<key>WebFetchInventoryDescendents</key> <key>WebFetchInventoryDescendents</key>
<boolean>false</boolean> <boolean>false</boolean>
<key>FetchInventory</key> <key>FetchInventory2</key>
<boolean>true</boolean> <boolean>true</boolean>
<key>FetchLibDescendents</key> <key>FetchLibDescendents2</key>
<boolean>true</boolean> <boolean>true</boolean>
<key>FetchLib</key> <key>FetchLib2</key>
<boolean>true</boolean> <boolean>true</boolean>
</map> </map>

11
indra/newview/app_settings/settings.xml
View File

@@ -14459,6 +14459,17 @@
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
<key>UseHTTPInventory</key>
<map>
<key>Comment</key>
<string>Allow use of http inventory transfers instead of UDP</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FloaterUploadRect</key> <key>FloaterUploadRect</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

6
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@@ -185,8 +185,8 @@ void LLInventoryModelBackgroundFetch::backgroundFetch()
if (mBackgroundFetchActive && gAgent.getRegion()) if (mBackgroundFetchActive && gAgent.getRegion())
{ {
// If we'll be using the capability, we'll be sending batches and the background thing isn't as important. // If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents"); std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents2");
if (false /*gSavedSettings.getBOOL("UseHTTPInventory")*/ && !url.empty()) if (gSavedSettings.getBOOL("UseHTTPInventory") && !url.empty())
{ {
bulkFetch(url); bulkFetch(url);
return; return;
@@ -605,7 +605,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch(std::string url)
} }
if (body_lib["folders"].size()) if (body_lib["folders"].size())
{ {
std::string url_lib = gAgent.getRegion()->getCapability("FetchLibDescendents"); std::string url_lib = gAgent.getRegion()->getCapability("FetchLibDescendents2");
LLInventoryModelFetchDescendentsResponder *fetcher = new LLInventoryModelFetchDescendentsResponder(body_lib, recursive_cats); LLInventoryModelFetchDescendentsResponder *fetcher = new LLInventoryModelFetchDescendentsResponder(body_lib, recursive_cats);
LLHTTPClient::post(url_lib, body_lib, fetcher, 300.0); LLHTTPClient::post(url_lib, body_lib, fetcher, 300.0);

4
indra/newview/llinventoryobserver.cpp
View File

@@ -262,8 +262,8 @@ void fetch_items_from_llsd(const LLSD& items_llsd)
{ {
if (!items_llsd.size() || gDisconnected) return; if (!items_llsd.size() || gDisconnected) return;
LLSD body; LLSD body;
body[0]["cap_name"] = "FetchInventory"; body[0]["cap_name"] = "FetchInventory2";
body[1]["cap_name"] = "FetchLib"; body[1]["cap_name"] = "FetchLib2";
for (S32 i=0; i<items_llsd.size();i++) for (S32 i=0; i<items_llsd.size();i++)
{ {
if (items_llsd[i]["owner_id"].asString() == gAgent.getID().asString()) if (items_llsd[i]["owner_id"].asString() == gAgent.getID().asString())

6
indra/newview/llviewerinventory.cpp
View File

@@ -220,9 +220,9 @@ void LLViewerInventoryItem::fetchFromServer(void) const
std::string url; std::string url;
if( ALEXANDRIA_LINDEN_ID.getString() == mPermissions.getOwner().getString()) if( ALEXANDRIA_LINDEN_ID.getString() == mPermissions.getOwner().getString())
url = gAgent.getRegion()->getCapability("FetchLib"); url = gAgent.getRegion()->getCapability("FetchLib2");
else else
url = gAgent.getRegion()->getCapability("FetchInventory"); url = gAgent.getRegion()->getCapability("FetchInventory2");
if (!url.empty()) if (!url.empty())
{ {
@@ -500,7 +500,7 @@ bool LLViewerInventoryCategory::fetchDescendents()
std::string url; std::string url;
if (gAgent.getRegion()) if (gAgent.getRegion())
{ {
url = gAgent.getRegion()->getCapability("FetchInventoryDescendents"); url = gAgent.getRegion()->getCapability("FetchInventoryDescendents2");
} }
else else
{ {

10
indra/newview/llviewerregion.cpp
View File

@@ -1501,12 +1501,12 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("ObjectMedia"); capabilityNames.append("ObjectMedia");
capabilityNames.append("ObjectMediaNavigate");*/ capabilityNames.append("ObjectMediaNavigate");*/
if (false)//gSavedSettings.getBOOL("UseHTTPInventory")) //Caps suffixed with 2 by LL. Don't update until rest of fetch system is updated first. if (gSavedSettings.getBOOL("UseHTTPInventory")) //Caps suffixed with 2 by LL. Don't update until rest of fetch system is updated first.
{ {
capabilityNames.append("FetchLib"); capabilityNames.append("FetchLib2");
capabilityNames.append("FetchLibDescendents"); capabilityNames.append("FetchLibDescendents2");
capabilityNames.append("FetchInventory"); capabilityNames.append("FetchInventory2");
capabilityNames.append("FetchInventoryDescendents"); capabilityNames.append("FetchInventoryDescendents2");
} }
capabilityNames.append("GetDisplayNames"); capabilityNames.append("GetDisplayNames");