diff options
author | Melanie | 2013-07-29 02:08:05 +0100 |
---|---|---|
committer | Melanie | 2013-07-29 02:08:05 +0100 |
commit | bf283208df4a6936de85b2746112bb568d9c9d25 (patch) | |
tree | dafe50ad8e55ac30c41f5e7ebd11992f2772c294 /OpenSim/Services | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Same issue. (diff) | |
download | opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.zip opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.gz opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.bz2 opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs | 1 | ||||
-rw-r--r-- | OpenSim/Services/MapImageService/MapImageService.cs | 2 |
2 files changed, 2 insertions, 1 deletions
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 | |||
123 | gim["position_z"] = msg.Position.Z.ToString(); | 123 | gim["position_z"] = msg.Position.Z.ToString(); |
124 | gim["region_id"] = msg.RegionID.ToString(); | 124 | gim["region_id"] = msg.RegionID.ToString(); |
125 | gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket, Base64FormattingOptions.None); | 125 | gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket, Base64FormattingOptions.None); |
126 | gim["region_id"] = new UUID(msg.RegionID).ToString(); | ||
126 | 127 | ||
127 | return gim; | 128 | return gim; |
128 | } | 129 | } |
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 | |||
86 | { | 86 | { |
87 | Bitmap waterTile = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH); | 87 | Bitmap waterTile = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH); |
88 | FillImage(waterTile, m_Watercolor); | 88 | FillImage(waterTile, m_Watercolor); |
89 | waterTile.Save(m_WaterTileFile); | 89 | waterTile.Save(m_WaterTileFile, ImageFormat.Jpeg); |
90 | } | 90 | } |
91 | } | 91 | } |
92 | } | 92 | } |