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

26 files changed, 382 insertions, 261 deletions

diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
index 0353d9d..08faf2d 100644
--- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Capabilities.Handlers
                         osdname["display_name"] = OSD.FromString(name);
                         osdname["legacy_first_name"] = parts[0];
                         osdname["legacy_last_name"] = parts[1];
-                        osdname["username"] = OSD.FromString(name);
+                        osdname["username"] = "";
                         osdname["id"] = OSD.FromUUID(uuid);
                         osdname["is_display_name_default"] = OSD.FromBoolean(false);
 
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index 6aa9479..caf0e98 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             catch (Exception ex)
             {
-                m_log.Warn(string.Format("[POLL SERVICE WORKER THREAD]: Error ", ex));
+                m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", ex);
             }
             finally
             {
@@ -87,7 +87,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 catch (Exception e)
                 {
-                    m_log.Warn(String.Format("[POLL SERVICE WORKER THREAD]: Error ", e));
+                    m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", e);
                 }
 
                 PollServiceArgs.RequestsHandled++;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 07e8025..e258bcb 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -235,7 +235,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private Hashtable HandleSimulatorFeaturesRequest(Hashtable mDhttpMethod, UUID agentID)
         {
-            m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: SimulatorFeatures request");
+//            m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: SimulatorFeatures request");
 
             OSDMap copy = DeepCopy();
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index ce6e3ee..0394e54 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -119,8 +119,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public readonly uint CircuitCode;
         /// <summary>Sequence numbers of packets we've received (for duplicate checking)</summary>
         public readonly IncomingPacketHistoryCollection PacketArchive = new IncomingPacketHistoryCollection(200);
+
+        /// <summary>
+        /// If true then we take action in response to unacked reliably sent packets such as resending the packet.
+        /// </summary>
+        public bool ProcessUnackedSends { get; set; }
+
         /// <summary>Packets we have sent that need to be ACKed by the client</summary>
         public readonly UnackedPacketCollection NeedAcks = new UnackedPacketCollection();
+
         /// <summary>ACKs that are queued up, waiting to be sent to the client</summary>
         public readonly OpenSim.Framework.LocklessQueue<uint> PendingAcks = new OpenSim.Framework.LocklessQueue<uint>();
 
@@ -225,6 +232,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (maxRTO != 0)
                 m_maxRTO = maxRTO;
 
+            ProcessUnackedSends = true;
+
             // Create a token bucket throttle for this client that has the scene token bucket as a parent
             m_throttleClient 
                 = new AdaptiveTokenBucket(
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 4fec91f..ad83b42 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1137,7 +1137,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 Utils.UIntToBytesBig(sequenceNumber, buffer.Data, 1);
                 outgoingPacket.SequenceNumber = sequenceNumber;
 
-                if (isReliable)
+                if (udpClient.ProcessUnackedSends && isReliable)
                 {
                     // Add this packet to the list of ACK responses we are waiting on from the server
                     udpClient.NeedAcks.Add(outgoingPacket);
@@ -1325,30 +1325,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             #region ACK Receiving
 
-            // Handle appended ACKs
-            if (packet.Header.AppendedAcks && packet.Header.AckList != null)
+            if (udpClient.ProcessUnackedSends)
             {
-//                m_log.DebugFormat(
-//                    "[LLUDPSERVER]: Handling {0} appended acks from {1} in {2}",
-//                    packet.Header.AckList.Length, client.Name, m_scene.Name);
+                // Handle appended ACKs
+                if (packet.Header.AppendedAcks && packet.Header.AckList != null)
+                {
+    //                m_log.DebugFormat(
+    //                    "[LLUDPSERVER]: Handling {0} appended acks from {1} in {2}",
+    //                    packet.Header.AckList.Length, client.Name, m_scene.Name);
 
-                for (int i = 0; i < packet.Header.AckList.Length; i++)
-                    udpClient.NeedAcks.Acknowledge(packet.Header.AckList[i], now, packet.Header.Resent);
-            }
+                    for (int i = 0; i < packet.Header.AckList.Length; i++)
+                        udpClient.NeedAcks.Acknowledge(packet.Header.AckList[i], now, packet.Header.Resent);
+                }
 
-            // Handle PacketAck packets
-            if (packet.Type == PacketType.PacketAck)
-            {
-                PacketAckPacket ackPacket = (PacketAckPacket)packet;
+                // Handle PacketAck packets
+                if (packet.Type == PacketType.PacketAck)
+                {
+                    PacketAckPacket ackPacket = (PacketAckPacket)packet;
 
-//                m_log.DebugFormat(
-//                    "[LLUDPSERVER]: Handling {0} packet acks for {1} in {2}",
-//                    ackPacket.Packets.Length, client.Name, m_scene.Name);
+    //                m_log.DebugFormat(
+    //                    "[LLUDPSERVER]: Handling {0} packet acks for {1} in {2}",
+    //                    ackPacket.Packets.Length, client.Name, m_scene.Name);
 
-                for (int i = 0; i < ackPacket.Packets.Length; i++)
-                    udpClient.NeedAcks.Acknowledge(ackPacket.Packets[i].ID, now, packet.Header.Resent);
+                    for (int i = 0; i < ackPacket.Packets.Length; i++)
+                        udpClient.NeedAcks.Acknowledge(ackPacket.Packets[i].ID, now, packet.Header.Resent);
 
-                // We don't need to do anything else with PacketAck packets
+                    // We don't need to do anything else with PacketAck packets
+                    return;
+                }
+            }
+            else if (packet.Type == PacketType.PacketAck)
+            {
                 return;
             }
 
@@ -2011,7 +2018,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     if (udpClient.IsConnected)
                     {
-                        if (m_resendUnacked)
+                        if (udpClient.ProcessUnackedSends && m_resendUnacked)
                             HandleUnacked(llClient);
 
                         if (m_sendAcks)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
index 17a394d..ac6c0b4 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
@@ -195,6 +195,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 "Start, stop or get status of OutgoingQueueRefillEngine.",
                 "If stopped then refill requests are processed directly via the threadpool.",
                 HandleOqreCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp client get",
+                "debug lludp client get [<avatar-first-name> <avatar-last-name>]",
+                "Get debug parameters for the client.  If no name is given then all client information is returned.",
+                "process-unacked-sends - Do we take action if a sent reliable packet has not been acked.",
+                HandleClientGetCommand);
+
+            m_console.Commands.AddCommand(
+                "Debug", 
+                false, 
+                "debug lludp client set",
+                "debug lludp client set <param> <value> [<avatar-first-name> <avatar-last-name>]",
+                "Set a debug parameter for a particular client.  If no name is given then the value is set on all clients.",
+                "process-unacked-sends - Do we take action if a sent reliable packet has not been acked.",
+                HandleClientSetCommand);
         }
 
         private void HandleShowServerThrottlesCommand(string module, string[] args)
@@ -538,6 +556,81 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name);
         }
 
+        private void HandleClientGetCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 4 && args.Length != 6)
+            {
+                MainConsole.Instance.OutputFormat("Usage: debug lludp client get [<avatar-first-name> <avatar-last-name>]");
+                return;
+            }
+
+            string name = null;
+
+            if (args.Length == 6)
+                name = string.Format("{0} {1}", args[4], args[5]);
+
+            m_udpServer.Scene.ForEachScenePresence(
+                sp =>
+                {
+                    if ((name == null || sp.Name == name) && sp.ControllingClient is LLClientView)
+                    {
+                        LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+
+                        m_console.OutputFormat(
+                            "Client debug parameters for {0} ({1}) in {2}",
+                            sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
+
+                        ConsoleDisplayList cdl = new ConsoleDisplayList();
+                        cdl.AddRow("process-unacked-sends", udpClient.ProcessUnackedSends);
+
+                        m_console.Output(cdl.ToString());
+                    }
+                });
+        }
+
+        private void HandleClientSetCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 6 && args.Length != 8)
+            {
+                MainConsole.Instance.OutputFormat("Usage: debug lludp client set <param> <value> [<avatar-first-name> <avatar-last-name>]");
+                return;
+            }        
+
+            string param = args[4];
+            string rawValue = args[5];
+
+            string name = null;
+
+            if (args.Length == 8)
+                name = string.Format("{0} {1}", args[6], args[7]);
+
+            if (param == "process-unacked-sends")
+            {
+                bool newValue;
+
+                if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newValue))
+                    return;
+
+                m_udpServer.Scene.ForEachScenePresence(
+                    sp =>
+                    {
+                        if ((name == null || sp.Name == name) && sp.ControllingClient is LLClientView)
+                        {
+                            LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+                            udpClient.ProcessUnackedSends = newValue;
+
+                            m_console.OutputFormat("{0} set to {1} for {2} in {3}", param, newValue, sp.Name, m_udpServer.Scene.Name);
+                        }
+                    });
+            }
+        }
+
         private void HandlePacketCommand(string module, string[] args)
         {
             if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 8bd0c0a..55db968 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes.Serialization;

+using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
 using PermissionMask = OpenSim.Framework.PermissionMask;
 
@@ -127,11 +127,11 @@ namespace OpenSim.Region.Framework.Scenes
 
                 return false;
             }
