Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs

1 files changed, 10 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 97429de..911dc90 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -539,6 +539,16 @@
     ;
     ;TextureSendLimit = 20
 
+    ; CannibalizeTextureRate allows bandwidth to be moved from the
+    ; UDP texture throttle to the task throttle. Since most viewers
+    ; use HTTP textures, this provides a means of using what is largely
+    ; unused bandwidth in the total throttle. The value is the proportion
+    ; of the texture rate to move to the task queue. It must be between
+    ; 0.0 (none of the bandwidth is cannibalized) and 0.9 (90% of the
+    ; bandwidth is grabbed)
+    ;
+    ; CannibalizeTextureRate = 0.5
+
     ; Quash and remove any light properties from attachments not on the
     ; hands. This allows flashlights and lanterns to function, but kills
     ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps