diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
commit | 85ccab2d8178c508e585f987bb076951bf2e9ddb (patch) | |
tree | 5fbdf54372657c2c9353d274cd81f62b1e4fdf02 /indra/newview/llviewerregion.cpp | |
parent | 9f2a04f217d54344360edc554456d9804e17eeb7 (diff) | |
parent | 6ef593580239df7b967cca59d4cfa9fcd8db6aec (diff) |
Automated merge with file:///Users/oz/Work/viewer-vs2010
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r-- | indra/newview/llviewerregion.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 23b7b921b8..e1d3e8a0b3 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -67,6 +67,7 @@ #include "llworld.h" #include "llspatialpartition.h" #include "stringize.h" +#include "llviewercontrol.h" #ifdef LL_WINDOWS #pragma warning(disable:4355) @@ -1387,10 +1388,15 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("EventQueueGet"); capabilityNames.append("ObjectMedia"); capabilityNames.append("ObjectMediaNavigate"); - capabilityNames.append("FetchLib2"); - capabilityNames.append("FetchLibDescendents2"); - capabilityNames.append("FetchInventory2"); - capabilityNames.append("FetchInventoryDescendents2"); + + if (gSavedSettings.getBOOL("UseHTTPInventory")) + { + capabilityNames.append("FetchLib2"); + capabilityNames.append("FetchLibDescendents2"); + capabilityNames.append("FetchInventory2"); + capabilityNames.append("FetchInventoryDescendents2"); + } + capabilityNames.append("GetDisplayNames"); capabilityNames.append("GetTexture"); capabilityNames.append("GroupProposalBallot"); |