Merge branch 'master' of git://opensimulator.org/git/opensim

5 files changed, 40 insertions, 41 deletions

diff --git a/bin/config-include/CenomeCache.ini.example b/bin/config-include/CenomeCache.ini.example
index c7c901b..8ef4e03 100644
--- a/bin/config-include/CenomeCache.ini.example
+++ b/bin/config-include/CenomeCache.ini.example
@@ -2,12 +2,12 @@
     ;;
     ;; Options for CenmoeAssetCache
     ;;
-    
+
     ; 256 MB (default: 134217728)
     MaxSize =  268435456
-    
+
     ; How many assets it is possible to store cache (default: 4096)
     MaxCount = 16384
-    
+
     ; Expiration time - 1 hour (default: 30 minutes)
     ExpirationTime = 60
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index b50d7ec..026dee7 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -2,7 +2,7 @@
     ;;
     ;; Options for FlotsamAssetCache
     ;;
-    
+
     ; cache directory can be shared by multiple instances
     CacheDirectory = ./assetcache
     ; Other examples:
@@ -34,9 +34,9 @@
     ; How often {in hours} should the disk be checked for expired filed
     ; Specify 0 to disable expiration checking
     FileCleanupTimer = .166  ;roughly every 10 minutes
-    
-    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how 
-    ; long (in miliseconds) to block a request thread while trying to complete 
+
+    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
+    ; long (in miliseconds) to block a request thread while trying to complete
     ; an existing write to disk.
     ; WaitOnInprogressTimeout = 3000
 
@@ -50,10 +50,10 @@
 
     ; 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 = false
+
+    ; 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 = false
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3ab11b8..cb771b8 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -11,8 +11,8 @@
     ; for more details
     ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
 
-    ; MySql  
-    ; Uncomment these lines if you want to use mysql storage 
+    ; MySql
+    ; Uncomment these lines if you want to use mysql storage
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
@@ -81,18 +81,18 @@
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
-        
+
     AssetCaching = "FlotsamAssetCache"
     Include-FlotsamCache = "config-include/FlotsamCache.ini"
 
     ;AssetCaching = "CenomeMemoryAssetCache"
     ;Include-CenomeCache = "config-include/CenomeCache.ini"
-    
+
     ;AssetCaching = "GlynnTuckerAssetCache"
 
     ;; Optionally, the port for the LLProxyLoginModule module can be changed
-    
+
     ;Setup_LLProxyLoginModule = "9090/"
 
     ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices      = "RemoteAuthorizationServicesConnector"
+    ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index d74b50e..6355d09 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,10 +17,10 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
-    
-    LibraryModule                               = true
-    LLLoginServiceInConnector   = true
-    GridInfoServiceInConnector  = true
+
+    LibraryModule              = true
+    LLLoginServiceInConnector  = true
+    GridInfoServiceInConnector = true
 
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
@@ -35,9 +35,9 @@
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [LibraryService]
-        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-          LibraryName = "OpenSim Library"
-          DefaultLibrary = "./inventory/Libraries.xml"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
@@ -78,7 +78,7 @@
 [LoginService]
     LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    GridUserService               = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    GridUserService       = "OpenSim.Services.UserAccountService.dll:GridUserService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -88,7 +88,6 @@
 
     WelcomeMessage = "Welcome, Avatar!"
 
-
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a810393..2f021d5 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -13,8 +13,8 @@
     ; for more details
     ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
 
-    ; MySql  
-    ; Uncomment these lines if you want to use mysql storage 
+    ; MySql
+    ; Uncomment these lines if you want to use mysql storage
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
@@ -28,9 +28,9 @@
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
-    
+
     ;AssetCaching = "GlynnTuckerAssetCache"
-    
+
     ;AssetCaching = "FlotsamAssetCache"
     ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
 
@@ -41,7 +41,7 @@
     ;FreeswitchServiceInConnector = True
 
     ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices      = "LocalAuthorizationServicesConnector"
+    ;AuthorizationServices = "LocalAuthorizationServicesConnector"
 
 [FreeswitchService]
     ;; Configuration for the freeswitch service goes here
@@ -49,11 +49,11 @@
 
 [GridService]
     ;; For in-memory region storage (default)
-          StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     ;;--- For MySql region storage (alternative)
-          ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+    ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
 
-        ; If HG, do you want this check on the distance to be performed?
+    ; If HG, do you want this check on the distance to be performed?
     ; Check4096 = "False"
 
     ;; Next, we can specify properties of regions, including default and fallback regions
@@ -65,7 +65,7 @@
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
     ;LibraryName = "My World's Library"
-    
+
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
 
@@ -77,9 +77,9 @@
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
 
-        ; Does this grid allow incoming links to any region in it? 
-        ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
-        AllowTeleportsToAnyRegion = true
+    ; Does this grid allow incoming links to any region in it?
+    ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
+    AllowTeleportsToAnyRegion = true
 
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.