-        }

-

-        public bool AddInventoryItem(InventoryItemBase item)

-        {

-            return AddInventoryItem(item, true);

+        }
+
+        public bool AddInventoryItem(InventoryItemBase item)
+        {
+            return AddInventoryItem(item, true);
         }
 
         /// <summary>
@@ -1074,7 +1074,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                }
 
                 CreateNewInventoryItem(
-                    remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,

+                    remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
                     name, description, 0, callbackID, olditemID, type, invType,
                     (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All,
                     (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, Util.UnixTimeSinceEpoch(),
@@ -2183,7 +2183,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            // OK, we're done with permissions. Let's check if any part of the code prevents the objects from being deleted

+            // OK, we're done with permissions. Let's check if any part of the code prevents the objects from being deleted
             bool canDelete = EventManager.TriggerDeRezRequested(remoteClient, deleteGroups, action);
 
             if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete))
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index ea242f5..ef2125b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -487,7 +487,16 @@ namespace OpenSim.Region.Framework.Scenes
 
         void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder)
         {
-            SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems);
+            try
+            {
+                SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems);
+            }
+            catch (Exception e)
+            {
+                m_log.Error(
+                    string.Format(
+                        "[AGENT INVENTORY]: Error in SendInventoryAsync() for {0} with folder ID {1}.  Exception  ", e));
+            }
         }
 
         void SendInventoryComplete(IAsyncResult iar)
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 8101768..c8c8714 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Framework.Scenes
     public class SceneCommunicationService //one instance per region
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private static string LogHeader = "[SCENE COMMUNIATION SERVICE]";
+        private static string LogHeader = "[SCENE COMMUNICATION SERVICE]";
 
         protected RegionInfo m_regionInfo;
         protected Scene m_scene;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c318e53..1ca250a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4836,7 +4836,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (OwnerID != item.Owner)
             {
                 //LogPermissions("Before ApplyNextOwnerPermissions");
-                ApplyNextOwnerPermissions();
+
+                if (scene.Permissions.PropagatePermissions())
+                    ApplyNextOwnerPermissions();
+
                 //LogPermissions("After ApplyNextOwnerPermissions");
 
                 LastOwnerID = OwnerID;
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
index c0041e6..b5e6d69 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
@@ -84,16 +84,16 @@ namespace OpenSim.Services.Connectors
         {
             if (String.IsNullOrEmpty(m_ServerURI))
             {
-                m_log.WarnFormat("[HELO SERVICE]: Unable to invoke HELO due to malformed URL");
+                m_log.WarnFormat("[HELO SERVICE]: Unable to invoke HELO due to empty URL");
                 return String.Empty;
             }
 
-            HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
-            // Eventually we need to switch to HEAD
-            /* req.Method = "HEAD"; */
-
             try
             {
+                HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
+                // Eventually we need to switch to HEAD
+                /* req.Method = "HEAD"; */
+
                 using (WebResponse response = req.GetResponse())
                 {
                     if (response.Headers.Get("X-Handlers-Provided") == null) // just in case this ever returns a null
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 75101ff..96c13c0 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -196,6 +196,9 @@ namespace OpenSim.Services.ProfilesService
 
         public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
         {
+            if (!ProfilesData.GetUserPreferences(ref pref, ref result))
+                return false;
+
             if(string.IsNullOrEmpty(pref.EMail))
             {
                 UserAccount account = new UserAccount();
@@ -228,9 +231,6 @@ namespace OpenSim.Services.ProfilesService
                     return false;
                 }
             }
-            if (!ProfilesData.GetUserPreferences (ref pref, ref result))
-                return false;
-
 
             if(string.IsNullOrEmpty(pref.EMail))
                 pref.EMail = "No Email Address On Record";
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
index 326396d..1ec2046 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
@@ -43,7 +43,7 @@ namespace pCampBot
     /// </summary>
     public class PhysicsBehaviour2 : AbstractBehaviour
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public PhysicsBehaviour2() 
         { 
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
index ae40bae..7b4639d 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
@@ -44,7 +44,7 @@ namespace pCampBot
     /// </summary>
     public class TwitchyBehaviour : AbstractBehaviour
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public TwitchyBehaviour() 
         { 
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c9a5f65..d352c33 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -101,10 +101,10 @@
     ; be stored here. The OpenSim.exe process must have R/W access to the location.
     ; RegistryLocation = "."
 
-        ;# {ConfigDirectory} {} {Set path to directory for modular ini files} {}
+    ;# {ConfigDirectory} {} {Set path to directory for modular ini files} {}
     ; Used by region module addins. You can set this to outside bin, so that addin
-        ; configurations will survive updates. The OpenSim.exe process must have R/W access 
-        ; to the location.
+    ; configurations will survive updates. The OpenSim.exe process must have R/W access 
+    ; to the location.
     ; ConfigDirectory = "."
 
     ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
@@ -164,7 +164,7 @@
     ;; physical prim max, clamp the dimensions to the appropriate maximum
     ;; This can be overridden 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.
@@ -406,9 +406,9 @@
 
 [Estates]
     ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
-        ; If these values are uncommented then they will be used to create a default estate as necessary.
+    ; If these values are uncommented then they will be used to create a default estate as necessary.
     ; New regions will be automatically assigned to that default estate.
-        
+
     ;# {DefaultEstateName} {} {Default name for estate?} {} My Estate
     ;; Name for the default estate
     ; DefaultEstateName = My Estate
@@ -418,7 +418,7 @@
     ; DefaultEstateOwnerName = FirstName LastName
 
 
-    ; ** Standalone Estate Settings **  
+    ; ** Standalone Estate Settings **
     ; The following parameters will only be used on a standalone system to 
     ; create an estate owner that does not already exist
 
@@ -506,15 +506,15 @@
     ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
-        ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
-        ;; Use this if your central services in port 8003 need to be accessible on the Internet
-        ;; but you want to protect them from unauthorized access. The username and password
-        ;; here need to match the ones in the Robust service configuration.
+    ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
+    ;; Use this if your central services in port 8003 need to be accessible on the Internet
+    ;; but you want to protect them from unauthorized access. The username and password
+    ;; here need to match the ones in the Robust service configuration.
     ; AuthType = "BasicHttpAuthentication"
     ; HttpAuthUsername = "some_username"
     ; HttpAuthPassword = "some_password"
-        ;;
-        ;; Any of these 3 variables above can be overriden in any of the service sections.
+    ;;
+    ;; Any of these 3 variables above can be overriden in any of the service sections.
 
 
 [XMLRPC]
@@ -794,14 +794,14 @@
     ;; the data snapshots.
     ; snapshot_cache_directory = "DataSnapshot"
 
-        ;; [Supported, but obsolete]
+    ;; [Supported, but obsolete]
     ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py
     ; This semicolon-separated string serves to notify specific data services
     ; about the existence of this sim. Uncomment if you want to index your
     ; data with this and/or other search providers.
     ; data_services="http://metaverseink.com/cgi-bin/register.py"
 
-        ;; New way of specifying data services, one per service
+    ;; New way of specifying data services, one per service
     ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
 [Economy]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 69a2a4a..4faf7f3 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -78,8 +78,8 @@
     RegistryLocation = "."
 
     ; Used by region module addins. You can set this to outside bin, so that addin
-        ; configurations will survive updates. The OpenSim.exe process must have R/W access 
-        ; to the location.
+    ; configurations will survive updates. The OpenSim.exe process must have R/W access 
+    ; to the location.
     ConfigDirectory = "."
 
     ; ##
@@ -127,7 +127,7 @@
     ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
     ; This can be overridden 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 overridden in the region config file.
     LinksetPrims = 0
@@ -1092,8 +1092,8 @@
     ;    shape. 'Compound' uses a lot less CPU time.
     LinkImplementation = 1      ; 0=constraint, 1=compound
 
-        ; If 'true', offset a linkset's origin based on mass of linkset parts.
-        LinksetOffsetCenterOfMass = false
+    ; If 'true', offset a linkset's origin based on mass of linkset parts.
+    LinksetOffsetCenterOfMass = false
 
     ; If 'true', turn scuplties into meshes
     MeshSculptedPrim = true
@@ -1401,7 +1401,7 @@
     snapshot_cache_directory = "DataSnapshot"
 
     ; Uncomment if you want to index your data with this and/or other search providers. One entry per
-        ; data service
+    ; data service
     ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
 [Economy]
@@ -1739,7 +1739,7 @@
 
     ; Experimental option to only message cached online users rather than all users
     ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
-        ; (Flotsam groups only; in V2 this is always on)
+    ; (Flotsam groups only; in V2 this is always on)
     MessageOnlineUsersOnly = false
 
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
@@ -1874,7 +1874,7 @@
 [GridService]
     ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-        
+
 
 [AutoBackupModule]
     ;; default is module is disabled at the top level
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 46dbc17..5fa4026 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -110,8 +110,8 @@
     ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
     ; UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
 
-        ;; Uncomment if you want to have centralized estate data
-        ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
+    ;; Uncomment if you want to have centralized estate data
+    ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -163,18 +163,18 @@
 
 [Hypergrid]
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-        ;; This is the address of the external robust server that
-        ;; runs the UserAgentsService, possibly this server.
-        ;; For example http://myworld.com:8002
-        ;; This is a default that can be overwritten in some sections.
-        ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
+    ;; This is the address of the external robust server that
+    ;; runs the UserAgentsService, possibly this server.
+    ;; For example http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-        ;; This is the address of the external robust server
-        ;; that runs the Gatekeeper service, possibly this server.
-        ;; For example http://myworld.com:8002
-        ;; This is a default that can be overwritten in some sections.
-        ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
+    ;; This is the address of the external robust server
+    ;; that runs the Gatekeeper service, possibly this server.
+    ;; For example http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 
 [DatabaseService]
@@ -328,7 +328,7 @@
     ; for the server connector
     AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-        
+
 
 ; * This is the new style user service.
 ; * "Realm" is the table that is used for user lookup.
@@ -527,7 +527,7 @@
 
     ; password help: optional: page providing password assistance for users of your grid
     ;password = ${Const|BaseURL}/password
-        
+
     ; HG address of the gatekeeper, if you have one
     ; this is the entry point for all the regions of the world
     ; gatekeeper = ${Const|BaseURL}:${Const|PublicPort}/
@@ -548,7 +548,7 @@
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
     ; how does the outside world reach me? This acts as public key too.
-        ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}"
 
     ; Does this grid allow incoming links to any region in it? 
@@ -558,20 +558,20 @@
     ; If you run this gatekeeper server behind a proxy, set this to true
     ; HasProxy = false
 
-        ;; Regular expressions for controlling which client versions are accepted/denied.
-        ;; An empty string means nothing is checked.
-        ;;
-        ;; Example 1: allow only these 3 types of clients (any version of them)
-        ;; AllowedClients = "Imprudence|Hippo|Second Life"
-        ;;
-        ;; Example 2: allow all clients except these
-        ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
-        ;;
-        ;; Note that these are regular expressions, so every character counts.
-        ;; Also note that this is very weak security and should not be trusted as a reliable means
-        ;; for keeping bad clients out; modified clients can fake their identifiers.
-        ;;
-        ;;
+    ;; Regular expressions for controlling which client versions are accepted/denied.
+    ;; An empty string means nothing is checked.
+    ;;
+    ;; Example 1: allow only these 3 types of clients (any version of them)
+    ;; AllowedClients = "Imprudence|Hippo|Second Life"
+    ;;
+    ;; Example 2: allow all clients except these
+    ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+    ;;
+    ;; Note that these are regular expressions, so every character counts.
+    ;; Also note that this is very weak security and should not be trusted as a reliable means
+    ;; for keeping bad clients out; modified clients can fake their identifiers.
+    ;;
+    ;;
     ;AllowedClients = ""
     ;DeniedClients = ""
 
@@ -590,12 +590,12 @@
 [UserAgentService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
     ;; for the service
-    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
-    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService     = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    GridService         = "OpenSim.Services.GridService.dll:GridService"
+    GatekeeperService   = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService  = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
     ; If you run this user agent server behind a proxy, set this to true
     ; HasProxy = false
@@ -611,7 +611,7 @@
     ;; Are local users allowed to visit other grids?
     ;; What user level? Use variables of this forrm:
     ;; ForeignTripsAllowed_Level_<UserLevel> = true | false
-        ;; (the default is true)
+    ;; (the default is true)
     ;; For example:
     ; ForeignTripsAllowed_Level_0 = false
     ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it
@@ -619,16 +619,16 @@
     ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept
     ;; Leave blank or commented for no exceptions.
     ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002"
-        ;;
+    ;;
     ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
-        ;; This variable controls what is exposed to profiles of local users
-        ;; as seen from outside of this grid. Leave it uncommented for exposing
-        ;; UserTitle, UserFlags and the creation date. Uncomment and change to False
-        ;; to block this info from being exposed.
-        ; ShowUserDetailsInHGProfile = True
+    ;; This variable controls what is exposed to profiles of local users
+    ;; as seen from outside of this grid. Leave it uncommented for exposing
+    ;; UserTitle, UserFlags and the creation date. Uncomment and change to False
+    ;; to block this info from being exposed.
+    ; ShowUserDetailsInHGProfile = True
 
 
 ; * The interface that local users get when they are in other grids.
@@ -687,10 +687,10 @@
 
 
 [HGInstantMessageService]
-    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
-    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    LocalServiceModule  = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService         = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    UserAgentService    = "OpenSim.Services.HypergridService.dll:UserAgentService"
     ; This should always be true in the Robust config
     InGatekeeper = True
 
@@ -718,7 +718,7 @@
     ;; Realm = UserProfiles
     UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
     AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-        
+
 
 [BakedTextureService]
     LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 687bb2e..a0b8f50 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -89,8 +89,8 @@
     ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
     ; UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
 
-        ;; Uncomment if you want to have centralized estate data
-        ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
+    ;; Uncomment if you want to have centralized estate data
+    ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -394,20 +394,20 @@
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
 
-        ;; Regular expressions for controlling which client versions are accepted/denied.
-        ;; An empty string means nothing is checked.
-        ;;
-        ;; Example 1: allow only these 3 types of clients (any version of them)
-        ;; AllowedClients = "Imprudence|Hippo|Second Life"
-        ;;
-        ;; Example 2: allow all clients except these
-        ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
-        ;;
-        ;; Note that these are regular expressions, so every character counts.
-        ;; Also note that this is very weak security and should not be trusted as a reliable means
-        ;; for keeping bad clients out; modified clients can fake their identifiers.
-        ;;
-        ;;
+    ;; Regular expressions for controlling which client versions are accepted/denied.
+    ;; An empty string means nothing is checked.
+    ;;
+    ;; Example 1: allow only these 3 types of clients (any version of them)
+    ;; AllowedClients = "Imprudence|Hippo|Second Life"
+    ;;
+    ;; Example 2: allow all clients except these
+    ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+    ;;
+    ;; Note that these are regular expressions, so every character counts.
+    ;; Also note that this is very weak security and should not be trusted as a reliable means
+    ;; for keeping bad clients out; modified clients can fake their identifiers.
+    ;;
+    ;;
     ;AllowedClients = ""
     ;DeniedClients = ""
 
@@ -453,13 +453,14 @@
 
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-        ; Set this if you want to change the default
-        ; TilesStoragePath = "maptiles"
-        ;
-        ; If for some reason you have the AddMapTile service outside the firewall (e.g. ${Const|PublicPort}),
-        ; you may want to set this. Otherwise, don't set it, because it's already protected.
-        ; GridService = "OpenSim.Services.GridService.dll:GridService"
-        ;
+
+    ; Set this if you want to change the default
+    ; TilesStoragePath = "maptiles"
+    ;
+    ; If for some reason you have the AddMapTile service outside the firewall (e.g. ${Const|PublicPort}),
+    ; you may want to set this. Otherwise, don't set it, because it's already protected.
+    ; GridService = "OpenSim.Services.GridService.dll:GridService"
+    ;
     ; Additionally, if you run this server behind a proxy, set this to true
     ; HasProxy = false
 
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 42ecec2..4b01d82 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -8,27 +8,27 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    AssetServices                       = "RemoteAssetServicesConnector"
-    InventoryServices           = "RemoteXInventoryServicesConnector"
-    GridServices                        = "RemoteGridServicesConnector"
-    AvatarServices                      = "RemoteAvatarServicesConnector"
-    NeighbourServices           = "RemoteNeighbourServicesConnector"
-    AuthenticationServices      = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices       = "LocalAuthorizationServicesConnector"
-    PresenceServices            = "RemotePresenceServicesConnector"
-    UserAccountServices         = "RemoteUserAccountServicesConnector"
-    GridUserServices            = "RemoteGridUserServicesConnector"
-    SimulationServices          = "RemoteSimulationConnectorModule"
-    EntityTransferModule        = "BasicEntityTransferModule"
-    InventoryAccessModule       = "BasicInventoryAccessModule"
+    AssetServices           = "RemoteAssetServicesConnector"
+    InventoryServices       = "RemoteXInventoryServicesConnector"
+    GridServices            = "RemoteGridServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
+    GridUserServices        = "RemoteGridUserServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    EntityTransferModule    = "BasicEntityTransferModule"
+    InventoryAccessModule   = "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-    MapImageService                     = "MapImageServiceModule"
-    SearchModule                        = "BasicSearchModule"
+    MapImageService         = "MapImageServiceModule"
+    SearchModule            = "BasicSearchModule"
     
-    LandServiceInConnector                      = true
-    NeighbourServiceInConnector         = true
-    SimulationServiceInConnector        = true
-    LibraryModule                                       = true
+    LandServiceInConnector        = true
+    NeighbourServiceInConnector   = true
+    SimulationServiceInConnector  = true
+    LibraryModule                 = true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -70,4 +70,4 @@
     Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
 
 [MapImageService]
-        LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 8dc3a73..4486f31 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -109,14 +109,14 @@
     Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
 
 [EstateDataStore]
-        ;
-        ; Uncomment if you want centralized estate data at robust server,
-        ; in which case the URL in [EstateService] will be used
-        ;
-        ;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
+    ;
+    ; Uncomment if you want centralized estate data at robust server,
+    ; in which case the URL in [EstateService] will be used
+    ;
+    ;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
 
 [EstateService]
-        EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+    EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [Messaging]
     ; === HG ONLY ===
@@ -171,17 +171,17 @@
     Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; set this to false. You may want to do this on sims that have licensed content.
-        ;; Default is true.
+    ;; Default is true.
     ; OutboundPermission = True
 
     ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
     ;; and available when they return. True by default.
     ;RestrictInventoryAccessAbroad = True
 
-        ;; Warning: advanced and unusual. Default is false.
-        ;; Enables configurations where grids share user services, including inventory,
-        ;; while separating regions' assets from users' assets. Asset transfer between 
-        ;; the users' asset server and the regions' asset server is done in HG-like manner.
+    ;; Warning: advanced and unusual. Default is false.
+    ;; Enables configurations where grids share user services, including inventory,
+    ;; while separating regions' assets from users' assets. Asset transfer between 
+    ;; the users' asset server and the regions' asset server is done in HG-like manner.
     ; CheckSeparateAssets = false
     ; RegionHGAssetServerURI = ${Const|BaseURL}:${Const|PublicPort}
 
@@ -218,7 +218,7 @@
     UserAgentServerURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [MapImageService]
-        MapImageServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+    MapImageServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [AuthorizationService]
   ; If you have regions with access restrictions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8b47ede..21a5a22 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -8,32 +8,32 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Startup]
-        WorldMapModule = "HGWorldMap"
+    WorldMapModule = "HGWorldMap"
 
 [Modules]
-    AssetServices                       = "HGAssetBroker"
-    InventoryServices           = "HGInventoryBroker"
-    GridServices                        = "RemoteGridServicesConnector"
-    AvatarServices                      = "RemoteAvatarServicesConnector"
-    NeighbourServices           = "RemoteNeighbourServicesConnector"
-    AuthenticationServices      = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices       = "LocalAuthorizationServicesConnector"
-    PresenceServices            = "RemotePresenceServicesConnector"
-    UserAccountServices         = "RemoteUserAccountServicesConnector"
-    GridUserServices            = "RemoteGridUserServicesConnector"
-    SimulationServices          = "RemoteSimulationConnectorModule"
-    EntityTransferModule        = "HGEntityTransferModule"
-    InventoryAccessModule       = "HGInventoryAccessModule"
+    AssetServices           = "HGAssetBroker"
+    InventoryServices       = "HGInventoryBroker"
+    GridServices            = "RemoteGridServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
+    GridUserServices        = "RemoteGridUserServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    EntityTransferModule    = "HGEntityTransferModule"
+    InventoryAccessModule   = "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-    FriendsModule                       = "HGFriendsModule"
-    MapImageService                     = "MapImageServiceModule"
-    UserManagementModule        = "HGUserManagementModule"
-    SearchModule                        = "BasicSearchModule"
+    FriendsModule           = "HGFriendsModule"
+    MapImageService         = "MapImageServiceModule"
+    UserManagementModule    = "HGUserManagementModule"
+    SearchModule            = "BasicSearchModule"
     
-    LandServiceInConnector                      = true
-    NeighbourServiceInConnector         = true
-    SimulationServiceInConnector        = true
-    LibraryModule                                       = true
+    LandServiceInConnector        = true
+    NeighbourServiceInConnector   = true
+    SimulationServiceInConnector  = true
+    LibraryModule                 = true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -96,7 +96,7 @@
 [HGInstantMessageService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
     GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
-    PresenceService     = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+    PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
     UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
 
 [MapImageService]
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index f561dd5..efad577 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -55,7 +55,7 @@
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
 
-        HypergridLinker = true
+    HypergridLinker = true
     AllowHypergridMapSearch = true
 
 [LibraryService]
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 8e42fab..5749656 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -53,7 +53,7 @@
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-        NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -63,7 +63,7 @@
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
-        
+
 [Groups]
     Enabled = true
     Module  = GroupsModule
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 398a76c..6b91d9a 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -9,7 +9,7 @@
     InventoryServices       = "LocalInventoryServicesConnector"
     NeighbourServices       = "LocalNeighbourServicesConnector"
     AuthenticationServices  = "LocalAuthenticationServicesConnector"
-    AuthorizationServices       = "LocalAuthorizationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
     GridServices            = "LocalGridServicesConnector"
     PresenceServices        = "LocalPresenceServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
@@ -19,8 +19,8 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
-    MapImageService                     = "MapImageServiceModule"
-    SearchModule                        = "BasicSearchModule"
+    MapImageService         = "MapImageServiceModule"
+    SearchModule            = "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index edccf23..a11a931 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -271,24 +271,24 @@
     ; uas = ${Const|BaseURL}:${Const|PublicPort}/
 
 [MapImageService]
-        ; Set this if you want to change the default
-        ; TilesStoragePath = "maptiles"
+    ; Set this if you want to change the default
+    ; TilesStoragePath = "maptiles"
 
 [AuthorizationService]
-        ; If you have regions with access restrictions
-        ; specify them here using the convention
-        ; Region_<Region_Name> = <flags>
-        ; Valid flags are:
-        ; DisallowForeigners -- HG visitors not allowed
-        ; DisallowResidents -- only Admins and Managers allowed
-        ; Example:
-        ; Region_Test_1 = "DisallowForeigners"
+    ; If you have regions with access restrictions
+    ; specify them here using the convention
+    ; Region_<Region_Name> = <flags>
+    ; Valid flags are:
+    ; DisallowForeigners -- HG visitors not allowed
+    ; DisallowResidents -- only Admins and Managers allowed
+    ; Example:
+    ; Region_Test_1 = "DisallowForeigners"
 
 ;;
 ;; HG configurations
 ;;
 [GatekeeperService]
-        ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}"
 
     ; Does this grid allow incoming links to any region in it?
@@ -344,11 +344,11 @@
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
-        ;; This variable controls what is exposed to profiles of local users
-        ;; as seen from outside of this grid. Leave it uncommented for exposing
-        ;; UserTitle, UserFlags and the creation date. Uncomment and change to False
-        ;; to block this info from being exposed.
-        ; ShowUserDetailsInHGProfile = True
+    ;; This variable controls what is exposed to profiles of local users
+    ;; as seen from outside of this grid. Leave it uncommented for exposing
+    ;; UserTitle, UserFlags and the creation date. Uncomment and change to False
+    ;; to block this info from being exposed.
+    ; ShowUserDetailsInHGProfile = True
 
 
 [HGInventoryService]
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 102947a..1be67db 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -8,35 +8,35 @@
     WorldMapModule = "HGWorldMap"
 
 [Modules]
-    AssetServices                       = "HGAssetBroker"
-    InventoryServices           = "HGInventoryBroker"
-    NeighbourServices           = "LocalNeighbourServicesConnector"
-    AuthenticationServices      = "LocalAuthenticationServicesConnector"
-    AuthorizationServices       = "LocalAuthorizationServicesConnector"
-    GridServices                        = "LocalGridServicesConnector"
-    PresenceServices            = "LocalPresenceServicesConnector"
-    UserAccountServices         = "LocalUserAccountServicesConnector"
+    AssetServices           = "HGAssetBroker"
+    InventoryServices       = "HGInventoryBroker"
+    NeighbourServices       = "LocalNeighbourServicesConnector"
+    AuthenticationServices  = "LocalAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    GridServices            = "LocalGridServicesConnector"
+    PresenceServices        = "LocalPresenceServicesConnector"
+    UserAccountServices     = "LocalUserAccountServicesConnector"
     GridUserServices        = "LocalGridUserServicesConnector"
-    SimulationServices          = "RemoteSimulationConnectorModule"
-    AvatarServices                      = "LocalAvatarServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    AvatarServices          = "LocalAvatarServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
-    MapImageService                     = "MapImageServiceModule"
-    EntityTransferModule        = "HGEntityTransferModule"
-    InventoryAccessModule       = "HGInventoryAccessModule"
-    FriendsModule                       = "HGFriendsModule"
-    UserManagementModule        = "HGUserManagementModule"
-    SearchModule                        = "BasicSearchModule"
+    MapImageService         = "MapImageServiceModule"
+    EntityTransferModule    = "HGEntityTransferModule"
+    InventoryAccessModule   = "HGInventoryAccessModule"
+    FriendsModule           = "HGFriendsModule"
+    UserManagementModule    = "HGUserManagementModule"
+    SearchModule            = "BasicSearchModule"
     
-    InventoryServiceInConnector                 = true
-    AssetServiceInConnector                             = true
-    HypergridServiceInConnector                 = true
-    NeighbourServiceInConnector                 = true
-    LibraryModule                                               = true
-    LLLoginServiceInConnector                   = true
-    GridInfoServiceInConnector                  = true
-    AuthenticationServiceInConnector    = true
-    SimulationServiceInConnector                = true
-    MapImageServiceInConnector                  = true
+    InventoryServiceInConnector       = true
+    AssetServiceInConnector           = true
+    HypergridServiceInConnector       = true
+    NeighbourServiceInConnector       = true
+    LibraryModule                     = true
+    LLLoginServiceInConnector         = true
+    GridInfoServiceInConnector        = true
+    AuthenticationServiceInConnector  = true
+    SimulationServiceInConnector      = true
+    MapImageServiceInConnector        = true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -90,13 +90,13 @@
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
     StorageProvider = "OpenSim.Data.Null.dll"
-        
+
     ; Needed to display non-default map tile images for remote regions
     AssetService = "OpenSim.Services.AssetService.dll:AssetService"
   
     HypergridLinker = true
     AllowHypergridMapSearch = true
-        
+
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
     StorageProvider = "OpenSim.Data.Null.dll"
@@ -124,21 +124,21 @@
     Connector = "OpenSim.Services.FriendsService.dll"
 
 [LoginService]
-    LocalServiceModule          = "OpenSim.Services.LLLoginService.dll:LLLoginService"
-    UserAccountService          = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    GridUserService                     = "OpenSim.Services.UserAccountService.dll:GridUserService"
-    UserAgentService            = "OpenSim.Services.HypergridService.dll:UserAgentService"
-    AuthenticationService       = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService            = "OpenSim.Services.InventoryService.dll:XInventoryService"
-    PresenceService                     = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService                         = "OpenSim.Services.GridService.dll:GridService"
-    AvatarService                       = "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService                      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService       = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    UserAgentService      = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService           = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
    
     ; This inventory service will be used to initialize the user's inventory
     HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
     HGInventoryServiceConstructorArg = "HGInventoryService"
-        
+
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
@@ -158,15 +158,14 @@
     ;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
-    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GatekeeperService   = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService  = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
     ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
     CreateDefaultAvatarEntries = true
 
-        
 ;; The interface that local users get when they are in other grids
 ;; This greatly restricts the inventory operations while in other grids
 [HGInventoryService]
@@ -198,8 +197,8 @@
 [HGInstantMessageService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
-    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    PresenceService   = "OpenSim.Services.PresenceService.dll:PresenceService"
+    UserAgentService  = "OpenSim.Services.HypergridService.dll:UserAgentService"
     InGatekeeper = True
 
 ;; This should always be the very last thing on this file