minor: Add explanation that [Startup] CombineContiguousRegions should be false for varregions.

The dylib update is a new version that doesn't leak memory.

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);
 

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++;

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();
 

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(

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;
+
+    //                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);
+
+                    // We don't need to do anything else with PacketAck packets
+                    return;
+                }
             }
-
-            // Handle PacketAck packets
-            if (packet.Type == PacketType.PacketAck)
+            else 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);
-
-                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
                 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)

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)

OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

@@ -795,9 +795,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         Utils.StringToBytes(sceneObjectXml),
                         sp.UUID);
 
-                    IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
-
-                    invAccess.UpdateInventoryItemAsset(sp.UUID, item, asset);
+                    if (m_invAccessModule != null)
+                        m_invAccessModule.UpdateInventoryItemAsset(sp.UUID, item, asset);
 
                     // If the name of the object has been changed whilst attached then we want to update the inventory
                     // item in the viewer.

OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs

@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
 
             if (!GetProfileData(ref props, foreign, out result))
             {
-                m_log.DebugFormat("Error getting profile for {0}: {1}", avatarID, result);
+//                m_log.DebugFormat("Error getting profile for {0}: {1}", avatarID, result);
                 return;
             }
 
@@ -1155,7 +1155,12 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                     }
                     catch (Exception e)
                     {
-                        m_log.Debug(string.Format("Request using the OpenProfile API to {0} failed", serverURI), e);
+                        m_log.Debug(
+                            string.Format(
+                                "[PROFILES]: Request using the OpenProfile API for user {0} to {1} failed", 
+                                properties.UserId, serverURI),
+                            e);
+
                         // Allow the return 'message' to say "JsonRpcRequest" and not "OpenProfile", because
                         // the most likely reason that OpenProfile failed is that the remote server
                         // doesn't support OpenProfile, and that's not very interesting.
@@ -1164,7 +1169,9 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
 
                 if (!secondChanceSuccess)
                 {
-                    message = string.Format("JsonRpcRequest to {0} failed", serverURI);
+                    message = string.Format("JsonRpcRequest for user {0} to {1} failed", properties.UserId, serverURI);
+                    m_log.DebugFormat("[PROFILES]: {0}", message);
+
                     return false;
                 }
                 // else, continue below

OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

@@ -297,6 +297,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             if (item != null && item.Owner == ownerID && asset != null)
             {
+//                m_log.DebugFormat(
+//                    "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}", 
+//                    item.Name, item.ID, asset.ID);
+
                 item.AssetID = asset.FullID;
                 item.Description = asset.Description;
                 item.Name = asset.Name;
@@ -314,7 +318,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     (item == null || asset == null? "null item or asset" : "wrong owner"));
                 return false;
             }
-
         }
 
         public virtual List<InventoryItemBase> CopyToInventory(

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))

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)

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;

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -911,28 +911,36 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void LoadScriptState(XmlReader reader)
         {
-//            m_log.DebugFormat("[SCENE OBJECT GROUP]: Looking for script state for {0} in {1}", Name);
+//            m_log.DebugFormat("[SCENE OBJECT GROUP]: Looking for script state for {0}", Name);
 
-            while (reader.ReadToFollowing("SavedScriptState"))
+            while (true)
             {
-//                m_log.DebugFormat("[SCENE OBJECT GROUP]: Loading script state for {0}", Name);
-
-                if (m_savedScriptState == null)
-                    m_savedScriptState = new Dictionary<UUID, string>();
-
-                string uuid = reader.GetAttribute("UUID");
-
-                if (uuid != null)
+                if (reader.Name == "SavedScriptState" && reader.NodeType == XmlNodeType.Element)
                 {
-//                    m_log.DebugFormat("[SCENE OBJECT GROUP]: Found state for item ID {0} in object {1}", uuid, Name);
+//                    m_log.DebugFormat("[SCENE OBJECT GROUP]: Loading script state for {0}", Name);
 
-                    UUID itemid = new UUID(uuid);
-                    if (itemid != UUID.Zero)
-                        m_savedScriptState[itemid] = reader.ReadInnerXml();
+                    if (m_savedScriptState == null)
+                        m_savedScriptState = new Dictionary<UUID, string>();
+
+                    string uuid = reader.GetAttribute("UUID");
+
+                    if (uuid != null)
+                    {
+//                        m_log.DebugFormat("[SCENE OBJECT GROUP]: Found state for item ID {0} in object {1}", uuid, Name);
+
+                        UUID itemid = new UUID(uuid);
+                        if (itemid != UUID.Zero)
+                            m_savedScriptState[itemid] = reader.ReadInnerXml();
+                    }
+                    else
+                    {
+                        m_log.WarnFormat("[SCENE OBJECT GROUP]: SavedScriptState element had no UUID in object {0}", Name);
+                    }
                 }
                 else
                 {
-                    m_log.WarnFormat("[SCENE OBJECT GROUP]: SavedScriptState element had no UUID in object {0}", Name);
+                    if (!reader.Read())
+                        break;
                 }
             }
         }

OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

@@ -400,6 +400,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         private UUID RestoreSavedScriptState(UUID loadedID, UUID oldID, UUID newID)
         {
+//            m_log.DebugFormat(
+//                "[PRIM INVENTORY]: Restoring scripted state for item {0}, oldID {1}, loadedID {2}", 
+//                newID, oldID, loadedID);
+
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
             if (engines.Length == 0) // No engine at all
                 return oldID;
@@ -412,7 +416,7 @@ namespace OpenSim.Region.Framework.Scenes
                 XmlDocument doc = new XmlDocument();
 
                 doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]);
-                
+
                 ////////// CRUFT WARNING ///////////////////////////////////
                 //
                 // Old objects will have <ScriptState><State> ...
@@ -442,6 +446,8 @@ namespace OpenSim.Region.Framework.Scenes
                     // This created document has only the minimun data
                     // necessary for XEngine to parse it successfully
 
+//                    m_log.DebugFormat("[PRIM INVENTORY]: Adding legacy state {0} in {1}", stateID, newID);
+
                     m_part.ParentGroup.m_savedScriptState[stateID] = newDoc.OuterXml;
                 }
                 

OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs

@@ -211,6 +211,21 @@ public struct HACDParams
 	public float addNeighboursDistPoints;	// false
 	public float addFacesPoints;			// false
 	public float shouldAdjustCollisionMargin;	// false
+    // VHACD
+	public float whichHACD;				    // zero if Bullet HACD, non-zero says VHACD
+	// http://kmamou.blogspot.ca/2014/12/v-hacd-20-parameters-description.html
+	public float vHACDresolution;			// 100,000 max number of voxels generated during voxelization stage
+	public float vHACDdepth;				// 20 max number of clipping stages
+	public float vHACDconcavity;			// 0.0025 maximum concavity
+	public float vHACDplaneDownsampling;	// 4 granularity of search for best clipping plane
+	public float vHACDconvexHullDownsampling;	// 4 precision of hull gen process
+	public float vHACDalpha;				// 0.05 bias toward clipping along symmetry planes
+	public float vHACDbeta;				    // 0.05 bias toward clipping along revolution axis
+	public float vHACDgamma;				// 0.00125 max concavity when merging
+	public float vHACDpca;					// 0 on/off normalizing mesh before decomp
+	public float vHACDmode;				    // 0 0:voxel based, 1: tetrahedron based
+	public float vHACDmaxNumVerticesPerCH;	// 64 max triangles per convex hull
+	public float vHACDminVolumePerCH;		// 0.0001 sampling of generated convex hulls
 }
 
 // The states a bullet collision object can have

OpenSim/Region/Physics/BulletSPlugin/BSParam.cs

@@ -183,6 +183,7 @@ public static class BSParam
     public static bool VehicleEnableAngularBanking { get; private set; }
 
     // Convex Hulls
+    // Parameters for convex hull routine that ships with Bullet
     public static int CSHullMaxDepthSplit { get; private set; }
     public static int CSHullMaxDepthSplitForSimpleShapes { get; private set; }
     public static float CSHullConcavityThresholdPercent { get; private set; }
