Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
author: Melanie 2012-04-30 19:04:38 +0100
committer: Melanie 2012-04-30 19:04:38 +0100
commit: 4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6 (patch)
tree: 4a1a8386e77f584c900229f1e8ddb08058d07697 /OpenSim/Data/MySQL/MySQLSimulationData.cs
parent: Merge branch 'master' into careminster (diff)
parent: Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on an... (diff)
download: opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.zip
opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.gz
opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.bz2
opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.xz
1 files changed, 133 insertions, 134 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 33c184f..89600db 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -129,119 +129,119 @@ namespace OpenSim.Data.MySQL
                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                {
                    dbcon.Open();
-                    MySqlCommand cmd = dbcon.CreateCommand();
-                    foreach (SceneObjectPart prim in obj.Parts)
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
                    {
-                        cmd.Parameters.Clear();
+                        foreach (SceneObjectPart prim in obj.Parts)
+                        {
+                            cmd.Parameters.Clear();
-                        cmd.CommandText = "replace into prims (" +
+                            cmd.CommandText = "replace into prims (" +
-                                "UUID, CreationDate, " +
+                                    "UUID, CreationDate, " +
-                                "Name, Text, Description, " +
+                                    "Name, Text, Description, " +
-                                "SitName, TouchName, ObjectFlags, " +
+                                    "SitName, TouchName, ObjectFlags, " +
-                                "OwnerMask, NextOwnerMask, GroupMask, " +
+                                    "OwnerMask, NextOwnerMask, GroupMask, " +
-                                "EveryoneMask, BaseMask, PositionX, " +
+                                    "EveryoneMask, BaseMask, PositionX, " +
-                                "PositionY, PositionZ, GroupPositionX, " +
+                                    "PositionY, PositionZ, GroupPositionX, " +
-                                "GroupPositionY, GroupPositionZ, VelocityX, " +
+                                    "GroupPositionY, GroupPositionZ, VelocityX, " +
-                                "VelocityY, VelocityZ, AngularVelocityX, " +
+                                    "VelocityY, VelocityZ, AngularVelocityX, " +
-                                "AngularVelocityY, AngularVelocityZ, " +
+                                    "AngularVelocityY, AngularVelocityZ, " +
-                                "AccelerationX, AccelerationY, " +
+                                    "AccelerationX, AccelerationY, " +
-                                "AccelerationZ, RotationX, " +
+                                    "AccelerationZ, RotationX, " +
-                                "RotationY, RotationZ, " +
+                                    "RotationY, RotationZ, " +
-                                "RotationW, SitTargetOffsetX, " +
+                                    "RotationW, SitTargetOffsetX, " +
-                                "SitTargetOffsetY, SitTargetOffsetZ, " +
+                                    "SitTargetOffsetY, SitTargetOffsetZ, " +
-                                "SitTargetOrientW, SitTargetOrientX, " +
+                                    "SitTargetOrientW, SitTargetOrientX, " +
-                                "SitTargetOrientY, SitTargetOrientZ, " +
+                                    "SitTargetOrientY, SitTargetOrientZ, " +
-                                "RegionUUID, CreatorID, " +
+                                    "RegionUUID, CreatorID, " +
-                                "OwnerID, GroupID, " +
+                                    "OwnerID, GroupID, " +
-                                "LastOwnerID, SceneGroupID, " +
+                                    "LastOwnerID, SceneGroupID, " +
-                                "PayPrice, PayButton1, " +
+                                    "PayPrice, PayButton1, " +
-                                "PayButton2, PayButton3, " +
+                                    "PayButton2, PayButton3, " +
-                                "PayButton4, LoopedSound, " +
+                                    "PayButton4, LoopedSound, " +
-                                "LoopedSoundGain, TextureAnimation, " +
+                                    "LoopedSoundGain, TextureAnimation, " +
-                                "OmegaX, OmegaY, OmegaZ, " +
+                                    "OmegaX, OmegaY, OmegaZ, " +
-                                "CameraEyeOffsetX, CameraEyeOffsetY, " +
+                                    "CameraEyeOffsetX, CameraEyeOffsetY, " +
-                                "CameraEyeOffsetZ, CameraAtOffsetX, " +
+                                    "CameraEyeOffsetZ, CameraAtOffsetX, " +
-                                "CameraAtOffsetY, CameraAtOffsetZ, " +
+                                    "CameraAtOffsetY, CameraAtOffsetZ, " +
-                                "ForceMouselook, ScriptAccessPin, " +
+                                    "ForceMouselook, ScriptAccessPin, " +
-                                "AllowedDrop, DieAtEdge, " +
+                                    "AllowedDrop, DieAtEdge, " +
-                                "SalePrice, SaleType, " +
+                                    "SalePrice, SaleType, " +
-                                "ColorR, ColorG, ColorB, ColorA, " +
+                                    "ColorR, ColorG, ColorB, ColorA, " +
-                                "ParticleSystem, ClickAction, Material, " +
+                                    "ParticleSystem, ClickAction, Material, " +
-                                "CollisionSound, CollisionSoundVolume, " +
+                                    "CollisionSound, CollisionSoundVolume, " +
-                                "PassTouches, " +
+                                    "PassTouches, " +
-                                "LinkNumber, MediaURL, KeyframeMotion, " +
+                                    "LinkNumber, MediaURL, KeyframeMotion, " +
-                                "PhysicsShapeType, Density, GravityModifier, " +
+                                    "PhysicsShapeType, Density, GravityModifier, " +
-                                "Friction, Restitution) values (" + "?UUID, " +
+                                    "Friction, Restitution) values (" + "?UUID, " +
-                                "?CreationDate, ?Name, ?Text, " +
+                                    "?CreationDate, ?Name, ?Text, " +
-                                "?Description, ?SitName, ?TouchName, " +
+                                    "?Description, ?SitName, ?TouchName, " +
-                                "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
+                                    "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
-                                "?GroupMask, ?EveryoneMask, ?BaseMask, " +
+                                    "?GroupMask, ?EveryoneMask, ?BaseMask, " +
-                                "?PositionX, ?PositionY, ?PositionZ, " +
+                                    "?PositionX, ?PositionY, ?PositionZ, " +
-                                "?GroupPositionX, ?GroupPositionY, " +
+                                    "?GroupPositionX, ?GroupPositionY, " +
-                                "?GroupPositionZ, ?VelocityX, " +
+                                    "?GroupPositionZ, ?VelocityX, " +
-                                "?VelocityY, ?VelocityZ, ?AngularVelocityX, " +
+                                    "?VelocityY, ?VelocityZ, ?AngularVelocityX, " +
-                                "?AngularVelocityY, ?AngularVelocityZ, " +
+                                    "?AngularVelocityY, ?AngularVelocityZ, " +
-                                "?AccelerationX, ?AccelerationY, " +
+                                    "?AccelerationX, ?AccelerationY, " +
-                                "?AccelerationZ, ?RotationX, " +
+                                    "?AccelerationZ, ?RotationX, " +
-                                "?RotationY, ?RotationZ, " +
+                                    "?RotationY, ?RotationZ, " +
-                                "?RotationW, ?SitTargetOffsetX, " +
+                                    "?RotationW, ?SitTargetOffsetX, " +
-                                "?SitTargetOffsetY, ?SitTargetOffsetZ, " +
+                                    "?SitTargetOffsetY, ?SitTargetOffsetZ, " +
-                                "?SitTargetOrientW, ?SitTargetOrientX, " +
+                                    "?SitTargetOrientW, ?SitTargetOrientX, " +
-                                "?SitTargetOrientY, ?SitTargetOrientZ, " +
+                                    "?SitTargetOrientY, ?SitTargetOrientZ, " +
-                                "?RegionUUID, ?CreatorID, ?OwnerID, " +
+                                    "?RegionUUID, ?CreatorID, ?OwnerID, " +
-                                "?GroupID, ?LastOwnerID, ?SceneGroupID, " +
+                                    "?GroupID, ?LastOwnerID, ?SceneGroupID, " +
-                                "?PayPrice, ?PayButton1, ?PayButton2, " +
+                                    "?PayPrice, ?PayButton1, ?PayButton2, " +
-                                "?PayButton3, ?PayButton4, ?LoopedSound, " +
+                                    "?PayButton3, ?PayButton4, ?LoopedSound, " +
-                                "?LoopedSoundGain, ?TextureAnimation, " +
+                                    "?LoopedSoundGain, ?TextureAnimation, " +
-                                "?OmegaX, ?OmegaY, ?OmegaZ, " +
+                                    "?OmegaX, ?OmegaY, ?OmegaZ, " +
-                                "?CameraEyeOffsetX, ?CameraEyeOffsetY, " +
+                                    "?CameraEyeOffsetX, ?CameraEyeOffsetY, " +
-                                "?CameraEyeOffsetZ, ?CameraAtOffsetX, " +
+                                    "?CameraEyeOffsetZ, ?CameraAtOffsetX, " +
-                                "?CameraAtOffsetY, ?CameraAtOffsetZ, " +
+                                    "?CameraAtOffsetY, ?CameraAtOffsetZ, " +
-                                "?ForceMouselook, ?ScriptAccessPin, " +
+                                    "?ForceMouselook, ?ScriptAccessPin, " +
-                                "?AllowedDrop, ?DieAtEdge, ?SalePrice, " +
+                                    "?AllowedDrop, ?DieAtEdge, ?SalePrice, " +
-                                "?SaleType, ?ColorR, ?ColorG, " +
+                                    "?SaleType, ?ColorR, ?ColorG, " +
-                                "?ColorB, ?ColorA, ?ParticleSystem, " +
+                                    "?ColorB, ?ColorA, ?ParticleSystem, " +
-                                "?ClickAction, ?Material, ?CollisionSound, " +
+                                    "?ClickAction, ?Material, ?CollisionSound, " +
-                                "?CollisionSoundVolume, ?PassTouches, " +
+                                    "?CollisionSoundVolume, ?PassTouches, " +
-                                "?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
+                                    "?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
-                                "?PhysicsShapeType, ?Density, ?GravityModifier, " +
+                                    "?PhysicsShapeType, ?Density, ?GravityModifier, " +
-                                "?Friction, ?Restitution)";
+                                    "?Friction, ?Restitution)";
-                        FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
+                            FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
-                        ExecuteNonQuery(cmd);
+                            ExecuteNonQuery(cmd);
-                        cmd.Parameters.Clear();
+                            cmd.Parameters.Clear();
-                        cmd.CommandText = "replace into primshapes (" +
+                            cmd.CommandText = "replace into primshapes (" +
-                                "UUID, Shape, ScaleX, ScaleY, " +
+                                    "UUID, Shape, ScaleX, ScaleY, " +
-                                "ScaleZ, PCode, PathBegin, PathEnd, " +
+                                    "ScaleZ, PCode, PathBegin, PathEnd, " +
-                                "PathScaleX, PathScaleY, PathShearX, " +
+                                    "PathScaleX, PathScaleY, PathShearX, " +
-                                "PathShearY, PathSkew, PathCurve, " +
+                                    "PathShearY, PathSkew, PathCurve, " +
-                                "PathRadiusOffset, PathRevolutions, " +
+                                    "PathRadiusOffset, PathRevolutions, " +
-                                "PathTaperX, PathTaperY, PathTwist, " +
+                                    "PathTaperX, PathTaperY, PathTwist, " +
-                                "PathTwistBegin, ProfileBegin, ProfileEnd, " +
+                                    "PathTwistBegin, ProfileBegin, ProfileEnd, " +
-                                "ProfileCurve, ProfileHollow, Texture, " +
+                                    "ProfileCurve, ProfileHollow, Texture, " +
-                                "ExtraParams, State, Media) values (?UUID, " +
+                                    "ExtraParams, State, Media) values (?UUID, " +
-                                "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
+                                    "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
-                                "?PCode, ?PathBegin, ?PathEnd, " +
+                                    "?PCode, ?PathBegin, ?PathEnd, " +
-                                "?PathScaleX, ?PathScaleY, " +
+                                    "?PathScaleX, ?PathScaleY, " +
-                                "?PathShearX, ?PathShearY, " +
+                                    "?PathShearX, ?PathShearY, " +
-                                "?PathSkew, ?PathCurve, ?PathRadiusOffset, " +
+                                    "?PathSkew, ?PathCurve, ?PathRadiusOffset, " +
-                                "?PathRevolutions, ?PathTaperX, " +
+                                    "?PathRevolutions, ?PathTaperX, " +
-                                "?PathTaperY, ?PathTwist, " +
+                                    "?PathTaperY, ?PathTwist, " +
-                                "?PathTwistBegin, ?ProfileBegin, " +
+                                    "?PathTwistBegin, ?ProfileBegin, " +
-                                "?ProfileEnd, ?ProfileCurve, " +
+                                    "?ProfileEnd, ?ProfileCurve, " +
-                                "?ProfileHollow, ?Texture, ?ExtraParams, " +
+                                    "?ProfileHollow, ?Texture, ?ExtraParams, " +
-                                "?State, ?Media)";
+                                    "?State, ?Media)";
-                        FillShapeCommand(cmd, prim);
+                            FillShapeCommand(cmd, prim);
-                        ExecuteNonQuery(cmd);
+                            ExecuteNonQuery(cmd);
+                        }
                    }
-                    
-                    cmd.Dispose();
                }
            }
        }
