diff options
author | Jeff Ames | 2009-09-29 08:32:59 +0900 |
---|---|---|
committer | Jeff Ames | 2009-09-29 08:32:59 +0900 |
commit | f00126dc2dfc9e23aa50227f02ee9adbe1efdfa6 (patch) | |
tree | 47e63f1f5f5b7e48f19cabc4c5685c4d58ff1697 /OpenSim/Data | |
parent | More reordering (diff) | |
download | opensim-SC_OLD-f00126dc2dfc9e23aa50227f02ee9adbe1efdfa6.zip opensim-SC_OLD-f00126dc2dfc9e23aa50227f02ee9adbe1efdfa6.tar.gz opensim-SC_OLD-f00126dc2dfc9e23aa50227f02ee9adbe1efdfa6.tar.bz2 opensim-SC_OLD-f00126dc2dfc9e23aa50227f02ee9adbe1efdfa6.tar.xz |
Add copyright header. Formatting cleanup.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAuthenticationData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserAccountData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/Null/NullRegionData.cs | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs index 78fc22c..099faea 100644 --- a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs | |||
@@ -135,7 +135,7 @@ namespace OpenSim.Data.MSSQL | |||
135 | 135 | ||
136 | insertBuilder.AppendFormat("insert into '{0}' ('UUID', '", m_Realm); | 136 | insertBuilder.AppendFormat("insert into '{0}' ('UUID', '", m_Realm); |
137 | insertBuilder.Append(String.Join("', '", fields)); | 137 | insertBuilder.Append(String.Join("', '", fields)); |
138 | insertBuilder.Append("') values ( @principalID, @"); | 138 | insertBuilder.Append("') values (@principalID, @"); |
139 | insertBuilder.Append(String.Join(", @", fields)); | 139 | insertBuilder.Append(String.Join(", @", fields)); |
140 | insertBuilder.Append(")"); | 140 | insertBuilder.Append(")"); |
141 | 141 | ||
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs index 1520888..e0c0ed6 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | |||
@@ -152,7 +152,7 @@ namespace OpenSim.Data.MSSQL | |||
152 | StringBuilder insertBuilder = new StringBuilder(); | 152 | StringBuilder insertBuilder = new StringBuilder(); |
153 | insertBuilder.AppendFormat("insert into '{0}' ('UUID', 'ScopeID', '", m_Realm); | 153 | insertBuilder.AppendFormat("insert into '{0}' ('UUID', 'ScopeID', '", m_Realm); |
154 | insertBuilder.Append(String.Join("', '", fields)); | 154 | insertBuilder.Append(String.Join("', '", fields)); |
155 | insertBuilder.Append("') values ( @principalID, @scopeID, @"); | 155 | insertBuilder.Append("') values (@principalID, @scopeID, @"); |
156 | insertBuilder.Append(String.Join(", @", fields)); | 156 | insertBuilder.Append(String.Join(", @", fields)); |
157 | insertBuilder.Append(")"); | 157 | insertBuilder.Append(")"); |
158 | 158 | ||
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs index afd59bd..e508b52 100644 --- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs +++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs | |||
@@ -127,7 +127,7 @@ namespace OpenSim.Data.MySQL | |||
127 | { | 127 | { |
128 | string insert = "insert into `" + m_Realm + "` (`UUID`, `" + | 128 | string insert = "insert into `" + m_Realm + "` (`UUID`, `" + |
129 | String.Join("`, `", fields) + | 129 | String.Join("`, `", fields) + |
130 | "`) values ( ?principalID, ?" + String.Join(", ?", fields) + ")"; | 130 | "`) values (?principalID, ?" + String.Join(", ?", fields) + ")"; |
131 | 131 | ||
132 | cmd.CommandText = insert; | 132 | cmd.CommandText = insert; |
133 | 133 | ||
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 4a16a70..ed62172 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -773,7 +773,7 @@ namespace OpenSim.Data.MySQL | |||
773 | "use_estate_sun, fixed_sun, sun_position, " + | 773 | "use_estate_sun, fixed_sun, sun_position, " + |
774 | "covenant, Sandbox, sunvectorx, sunvectory, " + | 774 | "covenant, Sandbox, sunvectorx, sunvectory, " + |
775 | "sunvectorz, loaded_creation_datetime, " + | 775 | "sunvectorz, loaded_creation_datetime, " + |
776 | "loaded_creation_id) values ( ?RegionUUID, ?BlockTerraform, " + | 776 | "loaded_creation_id) values (?RegionUUID, ?BlockTerraform, " + |
777 | "?BlockFly, ?AllowDamage, ?RestrictPushing, " + | 777 | "?BlockFly, ?AllowDamage, ?RestrictPushing, " + |
778 | "?AllowLandResell, ?AllowLandJoinDivide, " + | 778 | "?AllowLandResell, ?AllowLandJoinDivide, " + |
779 | "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " + | 779 | "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " + |
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs index 5352727..d48144d 100644 --- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs +++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs | |||
@@ -146,7 +146,7 @@ namespace OpenSim.Data.MySQL | |||
146 | { | 146 | { |
147 | string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" + | 147 | string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" + |
148 | String.Join("`, `", fields) + | 148 | String.Join("`, `", fields) + |
149 | "`) values ( ?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")"; | 149 | "`) values (?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")"; |
150 | 150 | ||
151 | cmd.CommandText = insert; | 151 | cmd.CommandText = insert; |
152 | 152 | ||
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs index 218fcd0..e8263ea 100644 --- a/OpenSim/Data/Null/NullRegionData.cs +++ b/OpenSim/Data/Null/NullRegionData.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Data.Null | |||
47 | { | 47 | { |
48 | List<RegionData> ret = new List<RegionData>(); | 48 | List<RegionData> ret = new List<RegionData>(); |
49 | 49 | ||
50 | foreach(RegionData r in m_regionData.Values) | 50 | foreach (RegionData r in m_regionData.Values) |
51 | { | 51 | { |
52 | if (regionName.Contains("%")) | 52 | if (regionName.Contains("%")) |
53 | { | 53 | { |
@@ -71,7 +71,7 @@ namespace OpenSim.Data.Null | |||
71 | { | 71 | { |
72 | List<RegionData> ret = new List<RegionData>(); | 72 | List<RegionData> ret = new List<RegionData>(); |
73 | 73 | ||
74 | foreach(RegionData r in m_regionData.Values) | 74 | foreach (RegionData r in m_regionData.Values) |
75 | { | 75 | { |
76 | if (r.posX == posX && r.posY == posY) | 76 | if (r.posX == posX && r.posY == posY) |
77 | ret.Add(r); | 77 | ret.Add(r); |
@@ -95,7 +95,7 @@ namespace OpenSim.Data.Null | |||
95 | { | 95 | { |
96 | List<RegionData> ret = new List<RegionData>(); | 96 | List<RegionData> ret = new List<RegionData>(); |
97 | 97 | ||
98 | foreach(RegionData r in m_regionData.Values) | 98 | foreach (RegionData r in m_regionData.Values) |
99 | { | 99 | { |
100 | if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY) | 100 | if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY) |
101 | ret.Add(r); | 101 | ret.Add(r); |