Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs

bin/OpenSim.ini.example

@@ -108,10 +108,10 @@
     ;; This can be overriden in the region config file.
     ; ClampPrimSize = false
 	
-	;# {LinksetPrims} {} {Max prims an object will hold?} {} 0
-	;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
-	;; This can be overriden in the region config file.
-	; LinksetPrims = 0
+    ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0
+    ;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
+    ;; This can be overriden in the region config file.
+    ; LinksetPrims = 0
 
     ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true
     ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted.  State is reloaded on the destination region.

bin/OpenSimDefaults.ini

@@ -95,9 +95,9 @@
     ; This can be overriden in the region config file.
     ClampPrimSize = false
 	
-	; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
-	; This can be overriden in the region config file.
-	LinksetPrims = 0
+    ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
+    ; This can be overriden in the region config file.
+    LinksetPrims = 0
 
     ; Allow scripts to keep running when they cross region boundaries, rather than being restarted.  State is reloaded on the destination region.
     ; This only applies when crossing to a region running in a different simulator.  

bin/config-include/FlotsamCache.ini.example

@@ -54,10 +54,3 @@
 
     ; Warning level for cache directory size
     ;CacheWarnAt = 30000
-
-    ; Perform a deep scan of all assets within all regions, looking for all assets
-    ; present or referenced.  Mark all assets found that are already present in the
-    ; cache, and request all assets that are found that are not already cached (this
-    ; will cause those assets to be cached)
-    ;
-    DeepScanBeforePurge = true

bin/config-include/StandaloneHypergrid.ini

@@ -153,6 +153,7 @@
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
 ;; The interface that local users get when they are in other grids
 ;; This restricts/filters the asset operations from the outside