@@ -198,6 +199,22 @@ public static class BSParam
 	public static bool BHullAddNeighboursDistPoints { get; private set; }	// false
 	public static bool BHullAddFacesPoints { get; private set; }			// false
 	public static bool BHullShouldAdjustCollisionMargin { get; private set; }	// false
+	public static float WhichHACD { get; private set; }				    // zero if Bullet HACD, non-zero says VHACD
+    // Parameters for VHACD 2.0: http://code.google.com/p/v-hacd
+    // To enable, set both ShouldUseBulletHACD=true and WhichHACD=1
+	// http://kmamou.blogspot.ca/2014/12/v-hacd-20-parameters-description.html
+	public static float VHACDresolution { get; private set; }			// 100,000 max number of voxels generated during voxelization stage
+	public static float VHACDdepth { get; private set; }				// 20 max number of clipping stages
+	public static float VHACDconcavity { get; private set; }			// 0.0025 maximum concavity
+	public static float VHACDplaneDownsampling { get; private set; }	// 4 granularity of search for best clipping plane
+	public static float VHACDconvexHullDownsampling { get; private set; }	// 4 precision of hull gen process
+	public static float VHACDalpha { get; private set; }				// 0.05 bias toward clipping along symmetry planes
+	public static float VHACDbeta { get; private set; }				    // 0.05 bias toward clipping along revolution axis
+	public static float VHACDgamma { get; private set; }				// 0.00125 max concavity when merging
+	public static float VHACDpca { get; private set; }					// 0 on/off normalizing mesh before decomp
+	public static float VHACDmode { get; private set; }				    // 0 0:voxel based, 1: tetrahedron based
+	public static float VHACDmaxNumVerticesPerCH { get; private set; }	// 64 max triangles per convex hull
+	public static float VHACDminVolumePerCH { get; private set; }		// 0.0001 sampling of generated convex hulls
 
     // Linkset implementation parameters
     public static float LinksetImplementation { get; private set; }
@@ -749,6 +766,33 @@ public static class BSParam
 	    new ParameterDefn<bool>("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
             false ),
 
+	    new ParameterDefn<float>("WhichHACD", "zero if Bullet HACD, non-zero says VHACD",
+            0f ),
+	    new ParameterDefn<float>("VHACDresolution", "max number of voxels generated during voxelization stage",
+            100000f ),
+	    new ParameterDefn<float>("VHACDdepth", "max number of clipping stages",
+            20f ),
+	    new ParameterDefn<float>("VHACDconcavity", "maximum concavity",
+            0.0025f ),
+	    new ParameterDefn<float>("VHACDplaneDownsampling", "granularity of search for best clipping plane",
+            4f ),
+	    new ParameterDefn<float>("VHACDconvexHullDownsampling", "precision of hull gen process",
+            4f ),
+	    new ParameterDefn<float>("VHACDalpha", "bias toward clipping along symmetry planes",
+            0.05f ),
+	    new ParameterDefn<float>("VHACDbeta", "bias toward clipping along revolution axis",
+            0.05f ),
+	    new ParameterDefn<float>("VHACDgamma", "max concavity when merging",
+            0.00125f ),
+	    new ParameterDefn<float>("VHACDpca", "on/off normalizing mesh before decomp",
+            0f ),
+	    new ParameterDefn<float>("VHACDmode", "0:voxel based, 1: tetrahedron based",
+            0f ),
+	    new ParameterDefn<float>("VHACDmaxNumVerticesPerCH", "max triangles per convex hull",
+            64f ),
+	    new ParameterDefn<float>("VHACDminVolumePerCH",	"sampling of generated convex hulls",
+            0.0001f ),
+
 	    new ParameterDefn<float>("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
             (float)BSLinkset.LinksetImplementation.Compound ),
 	    new ParameterDefn<bool>("LinksetOffsetCenterOfMass", "If 'true', compute linkset center-of-mass and offset linkset position to account for same",

OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs

@@ -782,7 +782,7 @@ public class BSShapeHull : BSShape
 
             if (meshShape.physShapeInfo.HasPhysicalShape)
             {
-                HACDParams parms;
+                HACDParams parms = new HACDParams();
                 parms.maxVerticesPerHull = BSParam.BHullMaxVerticesPerHull;
                 parms.minClusters = BSParam.BHullMinClusters;
                 parms.compacityWeight = BSParam.BHullCompacityWeight;
@@ -792,6 +792,7 @@ public class BSShapeHull : BSShape
                 parms.addNeighboursDistPoints = BSParam.NumericBool(BSParam.BHullAddNeighboursDistPoints);
                 parms.addFacesPoints = BSParam.NumericBool(BSParam.BHullAddFacesPoints);
                 parms.shouldAdjustCollisionMargin = BSParam.NumericBool(BSParam.BHullShouldAdjustCollisionMargin);
+                parms.whichHACD = 0;    // Use the HACD routine that comes with Bullet
 
                 physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
                 newShape = physicsScene.PE.BuildHullShapeFromMesh(physicsScene.World, meshShape.physShapeInfo, parms);

OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs

@@ -97,6 +97,12 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// </summary>
         string State { get; set; }
 
+        /// <summary>
+        /// If true then the engine is responsible for persisted state.  If false then some other component may 
+        /// persist state (e.g. attachments persisting in assets).
+        /// </summary>
+        bool StatePersistedHere { get; }
+
         /// <summary>
         /// Time the script was last started
         /// </summary>

OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs

@@ -469,7 +469,11 @@ namespace SecondLife
             scriptCompileCounter++;
             try
             {
-                File.Delete(assembly);
+                if (File.Exists(assembly))
+                {
+                    File.SetAttributes(assembly, FileAttributes.Normal);
+                    File.Delete(assembly);
+                }
             }
             catch (Exception e) // NOTLEGIT - Should be just FileIOException
             {

OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs

@@ -58,6 +58,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public bool StatePersistedHere { get { return m_AttachedAvatar == UUID.Zero; } }
+
         /// <summary>
         /// The current work item if an event for this script is running or waiting to run,
         /// </summary>
@@ -76,7 +78,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private string m_CurrentEvent = String.Empty;
         private bool m_InSelfDelete;
         private int m_MaxScriptQueue;
-        private bool m_SaveState = true;
+        private bool m_SaveState;
         private int m_ControlEventsInQueue;
         private int m_LastControlLevel;
         private bool m_CollisionInQueue;
@@ -238,6 +240,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             m_postOnRez = postOnRez;
             m_AttachedAvatar = Part.ParentGroup.AttachedAvatar;
             m_RegionID = Part.ParentGroup.Scene.RegionInfo.RegionID;
+
+            m_SaveState = StatePersistedHere;
+
+//            m_log.DebugFormat(
+//                "[SCRIPT INSTANCE]: Instantiated script instance {0} (id {1}) in part {2} (id {3}) in object {4} attached avatar {5} in {6}",
+//                ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, m_AttachedAvatar, Engine.World.Name);
         }
 
         /// <summary>
@@ -339,8 +347,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 return false;
             }
 
-            m_SaveState = true;
-
+            // For attachments, XEngine saves the state into a .state file when XEngine.SetXMLState() is called.           
             string savedState = Path.Combine(m_dataPath, ItemID.ToString() + ".state");
 
             if (File.Exists(savedState))
@@ -389,6 +396,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             m_SaveState = false;
                             m_startedFromSavedState = true;
                         }
+
+                        // If this script is in an attachment then we no longer need the state file.
+                        if (!StatePersistedHere)
+                            RemoveState();
                     }
 //                    else
 //                    {
@@ -984,7 +995,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                                  (int)m_Script.GetStateEventFlags(State));
             if (running)
                 Start();
-            m_SaveState = true;
+
+            m_SaveState = StatePersistedHere;
+
             PostEvent(new EventParams("state_entry",
                     new Object[0], new DetectParams[0]));
         }
@@ -1010,7 +1023,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             if (m_CurrentEvent != "state_entry")
             {
-                m_SaveState = true;
+                m_SaveState = StatePersistedHere;
                 PostEvent(new EventParams("state_entry",
                         new Object[0], new DetectParams[0]));
                 throw new EventAbortException();
@@ -1027,6 +1040,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public void SetVars(Dictionary<string, object> vars)
         {
+//            foreach (KeyValuePair<string, object> kvp in vars)
+//                m_log.DebugFormat("[SCRIPT INSTANCE]: Setting var {0}={1}", kvp.Key, kvp.Value);
+
             m_Script.SetVars(vars);
         }
 
@@ -1060,6 +1076,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 return;
             }
 
