From ad2ebd2f3dc70d708aa00a5fef59aeb3a3e16a44 Mon Sep 17 00:00:00 2001
From: nebadon
Date: Fri, 26 Jul 2013 14:11:42 -0400
Subject: Force map tiler to save Water.jpg as an actual jpeg format it seems
 even though we specified jpg extention it was actually a png and thus
 confusing the viewer silently.

---
 OpenSim/Services/MapImageService/MapImageService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index a85ee70..9ba5dab 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.MapImageService
                     {
                         Bitmap waterTile = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH);
                         FillImage(waterTile, m_Watercolor);
-                        waterTile.Save(m_WaterTileFile);
+                        waterTile.Save(m_WaterTileFile, ImageFormat.Jpeg);
                     }
                 }
             }
-- 
cgit v1.1


From 69975763d2a735eb2696d2e27e5796a472a208ea Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Jul 2013 15:38:56 -0700
Subject: Several major improvements to group (V2) chat. Specifically: handle
 join/drop appropriately, invitechatboxes. The major departure from flotsam is
 to send only one message per destination region, as opposed to one message
 per group member. This reduces messaging considerably in large groups that
 have clusters of members in certain regions.

---
 .../Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
index dbce9f6..e19c23d 100644
--- a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
+++ b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
@@ -123,6 +123,7 @@ namespace OpenSim.Services.Connectors.InstantMessage
             gim["position_z"] = msg.Position.Z.ToString();
             gim["region_id"] = msg.RegionID.ToString();
             gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket, Base64FormattingOptions.None);
+            gim["region_id"] = new UUID(msg.RegionID).ToString();
 
             return gim;
         }
-- 
cgit v1.1