diff options
| author | Richard Linden <none@none> | 2011-03-08 16:47:12 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-08 16:47:12 -0800 |
| commit | f3e37e047206b909c212a02493be6972fba2c8aa (patch) | |
| tree | c51ee8f6a1e9f9c7752858becbadf1f5fef52d3f | |
| parent | 858b7d36ab1a29c9ed30efefe895f10f9fa65310 (diff) | |
SOCIAL-588 WIP All avatar changes using avatar picker are not completed and incorrect avatar can be worn
disable AIS For minimal skin
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llinventorymodelbackgroundfetch.cpp | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a8e9ca3cc9..94a49f2cef 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12498,5 +12498,16 @@ <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> </map> </llsd> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 77a3f2a1bb..b5fb85c929 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -336,5 +336,16 @@ <key>Value</key> <integer>0</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>0</integer> + </map> </map> </llsd> diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 570e48d526..e31360fcbc 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -182,7 +182,7 @@ void LLInventoryModelBackgroundFetch::backgroundFetch() { // 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("FetchInventoryDescendents2"); - if (!url.empty()) + if (gSavedSettings.getBOOL("UseHTTPInventory") && !url.empty()) { bulkFetch(url); return; |