Merge branch 'master' into careminster

Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat

.gitignore

@@ -12,6 +12,12 @@
 *.dll.build
 *.dll
 *.log
+
+# Ignore .user and .suo files as these are user preference specific
+# http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control
+*.suo
+*.user
+
 *.VisualState.xml
 */*/obj
 */*/*/obj
@@ -68,7 +74,6 @@ bin/crashes/
 Examples/*.dll
 OpenSim.build
 OpenSim.sln
-OpenSim.suo
 OpenSim.userprefs
 Prebuild/Prebuild.build
 Prebuild/Prebuild.sln

CONTRIBUTORS.txt

@@ -7,7 +7,7 @@ people that make the day to day of OpenSim happen.
 
 * justincc (OSVW Consulting, justincc.org)
 * chi11ken (Genkii)
-* dahlia
+* dahlia 
 * Melanie Thielker
 * Diva (Crista Lopes, University of California, Irvine)
 * Dan Lake (Intel)
@@ -109,6 +109,7 @@ what it is today.
 * Kayne
 * Kevin Cozens
 * kinoc (Daxtron Labs)
+* Kira
 * Kitto Flora
 * KittyLiu
 * Kurt Taylor (IBM)

OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs

@@ -101,7 +101,7 @@ namespace OpenSim.Groups
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             if (GroupID != UUID.Zero)
                 sendData["GroupID"] = GroupID.ToString();
-            if (GroupName != null && GroupName != string.Empty)
+            if (!string.IsNullOrEmpty(GroupName))
                 sendData["Name"] = GroupsDataUtils.Sanitize(GroupName);
 
             sendData["RequestingAgentID"] = RequestingAgentID;
@@ -275,7 +275,7 @@ namespace OpenSim.Groups
 
             //m_log.DebugFormat("[XXX]: reply was {0}", reply);
 
-            if (reply == string.Empty || reply == null)
+            if (string.IsNullOrEmpty(reply))
                 return null;
 
             Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(

OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs

@@ -120,7 +120,7 @@ namespace OpenSim.Groups
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             if (GroupID != UUID.Zero)
                 sendData["GroupID"] = GroupID.ToString();
-            if (GroupName != null && GroupName != string.Empty)
+            if (!string.IsNullOrEmpty(GroupName))
                 sendData["Name"] = GroupsDataUtils.Sanitize(GroupName);
 
             sendData["RequestingAgentID"] = RequestingAgentID;

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Xml;
 using System.Net;
@@ -51,6 +52,7 @@ using OpenSim.Services.Interfaces;
 using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using PermissionMask = OpenSim.Framework.PermissionMask;
+using RegionInfo = OpenSim.Framework.RegionInfo;
 
 namespace OpenSim.ApplicationPlugins.RemoteController
 {
@@ -149,6 +151,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_create_user_email"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcCreateUserMethod);
                     availableMethods["admin_exists_user"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcUserExistsMethod);
                     availableMethods["admin_update_user"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcUpdateUserAccountMethod);
+                    availableMethods["admin_authenticate_user"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAuthenticateUserMethod);
 
                     // Region state management
                     availableMethods["admin_load_xml"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcLoadXMLMethod);
@@ -1411,6 +1414,139 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
         }
 
+        /// <summary>
+        /// Authenticate an user.
+        /// <summary>
+        /// <param name="request">incoming XML RPC request</param>
+        /// <remarks>
+        /// XmlRpcAuthenticateUserMethod takes the following XMLRPC
+        /// parameters
+        /// <list type="table">
+        /// <listheader><term>parameter name</term><description>description</description></listheader>
+        /// <item><term>password</term>
+        ///       <description>admin password as set in OpenSim.ini</description></item>
+        /// <item><term>user_firstname</term>
+        ///       <description>avatar's first name</description></item>
+        /// <item><term>user_lastname</term>
+        ///       <description>avatar's last name</description></item>
+        /// <item><term>user_password</term>
+        ///       <description>MD5 hash of avatar's password</description></item>
+        /// <item><term>token_lifetime</term>
+        ///       <description>the lifetime of the returned token (upper bounded to 30s)</description></item>
+        /// </list>
+        ///
+        /// XmlRpcAuthenticateUserMethod returns
+        /// <list type="table">
+        /// <listheader><term>name</term><description>description</description></listheader>
+        /// <item><term>success</term>
+        ///       <description>true or false</description></item>
+        /// <item><term>token</term>
+        ///       <description>the authentication token sent by OpenSim</description></item>
+        /// <item><term>error</term>
+        ///       <description>error message if success is false</description></item>
+        /// </list>
+        /// </remarks>
+        private void XmlRpcAuthenticateUserMethod(XmlRpcRequest request, XmlRpcResponse response,
+                                                   IPEndPoint remoteClient)
+        {
+            m_log.Info("[RADMIN]: AuthenticateUser: new request");
+
+            var responseData = (Hashtable)response.Value;
+            var requestData = (Hashtable)request.Params[0];
+
+            lock (m_requestLock)
+            {
+                try
+                {
+                    CheckStringParameters(requestData, responseData, new[]
+                                                                         {
+                                                                             "user_firstname",
+                                                                             "user_lastname",
+                                                                             "user_password",
+                                                                             "token_lifetime"
+                                                                         });
+
+                    var firstName = (string)requestData["user_firstname"];
+                    var lastName = (string)requestData["user_lastname"];
+                    var password = (string)requestData["user_password"];
+
+                    var scene = m_application.SceneManager.CurrentOrFirstScene;
+
+                    if (scene.Equals(null))
+                    {
+                        m_log.Debug("scene does not exist");
+                        throw new Exception("Scene does not exist.");
+                    }
+
+                    var scopeID = scene.RegionInfo.ScopeID;
+                    var account = scene.UserAccountService.GetUserAccount(scopeID, firstName, lastName);
+
+                    if (account.Equals(null) || account.PrincipalID.Equals(UUID.Zero))
+                    {
+                        m_log.DebugFormat("avatar {0} {1} does not exist", firstName, lastName);
+                        throw new Exception(String.Format("avatar {0} {1} does not exist", firstName, lastName));
+                    }
+
+                    if (String.IsNullOrEmpty(password))
+                    {
+                        m_log.DebugFormat("[RADMIN]: AuthenticateUser: no password provided for {0} {1}", firstName,
+                                          lastName);
+                        throw new Exception(String.Format("no password provided for {0} {1}", firstName,
+                                          lastName));
+                    }
+
+                    int lifetime;
+                    if (int.TryParse((string)requestData["token_lifetime"], NumberStyles.Integer, CultureInfo.InvariantCulture, out lifetime) == false)
+                    {
+                        m_log.DebugFormat("[RADMIN]: AuthenticateUser: no token lifetime provided for {0} {1}", firstName,
+                                          lastName);
+                        throw new Exception(String.Format("no token lifetime provided for {0} {1}", firstName,
+                                          lastName));
+                    }
+
+                    // Upper bound on lifetime set to 30s.
+                    if (lifetime > 30)
+                    {
+                        m_log.DebugFormat("[RADMIN]: AuthenticateUser: token lifetime longer than 30s for {0} {1}", firstName,
+                                          lastName);
+                        throw new Exception(String.Format("token lifetime longer than 30s for {0} {1}", firstName,
+                                          lastName));
+                    }
+
+                    var authModule = scene.RequestModuleInterface<IAuthenticationService>();
+                    if (authModule == null)
+                    {
+                        m_log.Debug("[RADMIN]: AuthenticateUser: no authentication module loded");
+                        throw new Exception("no authentication module loaded");
+                    }
+
+                    var token = authModule.Authenticate(account.PrincipalID, password, lifetime);
+                    if (String.IsNullOrEmpty(token))
+                    {
+                        m_log.DebugFormat("[RADMIN]: AuthenticateUser: authentication failed for {0} {1}", firstName,
+                            lastName);
+                        throw new Exception(String.Format("authentication failed for {0} {1}", firstName,
+                            lastName));
+                    }
+
+                    m_log.DebugFormat("[RADMIN]: AuthenticateUser: account for user {0} {1} identified with token {2}",
+                        firstName, lastName, token);
+
+                    responseData["token"] = token;
+                    responseData["success"] = true;
+
+                }
+                catch (Exception e)
+                {
+                    responseData["success"] = false;
+                    responseData["error"] = e.Message;
+                    throw e;
+                }
+
+                m_log.Info("[RADMIN]: AuthenticateUser: request complete");
+            }
+        }
+
         /// <summary>
         /// Load an OAR file into a region..
         /// <summary>
@@ -1539,7 +1675,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// </remarks>
         private void XmlRpcSaveOARMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
         {
-            m_log.Info("[RADMIN]: Received Save OAR Administrator Request");
+            m_log.Info("[RADMIN]: Received Save OAR Request");
 
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
@@ -1585,8 +1721,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 if (archiver != null)
                 {
+                    Guid requestId = Guid.NewGuid();
                     scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted;
-                    archiver.ArchiveRegion(filename, options);
+
+                    m_log.InfoFormat(
+                        "[RADMIN]: Submitting save OAR request for {0} to file {1}, request ID {2}", 
+                        scene.Name, filename, requestId);
+
+                    archiver.ArchiveRegion(filename, requestId, options);
 
                     lock (m_saveOarLock)
                         Monitor.Wait(m_saveOarLock,5000);
@@ -1607,12 +1749,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 throw e;
             }
 
-            m_log.Info("[RADMIN]: Save OAR Administrator Request complete");
+            m_log.Info("[RADMIN]: Save OAR Request complete");
         }
 
         private void RemoteAdminOarSaveCompleted(Guid uuid, string name)
         {
-            m_log.DebugFormat("[RADMIN]: File processing complete for {0}", name);
+            if (name != "")
+                m_log.ErrorFormat("[RADMIN]: Saving of OAR file with request ID {0} failed with message {1}", uuid, name);
+            else
+                m_log.DebugFormat("[RADMIN]: Saved OAR file for request {0}", uuid);
+
             lock (m_saveOarLock)
                 Monitor.Pulse(m_saveOarLock);
         }

OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs

@@ -85,7 +85,7 @@ namespace OpenSim.Capabilities.Handlers
 //                m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID);
                 
                 string[] formats;
-                if (format != null && format != string.Empty)
+                if (!string.IsNullOrEmpty(format))
                 {
                     formats = new string[1] { format.ToLower() };
                 }

OpenSim/Data/PGSQL/PGSQLSimulationData.cs

@@ -824,7 +824,7 @@ namespace OpenSim.Data.PGSQL
 
         public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
-            string sql = @"select count (region_id) from regionwindlight where ""region_id"" = :region_id ;";
+            string sql = @"select region_id from regionwindlight where ""region_id"" = :region_id limit 1;";
             bool exists = false;
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
@@ -832,7 +832,8 @@ namespace OpenSim.Data.PGSQL
                 using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
                     cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString() ));
-                    exists = cmd.ExecuteNonQuery() > 0;
+                    NpgsqlDataReader dr = cmd.ExecuteReader();
+                    exists = dr.Read();
                 }
             }
             if (exists)
@@ -975,7 +976,7 @@ namespace OpenSim.Data.PGSQL
                 conn.Open();
                 using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
-                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID));
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString()));
                     cmd.Parameters.Add(_Database.CreateParameter("water_color_r", wl.waterColor.X));
                     cmd.Parameters.Add(_Database.CreateParameter("water_color_g", wl.waterColor.Y));
                     cmd.Parameters.Add(_Database.CreateParameter("water_color_b", wl.waterColor.Z));
@@ -993,7 +994,7 @@ namespace OpenSim.Data.PGSQL
                     cmd.Parameters.Add(_Database.CreateParameter("big_wave_direction_y", wl.bigWaveDirection.Y));
                     cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_x", wl.littleWaveDirection.X));
                     cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_y", wl.littleWaveDirection.Y));
-                    cmd.Parameters.Add(_Database.CreateParameter("normal_map_texture", wl.normalMapTexture));
+                    cmd.Parameters.Add(_Database.CreateParameter("normal_map_texture", wl.normalMapTexture.ToString()));
                     cmd.Parameters.Add(_Database.CreateParameter("horizon_r", wl.horizon.X));
                     cmd.Parameters.Add(_Database.CreateParameter("horizon_g", wl.horizon.Y));
                     cmd.Parameters.Add(_Database.CreateParameter("horizon_b", wl.horizon.Z));

OpenSim/Framework/AgentCircuitData.cs

@@ -128,7 +128,31 @@ namespace OpenSim.Framework
         /// <summary>
         /// Viewer's version string as reported by the viewer at login
         /// </summary>
-        public string Viewer;
+        private string m_viewerInternal;
+
+        /// <summary>
+        /// Viewer's version string
+        /// </summary>
+        public string Viewer
+        {
+            set { m_viewerInternal = value; }
+
+            // Try to return consistent viewer string taking into account
+            // that viewers have chaagned how version is reported
+            // See http://opensimulator.org/mantis/view.php?id=6851
+            get
+            {
+                // Old style version string contains viewer name followed by a space followed by a version number
+                if (m_viewerInternal == null || m_viewerInternal.Contains(" "))
+                {
+                    return m_viewerInternal;
+                }
+                else // New style version contains no spaces, just version number
+                {
+                    return Channel + " " + m_viewerInternal;
+                }
+            }
+        }
 
         /// <summary>
         /// The channel strinf sent by the viewer at login

OpenSim/Framework/Configuration/XML/XmlConfiguration.cs

@@ -121,7 +121,7 @@ namespace OpenSim.Framework.Configuration.XML
 
         public void Commit()
         {
-            if (fileName == null || fileName == String.Empty)
+            if (string.IsNullOrEmpty(fileName))
                 return;
 
             if (!Directory.Exists(Util.configDir()))

OpenSim/Framework/InventoryItemBase.cs

@@ -122,7 +122,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                if (m_creatorData != null && m_creatorData != string.Empty)
+                if (!string.IsNullOrEmpty(m_creatorData))
                     return m_creatorId + ';' + m_creatorData;
                 else
                     return m_creatorId;

OpenSim/Framework/Monitoring/Stats/Stat.cs

@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Monitoring
                 Container, 
                 ShortName, 
                 Value, 
-                UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
+                string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
 
             AppendMeasuresOfInterest(sb);
 
@@ -316,9 +316,9 @@ namespace OpenSim.Framework.Monitoring
                 sb.AppendFormat(
                     ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
                     lastChangeOverTime, 
-                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName), 
+                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName), 
                     averageChangeOverTime,
-                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
+                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
             }
         }
     }

OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs

@@ -277,7 +277,7 @@ namespace OpenSim.Framework.Serialization.External
             writer.WriteStartElement("GroupOwned");
             writer.WriteString(inventoryItem.GroupOwned.ToString());
             writer.WriteEndElement();
-            if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty)
+            if (options.ContainsKey("creators") && !string.IsNullOrEmpty(inventoryItem.CreatorData))
                 writer.WriteElementString("CreatorData", inventoryItem.CreatorData);
             else if (options.ContainsKey("home"))
             {

OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

@@ -786,7 +786,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 "[BASE HTTP SERVER]: HTTP IN {0} :{1} {2} content type handler {3} {4} from {5}",
                 RequestNumber,
                 Port,
-                (request.ContentType == null || request.ContentType == "") ? "not set" : request.ContentType,
+                string.IsNullOrEmpty(request.ContentType) ? "not set" : request.ContentType,
                 request.HttpMethod,
                 request.Url.PathAndQuery,
                 request.RemoteIPEndPoint);

OpenSim/Framework/TaskInventoryItem.cs

@@ -124,7 +124,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                if (_creatorData != null && _creatorData != string.Empty)
+                if (!string.IsNullOrEmpty(_creatorData))
                     return _creatorID.ToString() + ';' + _creatorData;
                 else
                     return _creatorID.ToString();

OpenSim/Framework/WebUtil.cs

@@ -721,7 +721,7 @@ namespace OpenSim.Framework
         /// <returns></returns>
         public static string[] GetPreferredImageTypes(string accept)
         {
-            if (accept == null || accept == string.Empty)
+            if (string.IsNullOrEmpty(accept))
                 return new string[0];
 
             string[] types = accept.Split(new char[] { ',' });

OpenSim/Region/Application/OpenSim.cs

@@ -766,7 +766,7 @@ namespace OpenSim
                             foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
                                 MainConsole.Instance.OutputFormat("New Region Module (Shared): {0}", module.Name);
 
-                            foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
+                            foreach (IRegionModuleBase module in nonSharedModules.OrderBy(m => m.Name))
                                 MainConsole.Instance.OutputFormat("New Region Module (Non-Shared): {0}", module.Name);
                         }
                     );

OpenSim/Region/Application/OpenSimBase.cs

@@ -985,7 +985,7 @@ namespace OpenSim
             regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, true);
 
             string newName;
-            if (estateName != null && estateName != "")
+            if (!string.IsNullOrEmpty(estateName))
                 newName = estateName;
             else
                 newName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);

OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs

@@ -1456,6 +1456,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             mapReply.AgentData.AgentID = AgentId;
             mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length];
+            mapReply.Size = new MapBlockReplyPacket.SizeBlock[mapBlocks2.Length];
             mapReply.AgentData.Flags = flag;
 
             for (int i = 0; i < mapBlocks2.Length; i++)
@@ -1470,6 +1471,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 mapReply.Data[i].RegionFlags = mapBlocks2[i].RegionFlags;
                 mapReply.Data[i].Access = mapBlocks2[i].Access;
                 mapReply.Data[i].Agents = mapBlocks2[i].Agents;
+
+                // TODO: hookup varregion sim size here
+                mapReply.Size[i] = new MapBlockReplyPacket.SizeBlock();
+                mapReply.Size[i].SizeX = 256;
+                mapReply.Size[i].SizeY = 256;
             }
             OutPacket(mapReply, ThrottleOutPacketType.Land);
         }

OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

@@ -132,6 +132,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     stat => stat.Value = m_udpServer.IncomingOrphanedPacketCount,
                     StatVerbosity.Info));
 
+            StatsManager.RegisterStat(
+                new Stat(
+                    "IncomingPacketsResentCount",
+                    "Number of inbound packets that clients indicate are resends.",
+                    "",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = m_udpServer.IncomingPacketsResentCount,
+                    StatVerbosity.Debug));
+
             StatsManager.RegisterStat(
                 new Stat(
                     "OutgoingUDPSendsCount",
@@ -321,6 +334,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         internal int PacketsSentCount { get; set; }
 
+        /// <summary>
+        /// Record how many incoming packets are indicated as resends by clients.
+        /// </summary>
+        internal int IncomingPacketsResentCount { get; set; }
+
         /// <summary>
         /// Record how many inbound packets could not be recognized as LLUDP packets.
         /// </summary>
@@ -1506,6 +1524,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             #region Incoming Packet Accounting
 
+            // We're not going to worry about interlock yet since its not currently critical that this total count
+            // is 100% correct
+            if (packet.Header.Resent)
+                IncomingPacketsResentCount++;
+
             // Check the archive of received reliable packet IDs to see whether we already received this packet
             if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence))
             {

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

@@ -366,7 +366,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 }
                 catch (Exception e)
                 {
-                    UUID agentId = (sp.ControllingClient == null) ? (UUID)null : sp.ControllingClient.AgentId;
+                    UUID agentId = (sp.ControllingClient == null) ? default(UUID) : sp.ControllingClient.AgentId;
                     m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment with itemID {0}, assetID {1}, point {2} for {3}: {4}\n{5}",
                         attach.ItemID, attach.AssetID, attachmentPt, agentId, e.Message, e.StackTrace);
                 }

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs

@@ -421,7 +421,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 item.CreatorId = ospResolvedId.ToString();
                 item.CreatorData = string.Empty;
             }
-            else if (item.CreatorData == null || item.CreatorData == String.Empty)
+            else if (string.IsNullOrEmpty(item.CreatorData))
             {
                 item.CreatorId = m_userInfo.PrincipalID.ToString();
 //                item.CreatorIdAsUuid = new UUID(item.CreatorId);
@@ -522,7 +522,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         
                         foreach (SceneObjectGroup sog in sceneObjects)
                             foreach (SceneObjectPart sop in sog.Parts)
-                                if (sop.CreatorData == null || sop.CreatorData == "")
+                                if (string.IsNullOrEmpty(sop.CreatorData))
                                     sop.CreatorID = m_creatorIdForAssetId[assetId];
 
                         if (coa != null)

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

@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         private void AdjustIdentifiers(AssetMetadata meta)
         {
-            if (meta.CreatorID != null && meta.CreatorID != string.Empty)
+            if (!string.IsNullOrEmpty(meta.CreatorID))
             {
                 UUID uuid = UUID.Zero;
                 UUID.TryParse(meta.CreatorID, out uuid);

OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs

@@ -466,7 +466,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     return userdata.ServerURLs[serverType].ToString();
                 }
 
-                if (userdata.HomeURL != null && userdata.HomeURL != string.Empty)
+                if (!string.IsNullOrEmpty(userdata.HomeURL))
                 {
                     //m_log.DebugFormat(
                     //    "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}",
@@ -552,7 +552,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             if (oldUser != null)
             {
-                if (creatorData == null || creatorData == String.Empty)
+                if (string.IsNullOrEmpty(creatorData))
                 {
                     //ignore updates without creator data
                     return;

OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs

@@ -500,9 +500,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                         Request.Headers.Add(HttpCustomHeaders[i],
                                             HttpCustomHeaders[i+1]);
                 }
-                if (proxyurl != null && proxyurl.Length > 0)
+                if (!string.IsNullOrEmpty(proxyurl))
                 {
-                    if (proxyexcepts != null && proxyexcepts.Length > 0)
+                    if (!string.IsNullOrEmpty(proxyexcepts))
                     {
                         string[] elist = proxyexcepts.Split(';');
                         Request.Proxy = new WebProxy(proxyurl, true, elist);
@@ -520,7 +520,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                         Request.Headers[entry.Key] = entry.Value;
 
                 // Encode outbound data
-                if (OutboundBody.Length > 0)
+                if (!string.IsNullOrEmpty(OutboundBody))
                 {
                     byte[] data = Util.UTF8.GetBytes(OutboundBody);
 

OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs

@@ -161,9 +161,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
         {
             WebRequest request = HttpWebRequest.Create(url);
             
-            if (m_proxyurl != null && m_proxyurl.Length > 0) 
+            if (!string.IsNullOrEmpty(m_proxyurl)) 
             {
-                if (m_proxyexcepts != null && m_proxyexcepts.Length > 0) 
+                if (!string.IsNullOrEmpty(m_proxyexcepts)) 
                 {
                     string[] elist = m_proxyexcepts.Split(';');
                     request.Proxy = new WebProxy(m_proxyurl, true, elist);

OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs

@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
             TestHelpers.InMethod();
 
             string dtText
-                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://0.0.0.0/shouldnotexist.png";
 
             SetupScene(false);
             SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
@@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
             TestHelpers.InMethod();
 
             string dtText
-                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://0.0.0.0/shouldnotexist.png";
 
             SetupScene(true);
             SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);

OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs

@@ -677,7 +677,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             // if not, use as method name
             UUID parseUID;
             string mName = "llRemoteData";
-            if ((Channel != null) && (Channel != ""))
+            if (!string.IsNullOrEmpty(Channel))
                 if (!UUID.TryParse(Channel, out parseUID))
                     mName = Channel;
                 else

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs

@@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 if (sp == null)
                 {
                     inventoryURL = UserManagementModule.GetUserServerURL(userID, "InventoryServerURI");
-                    if (inventoryURL != null && inventoryURL != string.Empty)
+                    if (!string.IsNullOrEmpty(inventoryURL))
                     {
                         inventoryURL = inventoryURL.Trim(new char[] { '/' });
                         m_InventoryURLs.Add(userID, inventoryURL);

OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs

@@ -464,7 +464,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // or creator data is present.  Otherwise, use the estate owner instead.
                 foreach (SceneObjectPart part in sceneObject.Parts)
                 {
-                    if (part.CreatorData == null || part.CreatorData == string.Empty)
+                    if (string.IsNullOrEmpty(part.CreatorData))
                     {
                         if (!ResolveUserUuid(scene, part.CreatorID))
                             part.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
@@ -515,7 +515,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                 kvp.Value.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
                             }
 
-                            if (kvp.Value.CreatorData == null || kvp.Value.CreatorData == string.Empty)
+                            if (string.IsNullOrEmpty(kvp.Value.CreatorData))
                             {
                                 if (!ResolveUserUuid(scene, kvp.Value.CreatorID))
                                     kvp.Value.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;

OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs

@@ -42,7 +42,6 @@ using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
@@ -70,7 +69,6 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private LandChannel landChannel;
         private Scene m_scene;
-        protected Commander m_commander = new Commander("land");
         
         protected IUserManagement m_userManager;
         protected IPrimCountModule m_primCountModule;
@@ -148,14 +146,13 @@ namespace OpenSim.Region.CoreModules.World.Land
             m_scene.EventManager.OnIncomingLandDataFromStorage += EventManagerOnIncomingLandDataFromStorage;
             m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan;            
             m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps;
-            m_scene.EventManager.OnPluginConsole += EventManagerOnPluginConsole;
 
             lock (m_scene)
             {
                 m_scene.LandChannel = (ILandChannel)landChannel;
             }
             
-            InstallInterfaces();
+            RegisterCommands();
         }
 
         public void RegionLoaded(Scene scene)
@@ -167,34 +164,15 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void RemoveRegion(Scene scene)
         {            
-            // TODO: Also release other event manager listeners here
+            // TODO: Release event manager listeners here      
-            
-            m_scene.EventManager.OnPluginConsole -= EventManagerOnPluginConsole;
-            m_scene.UnregisterModuleCommander(m_commander.Name);            
         }
 
-        /// <summary>
+//        private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
-        /// Processes commandline input. Do not call directly.
+//        {
-        /// </summary>
+//            ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y);
-        /// <param name="args">Commandline arguments</param>
+//            reason = "You are not allowed to enter this sim.";
-        protected void EventManagerOnPluginConsole(string[] args)
+//            return nearestParcel != null;
-        {
+//        }     
-            if (args[0] == "land")
-            {
-                if (args.Length == 1)
-                {
-                    m_commander.ProcessConsoleCommand("help", new string[0]);
-                    return;
-                }
-
-                string[] tmpArgs = new string[args.Length - 2];
-                int i;
-                for (i = 2; i < args.Length; i++)
-                    tmpArgs[i - 2] = args[i];
-
-                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
-            }
-        }        
 
         void EventManagerOnNewClient(IClientAPI client)
         {
@@ -1946,43 +1924,84 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_Dialog.SendAlertToUser(remoteClient, "You are not allowed to set your home location in this parcel.");
         }
 
-        protected void InstallInterfaces()
+        protected void RegisterCommands()
         {
-            Command clearCommand
+            ICommands commands = MainConsole.Instance.Commands;
-                = new Command("clear", CommandIntentions.COMMAND_HAZARDOUS, ClearCommand, "Clears all the parcels from the region.");
-            Command showCommand 
-                = new Command("show", CommandIntentions.COMMAND_STATISTICAL, ShowParcelsCommand, "Shows all parcels on the region.");
 
-            m_commander.RegisterCommand("clear", clearCommand);
+            commands.AddCommand(
-            m_commander.RegisterCommand("show", showCommand);
+                "Land", false, "land clear",
+                "land clear",
+                "Clear all the parcels from the region.",
+                "Command will ask for confirmation before proceeding.",
+                HandleClearCommand);
 
-            // Add this to our scene so scripts can call these functions
+            commands.AddCommand(
-            m_scene.RegisterModuleCommander(m_commander);
+                "Land", false, "land show",
+                "land show [<local-land-id>]",
+                "Show information about the parcels on the region.",
+                "If no local land ID is given, then summary information about all the parcels is shown.\n"
+                    + "If a local land ID is given then full information about that parcel is shown.",
+                HandleShowCommand);
         }    
         
-        protected void ClearCommand(Object[] args)
+        protected void HandleClearCommand(string module, string[] args)
         {
+            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
+                return;
+
             string response = MainConsole.Instance.CmdPrompt(
                 string.Format(
-                    "Are you sure that you want to clear all land parcels from {0} (y or n)", 
+                    "Are you sure that you want to clear all land parcels from {0} (y or n)", m_scene.Name), 
-                    m_scene.RegionInfo.RegionName), 
                 "n");
             
             if (response.ToLower() == "y")
             {
                 Clear(true);
-                MainConsole.Instance.OutputFormat("Cleared all parcels from {0}", m_scene.RegionInfo.RegionName);
+                MainConsole.Instance.OutputFormat("Cleared all parcels from {0}", m_scene.Name);
             }
             else
             {
-                MainConsole.Instance.OutputFormat("Aborting clear of all parcels from {0}", m_scene.RegionInfo.RegionName);
+                MainConsole.Instance.OutputFormat("Aborting clear of all parcels from {0}", m_scene.Name);
             }
         }        
         
-        protected void ShowParcelsCommand(Object[] args)
+        protected void HandleShowCommand(string module, string[] args)
         {
-            StringBuilder report = new StringBuilder();  
+            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
-            
+                return;
+
+            StringBuilder report = new StringBuilder(); 
+
+            if (args.Length <= 2)
+            {
+                AppendParcelsSummaryReport(report);
+            }
+            else
+            {
+                int landLocalId;
+
+                if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[2], out landLocalId))
+                    return;
+
+                ILandObject lo;
+
+                lock (m_landList)
+                { 
+                    if (!m_landList.TryGetValue(landLocalId, out lo))
+                    {
+                        MainConsole.Instance.OutputFormat("No parcel found with local ID {0}", landLocalId);
+                        return;
+                    }
+                }
+
+                AppendParcelReport(report, lo);
+            }
+
+            MainConsole.Instance.Output(report.ToString());
+        }
+
+        private void AppendParcelsSummaryReport(StringBuilder report)
+        {           
             report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName);            
             report.AppendFormat(
                 "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n",
@@ -2028,6 +2047,69 @@ namespace OpenSim.Region.CoreModules.World.Land
                     ForceAvatarToPosition(avatar, avatar.lastKnownAllowedPosition);
                 }
             }
+        } 
+
+        private void AppendParcelReport(StringBuilder report, ILandObject lo)
+        {
+            LandData ld = lo.LandData;
+
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+            cdl.AddRow("Parcel name", ld.Name);
+            cdl.AddRow("Local ID", ld.LocalID);
+            cdl.AddRow("Description", ld.Description);
+            cdl.AddRow("Snapshot ID", ld.SnapshotID);
+            cdl.AddRow("Area", ld.Area);
+            cdl.AddRow("Starts", lo.StartPoint);
+            cdl.AddRow("Ends", lo.EndPoint);
+            cdl.AddRow("AABB Min", ld.AABBMin);
+            cdl.AddRow("AABB Max", ld.AABBMax);
+
+            cdl.AddRow("Owner", m_userManager.GetUserName(ld.OwnerID));
+            cdl.AddRow("Is group owned?", ld.IsGroupOwned);
+            cdl.AddRow("GroupID", ld.GroupID);
+
+            cdl.AddRow("Status", ld.Status);
+            cdl.AddRow("Flags", (ParcelFlags)ld.Flags);           
+
+            cdl.AddRow("Landing Type", (LandingType)ld.LandingType);
+            cdl.AddRow("User Location", ld.UserLocation);
+            cdl.AddRow("User look at", ld.UserLookAt);
+
+            cdl.AddRow("Other clean time", ld.OtherCleanTime);
+
+            cdl.AddRow("Max Prims", lo.GetParcelMaxPrimCount());
+            IPrimCounts pc = lo.PrimCounts;
+            cdl.AddRow("Owner Prims", pc.Owner);
+            cdl.AddRow("Group Prims", pc.Group);
+            cdl.AddRow("Other Prims", pc.Others);
+            cdl.AddRow("Selected Prims", pc.Selected);
+            cdl.AddRow("Total Prims", pc.Total);
+
+            cdl.AddRow("Music URL", ld.MusicURL);
+            cdl.AddRow("Obscure Music", ld.ObscureMusic);
+
+            cdl.AddRow("Media ID", ld.MediaID);
+            cdl.AddRow("Media Autoscale", Convert.ToBoolean(ld.MediaAutoScale));
+            cdl.AddRow("Media URL", ld.MediaURL);
+            cdl.AddRow("Media Type", ld.MediaType);
+            cdl.AddRow("Media Description", ld.MediaDescription);
+            cdl.AddRow("Media Width", ld.MediaWidth);
+            cdl.AddRow("Media Height", ld.MediaHeight);
+            cdl.AddRow("Media Loop", ld.MediaLoop);
+            cdl.AddRow("Obscure Media", ld.ObscureMedia);
+
+            cdl.AddRow("Parcel Category", ld.Category);
+
+            cdl.AddRow("Claim Date", ld.ClaimDate);
+            cdl.AddRow("Claim Price", ld.ClaimPrice);
+            cdl.AddRow("Pass Hours", ld.PassHours);
+            cdl.AddRow("Pass Price", ld.PassPrice);
+
+            cdl.AddRow("Auction ID", ld.AuctionID);
+            cdl.AddRow("Authorized Buyer ID", ld.AuthBuyerID);
+            cdl.AddRow("Sale Price", ld.SalePrice);
+
+            cdl.AddToStringBuilder(report);
         }
     }
 }

OpenSim/Region/DataSnapshot/DataSnapshotManager.cs

@@ -307,7 +307,7 @@ namespace OpenSim.Region.DataSnapshot
             XmlNode regiondata = requestedSnap.CreateNode(XmlNodeType.Element, "regiondata", "");
             try
             {
-                if (regionName == null || regionName == "")
+                if (string.IsNullOrEmpty(regionName))
                 {
                     XmlNode timerblock = requestedSnap.CreateNode(XmlNodeType.Element, "expire", "");
                     timerblock.InnerText = m_period.ToString();

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -511,7 +511,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get
             {
-                if (CreatorData != null && CreatorData != string.Empty)
+                if (!string.IsNullOrEmpty(CreatorData))
                     return CreatorID.ToString() + ';' + CreatorData;
                 else
                     return CreatorID.ToString();

OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs

@@ -1279,7 +1279,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             WriteUUID(writer, "CreatorID", sop.CreatorID, options);
 
-            if (sop.CreatorData != null && sop.CreatorData != string.Empty)
+            if (!string.IsNullOrEmpty(sop.CreatorData))
                 writer.WriteElementString("CreatorData", sop.CreatorData);
             else if (options.ContainsKey("home"))
             {
@@ -1464,7 +1464,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
                     WriteUUID(writer, "CreatorID", item.CreatorID, options);
 
-                    if (item.CreatorData != null && item.CreatorData != string.Empty)
+                    if (!string.IsNullOrEmpty(item.CreatorData))
                         writer.WriteElementString("CreatorData", item.CreatorData);
                     else if (options.ContainsKey("home"))
                     {

OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs

@@ -0,0 +1,71 @@
+/*
+ * 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.Reflection;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    [TestFixture]
+    public class SceneStatisticsTests : OpenSimTestCase
+    {
+        private TestScene m_scene;
+
+        [SetUp]
+        public void Init()
+        {
+            m_scene = new SceneHelpers().SetupScene();
+        }
+
+        [Test]
+        public void TestAddRemovePhysicalLinkset()
+        {
+            Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(0));
+
+            UUID ownerId = TestHelpers.ParseTail(0x1);
+            SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(3, ownerId, "so1", 0x10);
+            so1.ScriptSetPhysicsStatus(true);
+            m_scene.AddSceneObject(so1);
+
+            Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(3));
+            Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(3));
+
+            m_scene.DeleteSceneObject(so1, false);
+
+            Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(0));
+            Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(0));
+        }
+    }
+}

OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs

@@ -461,7 +461,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
             string result = instr;
 
-            if (result == null || result.Length == 0)
+            if (string.IsNullOrEmpty(result))
                 return result;
 
             // Repeatedly scan the string until all possible

OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs

@@ -827,11 +827,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         {
             string requrl = String.Format(m_vivoxChannelPath, m_vivoxServer, "create", channelId, m_authToken);
 
-            if (parent != null && parent != String.Empty)
+            if (!string.IsNullOrEmpty(parent))
             {
                 requrl = String.Format("{0}&chan_parent={1}", requrl, parent);
             }
-            if (description != null && description != String.Empty)
+            if (!string.IsNullOrEmpty(description))
             {
                 requrl = String.Format("{0}&chan_desc={1}", requrl, description);
             }
@@ -867,7 +867,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             //     requrl = String.Format("{0}&chan_parent={1}", requrl, parent);
             // }
 
-            if (description != null && description != String.Empty)
+            if (!string.IsNullOrEmpty(description))
             {
                 requrl = String.Format("{0}&chan_desc={1}", requrl, description);
             }
@@ -1053,7 +1053,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         private XmlElement VivoxDeleteChannel(string parent, string channelid)
         {
             string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken);
-            if (parent != null && parent != String.Empty)
+            if (!string.IsNullOrEmpty(parent))
             {
                 requrl = String.Format("{0}&chan_parent={1}", requrl, parent);
             }

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs

@@ -212,8 +212,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]: Initializing {0}", this.Name);
 
                 m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
-                if ((m_groupsServerURI == null) ||
+                if (string.IsNullOrEmpty(m_groupsServerURI))
-                    (m_groupsServerURI == string.Empty))
                 {
                     m_log.ErrorFormat("Please specify a valid Simian Server for GroupsServerURI in OpenSim.ini, [Groups]");
                     m_connectorEnabled = false;
@@ -438,7 +437,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     return null;
                 }
             } 
-            else if ((groupName != null) && (groupName != string.Empty))
+            else if (!string.IsNullOrEmpty(groupName))
             {
                 if (!SimianGetFirstGenericEntry("Group", groupName, out groupID, out GroupInfoMap))
                 {

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs

@@ -168,8 +168,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_log.DebugFormat("[XMLRPC-GROUPS-CONNECTOR]: Initializing {0}", this.Name);
 
                 m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
-                if ((m_groupsServerURI == null) ||
+                if (string.IsNullOrEmpty(m_groupsServerURI))
-                    (m_groupsServerURI == string.Empty))
                 {
                     m_log.ErrorFormat("Please specify a valid URL for GroupsServerURI in OpenSim.ini, [Groups]");
                     m_connectorEnabled = false;
@@ -354,7 +353,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             {
                 param["GroupID"] = GroupID.ToString();
             }
-            if ((GroupName != null) && (GroupName != string.Empty))
+            if (!string.IsNullOrEmpty(GroupName))
             {
                 param["Name"] = GroupName.ToString();
             }

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -6766,6 +6766,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             ps.BurstRate = 0.1f;
             ps.PartMaxAge = 10.0f;
             ps.BurstPartCount = 1;
+            ps.BlendFuncSource = ScriptBaseClass.PSYS_PART_BF_SOURCE_ALPHA;
+            ps.BlendFuncDest = ScriptBaseClass.PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA;
+            ps.PartStartGlow = 0.0f;
+            ps.PartEndGlow = 0.0f;
+
             return ps;
         }
 
@@ -6800,6 +6805,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSL_Vector tempv = new LSL_Vector();
 
                 float tempf = 0;
+                int tmpi = 0;
 
                 for (int i = 0; i < rules.Length; i += 2)
                 {
@@ -6858,7 +6864,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_PATTERN:
-                            int tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            tmpi = (int)rules.GetLSLIntegerItem(i + 1);
                             prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi;
                             break;
 
@@ -6878,6 +6884,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off.
                             break;
 
+                        case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_SOURCE:
+                            tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            prules.BlendFuncSource = (byte)tmpi;
+                            break;
+
+                        case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_DEST:
+                            tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            prules.BlendFuncDest = (byte)tmpi;
+                            break;
+
+                        case (int)ScriptBaseClass.PSYS_PART_START_GLOW:
+                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            prules.PartStartGlow = (float)tempf;
+                            break;
+
+                        case (int)ScriptBaseClass.PSYS_PART_END_GLOW:
+                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            prules.PartEndGlow = (float)tempf;
+                            break;
+
                         case (int)ScriptBaseClass.PSYS_SRC_TEXTURE:
                             prules.Texture = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, rules.GetLSLStringItem(i + 1));
                             break;

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs

@@ -368,7 +368,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             Vector3 ZeroVector = new Vector3(0, 0, 0);
 
-            bool nameSearch = (ts.name != null && ts.name != "");
+            bool nameSearch = !string.IsNullOrEmpty(ts.name);
 
             foreach (EntityBase ent in Entities)
             {
@@ -608,7 +608,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                     return sensedEntities;
                 senseEntity(sp);
             }
-            else if (ts.name != null && ts.name != "")
+            else if (!string.IsNullOrEmpty(ts.name))
             {
                 ScenePresence sp;
                 // Try lookup by name will return if/when found

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

@@ -618,7 +618,7 @@ namespace SecondLife
                         // error log.
                         if (results.Errors.Count > 0)
                         {
-                            if (!retried && (results.Errors[0].FileName == null || results.Errors[0].FileName == String.Empty) &&
+                            if (!retried && string.IsNullOrEmpty(results.Errors[0].FileName) &&
                                 results.Errors[0].Line == 0)
                             {
                                 // System.Console.WriteLine("retrying failed compilation");

OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs

@@ -0,0 +1,247 @@
+/*
+ * 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.Text.RegularExpressions;
+using NUnit.Framework;
+using OpenSim.Region.ScriptEngine.Shared.CodeTools;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Tests
+{
+    public class LSL_EventTests : OpenSimTestCase
+    {
+        CSCodeGenerator m_cg = new CSCodeGenerator();
+
+        [Test]
+        public void TestBadEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestCompile("default { bad() {} }", true);
+        }
+
+        [Test]
+        public void TestMovingEndEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVoidArgEvent("moving_end");
+        }
+
+        [Test]
+        public void TestMovingStartEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVoidArgEvent("moving_start");
+        }
+
+        [Test]
+        public void TestNoSensorEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVoidArgEvent("no_sensor");
+        }
+
+        [Test]
+        public void TestNotAtRotTargetEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVoidArgEvent("not_at_rot_target");
+        }
+
+        [Test]
+        public void TestNotAtTargetEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVoidArgEvent("not_at_target");
+        }
+
+        [Test]
+        public void TestStateEntryEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVoidArgEvent("state_entry");
+        }
+
+        [Test]
+        public void TestStateExitEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVoidArgEvent("state_exit");
+        }
+
+        [Test]
+        public void TestTimerEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVoidArgEvent("timer");
+        }
+
+        private void TestVoidArgEvent(string eventName)
+        {
+            TestCompile("default { " + eventName + "() {} }", false);
+            TestCompile("default { " + eventName + "(integer n) {} }", true);
+        }
+
+        [Test]
+        public void TestChangedEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("changed");
+        }  
+
+        [Test]
+        public void TestCollisionEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("collision");
+        }  
+
+        [Test]
+        public void TestCollisionStartEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("collision_start");
+        }  
+
+        [Test]
+        public void TestCollisionEndEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("collision_end");
+        }  
+
+        [Test]
+        public void TestOnRezEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("on_rez");
+        }  
+
+        [Test]
+        public void TestRunTimePermissionsEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("run_time_permissions");
+        }  
+
+        [Test]
+        public void TestSensorEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("sensor");
+        }  
+
+        [Test]
+        public void TestTouchEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("touch");
+        }  
+
+        [Test]
+        public void TestTouchStartEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("touch_start");
+        }            
+
+        [Test]
+        public void TestTouchEndEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("touch_end");
+        }           
+
+        private void TestIntArgEvent(string eventName)
+        {
+            TestCompile("default { " + eventName + "(integer n) {} }", false);
+            TestCompile("default { " + eventName + "{{}} }", true);
+            TestCompile("default { " + eventName + "(string s) {{}} }", true);
+            TestCompile("default { " + eventName + "(integer n, integer o) {{}} }", true);
+        }
+
+        private void TestCompile(string script, bool expectException)
+        {
+            bool gotException = false;
+            Exception ge = null;
+
+            try
+            {
+                m_cg.Convert(script);
+            }
+            catch (Exception e)
+            {
+                gotException = true;
+                ge = e;
+            }
+
+            Assert.That(
+                gotException, 
+                Is.EqualTo(expectException), 
+                "Failed on {0}, exception {1}", script, ge != null ? ge.ToString() : "n/a");
+        }
+    }
+}

OpenSim/Services/HypergridService/HGInventoryService.cs

@@ -298,7 +298,7 @@ namespace OpenSim.Services.HypergridService
                 UserAccount user = m_Cache.GetUser(it.CreatorId);
 
                 // Adjust the creator data
-                if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty))
+                if (user != null && it != null && string.IsNullOrEmpty(it.CreatorData))
                     it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
             }
             return it;

OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs

@@ -213,16 +213,23 @@ namespace OpenSim.Services.HypergridService
                 // In the DB we tag it as type 100, but we use -1 (Unknown) outside
                 suitcase = CreateFolder(principalID, root.folderID, 100, "My Suitcase");
                 if (suitcase == null)
+                {
                     m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to create suitcase folder");
-                m_Database.StoreFolder(suitcase);
+                }
+                else
+                {
+                    m_Database.StoreFolder(suitcase);
 
-                // Create System folders
+                    // Create System folders
-                CreateSystemFolders(principalID, suitcase.folderID);
+                    CreateSystemFolders(principalID, suitcase.folderID);
+
+                    SetAsNormalFolder(suitcase);
+
+                    return ConvertToOpenSim(suitcase);
+                }
             }
 
-            SetAsNormalFolder(suitcase);
+            return null;
-
-            return ConvertToOpenSim(suitcase);
         }
 
         protected void CreateSystemFolders(UUID principalID, UUID rootID)

OpenSim/Services/UserAccountService/GridUserService.cs

@@ -194,7 +194,8 @@ namespace OpenSim.Services.UserAccountService
 
         public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
-            m_log.DebugFormat("[GRID USER SERVICE]: SetLastPosition for {0}", userID);
+//            m_log.DebugFormat("[GRID USER SERVICE]: SetLastPosition for {0}", userID);
+
             GridUserData d = m_Database.Get(userID);
             if (d == null)
             {

OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj

@@ -1,58 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
+    <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenSim._32BitLaunch</RootNamespace>
+    <RootNamespace>OpenSim._32BitLaunch</RootNamespace>
-    <AssemblyName>OpenSim.32BitLaunch</AssemblyName>
+    <AssemblyName>OpenSim.32BitLaunch</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
+    <FileUpgradeFlags>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    </FileUpgradeFlags>
-    <DebugSymbols>true</DebugSymbols>
+    <UpgradeBackupLocation>
-    <DebugType>full</DebugType>
+    </UpgradeBackupLocation>
-    <Optimize>false</Optimize>
+    <OldToolsVersion>3.5</OldToolsVersion>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <PublishUrl>publish\</PublishUrl>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Install>true</Install>
-    <ErrorReport>prompt</ErrorReport>
+    <InstallFrom>Disk</InstallFrom>
-    <WarningLevel>4</WarningLevel>
+    <UpdateEnabled>false</UpdateEnabled>
-    <PlatformTarget>x86</PlatformTarget>
+    <UpdateMode>Foreground</UpdateMode>
-  </PropertyGroup>
+    <UpdateInterval>7</UpdateInterval>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <DebugType>pdbonly</DebugType>
+    <UpdatePeriodically>false</UpdatePeriodically>
-    <Optimize>true</Optimize>
+    <UpdateRequired>false</UpdateRequired>
-    <OutputPath>bin\Release\</OutputPath>
+    <MapFileExtensions>true</MapFileExtensions>
-    <DefineConstants>TRACE</DefineConstants>
+    <ApplicationRevision>0</ApplicationRevision>
-    <ErrorReport>prompt</ErrorReport>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <WarningLevel>4</WarningLevel>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
-  </PropertyGroup>
+    <UseApplicationTrust>false</UseApplicationTrust>
-  <ItemGroup>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
+  </PropertyGroup>
-    <Reference Include="System" />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Reference Include="System.Data" />
+    <DebugSymbols>true</DebugSymbols>
-    <Reference Include="System.Xml" />
+    <DebugType>full</DebugType>
-  </ItemGroup>
+    <Optimize>false</Optimize>
-  <ItemGroup>
+    <OutputPath>..\..\..\bin\</OutputPath>
-    <Compile Include="Program.cs" />
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ErrorReport>prompt</ErrorReport>
-  </ItemGroup>
+    <WarningLevel>4</WarningLevel>
-  <ItemGroup>
+    <PlatformTarget>x86</PlatformTarget>
-    <ProjectReference Include="..\..\Region\Application\OpenSim.csproj">
+  </PropertyGroup>
-      <Project>{438A9556-0000-0000-0000-000000000000}</Project>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-      <Name>OpenSim</Name>
+    <DebugType>pdbonly</DebugType>
-    </ProjectReference>
+    <Optimize>true</Optimize>
-  </ItemGroup>
+    <OutputPath>bin\Release\</OutputPath>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
+    <Reference Include="OpenSim, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <ExecutableExtension>.exe</ExecutableExtension>
+      <HintPath>..\..\..\bin\OpenSim.exe</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj

@@ -1,62 +1,99 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
+    <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Robust._32BitLaunch</RootNamespace>
+    <RootNamespace>Robust._32BitLaunch</RootNamespace>
-    <AssemblyName>Robust.32BitLaunch</AssemblyName>
+    <AssemblyName>Robust.32BitLaunch</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
+    <FileUpgradeFlags>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    </FileUpgradeFlags>
-    <DebugSymbols>true</DebugSymbols>
+    <UpgradeBackupLocation>
-    <DebugType>full</DebugType>
+    </UpgradeBackupLocation>
-    <Optimize>false</Optimize>
+    <OldToolsVersion>3.5</OldToolsVersion>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <PublishUrl>publish\</PublishUrl>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Install>true</Install>
-    <ErrorReport>prompt</ErrorReport>
+    <InstallFrom>Disk</InstallFrom>
-    <WarningLevel>4</WarningLevel>
+    <UpdateEnabled>false</UpdateEnabled>
-    <PlatformTarget>x86</PlatformTarget>
+    <UpdateMode>Foreground</UpdateMode>
-  </PropertyGroup>
+    <UpdateInterval>7</UpdateInterval>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <DebugType>pdbonly</DebugType>
+    <UpdatePeriodically>false</UpdatePeriodically>
-    <Optimize>true</Optimize>
+    <UpdateRequired>false</UpdateRequired>
-    <OutputPath>bin\Release\</OutputPath>
+    <MapFileExtensions>true</MapFileExtensions>
-    <DefineConstants>TRACE</DefineConstants>
+    <ApplicationRevision>0</ApplicationRevision>
-    <ErrorReport>prompt</ErrorReport>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <WarningLevel>4</WarningLevel>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
-  </PropertyGroup>
+    <UseApplicationTrust>false</UseApplicationTrust>
-  <ItemGroup>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+  </PropertyGroup>
-      <SpecificVersion>False</SpecificVersion>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-      <HintPath>..\..\..\bin\log4net.dll</HintPath>
+    <DebugSymbols>true</DebugSymbols>
-    </Reference>
+    <DebugType>full</DebugType>
-    <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Optimize>false</Optimize>
-      <SpecificVersion>False</SpecificVersion>
+    <OutputPath>..\..\..\bin\</OutputPath>
-      <HintPath>..\..\..\bin\Robust.exe</HintPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    </Reference>
+    <ErrorReport>prompt</ErrorReport>
-    <Reference Include="System" />
+    <WarningLevel>4</WarningLevel>
-    <Reference Include="System.Core">
+    <PlatformTarget>x86</PlatformTarget>
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+  </PropertyGroup>
-    </Reference>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Reference Include="System.Data" />
+    <DebugType>pdbonly</DebugType>
-    <Reference Include="System.Xml" />
+    <Optimize>true</Optimize>
-  </ItemGroup>
+    <OutputPath>bin\Release\</OutputPath>
-  <ItemGroup>
+    <DefineConstants>TRACE</DefineConstants>
-    <Compile Include="Program.cs" />
+    <ErrorReport>prompt</ErrorReport>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <WarningLevel>4</WarningLevel>
-  </ItemGroup>
+  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\Robust.exe</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln

@@ -1,20 +1,20 @@
-
+
-Microsoft Visual Studio Solution File, Format Version 10.00
+Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C# Express 2008
+# Visual C# Express 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}"
-EndProject
+EndProject
-Global
+Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
+		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
+	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
+	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
+	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+		HideSolutionNode = FALSE
-	EndGlobalSection
+	EndGlobalSection
-EndGlobal
+EndGlobal

OpenSim/Tools/pCampBot/Bot.cs

@@ -264,9 +264,10 @@ namespace pCampBot
                 newClient.Throttle.Total = 400000;
             }
 
-            newClient.Network.LoginProgress += this.Network_LoginProgress;
+            newClient.Network.LoginProgress += Network_LoginProgress;
-            newClient.Network.SimConnected += this.Network_SimConnected;
+            newClient.Network.SimConnected += Network_SimConnected;
-            newClient.Network.Disconnected += this.Network_OnDisconnected;
+            newClient.Network.SimDisconnected += Network_SimDisconnected;
+            newClient.Network.Disconnected += Network_OnDisconnected;
             newClient.Objects.ObjectUpdate += Objects_NewPrim;
 
             Client = newClient;
@@ -276,7 +277,7 @@ namespace pCampBot
         //add additional steps and/or things the bot should do
         private void Action()
         {
-            while (ConnectionState != ConnectionState.Disconnecting)
+            while (ConnectionState == ConnectionState.Connected)
             {
                 lock (Behaviours)
                 {
@@ -583,7 +584,13 @@ namespace pCampBot
         public void Network_SimConnected(object sender, SimConnectedEventArgs args)
         {
             m_log.DebugFormat(
-                "[BOT]: Bot {0} connected to {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
+                "[BOT]: Bot {0} connected to region {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
+        }
+
+        public void Network_SimDisconnected(object sender, SimDisconnectedEventArgs args)
+        {
+            m_log.DebugFormat(
+                "[BOT]: Bot {0} disconnected from region {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
         }
 
         public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
@@ -591,7 +598,7 @@ namespace pCampBot
             ConnectionState = ConnectionState.Disconnected;
 
             m_log.DebugFormat(
-                "[BOT]: Bot {0} disconnected reason {1}, message {2}", Name, args.Reason, args.Message);
+                "[BOT]: Bot {0} disconnected from grid, reason {1}, message {2}", Name, args.Reason, args.Message);
 
 //            m_log.ErrorFormat("Fired Network_OnDisconnected");
 

README.md

@@ -17,7 +17,7 @@ need to build OpenSim before running it.
 
 # Running OpenSim on Windows
 
-You will need .NET Framework 3.5 installed to run OpenSimulator.
+You will need .NET 4.0 installed to run OpenSimulator.
 
 We recommend that you run OpenSim from a command prompt on Windows in order
 to capture any errors.
@@ -31,7 +31,7 @@ Now see the "Configuring OpenSim" section
 
 # Running OpenSim on Linux
 
-You will need Mono >= 2.4.3 to run OpenSim.  On some Linux distributions you
+You will need Mono >= 2.10.8.1 to run OpenSimulator.  On some Linux distributions you
 may need to install additional packages.  See http://opensimulator.org/wiki/Dependencies
 for more information.
 

bin/OpenMetaverse.XML

@@ -7557,6 +7557,9 @@
         <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.DataBlock">
             <exclude/>
         </member>
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.SizeBlock">
+            <exclude/>
+        </member>
         <member name="T:OpenMetaverse.Packets.MapItemRequestPacket">
             <exclude/>
         </member>
@@ -9160,6 +9163,13 @@
             </summary>
             <returns>A byte array containing raw texture data</returns>
         </member>
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.ExportBitmap">
+            <summary>
+            Create a byte array containing 32-bit RGBA data with a bottom-left
+            origin, suitable for feeding directly into OpenGL
+            </summary>
+            <returns>A byte array containing raw texture data</returns>
+        </member>
         <member name="T:OpenMetaverse.Assets.AssetMutable">
             <summary>
             Represents an Animation
@@ -11537,6 +11547,26 @@
             <summary>A <see langword="float"/> that represents the ending Y size of the particle</summary>
             <remarks>Minimum value is 0, maximum value is 4</remarks>
         </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartStartGlow">
+            <summary>A <see langword="float"/> that represents the start glow value</summary>
+            <remarks>Minimum value is 0, maximum value is 1</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartEndGlow">
+            <summary>A <see langword="float"/> that represents the end glow value</summary>
+            <remarks>Minimum value is 0, maximum value is 1</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BlendFuncSource">
+            <summary>OpenGL blend function to use at particle source</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BlendFuncDest">
+            <summary>OpenGL blend function to use at particle destination</summary>
+        </member>
+        <member name="M:OpenMetaverse.Primitive.ParticleSystem.IsLegacyCompatible">
+            <summary>
+            Can this particle system be packed in a legacy compatible way
+            </summary>
+            <returns>True if the particle system doesn't use new particle system features</returns>
+        </member>
         <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
             <summary>
             Decodes a byte[] array into a ParticleSystem Object
@@ -11611,6 +11641,15 @@
         <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Beam">
             <summary>used for point/grab/touch</summary>
         </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Ribbon">
+            <summary>continuous ribbon particle</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.DataGlow">
+            <summary>particle data contains glow</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.DataBlend">
+            <summary>particle data contains blend functions</summary>
+        </member>
         <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags">
             <summary>
             Particle Flags Enum
@@ -12044,6 +12083,17 @@
             <param name="transactionID">UUID of the transaction</param>
             <param name="callback">The callback to fire when the simulator responds with the asset data</param>
         </member>
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.UUID,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+            <summary>
+            Request an asset download
+            </summary>
+            <param name="assetID">Asset UUID</param>
+            <param name="type">Asset type, must be correct for the transfer to succeed</param>
+            <param name="priority">Whether to give this transfer an elevated priority</param>
+            <param name="sourceType">Source location of the requested asset</param>
+            <param name="transactionID">UUID of the transaction</param>
+            <param name="callback">The callback to fire when the simulator responds with the asset data</param>
+        </member>
         <member name="M:OpenMetaverse.AssetManager.RequestAssetXfer(System.String,System.Boolean,System.Boolean,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean)">
             <summary>
             Request an asset download through the almost deprecated Xfer system
@@ -18501,7 +18551,11 @@
             </summary>
             <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.DecodeWearableParams(OpenMetaverse.AppearanceManager.WearableData)">
+        <member name="M:OpenMetaverse.AppearanceManager.DecodeWearableParams(OpenMetaverse.AppearanceManager.WearableData,OpenMetaverse.AppearanceManager.TextureData[]@)">
+            <summary>
+            Populates textures and visual params from a decoded asset
+            </summary>
+            <param name="wearable">Wearable to decode</param>
             <summary>
             Populates textures and visual params from a decoded asset
             </summary>
@@ -18984,6 +19038,9 @@
         <member name="P:OpenMetaverse.InventoryNode.Data">
             <summary></summary>
         </member>
+        <member name="P:OpenMetaverse.InventoryNode.Tag">
+            <summary>User data</summary>
+        </member>
         <member name="P:OpenMetaverse.InventoryNode.Parent">
             <summary></summary>
         </member>
@@ -19146,6 +19203,15 @@
             Region protocol flags
             </summary>
         </member>
+        <member name="F:OpenMetaverse.RegionProtocols.None">
+            <summary>Nothing special</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionProtocols.AgentAppearanceService">
+            <summary>Region supports Server side Appearance</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionProtocols.SelfAppearanceSupport">
+            <summary>Viewer supports Server side Appearance</summary>
+        </member>
         <member name="T:OpenMetaverse.SimAccess">
             <summary>
             Access level for a simulator
@@ -21475,6 +21541,11 @@
             Constants for the archiving module
             </summary>
         </member>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.LANDDATA_PATH">
+            <value>
+              Path for region settings.
+            </value>
+        </member>
         <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
             <summary>
             The location of the archive control file
@@ -23668,6 +23739,58 @@
             </summary>
             <returns>OSD containting the messaage</returns>
         </member>
+        <member name="T:OpenMetaverse.Parallel">
+            <summary>
+            Provides helper methods for parallelizing loops
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Action{System.Int32})">
+            <summary>
+            Executes a for loop in which iterations may run in parallel
+            </summary>
+            <param name="fromInclusive">The loop will be started at this index</param>
+            <param name="toExclusive">The loop will be terminated before this index is reached</param>
+            <param name="body">Method body to run for each iteration of the loop</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Int32,System.Action{System.Int32})">
+            <summary>
+            Executes a for loop in which iterations may run in parallel
+            </summary>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="fromInclusive">The loop will be started at this index</param>
+            <param name="toExclusive">The loop will be terminated before this index is reached</param>
+            <param name="body">Method body to run for each iteration of the loop</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
+            <summary>
+            Executes a foreach loop in which iterations may run in parallel
+            </summary>
+            <typeparam name="T">Object type that the collection wraps</typeparam>
+            <param name="enumerable">An enumerable collection to iterate over</param>
+            <param name="body">Method body to run for each object in the collection</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Int32,System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
+            <summary>
+            Executes a foreach loop in which iterations may run in parallel
+            </summary>
+            <typeparam name="T">Object type that the collection wraps</typeparam>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="enumerable">An enumerable collection to iterate over</param>
+            <param name="body">Method body to run for each object in the collection</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Action[])">
+            <summary>
+            Executes a series of tasks in parallel
+            </summary>
+            <param name="actions">A series of method bodies to execute</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Int32,System.Action[])">
+            <summary>
+            Executes a series of tasks in parallel
+            </summary>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="actions">A series of method bodies to execute</param>
+        </member>
         <member name="F:OpenMetaverse.InventorySortOrder.ByName">
             <summary>Sort by name</summary>
         </member>

bin/OpenSim.32BitLaunch.exe.config

@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>

bin/OpenSim.ConsoleClient.exe.config

@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>

bin/OpenSim.Services.exe.config

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <runtime>
-    <gcConcurrent enabled="true" />
-	<gcServer enabled="true" />
-  </runtime>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>

bin/OpenSim.exe.config

@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>

bin/OpenSim.ini.example

@@ -69,7 +69,7 @@
 
     ;# {PIDFile} {} {Path to PID file?} {}
     ;; Place to create a PID file
-    ; PIDFile = "/tmp/my.pid"
+    ; PIDFile = "/tmp/OpenSim.exe.pid"
 
     ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
     ;; Determine where OpenSimulator looks for the files which tell it

bin/OpenSimDefaults.ini

@@ -21,7 +21,7 @@
     crash_dir = "crashes"
 
     ; Place to create a PID file
-    ; PIDFile = "/tmp/my.pid"
+    ; PIDFile = "/tmp/OpenSim.exe.pid"
 
     ; Console commands run at startup
     startup_console_commands_file = "startup_commands.txt"

bin/OpenSimExport.exe.config

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSimExport.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>

bin/Robust.32BitLaunch.exe.config

@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>

bin/Robust.HG.ini.example

@@ -23,7 +23,7 @@
 [Startup]
   ; Place to create a PID file
   ; If no path if specified then a PID file is not created.
-  ; PIDFile = "/tmp/my.pid"
+  ; PIDFile = "/tmp/Robust.exe.pid"
 
   ; Plugin Registry Location
   ; Set path to directory for plugin registry. Information

bin/Robust.exe.config

@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>

bin/Robust.ini.example

@@ -15,7 +15,7 @@
 [Startup]
   ; Place to create a PID file
   ; If no path if specified then a PID file is not created.
-  ; PIDFile = "/tmp/my.pid"
+  ; PIDFile = "/tmp/Robust.exe.pid"
 
   ; Plugin Registry Location
   ; Set path to directory for plugin registry. Information

bin/SimpleApp.exe.config

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="SimpleApp.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>

bin/pCampBot.exe.config

@@ -3,6 +3,9 @@
   <configSections>
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+  </runtime>
   <appSettings>
   </appSettings>
   <log4net>

prebuild.xml

@@ -34,7 +34,7 @@
 
     <!-- Core OpenSim Projects -->
 <!--
-        <Project frameworkVersion="v3_5" name="OpenSim.Model" path="OpenSim/Model" type="Library">
+        <Project frameworkVersion="v4_0" name="OpenSim.Model" path="OpenSim/Model" type="Library">
           <Configuration name="Debug">
             <Options>
               <OutputPath>../../../bin/</OutputPath>
@@ -55,7 +55,7 @@
         </Project>
 -->
 
-    <Project frameworkVersion="v3_5" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library">
+    <Project frameworkVersion="v4_0" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -77,7 +77,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework" path="OpenSim/Framework" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework" path="OpenSim/Framework" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -113,7 +113,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -141,7 +141,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -168,7 +168,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -209,7 +209,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -236,7 +236,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -265,7 +265,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data" path="OpenSim/Data" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data" path="OpenSim/Data" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -295,7 +295,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -320,7 +320,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.HTTP" path="OpenSim/Framework/Configuration/HTTP" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Configuration.HTTP" path="OpenSim/Framework/Configuration/HTTP" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -347,7 +347,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -372,7 +372,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.RegionLoader.Web" path="OpenSim/Framework/RegionLoader/Web" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.RegionLoader.Web" path="OpenSim/Framework/RegionLoader/Web" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -398,7 +398,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.RegionLoader.Filesystem" path="OpenSim/Framework/RegionLoader/Filesystem" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.RegionLoader.Filesystem" path="OpenSim/Framework/RegionLoader/Filesystem" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -424,7 +424,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -457,7 +457,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -485,7 +485,7 @@
     </Project>
 
     <!-- Physics Plug-ins -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -508,7 +508,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.POSPlugin" path="OpenSim/Region/Physics/POSPlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.POSPlugin" path="OpenSim/Region/Physics/POSPlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -531,7 +531,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -561,7 +561,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -586,7 +586,7 @@
       </Files>
     </Project>
 
- <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ChOdePlugin" path="OpenSim/Region/Physics/ChOdePlugin" type="Library">
+ <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.ChOdePlugin" path="OpenSim/Region/Physics/ChOdePlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -617,7 +617,7 @@
       </Files>
     </Project>
 
-   <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.UbitOdePlugin" path="OpenSim/Region/Physics/UbitOdePlugin" type="Library">
+   <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.UbitOdePlugin" path="OpenSim/Region/Physics/UbitOdePlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -648,7 +648,7 @@
       </Files>
     </Project>	
 	
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -679,7 +679,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.UbitMeshing" path="OpenSim/Region/Physics/UbitMeshing" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.UbitMeshing" path="OpenSim/Region/Physics/UbitMeshing" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -711,7 +711,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -746,7 +746,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -787,7 +787,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Framework" path="OpenSim/Region/Framework" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Framework" path="OpenSim/Region/Framework" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -840,7 +840,7 @@
     <!-- OGS projects -->
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -875,7 +875,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -902,7 +902,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.UserAccountService" path="OpenSim/Services/UserAccountService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.UserAccountService" path="OpenSim/Services/UserAccountService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -933,7 +933,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.FriendsService" path="OpenSim/Services/Friends" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.FriendsService" path="OpenSim/Services/Friends" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -964,7 +964,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1005,7 +1005,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1037,7 +1037,7 @@
       </Files>
     </Project>
     
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1068,7 +1068,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1100,7 +1100,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1133,7 +1133,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1167,7 +1167,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1198,7 +1198,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.AvatarService" path="OpenSim/Services/AvatarService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.AvatarService" path="OpenSim/Services/AvatarService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1229,7 +1229,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1264,7 +1264,7 @@
     </Project>
     
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.LLLoginService" path="OpenSim/Services/LLLoginService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.LLLoginService" path="OpenSim/Services/LLLoginService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1297,7 +1297,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.HypergridService" path="OpenSim/Services/HypergridService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.HypergridService" path="OpenSim/Services/HypergridService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1335,7 +1335,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.MapImageService" path="OpenSim/Services/MapImageService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.MapImageService" path="OpenSim/Services/MapImageService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1365,7 +1365,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1401,7 +1401,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1441,7 +1441,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1482,7 +1482,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="Robust" path="OpenSim/Server" type="Exe">
+    <Project frameworkVersion="v4_0" name="Robust" path="OpenSim/Server" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -1518,7 +1518,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.ConsoleClient" path="OpenSim/ConsoleClient" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.ConsoleClient" path="OpenSim/ConsoleClient" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -1551,7 +1551,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1586,7 +1586,7 @@
     </Project>
 
     <!-- ClientStack Plugins -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/Linden/UDP" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/Linden/UDP" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -1632,7 +1632,7 @@
 
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -1678,7 +1678,7 @@
     </Project>
 
     
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1746,7 +1746,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1784,7 +1784,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1844,7 +1844,7 @@
     </Project>
 
     <!-- Datastore Plugins -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1872,7 +1872,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -1897,7 +1897,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -1936,7 +1936,7 @@
     </Project>
 
     <!-- OpenSim app -->
-    <Project frameworkVersion="v3_5" name="OpenSim" path="OpenSim/Region/Application" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim" path="OpenSim/Region/Application" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1981,7 +1981,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.ApplicationPlugins.LoadRegions" path="OpenSim/ApplicationPlugins/LoadRegions" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.ApplicationPlugins.LoadRegions" path="OpenSim/ApplicationPlugins/LoadRegions" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2016,7 +2016,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.ApplicationPlugins.RegionModulesController" path="OpenSim/ApplicationPlugins/RegionModulesController" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.ApplicationPlugins.RegionModulesController" path="OpenSim/ApplicationPlugins/RegionModulesController" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2046,7 +2046,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2088,7 +2088,7 @@
 
     <!-- Scene Server API Example Apps -->
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2125,7 +2125,7 @@
     </Project>
 
     <!-- Data Base Modules -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2164,7 +2164,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2198,7 +2198,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2234,7 +2234,7 @@
       </Files>
     </Project>
 	
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2276,7 +2276,7 @@
     </Project>
 
     
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2313,7 +2313,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../bin/</OutputPath>
@@ -2346,7 +2346,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.YieldProlog" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.YieldProlog" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../../bin/</OutputPath>
@@ -2378,7 +2378,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.Api" path="OpenSim/Region/ScriptEngine/Shared/Api/Implementation" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.Api" path="OpenSim/Region/ScriptEngine/Shared/Api/Implementation" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../bin/</OutputPath>
@@ -2418,7 +2418,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Region/ScriptEngine/Shared/CodeTools" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Region/ScriptEngine/Shared/CodeTools" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -2449,7 +2449,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.Instance" path="OpenSim/Region/ScriptEngine/Shared/Instance" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.Instance" path="OpenSim/Region/ScriptEngine/Shared/Instance" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -2489,7 +2489,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../bin/</OutputPath>
@@ -2523,7 +2523,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2568,7 +2568,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2619,7 +2619,7 @@
     
     <!-- Addons -->
     
-    <Project frameworkVersion="v3_5" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2666,7 +2666,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2717,7 +2717,7 @@
 
     <!-- Tools -->
 
-    <Project frameworkVersion="v3_5" name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe">
+    <Project frameworkVersion="v4_0" name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2744,7 +2744,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2771,7 +2771,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tools.Configger" path="OpenSim/Tools/Configger" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tools.Configger" path="OpenSim/Tools/Configger" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2795,7 +2795,7 @@
     </Project>
 
     <!-- Test Clients -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2822,7 +2822,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2849,7 +2849,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.PresenceClient" path="OpenSim/Tests/Clients/Presence" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.PresenceClient" path="OpenSim/Tests/Clients/Presence" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2876,7 +2876,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.UserAccountClient" path="OpenSim/Tests/Clients/UserAccounts" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.UserAccountClient" path="OpenSim/Tests/Clients/UserAccounts" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2903,7 +2903,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.InstantantMessage" path="OpenSim/Tests/Clients/InstantMessage" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.InstantantMessage" path="OpenSim/Tests/Clients/InstantMessage" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2931,7 +2931,7 @@
     </Project>
 
     <!-- Test assemblies -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2978,7 +2978,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests" path="OpenSim/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests" path="OpenSim/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -3001,7 +3001,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -3044,7 +3044,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3094,7 +3094,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3136,7 +3136,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3167,7 +3167,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -3198,7 +3198,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -3228,7 +3228,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3307,7 +3307,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules.Tests" path="OpenSim/Region/OptionalModules" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.OptionalModules.Tests" path="OpenSim/Region/OptionalModules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3369,7 +3369,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3429,7 +3429,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -3466,7 +3466,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../bin/</OutputPath>
@@ -3502,7 +3502,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3561,7 +3561,7 @@
            TODO: this is kind of lame, we basically build a duplicate
            assembly but with tests added in, just because we can't resolve cross-bin-dir-refs.
       -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -3592,7 +3592,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin.Tests" path="OpenSim/Region/Physics/BulletSPlugin/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin.Tests" path="OpenSim/Region/Physics/BulletSPlugin/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -3626,7 +3626,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3672,7 +3672,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3713,7 +3713,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>

runprebuild.bat

@@ -1,4 +1,30 @@
-bin\Prebuild.exe /target nant
+@echo OFF
-bin\Prebuild.exe /target vs2008
-echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenSim.sln > compile.bat
 
+bin\Prebuild.exe /target nant
+bin\Prebuild.exe /target vs2010
+
+setlocal ENABLEEXTENSIONS
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"
+set VALUE_NAME=MSBuildToolsPath
+
+rem We have to use find here as req query spits out 4 lines before Windows 7
+rem But 2 lines after Windows 7.  Unfortunately, this screws up cygwin
+rem as it uses its own find command.  This could be fixed but it could be
+rem complex to find the location of find on all windows systems
+FOR /F "usebackq tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul ^| FIND "%VALUE_NAME%"`) DO (
+    set ValueName=%%A
+    set ValueType=%%B
+    set ValueValue=%%C
+)
+
+if defined ValueName (
+    @echo Found msbuild path registry entry
+    @echo Value Name = %ValueName%
+    @echo Value Type = %ValueType%
+    @echo Value Value = %ValueValue%
+    @echo Creating compile.bat
+    @echo %ValueValue%\msbuild opensim.sln > compile.bat
+) else (
+    @echo %KEY_NAME%\%VALUE_NAME% not found.
+    @echo Not creating compile.bat
+)

runprebuild.sh

@@ -22,21 +22,11 @@ case "$1" in
   
   ;;
 
-
-  'vs2008')
-
-    mono bin/Prebuild.exe /target vs2008
-
-  ;;
-
-
   *)
 
     mono bin/Prebuild.exe /target nant
-    mono bin/Prebuild.exe /target vs2008
+    mono bin/Prebuild.exe /target vs2010
 
   ;;
 
-
 esac
-

runprebuild2010.bat

@@ -1,2 +0,0 @@
-bin\Prebuild.exe /target vs2010
-echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenSim.sln > compile.bat