aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorMelanie2010-10-03 16:52:27 +0100
committerMelanie2010-10-03 16:52:27 +0100
commit5910be236f62c22fb3d044652d69b0c39c35ffe0 (patch)
tree7f0c18f7f107b2fd88a34e8f97fa2faab3a2d4f4 /OpenSim/Services/Connectors
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-5910be236f62c22fb3d044652d69b0c39c35ffe0.zip
opensim-SC_OLD-5910be236f62c22fb3d044652d69b0c39c35ffe0.tar.gz
opensim-SC_OLD-5910be236f62c22fb3d044652d69b0c39c35ffe0.tar.bz2
opensim-SC_OLD-5910be236f62c22fb3d044652d69b0c39c35ffe0.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index c2c7168..4fc2a6d 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -415,7 +415,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
415 return; 415 return;
416 } 416 }
417 417
418 using (Image mapTile = tileGenerator.CreateMapTile("defaultstripe.png")) 418 using (Image mapTile = tileGenerator.CreateMapTile())
419 { 419 {
420 using (MemoryStream stream = new MemoryStream()) 420 using (MemoryStream stream = new MemoryStream())
421 { 421 {