diff options
author | Melanie | 2012-05-19 13:34:44 +0100 |
---|---|---|
committer | Melanie | 2012-05-19 13:34:44 +0100 |
commit | ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4 (patch) | |
tree | 2d63da14ca345487a27f2202b2490eae0d86b60c /bin/OpenSimDefaults.ini | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ... (diff) | |
download | opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.zip opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.gz opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.bz2 opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r-- | bin/OpenSimDefaults.ini | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d159960..ea83f91 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -601,13 +601,12 @@ | |||
601 | Cap_ViewerStartAuction = "" | 601 | Cap_ViewerStartAuction = "" |
602 | Cap_ViewerStats = "" | 602 | Cap_ViewerStats = "" |
603 | 603 | ||
604 | ; The various fetch inventory caps are supported by OpenSim, but may | 604 | ; Capabilities for fetching inventory over HTTP rather than UDP |
605 | ; lead to poor sim performance if served by the simulators, | ||
606 | ; so they are currently disabled by default. | ||
607 | ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above) | 605 | ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above) |
606 | ; It appears that Linden Lab viewer 3.3.1 onwards will not work properly if FetchInventoryDescendents2 and FetchInventory2 are not enabled | ||
608 | Cap_WebFetchInventoryDescendents = "" | 607 | Cap_WebFetchInventoryDescendents = "" |
609 | Cap_FetchInventoryDescendents2 = "" | 608 | Cap_FetchInventoryDescendents2 = "localhost" |
610 | Cap_FetchInventory2 = "" | 609 | Cap_FetchInventory2 = "localhost" |
611 | 610 | ||
612 | 611 | ||
613 | [Chat] | 612 | [Chat] |