ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "From: Chris Yeoh <cyeoh@au1.ibm.com>"

Browse Source 
This reverts r9666. for some reason the mysql update does not work.
This commit is contained in:
Dr Scofield
2009-05-25 11:32:31 +00:00
parent 0bff818d39
commit c18c1f6c7c
4 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Data/MySQL/MySQLRegionData.cs
View File

@@ -196,7 +196,6 @@ namespace OpenSim.Data.MySQL
"ColorR, ColorG, ColorB, ColorA, "+
"ParticleSystem, ClickAction, Material, "+
"CollisionSound, CollisionSoundVolume, "+
"PassTouches, "+
"LinkNumber) values (" + "?UUID, "+
"?CreationDate, ?Name, ?Text, "+
"?Description, ?SitName, ?TouchName, "+
@@ -228,7 +227,7 @@ namespace OpenSim.Data.MySQL
"?SaleType, ?ColorR, ?ColorG, "+
"?ColorB, ?ColorA, ?ParticleSystem, "+
"?ClickAction, ?Material, ?CollisionSound, "+
"?CollisionSoundVolume, ?PassTouches, ?LinkNumber)";
"?CollisionSoundVolume, ?LinkNumber)";
FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
@@ -951,9 +950,6 @@ namespace OpenSim.Data.MySQL
prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]);
if (Convert.ToInt16(row["PassTouches"]) != 0)
prim.PassTouches = true;
prim.LinkNum = Convert.ToInt32(row["LinkNumber"]);
return prim;
@@ -1276,12 +1272,6 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("CollisionSound", prim.CollisionSound.ToString());
cmd.Parameters.AddWithValue("CollisionSoundVolume", prim.CollisionSoundVolume);
if (prim.PassTouches)
cmd.Parameters.AddWithValue("PassTouches", 1);
else
cmd.Parameters.AddWithValue("PassTouches", 0);
cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
}
@@ -1544,4 +1534,4 @@ namespace OpenSim.Data.MySQL
}
}
}
}
}