@@ -1865,41 +1865,40 @@ namespace OpenSim.Data.MySQL
            {
                RemoveItems(primID);
+                if (items.Count == 0)
+                    return;
                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                {
                    dbcon.Open();
-                    MySqlCommand cmd = dbcon.CreateCommand();
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    if (items.Count == 0)
-                        return;
-                    cmd.CommandText = "insert into primitems (" +
-                            "invType, assetType, name, " +
-                            "description, creationDate, nextPermissions, " +
-                            "currentPermissions, basePermissions, " +
-                            "everyonePermissions, groupPermissions, " +
-                            "flags, itemID, primID, assetID, " +
-                            "parentFolderID, creatorID, ownerID, " +
-                            "groupID, lastOwnerID) values (?invType, " +
-                            "?assetType, ?name, ?description, " +
-                            "?creationDate, ?nextPermissions, " +
-                            "?currentPermissions, ?basePermissions, " +
-                            "?everyonePermissions, ?groupPermissions, " +
-                            "?flags, ?itemID, ?primID, ?assetID, " +
-                            "?parentFolderID, ?creatorID, ?ownerID, " +
-                            "?groupID, ?lastOwnerID)";
-                    foreach (TaskInventoryItem item in items)
                    {
-                        cmd.Parameters.Clear();
+                        cmd.CommandText = "insert into primitems (" +
+                                "invType, assetType, name, " +
-                        FillItemCommand(cmd, item);
+                                "description, creationDate, nextPermissions, " +
+                                "currentPermissions, basePermissions, " +
-                        ExecuteNonQuery(cmd);
+                                "everyonePermissions, groupPermissions, " +
+                                "flags, itemID, primID, assetID, " +
+                                "parentFolderID, creatorID, ownerID, " +
+                                "groupID, lastOwnerID) values (?invType, " +
+                                "?assetType, ?name, ?description, " +
+                                "?creationDate, ?nextPermissions, " +
+                                "?currentPermissions, ?basePermissions, " +
+                                "?everyonePermissions, ?groupPermissions, " +
+                                "?flags, ?itemID, ?primID, ?assetID, " +
+                                "?parentFolderID, ?creatorID, ?ownerID, " +
+                                "?groupID, ?lastOwnerID)";
+    
+                        foreach (TaskInventoryItem item in items)
+                        {
+                            cmd.Parameters.Clear();
+    
+                            FillItemCommand(cmd, item);
+    
+                            ExecuteNonQuery(cmd);
+                        }
                    }
-                    cmd.Dispose();
                }
            }
        }
