mirror of
https://github.com/opensim/opensim.git
synced 2026-08-10 11:33:28 +08:00
Update svn properties, add copyright headers, minor formatting cleanup.
This commit is contained in:
@@ -404,11 +404,11 @@ namespace OpenSim
|
||||
// Allow absolute and relative specifiers
|
||||
if (cmd[3].StartsWith("/") || cmd[3].StartsWith("\\") || cmd[3].StartsWith("..") || cmd[3].EndsWith(".xml"))
|
||||
regionFile = cmd[3];
|
||||
else
|
||||
{
|
||||
m_console.Error("Usage: create region <region name> <region_file.xml>");
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
m_console.Error("Usage: create region <region name> <region_file.xml>");
|
||||
}
|
||||
|
||||
|
||||
CreateRegion(new RegionInfo(cmd[2], regionFile, false, ConfigSource.Source), true);
|
||||
}
|
||||
|
||||
@@ -229,10 +229,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
|
||||
alpha = temp;
|
||||
}
|
||||
}
|
||||
// Allow a bitmap w/o the alpha component to be created
|
||||
else if (value.ToLower() == "false") {
|
||||
alpha = 256;
|
||||
}
|
||||
// Allow a bitmap w/o the alpha component to be created
|
||||
else if (value.ToLower() == "false") {
|
||||
alpha = 256;
|
||||
}
|
||||
break;
|
||||
case "bgcolour":
|
||||
int hex = 0;
|
||||
@@ -276,16 +276,16 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
|
||||
}
|
||||
}
|
||||
|
||||
Bitmap bitmap;
|
||||
|
||||
if ( alpha == 256 )
|
||||
{
|
||||
bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
|
||||
}
|
||||
else {
|
||||
|
||||
bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
|
||||
}
|
||||
Bitmap bitmap;
|
||||
|
||||
if (alpha == 256)
|
||||
{
|
||||
bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
|
||||
}
|
||||
else
|
||||
{
|
||||
bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
|
||||
}
|
||||
|
||||
Graphics graph = Graphics.FromImage(bitmap);
|
||||
|
||||
@@ -298,13 +298,13 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
|
||||
|
||||
for (int w = 0; w < bitmap.Width; w++)
|
||||
{
|
||||
if (alpha <= 255)
|
||||
{
|
||||
for (int h = 0; h < bitmap.Height; h++)
|
||||
{
|
||||
bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h)));
|
||||
}
|
||||
}
|
||||
if (alpha <= 255)
|
||||
{
|
||||
for (int h = 0; h < bitmap.Height; h++)
|
||||
{
|
||||
bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GDIDraw(data, graph);
|
||||
|
||||
Reference in New Issue
Block a user