diff options
| author | Jonathan Freedman | 2010-10-03 18:04:38 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-03 18:04:38 -0400 |
| commit | e3099d48f9ebfaa7b1feede2d6f2788bdc93552b (patch) | |
| tree | 4bddd7ea4e3d4671c9c4956fc7f6105219d88338 /OpenSim/Services | |
| parent | * additional serveruri cleanup (diff) | |
| parent | Upgraded Mono.Addins.dll to 0.5, coming from here: http://monoaddins.codeplex... (diff) | |
| download | opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.zip opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.gz opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.bz2 opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 0a9f230..8076fab 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
| @@ -411,7 +411,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 411 | return; | 411 | return; |
| 412 | } | 412 | } |
| 413 | 413 | ||
| 414 | using (Image mapTile = tileGenerator.CreateMapTile("defaultstripe.png")) | 414 | using (Image mapTile = tileGenerator.CreateMapTile()) |
| 415 | { | 415 | { |
| 416 | using (MemoryStream stream = new MemoryStream()) | 416 | using (MemoryStream stream = new MemoryStream()) |
| 417 | { | 417 | { |