livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5090 Remove disabling HTTP Inventory from Viewer

meow-7.2.2
Mnikolenko ProductEngine 2015-04-14 14:10:38 +03:00
parent a647b8f1cb
commit 8be5c8eade
4 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14703,17 +14703,6 @@
<key>Value</key>
<integer>1</integer>
</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>ClickToWalk</key>
<map>
<key>Comment</key>

8
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@ -351,13 +351,9 @@ void LLInventoryModelBackgroundFetch::backgroundFetch()
if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
{
// If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
if (gSavedSettings.getBOOL("UseHTTPInventory"))
{
bulkFetch();
return;
}
bulkFetch();
#if 1
#if 0
//--------------------------------------------------------------------------------
// DEPRECATED OLD CODE
//

15
indra/newview/llviewerregion.cpp
View File

@ -2728,15 +2728,12 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("FlickrConnect");
capabilityNames.append("TwitterConnect");
if (gSavedSettings.getBOOL("UseHTTPInventory"))
{
capabilityNames.append("FetchLib2");
capabilityNames.append("FetchLibDescendents2");
capabilityNames.append("FetchInventory2");
capabilityNames.append("FetchInventoryDescendents2");
capabilityNames.append("IncrementCOFVersion");
AISCommand::getCapabilityNames(capabilityNames);
}
capabilityNames.append("FetchLib2");
capabilityNames.append("FetchLibDescendents2");
capabilityNames.append("FetchInventory2");
capabilityNames.append("FetchInventoryDescendents2");
capabilityNames.append("IncrementCOFVersion");
AISCommand::getCapabilityNames(capabilityNames);
capabilityNames.append("GetDisplayNames");
capabilityNames.append("GetMesh");

10
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -3590,16 +3590,6 @@
function="ToggleControl"
parameter="ImagePipelineUseHTTP" />
</menu_item_check>
<menu_item_check
label="HTTP Inventory"
name="HTTP Inventory">
<menu_item_check.on_check
function="CheckControl"
parameter="UseHTTPInventory" />
<menu_item_check.on_click
function="ToggleControl"
parameter="UseHTTPInventory" />
</menu_item_check>
<menu_item_call
label="Compress Images"
name="Compress Images">