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

15 files changed, 66 insertions, 67 deletions

diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 2895a71..d606470 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -138,12 +138,12 @@ namespace OpenSim.Data
         /// <param name="conn"></param>
         /// <param name="script">Array of strings, one-per-batch (often just one)</param>
         protected virtual void ExecuteScript(DbConnection conn, string[] script)
-        {            
+        {
             using (DbCommand cmd = conn.CreateCommand())
             {
                 cmd.CommandTimeout = 0;
                 foreach (string sql in script)
-                {                                      
+                {
                     cmd.CommandText = sql;
                     try
                     {
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 28c50ab..457e0bb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <param name="remoteClient"></param>
         /// <param name="itemID"></param>
         /// <param name="AttachmentPt"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         protected UUID ShowAttachInUserInventory(
             SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
         {
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 7a21d5e..b3f0a25 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/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[] presences = PresenceService.GetAgents(new string[] { fid });
-                                if (presences != null && presences.Length > 0)
-                                        presence = presences[0];
-                                if (presence != null)
-                                        im.offline = 0;
+                PresenceInfo presence = null;
+                PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
+                if (presences != null && presences.Length > 0)
+                    presence = presences[0];
+                if (presence != null)
+                    im.offline = 0;
 
                 im.fromAgentID = fromAgentID.Guid;
                 im.fromAgentName = account.FirstName + " " + account.LastName;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a8e76e3..8140d42 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/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>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a4533fa..13d9964 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1523,7 +1523,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 // If the agent update does move the avatar, then calculate the force ready for the velocity update,
-                // which occurs later in the main scene loop                
+                // which occurs later in the main scene loop
                 if (update_movementflag || (update_rotation && DCFlagKeyPressed))
                 {
                     //                    m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index e6ff0c0..5616a4e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
                     { Name = childPartName, UUID = childPartUuid };
 
-            SceneObjectGroup sog = new SceneObjectGroup(rootPart);            
+            SceneObjectGroup sog = new SceneObjectGroup(rootPart);
             sog.AddPart(linkPart);
             
             Assert.That(sog.UUID, Is.EqualTo(rootPartUuid));
@@ -221,7 +221,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             sog.UUID = newRootPartUuid;
                         
             Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid));
-            Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid));            
+            Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid));
             Assert.That(sog.Parts.Length, Is.EqualTo(2));
         }
     }
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index e42dbf2..7e1b5ac 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -812,7 +812,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             // gets the object data.   If the data sent by the client doesn't match the object, the viewer probably has an 
             // old idea of what the object properties are.   Viewer developer Hazim informed us that the base module 
             // didn't check the client sent data against the object do any.   Since the base modules are the 
-            // 'crowning glory' examples of good practice..    
+            // 'crowning glory' examples of good practice..
 
             // Validate that the object exists in the scene the user is in
             SceneObjectPart part = s.GetSceneObjectPart(localID);
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index c37c9bd..c91658e 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size,
                        Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode)
         {
-            Name = primName;            
+            Name = primName;
             m_vehicle = new ODEDynamics();
             //gc = GCHandle.Alloc(prim_geom, GCHandleType.Pinned);
             ode = dode;
@@ -620,7 +620,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                             volume *= (1.0f - hollowVolume);
                             }
                         }
-                        break;                  
+                        break;
 
                 default:
                     break;
@@ -658,7 +658,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                 taperY = _pbs.PathTaperY * 0.01f;
                 if (taperY < 0.0f)
-                    taperY = -taperY;               
+                    taperY = -taperY;
                 taperY1 = 1.0f - taperY;
 
                 }
@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                             }
                             
                             foreach (OdePrim prm in childrenPrim)
-                            {                       
+                            {
                                 prm.m_collisionCategories |= CollisionCategories.Body;
                                 prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
 
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 18f0f24..2652ff2 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/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);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2b78014..1625de0 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -364,7 +364,7 @@
 
     ;; Path to default appearance XML file that specifies the look of the
     ;; default avatars
-    ; default_appearance = default_appearance.xml 
+    ; default_appearance = default_appearance.xml
 
 [Wind]
     ;# {enabled} {} {Enable wind module?} {true false} true
@@ -510,7 +510,7 @@
     ;# {AllowOSFunctions} {Enabled:true} {Allow OSFunctions? (DANGEROUS!)} {true false} false
     ;; Allow the use of os* functions (some are dangerous)
     ; AllowOSFunctions = false
-    
+
     ;# {AllowLightShareFunctions} {Enabled:true [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} true
     ; Allow the user of LightShare functions
     ; AllowLightShareFunctions = false
@@ -633,7 +633,7 @@
 
     ;; Service connectors to the Groups Service.  Select one depending on
     ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
-  
+
     ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups?} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
     ;; The service connector to use for the GroupsModule
     ; ServicesConnectorModule = SimianGroupsServicesConnector
@@ -644,7 +644,7 @@
 
     ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true
     ;; Enable Group Notices
-    ; NoticesEnabled = true 
+    ; NoticesEnabled = true
 
     ;; This makes the Groups modules very chatty on the console.
     ; DebugEnabled = false
@@ -652,12 +652,12 @@
     ;; Specify which messaging module to use for groups messaging and if it's
     ;; enabled
     ; MessagingModule = GroupsMessagingModule
-    ; MessagingEnabled = true 
+    ; MessagingEnabled = true
 
     ;; XmlRpc Security settings.  These must match those set on your backend
     ;; groups service.
-    ; XmlRpcServiceReadKey    = 1234 
-    ; XmlRpcServiceWriteKey   = 1234 
+    ; XmlRpcServiceReadKey    = 1234
+    ; XmlRpcServiceWriteKey   = 1234
 
 [InterestManagement]
      ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
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.