diff options
Diffstat (limited to 'OpenSim/Framework/Data.MSSQL')
-rw-r--r-- | OpenSim/Framework/Data.MSSQL/MSSQLManager.cs | 12 | ||||
-rw-r--r-- | OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs | 30 |
2 files changed, 35 insertions, 7 deletions
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs index bf57492..3a70909 100644 --- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs +++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs | |||
@@ -186,7 +186,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
186 | protected static string defineTable(DataTable dt) | 186 | protected static string defineTable(DataTable dt) |
187 | { | 187 | { |
188 | string sql = "create table " + dt.TableName + "("; | 188 | string sql = "create table " + dt.TableName + "("; |
189 | string subsql = ""; | 189 | string subsql = String.Empty; |
190 | foreach (DataColumn col in dt.Columns) | 190 | foreach (DataColumn col in dt.Columns) |
191 | { | 191 | { |
192 | if (subsql.Length > 0) | 192 | if (subsql.Length > 0) |
@@ -337,7 +337,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
337 | 337 | ||
338 | // World Map Addition | 338 | // World Map Addition |
339 | string tempRegionMap = reader["regionMapTexture"].ToString(); | 339 | string tempRegionMap = reader["regionMapTexture"].ToString(); |
340 | if (tempRegionMap != "") | 340 | if (tempRegionMap != String.Empty) |
341 | { | 341 | { |
342 | regionprofile.regionMapTextureID = new LLUUID(tempRegionMap); | 342 | regionprofile.regionMapTextureID = new LLUUID(tempRegionMap); |
343 | } | 343 | } |
@@ -644,12 +644,12 @@ namespace OpenSim.Framework.Data.MSSQL | |||
644 | parameters["homeLookAtZ"] = homeLookAtZ.ToString(); | 644 | parameters["homeLookAtZ"] = homeLookAtZ.ToString(); |
645 | parameters["created"] = created.ToString(); | 645 | parameters["created"] = created.ToString(); |
646 | parameters["lastLogin"] = lastlogin.ToString(); | 646 | parameters["lastLogin"] = lastlogin.ToString(); |
647 | parameters["userInventoryURI"] = ""; | 647 | parameters["userInventoryURI"] = String.Empty; |
648 | parameters["userAssetURI"] = ""; | 648 | parameters["userAssetURI"] = String.Empty; |
649 | parameters["profileCanDoMask"] = "0"; | 649 | parameters["profileCanDoMask"] = "0"; |
650 | parameters["profileWantDoMask"] = "0"; | 650 | parameters["profileWantDoMask"] = "0"; |
651 | parameters["profileAboutText"] = ""; | 651 | parameters["profileAboutText"] = String.Empty; |
652 | parameters["profileFirstText"] = ""; | 652 | parameters["profileFirstText"] = String.Empty; |
653 | parameters["profileImage"] = LLUUID.Zero.ToString(); | 653 | parameters["profileImage"] = LLUUID.Zero.ToString(); |
654 | parameters["profileFirstImage"] = LLUUID.Zero.ToString(); | 654 | parameters["profileFirstImage"] = LLUUID.Zero.ToString(); |
655 | parameters["webLoginKey"] = LLUUID.Random().ToString(); | 655 | parameters["webLoginKey"] = LLUUID.Random().ToString(); |
diff --git a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs index 6846ecf..a91ce62 100644 --- a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs | |||
@@ -1,3 +1,31 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | |||
1 | using System.Reflection; | 29 | using System.Reflection; |
2 | using System.Runtime.InteropServices; | 30 | using System.Runtime.InteropServices; |
3 | 31 | ||
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices; | |||
10 | [assembly : AssemblyConfiguration("")] | 38 | [assembly : AssemblyConfiguration("")] |
11 | [assembly : AssemblyCompany("")] | 39 | [assembly : AssemblyCompany("")] |
12 | [assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")] | 40 | [assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")] |
13 | [assembly : AssemblyCopyright("Copyright © 2007")] | 41 | [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] |
14 | [assembly : AssemblyTrademark("")] | 42 | [assembly : AssemblyTrademark("")] |
15 | [assembly : AssemblyCulture("")] | 43 | [assembly : AssemblyCulture("")] |
16 | 44 | ||