OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, add copyright headers, minor formatting cleanup.

GenericGridServerConcept
Jeff Ames 2009-02-20 02:33:54 +00:00
parent 5e39e515f9
commit 7d4846462b
11 changed files with 1654 additions and 1609 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Data/NHibernate/EstateRegionLink.cs
View File

@ -1,3 +1,30 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;

33
OpenSim/Data/Tests/DataTestUtil.cs
View File

@ -1,4 +1,31 @@
using System; /*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
@ -6,13 +33,11 @@ using NUnit.Framework;
namespace OpenSim.Data.Tests namespace OpenSim.Data.Tests
{ {
/// <summary> /// <summary>
/// Shared constants and methods for database unit tests. /// Shared constants and methods for database unit tests.
/// </summary> /// </summary>
public class DataTestUtil public class DataTestUtil
{ {
public const uint UNSIGNED_INTEGER_MIN = uint.MinValue; public const uint UNSIGNED_INTEGER_MIN = uint.MinValue;
public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue / 2; // NHibernate does not support unsigned integer range. public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue / 2; // NHibernate does not support unsigned integer range.
@ -57,6 +82,6 @@ namespace OpenSim.Data.Tests
Assert.GreaterOrEqual(actualValue, expectedValue - Math.Abs(expectedValue) * DOUBLE_PRECISSION); Assert.GreaterOrEqual(actualValue, expectedValue - Math.Abs(expectedValue) * DOUBLE_PRECISSION);
Assert.LessOrEqual(actualValue, expectedValue + Math.Abs(expectedValue) * DOUBLE_PRECISSION); Assert.LessOrEqual(actualValue, expectedValue + Math.Abs(expectedValue) * DOUBLE_PRECISSION);
} }
} }
} }

2
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -437,7 +437,7 @@ namespace OpenSim
private IAssetServer loadAssetServer(string id, PluginInitialiserBase pi) private IAssetServer loadAssetServer(string id, PluginInitialiserBase pi)
{ {
if(id != null && id != String.Empty) if (id != null && id != String.Empty)
{ {
m_log.DebugFormat("[OPENSIMBASE] Attempting to load asset server id={0}", id); m_log.DebugFormat("[OPENSIMBASE] Attempting to load asset server id={0}", id);

92
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
View File

@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
int width = 256; int width = 256;
int height = 256; int height = 256;
int alpha = 255; // 0 is transparent int alpha = 255; // 0 is transparent
Color bgColour = Color.White; // Default background color Color bgColour = Color.White; // Default background color
char[] paramDelimiter = { ',' }; char[] paramDelimiter = { ',' };
char[] nvpDelimiter = { ':' }; char[] nvpDelimiter = { ':' };
@ -230,18 +230,17 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
} }
} }
break; break;
case "bgcolour": case "bgcolour":
int hex = 0; int hex = 0;
if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex)) if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
{ {
bgColour = Color.FromArgb(hex); bgColour = Color.FromArgb(hex);
} }
else else
{ {
bgColour = Color.FromName(value);
bgColour = Color.FromName(value); }
} break;
break;
case "": case "":
// blank string has been passed do nothing just use defaults // blank string has been passed do nothing just use defaults
break; break;
@ -271,7 +270,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
} }
break; break;
} }
} }
Bitmap bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); Bitmap bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
@ -282,8 +280,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
// background color in their scripts, only do when fully opaque // background color in their scripts, only do when fully opaque
if (alpha == 255) if (alpha == 255)
{ {
graph.FillRectangle(new SolidBrush(bgColour), 0, 0, width, height); graph.FillRectangle(new SolidBrush(bgColour), 0, 0, width, height);
} }
for (int w = 0; w < bitmap.Width; w++) for (int w = 0; w < bitmap.Width; w++)
@ -294,7 +291,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
} }
} }
GDIDraw(data, graph); GDIDraw(data, graph);
byte[] imageJ2000 = new byte[0]; byte[] imageJ2000 = new byte[0];
@ -326,10 +322,8 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
} }
return parsed; return parsed;
} }
/* /*
private void CairoDraw(string data, System.Drawing.Graphics graph) private void CairoDraw(string data, System.Drawing.Graphics graph)
{ {
@ -462,38 +456,38 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
fontSize = Convert.ToSingle(nextLine, CultureInfo.InvariantCulture); fontSize = Convert.ToSingle(nextLine, CultureInfo.InvariantCulture);
myFont = new Font(fontName, fontSize); myFont = new Font(fontName, fontSize);
} }
else if (nextLine.StartsWith("FontProp")) else if (nextLine.StartsWith("FontProp"))
{ {
nextLine = nextLine.Remove(0, 8); nextLine = nextLine.Remove(0, 8);
nextLine = nextLine.Trim(); nextLine = nextLine.Trim();
string [] fprops = nextLine.Split(partsDelimiter); string [] fprops = nextLine.Split(partsDelimiter);
foreach (string prop in fprops) { foreach (string prop in fprops) {
switch (prop) switch (prop)
{ {
case "B": case "B":
if(!(myFont.Bold)) if (!(myFont.Bold))
myFont = new Font(myFont, myFont.Style | FontStyle.Bold); myFont = new Font(myFont, myFont.Style | FontStyle.Bold);
break; break;
case "I": case "I":
if(!(myFont.Italic)) if (!(myFont.Italic))
myFont = new Font(myFont, myFont.Style | FontStyle.Italic); myFont = new Font(myFont, myFont.Style | FontStyle.Italic);
break; break;
case "U": case "U":
if(!(myFont.Underline)) if (!(myFont.Underline))
myFont = new Font(myFont, myFont.Style | FontStyle.Underline); myFont = new Font(myFont, myFont.Style | FontStyle.Underline);
break; break;
case "S": case "S":
if(!(myFont.Strikeout)) if (!(myFont.Strikeout))
myFont = new Font(myFont, myFont.Style | FontStyle.Strikeout); myFont = new Font(myFont, myFont.Style | FontStyle.Strikeout);
break; break;
case "R": case "R":
myFont = new Font(myFont, FontStyle.Regular); myFont = new Font(myFont, FontStyle.Regular);
break; break;
} }
} }
} }
else if (nextLine.StartsWith("FontName")) else if (nextLine.StartsWith("FontName"))
{ {
nextLine = nextLine.Remove(0, 8); nextLine = nextLine.Remove(0, 8);

1012
OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
View File

File diff suppressed because it is too large Load Diff

1
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1379,7 +1379,6 @@ namespace OpenSim.Region.Framework.Scenes
if (part != null) if (part != null)
{ {
TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID); TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID);
bool allowInventoryDrop = (part.GetEffectiveObjectFlags() bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
& (uint)PrimFlags.AllowInventoryDrop) != 0; & (uint)PrimFlags.AllowInventoryDrop) != 0;

6
OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
View File

@ -282,7 +282,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
{ {
m_log.DebugFormat("[Concierge]: {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName); m_log.DebugFormat("[Concierge]: {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName);
RemoveFromAttendeeList(client.AgentId, client.Name, client.Scene); RemoveFromAttendeeList(client.AgentId, client.Name, client.Scene);
lock(m_sceneAttendees) lock (m_sceneAttendees)
{ {
AnnounceToAgentsRegion(client.Scene, String.Format(m_announceLeaving, client.Name, client.Scene.RegionInfo.RegionName, AnnounceToAgentsRegion(client.Scene, String.Format(m_announceLeaving, client.Name, client.Scene.RegionInfo.RegionName,
m_sceneAttendees[client.Scene].Count)); m_sceneAttendees[client.Scene].Count));
@ -406,7 +406,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
attendees.Count, scene.RegionInfo.RegionName, attendees.Count, scene.RegionInfo.RegionName,
scene.RegionInfo.RegionID, scene.RegionInfo.RegionID,
DateTime.UtcNow.ToString("s"))); DateTime.UtcNow.ToString("s")));
lock(m_sceneAttendees) lock (m_sceneAttendees)
{ {
foreach (UUID uuid in attendees) foreach (UUID uuid in attendees)
{ {
@ -458,7 +458,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
string payload = bs.Payload; string payload = bs.Payload;
HttpWebRequest updatePost = bs.Poster; HttpWebRequest updatePost = bs.Poster;
using(StreamWriter payloadStream = new StreamWriter(updatePost.EndGetRequestStream(result))) using (StreamWriter payloadStream = new StreamWriter(updatePost.EndGetRequestStream(result)))
{ {
payloadStream.Write(payload); payloadStream.Write(payload);
payloadStream.Close(); payloadStream.Close();

8
Prebuild/scripts/VS2008.bat Normal file → Executable file
View File

@ -1,4 +1,4 @@
@rem Generates a solution (.sln) and a set of project files (.csproj, .vbproj, etc.) @rem Generates a solution (.sln) and a set of project files (.csproj, .vbproj, etc.)
@rem for Microsoft Visual Studio .NET 2008 @rem for Microsoft Visual Studio .NET 2008
cd .. cd ..
Prebuild.exe /target vs2008 /file prebuild.xml /pause Prebuild.exe /target vs2008 /file prebuild.xml /pause

188
Prebuild/src/Core/Nodes/DatabaseProjectNode.cs
View File

@ -1,94 +1,94 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using Prebuild.Core.Attributes; using Prebuild.Core.Attributes;
using Prebuild.Core.Interfaces; using Prebuild.Core.Interfaces;
using Prebuild.Core.Utilities; using Prebuild.Core.Utilities;
namespace Prebuild.Core.Nodes namespace Prebuild.Core.Nodes
{ {
[DataNode("DatabaseProject")] [DataNode("DatabaseProject")]
public class DatabaseProjectNode : DataNode public class DatabaseProjectNode : DataNode
{ {
string name; string name;
string path; string path;
string fullpath; string fullpath;
Guid guid = Guid.NewGuid(); Guid guid = Guid.NewGuid();
readonly List<AuthorNode> authors = new List<AuthorNode>(); readonly List<AuthorNode> authors = new List<AuthorNode>();
readonly List<DatabaseReferenceNode> references = new List<DatabaseReferenceNode>(); readonly List<DatabaseReferenceNode> references = new List<DatabaseReferenceNode>();
public Guid Guid public Guid Guid
{ {
get { return guid; } get { return guid; }
} }
public string Name public string Name
{ {
get { return name; } get { return name; }
} }
public string Path public string Path
{ {
get { return path; } get { return path; }
} }
public string FullPath public string FullPath
{ {
get { return fullpath; } get { return fullpath; }
} }
public IEnumerable<DatabaseReferenceNode> References public IEnumerable<DatabaseReferenceNode> References
{ {
get { return references; } get { return references; }
} }
public override void Parse(XmlNode node) public override void Parse(XmlNode node)
{ {
name = Helper.AttributeValue(node, "name", name); name = Helper.AttributeValue(node, "name", name);
path = Helper.AttributeValue(node, "path", name); path = Helper.AttributeValue(node, "path", name);
try try
{ {
fullpath = Helper.ResolvePath(path); fullpath = Helper.ResolvePath(path);
} }
catch catch
{ {
throw new WarningException("Could not resolve Solution path: {0}", path); throw new WarningException("Could not resolve Solution path: {0}", path);
} }
Kernel.Instance.CurrentWorkingDirectory.Push(); Kernel.Instance.CurrentWorkingDirectory.Push();
try try
{ {
Helper.SetCurrentDir(fullpath); Helper.SetCurrentDir(fullpath);
if (node == null) if (node == null)
{ {
throw new ArgumentNullException("node"); throw new ArgumentNullException("node");
} }
foreach (XmlNode child in node.ChildNodes) foreach (XmlNode child in node.ChildNodes)
{ {
IDataNode dataNode = Kernel.Instance.ParseNode(child, this); IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
if (dataNode == null) if (dataNode == null)
continue; continue;
if (dataNode is AuthorNode) if (dataNode is AuthorNode)
authors.Add((AuthorNode)dataNode); authors.Add((AuthorNode)dataNode);
else if (dataNode is DatabaseReferenceNode) else if (dataNode is DatabaseReferenceNode)
references.Add((DatabaseReferenceNode)dataNode); references.Add((DatabaseReferenceNode)dataNode);
} }
} }
finally finally
{ {
Kernel.Instance.CurrentWorkingDirectory.Pop(); Kernel.Instance.CurrentWorkingDirectory.Pop();
} }
base.Parse(node); base.Parse(node);
} }
} }
} }

126
Prebuild/src/Core/Nodes/DatabaseReferenceNode.cs
View File

@ -1,63 +1,63 @@
using System; using System;
using Prebuild.Core.Attributes; using Prebuild.Core.Attributes;
using Prebuild.Core.Utilities; using Prebuild.Core.Utilities;
namespace Prebuild.Core.Nodes namespace Prebuild.Core.Nodes
{ {
[DataNode("DatabaseReference")] [DataNode("DatabaseReference")]
public class DatabaseReferenceNode : DataNode public class DatabaseReferenceNode : DataNode
{ {
string name; string name;
Guid providerId; Guid providerId;
string connectionString; string connectionString;
public string Name public string Name
{ {
get { return name; } get { return name; }
} }
public Guid ProviderId public Guid ProviderId
{ {
get { return providerId; } get { return providerId; }
} }
public string ConnectionString public string ConnectionString
{ {
get { return connectionString; } get { return connectionString; }
} }
public override void Parse(System.Xml.XmlNode node) public override void Parse(System.Xml.XmlNode node)
{ {
name = Helper.AttributeValue(node, "name", name); name = Helper.AttributeValue(node, "name", name);
string providerName = Helper.AttributeValue(node, "providerName", string.Empty); string providerName = Helper.AttributeValue(node, "providerName", string.Empty);
if (providerName != null) if (providerName != null)
{ {
switch (providerName) switch (providerName)
{ {
// digitaljeebus: pulled from HKLM\SOFTWARE\Microsoft\VisualStudio\9.0\DataProviders\* // digitaljeebus: pulled from HKLM\SOFTWARE\Microsoft\VisualStudio\9.0\DataProviders\*
// Not sure if these will help other operating systems, or if there's a better way. // Not sure if these will help other operating systems, or if there's a better way.
case "Microsoft.SqlServerCe.Client.3.5": case "Microsoft.SqlServerCe.Client.3.5":
providerId = new Guid("7C602B5B-ACCB-4acd-9DC0-CA66388C1533"); break; providerId = new Guid("7C602B5B-ACCB-4acd-9DC0-CA66388C1533"); break;
case "System.Data.OleDb": case "System.Data.OleDb":
providerId = new Guid("7F041D59-D76A-44ed-9AA2-FBF6B0548B80"); break; providerId = new Guid("7F041D59-D76A-44ed-9AA2-FBF6B0548B80"); break;
case "System.Data.OracleClient": case "System.Data.OracleClient":
providerId = new Guid("8F5C5018-AE09-42cf-B2CC-2CCCC7CFC2BB"); break; providerId = new Guid("8F5C5018-AE09-42cf-B2CC-2CCCC7CFC2BB"); break;
case "System.Data.SqlClient": case "System.Data.SqlClient":
providerId = new Guid("91510608-8809-4020-8897-FBA057E22D54"); break; providerId = new Guid("91510608-8809-4020-8897-FBA057E22D54"); break;
case "System.Data.Odbc": case "System.Data.Odbc":
providerId = new Guid("C3D4F4CE-2C48-4381-B4D6-34FA50C51C86"); break; providerId = new Guid("C3D4F4CE-2C48-4381-B4D6-34FA50C51C86"); break;
default: default:
throw new ArgumentOutOfRangeException("providerName", providerName, "Could not provider name to an id."); throw new ArgumentOutOfRangeException("providerName", providerName, "Could not provider name to an id.");
} }
} }
else else
providerId = new Guid(Helper.AttributeValue(node, "providerId", Guid.Empty.ToString("B"))); providerId = new Guid(Helper.AttributeValue(node, "providerId", Guid.Empty.ToString("B")));
connectionString = Helper.AttributeValue(node, "connectionString", connectionString); connectionString = Helper.AttributeValue(node, "connectionString", connectionString);
base.Parse(node); base.Parse(node);
} }
} }
} }

1768
Prebuild/src/Core/Targets/VSGenericTarget.cs
View File

File diff suppressed because it is too large Load Diff