diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
| commit | c5ae838ce3cd8521b7b4817f153560e03a8dcc32 (patch) | |
| tree | 7a489631ed3811ae52fab7bbf6b5a1075aa20e65 /indra/newview/llviewerregion.cpp | |
| parent | ba0c369aa20cdbfd7940a2435dd3c6630f0d54ae (diff) | |
| parent | 4047349ade461fa6bac43da2a14c6e7689918aa1 (diff) | |
pull improved avatar physics ui and other improvements from Seraph
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"); |