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

OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

@@ -318,12 +318,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
                 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID);
 
-				PresenceInfo presence = null;
+                PresenceInfo presence = null;
-				PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
+                PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
-				if (presences != null && presences.Length > 0)
+                if (presences != null && presences.Length > 0)
-					presence = presences[0];
+                    presence = presences[0];
-				if (presence != null)
+                if (presence != null)
-					im.offline = 0;
+                    im.offline = 0;
 
                 im.fromAgentID = fromAgentID.Guid;
                 im.fromAgentName = account.FirstName + " " + account.LastName;

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -2763,7 +2763,7 @@ namespace OpenSim.Region.Framework.Scenes
             UUID = UUID.Random();
             LinkNum = linkNum;
             LocalId = 0;
-			Inventory.ResetInventoryIDs();
+            Inventory.ResetInventoryIDs();
         }
 
         /// <summary>

OpenSim/Server/Base/ServicesServerBase.cs

@@ -176,7 +176,7 @@ namespace OpenSim.Server.Base
             OpenSimAppender consoleAppender = null;
             FileAppender fileAppender = null;
 
-            if ( logConfig != null )
+            if (logConfig != null)
             {
                 FileInfo cfg = new FileInfo(logConfig);
                 XmlConfigurator.Configure(cfg);

bin/config-include/FlotsamCache.ini.example

@@ -51,9 +51,9 @@
     ; Warning level for cache directory size
     ;CacheWarnAt = 30000
 
-	; Perform a deep scan of all assets within all regions, looking for all assets
+    ; 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
+    ; 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
+    ; cache, and request all assets that are found that are not already cached (this
-	; will cause those assets to be cached)
+    ; will cause those assets to be cached)
-	;
+    ;
-	; DeepScanBeforePurge = false
+    ; DeepScanBeforePurge = false

bin/config-include/GridCommon.ini.example

@@ -95,4 +95,4 @@
     ;Setup_LLProxyLoginModule = "9090/"
 
     ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices	= "RemoteAuthorizationServicesConnector"
+    ;AuthorizationServices = "RemoteAuthorizationServicesConnector"

bin/config-include/Standalone.ini

@@ -18,9 +18,9 @@
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
 
-    LibraryModule				= true
+    LibraryModule              = true
-    LLLoginServiceInConnector	= true
+    LLLoginServiceInConnector  = true
-    GridInfoServiceInConnector	= 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"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-	  LibraryName = "OpenSim Library"
+    LibraryName = "OpenSim Library"
-	  DefaultLibrary = "./inventory/Libraries.xml"
+    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"

bin/config-include/StandaloneCommon.ini.example

@@ -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
@@ -77,9 +77,9 @@
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
 
-	; Does this grid allow incoming links to any region in it? 
+    ; 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
+    ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
-	AllowTeleportsToAnyRegion = true
+    AllowTeleportsToAnyRegion = true
 
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.