aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs6
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs3
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs
index 629a7f6..4fbb0ac 100644
--- a/OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs
@@ -1,5 +1,6 @@
1/* 1/*
2* Copyright (c) Tribal Media AB, http://tribalmedia.se/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
3* 4*
4* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
@@ -8,7 +9,8 @@
8* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
11* * The name of Tribal Media AB may not be used to endorse or promote products 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
12* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
13* 15*
14* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
index 04b4b4d..7e89709 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
@@ -28,8 +28,7 @@
28 28
29using System.Data.Common; 29using System.Data.Common;
30using MySql.Data.MySqlClient; 30using MySql.Data.MySqlClient;
31 //using TribalMedia.Framework.Data; 31
32
33namespace OpenSim.Framework.Data.MySQL 32namespace OpenSim.Framework.Data.MySQL
34{ 33{
35 /* 34 /*