diff options
| author | Melanie | 2010-09-17 03:49:30 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-17 03:49:30 +0100 |
| commit | 7df438323576603344442e1350ed593e797ae3ae (patch) | |
| tree | 2de03b8eaf5de93ba3305b0af8ae2616f9440d15 /OpenSim/Data/SQLite | |
| parent | Revert "* Changed 11 calls for session info to the more optimized API method" (diff) | |
| parent | Revert "* Changed 11 calls for session info to the more optimized API method" (diff) | |
| download | opensim-SC-7df438323576603344442e1350ed593e797ae3ae.zip opensim-SC-7df438323576603344442e1350ed593e797ae3ae.tar.gz opensim-SC-7df438323576603344442e1350ed593e797ae3ae.tar.bz2 opensim-SC-7df438323576603344442e1350ed593e797ae3ae.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 3e9bc3f..ebe6da8 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
| @@ -368,7 +368,7 @@ namespace OpenSim.Data.SQLite | |||
| 368 | 368 | ||
| 369 | lock (ds) | 369 | lock (ds) |
| 370 | { | 370 | { |
| 371 | foreach (SceneObjectPart prim in obj.Children.Values) | 371 | foreach (SceneObjectPart prim in obj.Parts) |
| 372 | { | 372 | { |
| 373 | // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); | 373 | // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); |
| 374 | addPrim(prim, obj.UUID, regionUUID); | 374 | addPrim(prim, obj.UUID, regionUUID); |
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs index 2dde926..ce18a42 100644 --- a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs | |||
| @@ -335,7 +335,7 @@ namespace OpenSim.Data.SQLiteLegacy | |||
| 335 | 335 | ||
| 336 | lock (ds) | 336 | lock (ds) |
| 337 | { | 337 | { |
| 338 | foreach (SceneObjectPart prim in obj.Children.Values) | 338 | foreach (SceneObjectPart prim in obj.Parts) |
| 339 | { | 339 | { |
| 340 | // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); | 340 | // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); |
| 341 | addPrim(prim, obj.UUID, regionUUID); | 341 | addPrim(prim, obj.UUID, regionUUID); |