diff options
author | Teravus Ovares | 2008-09-18 17:47:29 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-18 17:47:29 +0000 |
commit | e6f3181d3a5f0e5ecd0c813c4f375f16285ddebe (patch) | |
tree | 928693aecbc50e4e38222569ebc2b0511e6c4f9d /OpenSim/Region/Environment/Scenes | |
parent | Remove redundant permissions check in OSSL_Api.cs (diff) | |
download | opensim-SC_OLD-e6f3181d3a5f0e5ecd0c813c4f375f16285ddebe.zip opensim-SC_OLD-e6f3181d3a5f0e5ecd0c813c4f375f16285ddebe.tar.gz opensim-SC_OLD-e6f3181d3a5f0e5ecd0c813c4f375f16285ddebe.tar.bz2 opensim-SC_OLD-e6f3181d3a5f0e5ecd0c813c4f375f16285ddebe.tar.xz |
* Updates the SQLite region database to support the same properties that the MySQL version does for the table, prims.
* If this causes any unit tests to fail, the tests need to be updated.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 510f2fa..5c22367 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -211,6 +211,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
211 | { | 211 | { |
212 | // It's not necessary to persist this | 212 | // It's not necessary to persist this |
213 | m_TextureAnimation = new byte[0]; | 213 | m_TextureAnimation = new byte[0]; |
214 | m_particleSystem = new byte[0]; | ||
214 | } | 215 | } |
215 | 216 | ||
216 | public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, UUID ownerID, uint localID, | 217 | public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, UUID ownerID, uint localID, |
@@ -256,7 +257,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
256 | Velocity = new Vector3(0, 0, 0); | 257 | Velocity = new Vector3(0, 0, 0); |
257 | AngularVelocity = new Vector3(0, 0, 0); | 258 | AngularVelocity = new Vector3(0, 0, 0); |
258 | Acceleration = new Vector3(0, 0, 0); | 259 | Acceleration = new Vector3(0, 0, 0); |
260 | |||
261 | |||
262 | |||
259 | m_TextureAnimation = new byte[0]; | 263 | m_TextureAnimation = new byte[0]; |
264 | m_particleSystem = new byte[0]; | ||
265 | |||
266 | |||
260 | 267 | ||
261 | // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, | 268 | // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, |
262 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from | 269 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from |
@@ -304,6 +311,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
304 | RotationOffset = rotation; | 311 | RotationOffset = rotation; |
305 | ObjectFlags = flags; | 312 | ObjectFlags = flags; |
306 | 313 | ||
314 | m_TextureAnimation = new byte[0]; | ||
315 | m_particleSystem = new byte[0]; | ||
307 | // Since we don't store script state, this is only a 'temporary' objectflag now | 316 | // Since we don't store script state, this is only a 'temporary' objectflag now |
308 | // If the object is scripted, the script will get loaded and this will be set again | 317 | // If the object is scripted, the script will get loaded and this will be set again |
309 | ObjectFlags &= ~(uint)(PrimFlags.Scripted | PrimFlags.Touch); | 318 | ObjectFlags &= ~(uint)(PrimFlags.Scripted | PrimFlags.Touch); |
@@ -317,7 +326,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
317 | protected SceneObjectPart(SerializationInfo info, StreamingContext context) | 326 | protected SceneObjectPart(SerializationInfo info, StreamingContext context) |
318 | { | 327 | { |
319 | //System.Console.WriteLine("SceneObjectPart Deserialize BGN"); | 328 | //System.Console.WriteLine("SceneObjectPart Deserialize BGN"); |
320 | 329 | m_TextureAnimation = new byte[0]; | |
330 | m_particleSystem = new byte[0]; | ||
321 | if (info == null) | 331 | if (info == null) |
322 | { | 332 | { |
323 | throw new ArgumentNullException("info"); | 333 | throw new ArgumentNullException("info"); |