diff options
author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llviewerregion.cpp | |
parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llviewerregion.cpp')
-rw-r--r-- | linden/indra/newview/llviewerregion.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp index 2fafe30..42eb112 100644 --- a/linden/indra/newview/llviewerregion.cpp +++ b/linden/indra/newview/llviewerregion.cpp | |||
@@ -1436,6 +1436,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url) | |||
1436 | capabilityNames.append("EstateChangeInfo"); | 1436 | capabilityNames.append("EstateChangeInfo"); |
1437 | capabilityNames.append("EventQueueGet"); | 1437 | capabilityNames.append("EventQueueGet"); |
1438 | capabilityNames.append("FetchInventory"); | 1438 | capabilityNames.append("FetchInventory"); |
1439 | capabilityNames.append("ObjectMedia"); | ||
1440 | capabilityNames.append("ObjectMediaNavigate"); | ||
1439 | capabilityNames.append("FetchLib"); | 1441 | capabilityNames.append("FetchLib"); |
1440 | capabilityNames.append("FetchLibDescendents"); | 1442 | capabilityNames.append("FetchLibDescendents"); |
1441 | capabilityNames.append("GetDisplayNames"); | 1443 | capabilityNames.append("GetDisplayNames"); |