aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Storage
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Storage')
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs10
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs14
2 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs
index c0fc890..0416779 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs
@@ -29,7 +29,7 @@ using System.Reflection;
29using System.Runtime.CompilerServices; 29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
31 31
32// General Information about an assembly is controlled through the following 32// General information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information 33// set of attributes. Change these attribute values to modify the information
34// associated with an assembly. 34// associated with an assembly.
35[assembly: AssemblyTitle("OpenSim.DataStore.DB4o")] 35[assembly: AssemblyTitle("OpenSim.DataStore.DB4o")]
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
41[assembly: AssemblyTrademark("")] 41[assembly: AssemblyTrademark("")]
42[assembly: AssemblyCulture("")] 42[assembly: AssemblyCulture("")]
43 43
44// Setting ComVisible to false makes the types in this assembly not visible 44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from 45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type. 46// COM, set the ComVisible attribute to true on that type.
47[assembly: ComVisible(false)] 47[assembly: ComVisible(false)]
48 48
@@ -52,11 +52,11 @@ using System.Runtime.InteropServices;
52// Version information for an assembly consists of the following four values: 52// Version information for an assembly consists of the following four values:
53// 53//
54// Major Version 54// Major Version
55// Minor Version 55// Minor Version
56// Build Number 56// Build Number
57// Revision 57// Revision
58// 58//
59// You can specify all the values or you can default the Revision and Build Numbers 59// You can specify all the values or you can default the Revision and Build Numbers
60// by using the '*' as shown below: 60// by using the '*' as shown below:
61[assembly: AssemblyVersion("1.0.0.0")] 61[assembly: AssemblyVersion("1.0.0.0")]
62[assembly: AssemblyFileVersion("1.0.0.0")] 62[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index c917e1e..fa0d0b6 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -142,7 +142,7 @@ namespace OpenSim.DataStore.MSSQL
142 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 142 public void RemoveObject(LLUUID obj, LLUUID regionUUID)
143 { 143 {
144 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 144 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
145 145
146 DataTable prims = ds.Tables["prims"]; 146 DataTable prims = ds.Tables["prims"];
147 DataTable shapes = ds.Tables["primshapes"]; 147 DataTable shapes = ds.Tables["primshapes"];
148 148
@@ -332,7 +332,7 @@ namespace OpenSim.DataStore.MSSQL
332 /*********************************************************************** 332 /***********************************************************************
333 * 333 *
334 * Database Definition Functions 334 * Database Definition Functions
335 * 335 *
336 * This should be db agnostic as we define them in ADO.NET terms 336 * This should be db agnostic as we define them in ADO.NET terms
337 * 337 *
338 **********************************************************************/ 338 **********************************************************************/
@@ -460,7 +460,7 @@ namespace OpenSim.DataStore.MSSQL
460 } 460 }
461 461
462 /*********************************************************************** 462 /***********************************************************************
463 * 463 *
464 * Convert between ADO.NET <=> OpenSim Objects 464 * Convert between ADO.NET <=> OpenSim Objects
465 * 465 *
466 * These should be database independant 466 * These should be database independant
@@ -650,7 +650,7 @@ namespace OpenSim.DataStore.MSSQL
650 s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]); 650 s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]);
651 651
652 // text TODO: this isn't right] = but I'm not sure the right 652 // text TODO: this isn't right] = but I'm not sure the right
653 // way to specify this as a blob atm 653 // way to specify this as a blob atm
654 byte[] textureEntry = (byte[]) row["Texture"]; 654 byte[] textureEntry = (byte[]) row["Texture"];
655 s.TextureEntry = textureEntry; 655 s.TextureEntry = textureEntry;
656 656
@@ -695,7 +695,7 @@ namespace OpenSim.DataStore.MSSQL
695 // way to specify this as a blob atm 695 // way to specify this as a blob atm
696 696
697 // And I couldn't work out how to save binary data either 697 // And I couldn't work out how to save binary data either
698 // seems that the texture colum is being treated as a string in the Datarow 698 // seems that the texture colum is being treated as a string in the Datarow
699 // if you do a .getType() on it, it returns string, while the other columns return correct type 699 // if you do a .getType() on it, it returns string, while the other columns return correct type
700 // MW[10-08-07] 700 // MW[10-08-07]
701 // Added following xml hack but not really ideal , also ExtraParams isn't currently part of the database 701 // Added following xml hack but not really ideal , also ExtraParams isn't currently part of the database
@@ -738,7 +738,7 @@ namespace OpenSim.DataStore.MSSQL
738 fillShapeRow(shapeRow, prim); 738 fillShapeRow(shapeRow, prim);
739 } 739 }
740 } 740 }
741 741
742 // see IRegionDatastore 742 // see IRegionDatastore
743 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 743 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items)
744 { 744 {
@@ -868,7 +868,7 @@ namespace OpenSim.DataStore.MSSQL
868 /// This is a convenience function that collapses 5 repetitive 868 /// This is a convenience function that collapses 5 repetitive
869 /// lines for defining SqlParameters to 2 parameters: 869 /// lines for defining SqlParameters to 2 parameters:
870 /// column name and database type. 870 /// column name and database type.
871 /// 871 ///
872 /// It assumes certain conventions like :param as the param 872 /// It assumes certain conventions like :param as the param
873 /// name to replace in parametrized queries, and that source 873 /// name to replace in parametrized queries, and that source
874 /// version is always current version, both of which are fine 874 /// version is always current version, both of which are fine