aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLSimulationData.cs
diff options
context:
space:
mode:
authorJeff Ames2010-09-12 13:43:49 -0400
committerJeff Ames2010-09-12 13:43:49 -0400
commitf1f0bc23f4501ba99035283d3407ddad2b21b785 (patch)
tree2b62a244eddf18f5608405abcefa9f763ab54340 /OpenSim/Data/MySQL/MySQLSimulationData.cs
parentAdd copyright headers. (diff)
downloadopensim-SC-f1f0bc23f4501ba99035283d3407ddad2b21b785.zip
opensim-SC-f1f0bc23f4501ba99035283d3407ddad2b21b785.tar.gz
opensim-SC-f1f0bc23f4501ba99035283d3407ddad2b21b785.tar.bz2
opensim-SC-f1f0bc23f4501ba99035283d3407ddad2b21b785.tar.xz
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 36f73ef..8201cef 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -680,7 +680,7 @@ namespace OpenSim.Data.MySQL
680 "UserLocationX, UserLocationY, UserLocationZ, " + 680 "UserLocationX, UserLocationY, UserLocationZ, " +
681 "UserLookAtX, UserLookAtY, UserLookAtZ, " + 681 "UserLookAtX, UserLookAtY, UserLookAtZ, " +
682 "AuthbuyerID, OtherCleanTime, MediaType, MediaDescription, " + 682 "AuthbuyerID, OtherCleanTime, MediaType, MediaDescription, " +
683 "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" + 683 "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" +
684 "?UUID, ?RegionUUID, " + 684 "?UUID, ?RegionUUID, " +
685 "?LocalLandID, ?Bitmap, ?Name, ?Description, " + 685 "?LocalLandID, ?Bitmap, ?Name, ?Description, " +
686 "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " + 686 "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " +
@@ -691,7 +691,7 @@ namespace OpenSim.Data.MySQL
691 "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + 691 "?UserLocationX, ?UserLocationY, ?UserLocationZ, " +
692 "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + 692 "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " +
693 "?AuthbuyerID, ?OtherCleanTime, ?MediaType, ?MediaDescription, "+ 693 "?AuthbuyerID, ?OtherCleanTime, ?MediaType, ?MediaDescription, "+
694 "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)"; 694 "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)";
695 695
696 FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); 696 FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID);
697 697
@@ -728,7 +728,7 @@ namespace OpenSim.Data.MySQL
728 728
729 string command = "select * from `regionwindlight` where region_id = ?regionID"; 729 string command = "select * from `regionwindlight` where region_id = ?regionID";
730 730
731 using(MySqlCommand cmd = new MySqlCommand(command)) 731 using (MySqlCommand cmd = new MySqlCommand(command))
732 { 732 {
733 cmd.Connection = dbcon; 733 cmd.Connection = dbcon;
734 734
@@ -1350,13 +1350,13 @@ namespace OpenSim.Data.MySQL
1350 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); 1350 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
1351 } 1351 }
1352 1352
1353 newData.MediaDescription = (string) row["MediaDescription"]; 1353 newData.MediaDescription = (string) row["MediaDescription"];
1354 newData.MediaType = (string) row["MediaType"]; 1354 newData.MediaType = (string) row["MediaType"];
1355 newData.MediaWidth = Convert.ToInt32((((string) row["MediaSize"]).Split(','))[0]); 1355 newData.MediaWidth = Convert.ToInt32((((string) row["MediaSize"]).Split(','))[0]);
1356 newData.MediaHeight = Convert.ToInt32((((string) row["MediaSize"]).Split(','))[1]); 1356 newData.MediaHeight = Convert.ToInt32((((string) row["MediaSize"]).Split(','))[1]);
1357 newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]); 1357 newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
1358 newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]); 1358 newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
1359 newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]); 1359 newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
1360 1360
1361 newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); 1361 newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
1362 1362
@@ -1724,7 +1724,7 @@ namespace OpenSim.Data.MySQL
1724 1724
1725 s.State = (byte)(int)row["State"]; 1725 s.State = (byte)(int)row["State"];
1726 1726
1727 if (!(row["Media"] is System.DBNull)) 1727 if (!(row["Media"] is System.DBNull))
1728 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); 1728 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
1729 1729
1730 return s; 1730 return s;