aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs6
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs13
2 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 1852ba7..4c6865a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -579,7 +579,11 @@ namespace OpenSim.Region.Environment.Scenes
579 { 579 {
580 AddTerseUpdateToAllAvatars(); 580 AddTerseUpdateToAllAvatars();
581 ClearUpdateSchedule(); 581 ClearUpdateSchedule();
582 ScheduleTerseUpdate(); 582 if ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) != 0)
583 {
584 // Only send the constant terse updates on physical objects!
585 ScheduleTerseUpdate();
586 }
583 } 587 }
584 else 588 else
585 { 589 {
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index 1b16a07..80c1a31 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -125,8 +125,15 @@ namespace OpenSim.DataStore.MonoSqlite
125 { 125 {
126 foreach (SceneObjectPart prim in obj.Children.Values) 126 foreach (SceneObjectPart prim in obj.Children.Values)
127 { 127 {
128 MainLog.Instance.Verbose("DATASTORE", "Adding obj: " + obj.UUID + " to region: " + regionUUID); 128 if ((prim.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) == 0)
129 addPrim(prim, obj.UUID, regionUUID); 129 {
130 MainLog.Instance.Verbose("DATASTORE", "Adding obj: " + obj.UUID + " to region: " + regionUUID);
131 addPrim(prim, obj.UUID, regionUUID);
132 }
133 else
134 {
135 MainLog.Instance.Verbose("DATASTORE", "Ignoring Physical obj: " + obj.UUID + " in region: " + regionUUID);
136 }
130 } 137 }
131 } 138 }
132 139
@@ -1026,4 +1033,4 @@ namespace OpenSim.DataStore.MonoSqlite
1026 } 1033 }
1027 } 1034 }
1028 } 1035 }
1029} \ No newline at end of file 1036}