diff options
author | Justin Clarke Casey | 2008-06-12 18:18:59 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-12 18:18:59 +0000 |
commit | 7cdedcaf0e1c69266d6c1d4648d00b76bcb329d4 (patch) | |
tree | bba32cd5ab18905cddecab8762eb783fb526d9d1 | |
parent | * refactor: For new objects, move attach to backup to occur when adding to a ... (diff) | |
download | opensim-SC-7cdedcaf0e1c69266d6c1d4648d00b76bcb329d4.zip opensim-SC-7cdedcaf0e1c69266d6c1d4648d00b76bcb329d4.tar.gz opensim-SC-7cdedcaf0e1c69266d6c1d4648d00b76bcb329d4.tar.bz2 opensim-SC-7cdedcaf0e1c69266d6c1d4648d00b76bcb329d4.tar.xz |
* minor: Remove and tidy duplicate 'storing object to scene' messages in log
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLDataStore.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLDataStore.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index 8bb15c8..c339d62 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs | |||
@@ -156,7 +156,7 @@ namespace OpenSim.Data.MSSQL | |||
156 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 | 156 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 |
157 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) | 157 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) |
158 | { | 158 | { |
159 | 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); |
160 | addPrim(prim, obj.UUID, regionUUID); | 160 | addPrim(prim, obj.UUID, regionUUID); |
161 | } | 161 | } |
162 | else | 162 | else |
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index 60aca7a..e9bc365 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs | |||
@@ -265,7 +265,7 @@ namespace OpenSim.Data.MySQL | |||
265 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 | 265 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 |
266 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) | 266 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) |
267 | { | 267 | { |
268 | m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); | 268 | //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); |
269 | addPrim(prim, obj.UUID, regionUUID); | 269 | addPrim(prim, obj.UUID, regionUUID); |
270 | } | 270 | } |
271 | else | 271 | else |
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 42299a0..cc059af 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -194,7 +194,7 @@ namespace OpenSim.Data.SQLite | |||
194 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 | 194 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 |
195 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) | 195 | && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) |
196 | { | 196 | { |
197 | m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); | 197 | //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); |
198 | addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); | 198 | addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); |
199 | } | 199 | } |
200 | else if (prim.Stopped) | 200 | else if (prim.Stopped) |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 336009b..8812183 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -1107,7 +1107,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1107 | { | 1107 | { |
1108 | if ((!IsSelected) && (RootPart != null)) | 1108 | if ((!IsSelected) && (RootPart != null)) |
1109 | { | 1109 | { |
1110 | m_log.InfoFormat("[SCENE OBJECT GROUP]: Storing object {0}", UUID); | 1110 | m_log.InfoFormat( |
1111 | "[SCENE]: Storing object {0}, {1} in {2}", | ||
1112 | m_rootPart.Name, UUID, m_scene.RegionInfo.RegionName); | ||
1111 | 1113 | ||
1112 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); | 1114 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); |
1113 | 1115 | ||
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs index fa0d0b6..b7919e0 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | |||
@@ -130,7 +130,7 @@ namespace OpenSim.DataStore.MSSQL | |||
130 | { | 130 | { |
131 | foreach (SceneObjectPart prim in obj.Children.Values) | 131 | foreach (SceneObjectPart prim in obj.Children.Values) |
132 | { | 132 | { |
133 | m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID); | 133 | //m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID); |
134 | addPrim(prim, obj.UUID, regionUUID); | 134 | addPrim(prim, obj.UUID, regionUUID); |
135 | } | 135 | } |
136 | } | 136 | } |