+//            m_log.DebugFormat(
+//                "[SCRIPT INSTANCE]: Saving state for script {0} (id {1}) in part {2} (id {3}) in object {4} in {5}",
+//                ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name);
+
             PluginData = AsyncCommandManager.GetSerializationData(Engine, ItemID);
 
             string xml = ScriptSerializer.Serialize(this);

OpenSim/Region/ScriptEngine/XEngine/Tests/XEnginePersistenceTests.cs

@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.Attachments;
+using OpenSim.Region.CoreModules.Framework.InventoryAccess;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.XEngine;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.ScriptEngine.Tests
+{
+    [TestFixture]
+    public class XEnginePersistenceTests : OpenSimTestCase
+    {
+        private AutoResetEvent m_chatEvent = new AutoResetEvent(false);
+
+        private void OnChatFromWorld(object sender, OSChatMessage oscm)
+        {
+            //            Console.WriteLine("Got chat [{0}]", oscm.Message);
+
+            //            m_osChatMessageReceived = oscm;
+            m_chatEvent.Set();
+        }
+
+        private void AddCommonConfig(IConfigSource config, List<object> modules)
+        {
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
+
+            AttachmentsModule attMod = new AttachmentsModule();
+            attMod.DebugLevel = 1;
+            modules.Add(attMod);
+            modules.Add(new BasicInventoryAccessModule());
+        }
+
+        private void AddScriptingConfig(IConfigSource config, XEngine.XEngine xEngine, List<object> modules)
+        {
+            IConfig startupConfig = config.AddConfig("Startup");
+            startupConfig.Set("DefaultScriptEngine", "XEngine");
+
+            IConfig xEngineConfig = config.AddConfig("XEngine");
+            xEngineConfig.Set("Enabled", "true");
+            xEngineConfig.Set("StartDelay", "0");
+
+            // These tests will not run with AppDomainLoading = true, at least on mono.  For unknown reasons, the call
+            // to AssemblyResolver.OnAssemblyResolve fails.
+            xEngineConfig.Set("AppDomainLoading", "false");
+
+            modules.Add(xEngine);
+        }
+
+        private Scene CreateScriptingEnabledTestScene(XEngine.XEngine xEngine)
+        {
+            IConfigSource config = new IniConfigSource();
+            List<object> modules = new List<object>();
+
+            AddCommonConfig(config, modules);
+            AddScriptingConfig(config, xEngine, modules);
+
+            Scene scene
+                = new SceneHelpers().SetupScene(
+                    "attachments-test-scene", TestHelpers.ParseTail(999), 1000, 1000, config);
+            SceneHelpers.SetupSceneModules(scene, config, modules.ToArray());
+
+            scene.StartScripts();
+
+            return scene;
+        }
+
+        [Test]
+        public void TestScriptedAttachmentPersistence()
+        {
+            TestHelpers.InMethod();
+//                        TestHelpers.EnableLogging();
+
+            XEngine.XEngine xEngine = new XEngine.XEngine();
+            Scene scene = CreateScriptingEnabledTestScene(xEngine);
+            UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1);
+
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10);
+            TaskInventoryHelpers.AddScript(
+                scene,
+                so.RootPart,
+                "scriptItem",
+                "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }");
+
+            InventoryItemBase userItem = UserInventoryHelpers.AddInventoryItem(scene, so, 0x100, 0x1000);
+
+            // FIXME: Right now, we have to do a tricksy chat listen to make sure we know when the script is running.
+            // In the future, we need to be able to do this programatically more predicably.
+            scene.EventManager.OnChatFromWorld += OnChatFromWorld;
+
+            SceneObjectGroup rezzedSo
+                = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest);
+            TaskInventoryItem rezzedScriptItem = rezzedSo.RootPart.Inventory.GetInventoryItem("scriptItem");
+
+            // Wait for chat to signal rezzed script has been started.
+            m_chatEvent.WaitOne(60000);
+
+            // Force save
+            xEngine.DoBackup(new Object[] { 0 });
+
+//            Console.WriteLine("ItemID {0}", rezzedScriptItem.ItemID);
+//
+//            foreach (
+//                string s in Directory.EnumerateFileSystemEntries(
+//                    string.Format("ScriptEngines/{0}", scene.RegionInfo.RegionID)))
+//                Console.WriteLine(s);
+
+            Assert.IsFalse(
+                File.Exists(
+                    string.Format("ScriptEngines/{0}/{1}.state", scene.RegionInfo.RegionID, rezzedScriptItem.ItemID)));
+
+            scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, rezzedSo);
+        }
+    }
+}

OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

@@ -247,7 +247,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             m_ScriptConfig = configSource.Configs["XEngine"];
             m_ConfigSource = configSource;
 
-            string rawScriptStopStrategy = m_ScriptConfig.GetString("ScriptStopStrategy", "coop");
+            string rawScriptStopStrategy = m_ScriptConfig.GetString("ScriptStopStrategy", "co-op");
 
             m_log.InfoFormat("[XEngine]: Script stop strategy is {0}", rawScriptStopStrategy);
 
@@ -718,7 +718,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     //
                     try
                     {
-                        instance.SaveState();
+                        if (instance.StatePersistedHere)
+                            instance.SaveState();
                     }
                     catch (Exception e)
                     {
@@ -830,7 +831,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             lock (m_Scripts)
             {
                 foreach (IScriptInstance instance in m_Scripts.Values)
-                    instances.Add(instance);
+                {
+                    if (instance.StatePersistedHere)
+                    {
+//                        m_log.DebugFormat(
+//                            "[XEngine]: Adding script {0}.{1}, item UUID {2}, prim UUID {3} in {4} for state persistence",
+//                            instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, World.Name);
+
+                        instances.Add(instance);
+                    }
+                }
             }
 
             foreach (IScriptInstance i in instances)
@@ -860,6 +870,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void SaveAllState()
         {
+            DoBackup(new object[] { 0 });
+        }
+
+        public object DoMaintenance(object p)
+        {
+            object[] parms = (object[])p;
+            int sleepTime = (int)parms[0];
+
             foreach (IScriptInstance inst in m_Scripts.Values)
             {
                 if (inst.EventTime() > m_EventLimit)
@@ -869,14 +887,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         inst.Start();
                 }
             }
-        }
-
-        public object DoMaintenance(object p)
-        {
-            object[] parms = (object[])p;
-            int sleepTime = (int)parms[0];
-
-            SaveAllState();
 
             System.Threading.Thread.Sleep(sleepTime);
 
@@ -1044,14 +1054,25 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                 while (m_CompileQueue.Dequeue(out o))
                 {
-                    if (DoOnRezScript(o))
+                    try
                     {
-                        scriptsStarted++;
+                        if (DoOnRezScript(o))
+                        {
+                            scriptsStarted++;
 
-                        if (m_InitialStartup)
-                            if (scriptsStarted % 50 == 0)
-                                m_log.InfoFormat(
-                                    "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name);
+                            if (m_InitialStartup)
+                                if (scriptsStarted % 50 == 0)
+                                    m_log.InfoFormat(
+                                        "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(
+                            string.Format(
+                                "[XEngine]: Failure in DoOnRezScriptQueue() for item {0} in {1}.  Continuing.  Exception  ", 
+                                o[1], m_Scene.Name), 
+                            e);
                     }
                 }
 
@@ -1437,8 +1458,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             instance.Stop(m_WaitForEventCompletionOnScriptStop);
 
-//                bool objectRemoved = false;
-
             lock (m_PrimObjects)
             {
                 // Remove the script from it's prim
@@ -1450,14 +1469,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                     // If there are no more scripts, remove prim
                     if (m_PrimObjects[localID].Count == 0)
-                    {
                         m_PrimObjects.Remove(localID);
-//                            objectRemoved = true;
-                    }
                 }
             }
 
-            instance.RemoveState();
+            if (instance.StatePersistedHere)
+                instance.RemoveState(); 
+
             instance.DestroyScriptInstance();
 
             m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);

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

OpenSim/Services/GridService/GridService.cs

@@ -164,8 +164,14 @@ namespace OpenSim.Services.GridService
 
             configVal = loginConfig.GetString("MapTileURL", string.Empty);
             if (!string.IsNullOrEmpty(configVal))
+            {
+                // This URL must end with '/', the viewer doesn't check
+                configVal = configVal.Trim();
+                if (!configVal.EndsWith("/"))
+                    configVal = configVal + "/";
                 m_ExtraFeatures["map-server-url"] = configVal;
-            
+            }
+
             configVal = loginConfig.GetString("DestinationGuide", string.Empty);
             if (!string.IsNullOrEmpty(configVal))
                 m_ExtraFeatures["destination-guide-url"] = configVal;

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";

OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs

@@ -116,26 +116,44 @@ namespace OpenSim.Tests.Common
         /// <returns>The item that was added</returns>
         public static TaskInventoryItem AddScript(
             Scene scene, SceneObjectPart part, string scriptName, string scriptSource)
+        {
+            return AddScript(scene, part, UUID.Random(), UUID.Random(), scriptName, scriptSource);
+        }
+                
+        /// <summary>
+        /// Add a simple script to the given part.
+        /// </summary>
+        /// <remarks>
+        /// TODO: Accept input for item and asset IDs so that we have completely replicatable regression tests rather
+        /// than a random component.
+        /// </remarks>
+        /// <param name="scene"></param>
+        /// <param name="part"></param>
+        /// <param name="itemId">Item UUID for the script</param>
+        /// <param name="assetId">Asset UUID for the script</param>
+        /// <param name="scriptName">Name of the script to add</param>
+        /// <param name="scriptSource">LSL script source</param>
+        /// <returns>The item that was added</returns>
+        public static TaskInventoryItem AddScript(
+            Scene scene, SceneObjectPart part, UUID itemId, UUID assetId, string scriptName, string scriptSource)
         {
             AssetScriptText ast = new AssetScriptText();
             ast.Source = scriptSource;
             ast.Encode();
 
-            UUID assetUuid = UUID.Random();
-            UUID itemUuid = UUID.Random();
-
             AssetBase asset
-                = AssetHelpers.CreateAsset(assetUuid, AssetType.LSLText, ast.AssetData, UUID.Zero);
+                = AssetHelpers.CreateAsset(assetId, AssetType.LSLText, ast.AssetData, UUID.Zero);
             scene.AssetService.Store(asset);
             TaskInventoryItem item
                 = new TaskInventoryItem 
-                    { Name = scriptName, AssetID = assetUuid, ItemID = itemUuid,
-                      Type = (int)AssetType.LSLText, InvType = (int)InventoryType.LSL };
+            { Name = scriptName, AssetID = assetId, ItemID = itemId,
+                Type = (int)AssetType.LSLText, InvType = (int)InventoryType.LSL };
             part.Inventory.AddInventoryItem(item, true);
-            
+
             return item;
         }
 
+
         /// <summary>
         /// Add a scene object item to the given part.
         /// </summary>

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() 
         { 

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() 
         { 

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.
@@ -187,12 +187,13 @@
     ;; YOU HAVE BEEN WARNED!!!
     ; TrustBinaries = false
 
-    ;# {CombineContiguousRegions} {} {Create megaregions where possible? (Do not use with existing content!)} {true false} false
+    ;# {CombineContiguousRegions} {} {Create megaregions where possible? (Do not use with existing content or varregions!)} {true false} false
     ;; Combine all contiguous regions into one large megaregion
     ;; Order your regions from South to North, West to East in your regions.ini
     ;; and then set this to true
     ;; Warning!  Don't use this with regions that have existing content!,
     ;; This will likely break them
+    ;; Also, this setting should be set to false for varregions as they are proper larger single regions rather than combined smaller regions.
     ; CombineContiguousRegions = false
 
     ;# {InworldRestartShutsDown} {} {Shutdown instance on region restart?} {true false} false
@@ -406,9 +407,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 +419,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 +507,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 +795,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]

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

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"

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
 

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"

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

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]

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]

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

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

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]

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