aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJeff Ames2009-06-10 04:28:56 +0000
committerJeff Ames2009-06-10 04:28:56 +0000
commita23d64dec1cbf88abc3c7e84664a683dee534e4a (patch)
tree7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Data
parentLetting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff)
downloadopensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs2
-rw-r--r--OpenSim/Data/RegionProfileServiceProxy.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs8
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index c62520c..3f04f68 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Data.NHibernate
183 ICriteria criteria = manager.GetSession().CreateCriteria(typeof(SceneObjectPart)); 183 ICriteria criteria = manager.GetSession().CreateCriteria(typeof(SceneObjectPart));
184 criteria.Add(Expression.Eq("RegionID", region)); 184 criteria.Add(Expression.Eq("RegionID", region));
185 criteria.Add(Expression.Eq("ParentUUID", uuid)); 185 criteria.Add(Expression.Eq("ParentUUID", uuid));
186 criteria.AddOrder( Order.Asc("ParentID") ); 186 criteria.AddOrder(Order.Asc("ParentID"));
187 187
188 foreach (SceneObjectPart p in criteria.List()) 188 foreach (SceneObjectPart p in criteria.List())
189 { 189 {
diff --git a/OpenSim/Data/RegionProfileServiceProxy.cs b/OpenSim/Data/RegionProfileServiceProxy.cs
index e9d0036..20d7df0 100644
--- a/OpenSim/Data/RegionProfileServiceProxy.cs
+++ b/OpenSim/Data/RegionProfileServiceProxy.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Data
113 public RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl, 113 public RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl,
114 string gridserverSendkey, string gridserverRecvkey) 114 string gridserverSendkey, string gridserverRecvkey)
115 { 115 {
116 return RequestSimData(gridserverUrl, gridserverSendkey, "region_name_search", regionName ); 116 return RequestSimData(gridserverUrl, gridserverSendkey, "region_name_search", regionName);
117 } 117 }
118 } 118 }
119} 119}
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index f2d97d7..74d2633 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -1195,14 +1195,14 @@ namespace OpenSim.Data.SQLite
1195 1195
1196 private void setupAgentCommands(SqliteDataAdapter da, SqliteConnection conn) 1196 private void setupAgentCommands(SqliteDataAdapter da, SqliteConnection conn)
1197 { 1197 {
1198 da.InsertCommand = SQLiteUtil.createInsertCommand( "useragents", ds.Tables["useragents"]); 1198 da.InsertCommand = SQLiteUtil.createInsertCommand("useragents", ds.Tables["useragents"]);
1199 da.InsertCommand.Connection = conn; 1199 da.InsertCommand.Connection = conn;
1200 1200
1201 da.UpdateCommand = SQLiteUtil.createUpdateCommand( "useragents", "UUID=:UUID", ds.Tables["useragents"]); 1201 da.UpdateCommand = SQLiteUtil.createUpdateCommand("useragents", "UUID=:UUID", ds.Tables["useragents"]);
1202 da.UpdateCommand.Connection = conn; 1202 da.UpdateCommand.Connection = conn;
1203 1203
1204 SqliteCommand delete = new SqliteCommand( "delete from useragents where UUID = :ProfileID"); 1204 SqliteCommand delete = new SqliteCommand("delete from useragents where UUID = :ProfileID");
1205 delete.Parameters.Add( SQLiteUtil.createSqliteParameter( "ProfileID", typeof(String))); 1205 delete.Parameters.Add(SQLiteUtil.createSqliteParameter("ProfileID", typeof(String)));
1206 delete.Connection = conn; 1206 delete.Connection = conn;
1207 da.DeleteCommand = delete; 1207 da.DeleteCommand = delete;
1208 } 1208 }