author	Melanie	2012-04-30 19:04:38 +0100
committer	Melanie	2012-04-30 19:04:38 +0100
commit	4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6 (patch)
tree	4a1a8386e77f584c900229f1e8ddb08058d07697 /OpenSim/Data/MySQL/MySQLSimulationData.cs
parent	Merge branch 'master' into careminster (diff)
parent	Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on an... (diff)
download	opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.zip opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.gz opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.bz2 opensim-SC_OLD-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.xz

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 33c184f..89600db 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -129,119 +129,119 @@ namespace OpenSim.Data.MySQL
129	using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))	129	using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
130	{	130	{
131	dbcon.Open();	131	dbcon.Open();
132	MySqlCommand cmd = dbcon.CreateCommand();
133		132
134	foreach (SceneObjectPart prim in obj.Parts)	133	using (MySqlCommand cmd = dbcon.CreateCommand())
135	{	134	{
136	cmd.Parameters.Clear();	135	foreach (SceneObjectPart prim in obj.Parts)
		136	{
		137	cmd.Parameters.Clear();
137		138
138	cmd.CommandText = "replace into prims (" +	139	cmd.CommandText = "replace into prims (" +
139	"UUID, CreationDate, " +	140	"UUID, CreationDate, " +
140	"Name, Text, Description, " +	141	"Name, Text, Description, " +
141	"SitName, TouchName, ObjectFlags, " +	142	"SitName, TouchName, ObjectFlags, " +
142	"OwnerMask, NextOwnerMask, GroupMask, " +	143	"OwnerMask, NextOwnerMask, GroupMask, " +
143	"EveryoneMask, BaseMask, PositionX, " +	144	"EveryoneMask, BaseMask, PositionX, " +
144	"PositionY, PositionZ, GroupPositionX, " +	145	"PositionY, PositionZ, GroupPositionX, " +
145	"GroupPositionY, GroupPositionZ, VelocityX, " +	146	"GroupPositionY, GroupPositionZ, VelocityX, " +
146	"VelocityY, VelocityZ, AngularVelocityX, " +	147	"VelocityY, VelocityZ, AngularVelocityX, " +
147	"AngularVelocityY, AngularVelocityZ, " +	148	"AngularVelocityY, AngularVelocityZ, " +
148	"AccelerationX, AccelerationY, " +	149	"AccelerationX, AccelerationY, " +
149	"AccelerationZ, RotationX, " +	150	"AccelerationZ, RotationX, " +
150	"RotationY, RotationZ, " +	151	"RotationY, RotationZ, " +
151	"RotationW, SitTargetOffsetX, " +	152	"RotationW, SitTargetOffsetX, " +
152	"SitTargetOffsetY, SitTargetOffsetZ, " +	153	"SitTargetOffsetY, SitTargetOffsetZ, " +
153	"SitTargetOrientW, SitTargetOrientX, " +	154	"SitTargetOrientW, SitTargetOrientX, " +
154	"SitTargetOrientY, SitTargetOrientZ, " +	155	"SitTargetOrientY, SitTargetOrientZ, " +
155	"RegionUUID, CreatorID, " +	156	"RegionUUID, CreatorID, " +
156	"OwnerID, GroupID, " +	157	"OwnerID, GroupID, " +
157	"LastOwnerID, SceneGroupID, " +	158	"LastOwnerID, SceneGroupID, " +
158	"PayPrice, PayButton1, " +	159	"PayPrice, PayButton1, " +
159	"PayButton2, PayButton3, " +	160	"PayButton2, PayButton3, " +
160	"PayButton4, LoopedSound, " +	161	"PayButton4, LoopedSound, " +
161	"LoopedSoundGain, TextureAnimation, " +	162	"LoopedSoundGain, TextureAnimation, " +
162	"OmegaX, OmegaY, OmegaZ, " +	163	"OmegaX, OmegaY, OmegaZ, " +
163	"CameraEyeOffsetX, CameraEyeOffsetY, " +	164	"CameraEyeOffsetX, CameraEyeOffsetY, " +
164	"CameraEyeOffsetZ, CameraAtOffsetX, " +	165	"CameraEyeOffsetZ, CameraAtOffsetX, " +
165	"CameraAtOffsetY, CameraAtOffsetZ, " +	166	"CameraAtOffsetY, CameraAtOffsetZ, " +
166	"ForceMouselook, ScriptAccessPin, " +	167	"ForceMouselook, ScriptAccessPin, " +
167	"AllowedDrop, DieAtEdge, " +	168	"AllowedDrop, DieAtEdge, " +
168	"SalePrice, SaleType, " +	169	"SalePrice, SaleType, " +
169	"ColorR, ColorG, ColorB, ColorA, " +	170	"ColorR, ColorG, ColorB, ColorA, " +
170	"ParticleSystem, ClickAction, Material, " +	171	"ParticleSystem, ClickAction, Material, " +
171	"CollisionSound, CollisionSoundVolume, " +	172	"CollisionSound, CollisionSoundVolume, " +
172	"PassTouches, " +	173	"PassTouches, " +
173	"LinkNumber, MediaURL, KeyframeMotion, " +	174	"LinkNumber, MediaURL, KeyframeMotion, " +
174	"PhysicsShapeType, Density, GravityModifier, " +	175	"PhysicsShapeType, Density, GravityModifier, " +
175	"Friction, Restitution) values (" + "?UUID, " +	176	"Friction, Restitution) values (" + "?UUID, " +
176	"?CreationDate, ?Name, ?Text, " +	177	"?CreationDate, ?Name, ?Text, " +
177	"?Description, ?SitName, ?TouchName, " +	178	"?Description, ?SitName, ?TouchName, " +
178	"?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +	179	"?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
179	"?GroupMask, ?EveryoneMask, ?BaseMask, " +	180	"?GroupMask, ?EveryoneMask, ?BaseMask, " +
180	"?PositionX, ?PositionY, ?PositionZ, " +	181	"?PositionX, ?PositionY, ?PositionZ, " +
181	"?GroupPositionX, ?GroupPositionY, " +	182	"?GroupPositionX, ?GroupPositionY, " +
182	"?GroupPositionZ, ?VelocityX, " +	183	"?GroupPositionZ, ?VelocityX, " +
183	"?VelocityY, ?VelocityZ, ?AngularVelocityX, " +	184	"?VelocityY, ?VelocityZ, ?AngularVelocityX, " +
184	"?AngularVelocityY, ?AngularVelocityZ, " +	185	"?AngularVelocityY, ?AngularVelocityZ, " +
185	"?AccelerationX, ?AccelerationY, " +	186	"?AccelerationX, ?AccelerationY, " +
186	"?AccelerationZ, ?RotationX, " +	187	"?AccelerationZ, ?RotationX, " +
187	"?RotationY, ?RotationZ, " +	188	"?RotationY, ?RotationZ, " +
188	"?RotationW, ?SitTargetOffsetX, " +	189	"?RotationW, ?SitTargetOffsetX, " +
189	"?SitTargetOffsetY, ?SitTargetOffsetZ, " +	190	"?SitTargetOffsetY, ?SitTargetOffsetZ, " +
190	"?SitTargetOrientW, ?SitTargetOrientX, " +	191	"?SitTargetOrientW, ?SitTargetOrientX, " +
191	"?SitTargetOrientY, ?SitTargetOrientZ, " +	192	"?SitTargetOrientY, ?SitTargetOrientZ, " +
192	"?RegionUUID, ?CreatorID, ?OwnerID, " +	193	"?RegionUUID, ?CreatorID, ?OwnerID, " +
193	"?GroupID, ?LastOwnerID, ?SceneGroupID, " +	194	"?GroupID, ?LastOwnerID, ?SceneGroupID, " +
194	"?PayPrice, ?PayButton1, ?PayButton2, " +	195	"?PayPrice, ?PayButton1, ?PayButton2, " +
195	"?PayButton3, ?PayButton4, ?LoopedSound, " +	196	"?PayButton3, ?PayButton4, ?LoopedSound, " +
196	"?LoopedSoundGain, ?TextureAnimation, " +	197	"?LoopedSoundGain, ?TextureAnimation, " +
197	"?OmegaX, ?OmegaY, ?OmegaZ, " +	198	"?OmegaX, ?OmegaY, ?OmegaZ, " +
198	"?CameraEyeOffsetX, ?CameraEyeOffsetY, " +	199	"?CameraEyeOffsetX, ?CameraEyeOffsetY, " +
199	"?CameraEyeOffsetZ, ?CameraAtOffsetX, " +	200	"?CameraEyeOffsetZ, ?CameraAtOffsetX, " +
200	"?CameraAtOffsetY, ?CameraAtOffsetZ, " +	201	"?CameraAtOffsetY, ?CameraAtOffsetZ, " +
201	"?ForceMouselook, ?ScriptAccessPin, " +	202	"?ForceMouselook, ?ScriptAccessPin, " +
202	"?AllowedDrop, ?DieAtEdge, ?SalePrice, " +	203	"?AllowedDrop, ?DieAtEdge, ?SalePrice, " +
203	"?SaleType, ?ColorR, ?ColorG, " +	204	"?SaleType, ?ColorR, ?ColorG, " +
204	"?ColorB, ?ColorA, ?ParticleSystem, " +	205	"?ColorB, ?ColorA, ?ParticleSystem, " +
205	"?ClickAction, ?Material, ?CollisionSound, " +	206	"?ClickAction, ?Material, ?CollisionSound, " +
206	"?CollisionSoundVolume, ?PassTouches, " +	207	"?CollisionSoundVolume, ?PassTouches, " +
207	"?LinkNumber, ?MediaURL, ?KeyframeMotion, " +	208	"?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
208	"?PhysicsShapeType, ?Density, ?GravityModifier, " +	209	"?PhysicsShapeType, ?Density, ?GravityModifier, " +
209	"?Friction, ?Restitution)";	210	"?Friction, ?Restitution)";
210		211
211	FillPrimCommand(cmd, prim, obj.UUID, regionUUID);	212	FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
212		213
213	ExecuteNonQuery(cmd);	214	ExecuteNonQuery(cmd);
214		215
215	cmd.Parameters.Clear();	216	cmd.Parameters.Clear();
216		217
217	cmd.CommandText = "replace into primshapes (" +	218	cmd.CommandText = "replace into primshapes (" +
218	"UUID, Shape, ScaleX, ScaleY, " +	219	"UUID, Shape, ScaleX, ScaleY, " +
219	"ScaleZ, PCode, PathBegin, PathEnd, " +	220	"ScaleZ, PCode, PathBegin, PathEnd, " +
220	"PathScaleX, PathScaleY, PathShearX, " +	221	"PathScaleX, PathScaleY, PathShearX, " +
221	"PathShearY, PathSkew, PathCurve, " +	222	"PathShearY, PathSkew, PathCurve, " +
222	"PathRadiusOffset, PathRevolutions, " +	223	"PathRadiusOffset, PathRevolutions, " +
223	"PathTaperX, PathTaperY, PathTwist, " +	224	"PathTaperX, PathTaperY, PathTwist, " +
224	"PathTwistBegin, ProfileBegin, ProfileEnd, " +	225	"PathTwistBegin, ProfileBegin, ProfileEnd, " +
225	"ProfileCurve, ProfileHollow, Texture, " +	226	"ProfileCurve, ProfileHollow, Texture, " +
226	"ExtraParams, State, Media) values (?UUID, " +	227	"ExtraParams, State, Media) values (?UUID, " +
227	"?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +	228	"?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
228	"?PCode, ?PathBegin, ?PathEnd, " +	229	"?PCode, ?PathBegin, ?PathEnd, " +
229	"?PathScaleX, ?PathScaleY, " +	230	"?PathScaleX, ?PathScaleY, " +
230	"?PathShearX, ?PathShearY, " +	231	"?PathShearX, ?PathShearY, " +
231	"?PathSkew, ?PathCurve, ?PathRadiusOffset, " +	232	"?PathSkew, ?PathCurve, ?PathRadiusOffset, " +
232	"?PathRevolutions, ?PathTaperX, " +	233	"?PathRevolutions, ?PathTaperX, " +
233	"?PathTaperY, ?PathTwist, " +	234	"?PathTaperY, ?PathTwist, " +
234	"?PathTwistBegin, ?ProfileBegin, " +	235	"?PathTwistBegin, ?ProfileBegin, " +
235	"?ProfileEnd, ?ProfileCurve, " +	236	"?ProfileEnd, ?ProfileCurve, " +
236	"?ProfileHollow, ?Texture, ?ExtraParams, " +	237	"?ProfileHollow, ?Texture, ?ExtraParams, " +
237	"?State, ?Media)";	238	"?State, ?Media)";
238		239
239	FillShapeCommand(cmd, prim);	240	FillShapeCommand(cmd, prim);
240		241
241	ExecuteNonQuery(cmd);	242	ExecuteNonQuery(cmd);
		243	}
242	}	244	}
243
244	cmd.Dispose();
245	}	245	}
246	}	246	}
247	}	247	}
@@ -1865,41 +1865,40 @@ namespace OpenSim.Data.MySQL
1865	{	1865	{
1866	RemoveItems(primID);	1866	RemoveItems(primID);
1867		1867
		1868	if (items.Count == 0)
		1869	return;
		1870
1868	using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))	1871	using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
1869	{	1872	{
1870	dbcon.Open();	1873	dbcon.Open();
1871		1874
1872	MySqlCommand cmd = dbcon.CreateCommand();	1875	using (MySqlCommand cmd = dbcon.CreateCommand())
1873
1874	if (items.Count == 0)
1875	return;
1876
1877	cmd.CommandText = "insert into primitems (" +
1878	"invType, assetType, name, " +
1879	"description, creationDate, nextPermissions, " +
1880	"currentPermissions, basePermissions, " +
1881	"everyonePermissions, groupPermissions, " +
1882	"flags, itemID, primID, assetID, " +
1883	"parentFolderID, creatorID, ownerID, " +
1884	"groupID, lastOwnerID) values (?invType, " +
1885	"?assetType, ?name, ?description, " +
1886	"?creationDate, ?nextPermissions, " +
1887	"?currentPermissions, ?basePermissions, " +
1888	"?everyonePermissions, ?groupPermissions, " +
1889	"?flags, ?itemID, ?primID, ?assetID, " +
1890	"?parentFolderID, ?creatorID, ?ownerID, " +
1891	"?groupID, ?lastOwnerID)";
1892
1893	foreach (TaskInventoryItem item in items)
1894	{	1876	{
1895	cmd.Parameters.Clear();	1877	cmd.CommandText = "insert into primitems (" +
1896		1878	"invType, assetType, name, " +
1897	FillItemCommand(cmd, item);	1879	"description, creationDate, nextPermissions, " +
1898		1880	"currentPermissions, basePermissions, " +
1899	ExecuteNonQuery(cmd);	1881	"everyonePermissions, groupPermissions, " +
		1882	"flags, itemID, primID, assetID, " +
		1883	"parentFolderID, creatorID, ownerID, " +
		1884	"groupID, lastOwnerID) values (?invType, " +
		1885	"?assetType, ?name, ?description, " +
		1886	"?creationDate, ?nextPermissions, " +
		1887	"?currentPermissions, ?basePermissions, " +
		1888	"?everyonePermissions, ?groupPermissions, " +
		1889	"?flags, ?itemID, ?primID, ?assetID, " +
		1890	"?parentFolderID, ?creatorID, ?ownerID, " +
		1891	"?groupID, ?lastOwnerID)";
		1892
		1893	foreach (TaskInventoryItem item in items)
		1894	{
		1895	cmd.Parameters.Clear();
		1896
		1897	FillItemCommand(cmd, item);
		1898
		1899	ExecuteNonQuery(cmd);
		1900	}
1900	}	1901	}
1901
1902	cmd.Dispose();
1903	}	1902	}
1904	}	1903	}
1905	}	1904	}