diff options
author | Jeff Ames | 2009-02-22 01:18:49 +0000 |
---|---|---|
committer | Jeff Ames | 2009-02-22 01:18:49 +0000 |
commit | 551bebdc84515d77bc3d7a564100efd0525a1949 (patch) | |
tree | 1e3300c3a60d51a5607b69ee357f1d08936014f3 /OpenSim/Region | |
parent | Applied patch from mantis #3217, which allows Dynamic Images of type RGB (so ... (diff) | |
download | opensim-SC_OLD-551bebdc84515d77bc3d7a564100efd0525a1949.zip opensim-SC_OLD-551bebdc84515d77bc3d7a564100efd0525a1949.tar.gz opensim-SC_OLD-551bebdc84515d77bc3d7a564100efd0525a1949.tar.bz2 opensim-SC_OLD-551bebdc84515d77bc3d7a564100efd0525a1949.tar.xz |
Update svn properties, add copyright headers, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | 42 |
2 files changed, 26 insertions, 26 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 9f8add2..3a4276f 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -404,11 +404,11 @@ namespace OpenSim | |||
404 | // Allow absolute and relative specifiers | 404 | // Allow absolute and relative specifiers |
405 | if (cmd[3].StartsWith("/") || cmd[3].StartsWith("\\") || cmd[3].StartsWith("..") || cmd[3].EndsWith(".xml")) | 405 | if (cmd[3].StartsWith("/") || cmd[3].StartsWith("\\") || cmd[3].StartsWith("..") || cmd[3].EndsWith(".xml")) |
406 | regionFile = cmd[3]; | 406 | regionFile = cmd[3]; |
407 | else | 407 | else |
408 | { | 408 | { |
409 | m_console.Error("Usage: create region <region name> <region_file.xml>"); | 409 | m_console.Error("Usage: create region <region name> <region_file.xml>"); |
410 | } | 410 | } |
411 | 411 | ||
412 | 412 | ||
413 | CreateRegion(new RegionInfo(cmd[2], regionFile, false, ConfigSource.Source), true); | 413 | CreateRegion(new RegionInfo(cmd[2], regionFile, false, ConfigSource.Source), true); |
414 | } | 414 | } |
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index 2ef89b7..e7fabbe 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||
@@ -229,10 +229,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
229 | alpha = temp; | 229 | alpha = temp; |
230 | } | 230 | } |
231 | } | 231 | } |
232 | // Allow a bitmap w/o the alpha component to be created | 232 | // Allow a bitmap w/o the alpha component to be created |
233 | else if (value.ToLower() == "false") { | 233 | else if (value.ToLower() == "false") { |
234 | alpha = 256; | 234 | alpha = 256; |
235 | } | 235 | } |
236 | break; | 236 | break; |
237 | case "bgcolour": | 237 | case "bgcolour": |
238 | int hex = 0; | 238 | int hex = 0; |
@@ -276,16 +276,16 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | ||
279 | Bitmap bitmap; | 279 | Bitmap bitmap; |
280 | 280 | ||
281 | if ( alpha == 256 ) | 281 | if (alpha == 256) |
282 | { | 282 | { |
283 | bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb); | 283 | bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb); |
284 | } | 284 | } |
285 | else { | 285 | else |
286 | 286 | { | |
287 | bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); | 287 | bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); |
288 | } | 288 | } |
289 | 289 | ||
290 | Graphics graph = Graphics.FromImage(bitmap); | 290 | Graphics graph = Graphics.FromImage(bitmap); |
291 | 291 | ||
@@ -298,13 +298,13 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
298 | 298 | ||
299 | for (int w = 0; w < bitmap.Width; w++) | 299 | for (int w = 0; w < bitmap.Width; w++) |
300 | { | 300 | { |
301 | if (alpha <= 255) | 301 | if (alpha <= 255) |
302 | { | 302 | { |
303 | for (int h = 0; h < bitmap.Height; h++) | 303 | for (int h = 0; h < bitmap.Height; h++) |
304 | { | 304 | { |
305 | bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h))); | 305 | bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h))); |
306 | } | 306 | } |
307 | } | 307 | } |
308 | } | 308 | } |
309 | 309 | ||
310 | GDIDraw(data, graph); | 310 | GDIDraw(data, graph); |