3 files changed, 28 insertions, 19 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index eb1e4b5..8101ca2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -150,7 +150,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
             string skillsText = String.Empty;
             string languages = String.Empty;
 
-            Byte[] charterMember = Utils.StringToBytes("Avatar");
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, avatarID);
+
+            string name = "Avatar";
+            int created = 0;
+            if (account != null)
+            {
+                name = account.FirstName + " " + account.LastName;
+                created = account.Created;
+            }
+            Byte[] charterMember = Utils.StringToBytes(name);
 
             profileUrl = "No profile data";
             aboutText = string.Empty;
@@ -160,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
             partner = UUID.Zero;
 
             remoteClient.SendAvatarProperties(avatarID, aboutText,
-                        Util.ToDateTime(0).ToString(
+                        Util.ToDateTime(created).ToString(
                                 "M/d/yyyy", CultureInfo.InvariantCulture),
                         charterMember, firstLifeAboutText,
                         (uint)(0 & 0xff),
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 0c4ff7f..d2fe388 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             string userAssetServer = string.Empty;
             if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission)
             {
-                Util.FireAndForget(delegate { m_assMapper.Post(assetID, avatarID, userAssetServer); });
+                m_assMapper.Post(assetID, avatarID, userAssetServer);
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 74b047b..fd122da 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             // There is a major hack going on in this method. The viewer doesn't request
             // map blocks (RequestMapBlocks) above 2048. That means that if we don't hack,
             // grids above that cell don't have a map at all. So, here's the hack: we wait
-            // for this CAP request to come, and we inject the map blocks at this point. 
+            // for this CAP request to come, and we inject the map blocks at this point.
             // In a normal scenario, this request simply sends back the MapLayer (the blue color).
             // In the hacked scenario, it also sends the map blocks via UDP.
             //
@@ -751,7 +751,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 uint x = 0, y = 0;
                 Utils.LongToUInts(regionhandle, out x, out y);
-                GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); 
+                GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
 
                 if (mreg != null)
                 {
@@ -857,7 +857,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             finally
             {
                 if (os != null)
-                    os.Close();                    
+                    os.Close();
             }
 
             string response_mapItems_reply = null;
@@ -960,16 +960,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 // on an unloaded square.
                 // But make sure: Look whether the one we requested is in there
                 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                    minX * (int)Constants.RegionSize, 
-                    maxX * (int)Constants.RegionSize, 
-                    minY * (int)Constants.RegionSize, 
+                    minX * (int)Constants.RegionSize,
+                    maxX * (int)Constants.RegionSize,
+                    minY * (int)Constants.RegionSize,
                     maxY * (int)Constants.RegionSize);
 
                 if (regions != null)
                 {
                     foreach (GridRegion r in regions)
                     {
-                        if ((r.RegionLocX == minX * (int)Constants.RegionSize) && 
+                        if ((r.RegionLocX == minX * (int)Constants.RegionSize) &&
                             (r.RegionLocY == minY * (int)Constants.RegionSize))
                         {
                             // found it => add it to response
@@ -1004,7 +1004,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             List<MapBlockData> mapBlocks = new List<MapBlockData>();
             List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                (minX - 4) * (int)Constants.RegionSize, 
+                (minX - 4) * (int)Constants.RegionSize,
                 (maxX + 4) * (int)Constants.RegionSize,
                 (minY - 4) * (int)Constants.RegionSize,
                 (maxY + 4) * (int)Constants.RegionSize);
@@ -1336,7 +1336,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             // Cannot create a map for a nonexistant heightmap
             if (m_scene.Heightmap == null)
                 return;
-            
+
             //create a texture asset of the terrain
             IMapImageGenerator terrain = m_scene.RequestModuleInterface<IMapImageGenerator>();
             if (terrain == null)
@@ -1345,7 +1345,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             byte[] data = terrain.WriteJpeg2000Image();
             if (data == null)
                 return;
-            
+
             byte[] overlay = GenerateOverlay();
 
             m_log.Debug("[WORLDMAP]: STORING MAPTILE IMAGE");
@@ -1366,7 +1366,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             // Store the new one
             m_log.DebugFormat("[WORLDMAP]: Storing map tile {0}", asset.ID);
             m_scene.AssetService.Store(asset);
-            
+
             if (overlay != null)
             {
                 parcelImageID = UUID.Random();
@@ -1390,7 +1390,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID;
             m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID;
             m_scene.RegionInfo.RegionSettings.Save();
-            
+
             // Delete the old one
             // m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastTerrainImageID);
             m_scene.AssetService.Delete(lastTerrainImageID.ToString());
@@ -1469,18 +1469,18 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if ((land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0)
                 {
                     landForSale = true;
-                    
+
                     saleBitmap = land.MergeLandBitmaps(saleBitmap, land.GetLandBitmap());
                 }
             }
 
             if (!landForSale)
             {
-                m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not geenrating overlay", m_scene.RegionInfo.RegionName);
+                m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not generating overlay", m_scene.RegionInfo.RegionName);
                 return null;
             }
 
-            m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, genrating overlay", m_scene.RegionInfo.RegionName);
+            m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName);
 
             for (int x = 0 ; x < 64 ; x++)
             {