aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs211
1 files changed, 104 insertions, 107 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index b756b4f..37d7a88 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -135,115 +135,112 @@ namespace OpenSim.Data.MySQL
135 dbcon.Open(); 135 dbcon.Open();
136 MySqlCommand cmd = dbcon.CreateCommand(); 136 MySqlCommand cmd = dbcon.CreateCommand();
137 137
138 lock (obj.Children) 138 foreach (SceneObjectPart prim in obj.Children.Values)
139 { 139 {
140 foreach (SceneObjectPart prim in obj.Children.Values) 140 cmd.Parameters.Clear();
141 { 141
142 cmd.Parameters.Clear(); 142 cmd.CommandText = "replace into prims (" +
143 143 "UUID, CreationDate, " +
144 cmd.CommandText = "replace into prims (" + 144 "Name, Text, Description, " +
145 "UUID, CreationDate, " + 145 "SitName, TouchName, ObjectFlags, " +
146 "Name, Text, Description, " + 146 "OwnerMask, NextOwnerMask, GroupMask, " +
147 "SitName, TouchName, ObjectFlags, " + 147 "EveryoneMask, BaseMask, PositionX, " +
148 "OwnerMask, NextOwnerMask, GroupMask, " + 148 "PositionY, PositionZ, GroupPositionX, " +
149 "EveryoneMask, BaseMask, PositionX, " + 149 "GroupPositionY, GroupPositionZ, VelocityX, " +
150 "PositionY, PositionZ, GroupPositionX, " + 150 "VelocityY, VelocityZ, AngularVelocityX, " +
151 "GroupPositionY, GroupPositionZ, VelocityX, " + 151 "AngularVelocityY, AngularVelocityZ, " +
152 "VelocityY, VelocityZ, AngularVelocityX, " + 152 "AccelerationX, AccelerationY, " +
153 "AngularVelocityY, AngularVelocityZ, " + 153 "AccelerationZ, RotationX, " +
154 "AccelerationX, AccelerationY, " + 154 "RotationY, RotationZ, " +
155 "AccelerationZ, RotationX, " + 155 "RotationW, SitTargetOffsetX, " +
156 "RotationY, RotationZ, " + 156 "SitTargetOffsetY, SitTargetOffsetZ, " +
157 "RotationW, SitTargetOffsetX, " + 157 "SitTargetOrientW, SitTargetOrientX, " +
158 "SitTargetOffsetY, SitTargetOffsetZ, " + 158 "SitTargetOrientY, SitTargetOrientZ, " +
159 "SitTargetOrientW, SitTargetOrientX, " + 159 "RegionUUID, CreatorID, " +
160 "SitTargetOrientY, SitTargetOrientZ, " + 160 "OwnerID, GroupID, " +
161 "RegionUUID, CreatorID, " + 161 "LastOwnerID, SceneGroupID, " +
162 "OwnerID, GroupID, " + 162 "PayPrice, PayButton1, " +
163 "LastOwnerID, SceneGroupID, " + 163 "PayButton2, PayButton3, " +
164 "PayPrice, PayButton1, " + 164 "PayButton4, LoopedSound, " +
165 "PayButton2, PayButton3, " + 165 "LoopedSoundGain, TextureAnimation, " +
166 "PayButton4, LoopedSound, " + 166 "OmegaX, OmegaY, OmegaZ, " +
167 "LoopedSoundGain, TextureAnimation, " + 167 "CameraEyeOffsetX, CameraEyeOffsetY, " +
168 "OmegaX, OmegaY, OmegaZ, " + 168 "CameraEyeOffsetZ, CameraAtOffsetX, " +
169 "CameraEyeOffsetX, CameraEyeOffsetY, " + 169 "CameraAtOffsetY, CameraAtOffsetZ, " +
170 "CameraEyeOffsetZ, CameraAtOffsetX, " + 170 "ForceMouselook, ScriptAccessPin, " +
171 "CameraAtOffsetY, CameraAtOffsetZ, " + 171 "AllowedDrop, DieAtEdge, " +
172 "ForceMouselook, ScriptAccessPin, " + 172 "SalePrice, SaleType, " +
173 "AllowedDrop, DieAtEdge, " + 173 "ColorR, ColorG, ColorB, ColorA, " +
174 "SalePrice, SaleType, " + 174 "ParticleSystem, ClickAction, Material, " +
175 "ColorR, ColorG, ColorB, ColorA, " + 175 "CollisionSound, CollisionSoundVolume, " +
176 "ParticleSystem, ClickAction, Material, " + 176 "PassTouches, " +
177 "CollisionSound, CollisionSoundVolume, " + 177 "LinkNumber, MediaURL) values (" + "?UUID, " +
178 "PassTouches, " + 178 "?CreationDate, ?Name, ?Text, " +
179 "LinkNumber, MediaURL) values (" + "?UUID, " + 179 "?Description, ?SitName, ?TouchName, " +
180 "?CreationDate, ?Name, ?Text, " + 180 "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
181 "?Description, ?SitName, ?TouchName, " + 181 "?GroupMask, ?EveryoneMask, ?BaseMask, " +
182 "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " + 182 "?PositionX, ?PositionY, ?PositionZ, " +
183 "?GroupMask, ?EveryoneMask, ?BaseMask, " + 183 "?GroupPositionX, ?GroupPositionY, " +
184 "?PositionX, ?PositionY, ?PositionZ, " + 184 "?GroupPositionZ, ?VelocityX, " +
185 "?GroupPositionX, ?GroupPositionY, " + 185 "?VelocityY, ?VelocityZ, ?AngularVelocityX, " +
186 "?GroupPositionZ, ?VelocityX, " + 186 "?AngularVelocityY, ?AngularVelocityZ, " +
187 "?VelocityY, ?VelocityZ, ?AngularVelocityX, " + 187 "?AccelerationX, ?AccelerationY, " +
188 "?AngularVelocityY, ?AngularVelocityZ, " + 188 "?AccelerationZ, ?RotationX, " +
189 "?AccelerationX, ?AccelerationY, " + 189 "?RotationY, ?RotationZ, " +
190 "?AccelerationZ, ?RotationX, " + 190 "?RotationW, ?SitTargetOffsetX, " +
191 "?RotationY, ?RotationZ, " + 191 "?SitTargetOffsetY, ?SitTargetOffsetZ, " +
192 "?RotationW, ?SitTargetOffsetX, " + 192 "?SitTargetOrientW, ?SitTargetOrientX, " +
193 "?SitTargetOffsetY, ?SitTargetOffsetZ, " + 193 "?SitTargetOrientY, ?SitTargetOrientZ, " +
194 "?SitTargetOrientW, ?SitTargetOrientX, " + 194 "?RegionUUID, ?CreatorID, ?OwnerID, " +
195 "?SitTargetOrientY, ?SitTargetOrientZ, " + 195 "?GroupID, ?LastOwnerID, ?SceneGroupID, " +
196 "?RegionUUID, ?CreatorID, ?OwnerID, " + 196 "?PayPrice, ?PayButton1, ?PayButton2, " +
197 "?GroupID, ?LastOwnerID, ?SceneGroupID, " + 197 "?PayButton3, ?PayButton4, ?LoopedSound, " +
198 "?PayPrice, ?PayButton1, ?PayButton2, " + 198 "?LoopedSoundGain, ?TextureAnimation, " +
199 "?PayButton3, ?PayButton4, ?LoopedSound, " + 199 "?OmegaX, ?OmegaY, ?OmegaZ, " +
200 "?LoopedSoundGain, ?TextureAnimation, " + 200 "?CameraEyeOffsetX, ?CameraEyeOffsetY, " +
201 "?OmegaX, ?OmegaY, ?OmegaZ, " + 201 "?CameraEyeOffsetZ, ?CameraAtOffsetX, " +
202 "?CameraEyeOffsetX, ?CameraEyeOffsetY, " + 202 "?CameraAtOffsetY, ?CameraAtOffsetZ, " +
203 "?CameraEyeOffsetZ, ?CameraAtOffsetX, " + 203 "?ForceMouselook, ?ScriptAccessPin, " +
204 "?CameraAtOffsetY, ?CameraAtOffsetZ, " + 204 "?AllowedDrop, ?DieAtEdge, ?SalePrice, " +
205 "?ForceMouselook, ?ScriptAccessPin, " + 205 "?SaleType, ?ColorR, ?ColorG, " +
206 "?AllowedDrop, ?DieAtEdge, ?SalePrice, " + 206 "?ColorB, ?ColorA, ?ParticleSystem, " +
207 "?SaleType, ?ColorR, ?ColorG, " + 207 "?ClickAction, ?Material, ?CollisionSound, " +
208 "?ColorB, ?ColorA, ?ParticleSystem, " + 208 "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)";
209 "?ClickAction, ?Material, ?CollisionSound, " + 209
210 "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)"; 210 FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
211 211
212 FillPrimCommand(cmd, prim, obj.UUID, regionUUID); 212 ExecuteNonQuery(cmd);
213 213
214 ExecuteNonQuery(cmd); 214 cmd.Parameters.Clear();
215 215
216 cmd.Parameters.Clear(); 216 cmd.CommandText = "replace into primshapes (" +
217 217 "UUID, Shape, ScaleX, ScaleY, " +
218 cmd.CommandText = "replace into primshapes (" + 218 "ScaleZ, PCode, PathBegin, PathEnd, " +
219 "UUID, Shape, ScaleX, ScaleY, " + 219 "PathScaleX, PathScaleY, PathShearX, " +
220 "ScaleZ, PCode, PathBegin, PathEnd, " + 220 "PathShearY, PathSkew, PathCurve, " +
221 "PathScaleX, PathScaleY, PathShearX, " + 221 "PathRadiusOffset, PathRevolutions, " +
222 "PathShearY, PathSkew, PathCurve, " + 222 "PathTaperX, PathTaperY, PathTwist, " +
223 "PathRadiusOffset, PathRevolutions, " + 223 "PathTwistBegin, ProfileBegin, ProfileEnd, " +
224 "PathTaperX, PathTaperY, PathTwist, " + 224 "ProfileCurve, ProfileHollow, Texture, " +
225 "PathTwistBegin, ProfileBegin, ProfileEnd, " + 225 "ExtraParams, State, Media) values (?UUID, " +
226 "ProfileCurve, ProfileHollow, Texture, " + 226 "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
227 "ExtraParams, State, Media) values (?UUID, " + 227 "?PCode, ?PathBegin, ?PathEnd, " +
228 "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " + 228 "?PathScaleX, ?PathScaleY, " +
229 "?PCode, ?PathBegin, ?PathEnd, " + 229 "?PathShearX, ?PathShearY, " +
230 "?PathScaleX, ?PathScaleY, " + 230 "?PathSkew, ?PathCurve, ?PathRadiusOffset, " +
231 "?PathShearX, ?PathShearY, " + 231 "?PathRevolutions, ?PathTaperX, " +
232 "?PathSkew, ?PathCurve, ?PathRadiusOffset, " + 232 "?PathTaperY, ?PathTwist, " +
233 "?PathRevolutions, ?PathTaperX, " + 233 "?PathTwistBegin, ?ProfileBegin, " +
234 "?PathTaperY, ?PathTwist, " + 234 "?ProfileEnd, ?ProfileCurve, " +
235 "?PathTwistBegin, ?ProfileBegin, " + 235 "?ProfileHollow, ?Texture, ?ExtraParams, " +
236 "?ProfileEnd, ?ProfileCurve, " + 236 "?State, ?Media)";
237 "?ProfileHollow, ?Texture, ?ExtraParams, " + 237
238 "?State, ?Media)"; 238 FillShapeCommand(cmd, prim);
239 239
240 FillShapeCommand(cmd, prim); 240 ExecuteNonQuery(cmd);
241
242 ExecuteNonQuery(cmd);
243 }
244
245 cmd.Dispose();
246 } 241 }
242
243 cmd.Dispose();
247 } 244 }
248 } 245 }
249 } 246 }