diff options
author | Teravus Ovares | 2008-04-30 16:52:12 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-30 16:52:12 +0000 |
commit | b70da6ac1955ada29e1cb4dbe9aeb915735ec686 (patch) | |
tree | 68f6f5f3e7fe2b0fd9a8e0c9baf2dbfafeb90882 /OpenSim/Data/SQLite/SQLiteRegionData.cs | |
parent | * Deal with a situation where the new fields in the inventory store are null ... (diff) | |
download | opensim-SC-b70da6ac1955ada29e1cb4dbe9aeb915735ec686.zip opensim-SC-b70da6ac1955ada29e1cb4dbe9aeb915735ec686.tar.gz opensim-SC-b70da6ac1955ada29e1cb4dbe9aeb915735ec686.tar.bz2 opensim-SC-b70da6ac1955ada29e1cb4dbe9aeb915735ec686.tar.xz |
* Patch by Melanie. Implements proper objectflags on child objects. Thanks Melanie!
RE: 0001079: r4387. touch() event does not fire when touch script is in root prim and child prims are touched
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index d385376..e075c22 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -182,7 +182,7 @@ namespace OpenSim.Data.SQLite | |||
182 | { | 182 | { |
183 | foreach (SceneObjectPart prim in obj.Children.Values) | 183 | foreach (SceneObjectPart prim in obj.Children.Values) |
184 | { | 184 | { |
185 | if ((prim.ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0) | 185 | if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0) |
186 | { | 186 | { |
187 | m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID); | 187 | m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID); |
188 | addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); | 188 | addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); |