aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-04 22:55:52 +0000
committerTeravus Ovares2008-05-04 22:55:52 +0000
commit7b446aba9174aac68c62ec40c2115a1e1f012191 (patch)
treec30d8ef2bf6c3e66f5601043352accbe4613c669 /OpenSim/Data
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-7b446aba9174aac68c62ec40c2115a1e1f012191.zip
opensim-SC_OLD-7b446aba9174aac68c62ec40c2115a1e1f012191.tar.gz
opensim-SC_OLD-7b446aba9174aac68c62ec40c2115a1e1f012191.tar.bz2
opensim-SC_OLD-7b446aba9174aac68c62ec40c2115a1e1f012191.tar.xz
* Implemented DIE_AT_EDGE and Temporary objects don't save to the database.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs4
3 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index 44bc660..125501b 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -152,7 +152,9 @@ namespace OpenSim.Data.MSSQL
152 { 152 {
153 foreach (SceneObjectPart prim in obj.Children.Values) 153 foreach (SceneObjectPart prim in obj.Children.Values)
154 { 154 {
155 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0) 155 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0
156 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0
157 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0)
156 { 158 {
157 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 159 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
158 addPrim(prim, obj.UUID, regionUUID); 160 addPrim(prim, obj.UUID, regionUUID);
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index c3fe332..ac0d382 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -254,7 +254,9 @@ namespace OpenSim.Data.MySQL
254 { 254 {
255 foreach (SceneObjectPart prim in obj.Children.Values) 255 foreach (SceneObjectPart prim in obj.Children.Values)
256 { 256 {
257 if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0) 257 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0
258 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0
259 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0)
258 { 260 {
259 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 261 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
260 addPrim(prim, obj.UUID, regionUUID); 262 addPrim(prim, obj.UUID, regionUUID);
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index b648ee8..f1694ca 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -183,7 +183,9 @@ namespace OpenSim.Data.SQLite
183 { 183 {
184 foreach (SceneObjectPart prim in obj.Children.Values) 184 foreach (SceneObjectPart prim in obj.Children.Values)
185 { 185 {
186 if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0) 186 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0
187 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0
188 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0)
187 { 189 {
188 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 190 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
189 addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); 191 addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));