diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLLegacyRegionData.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index ed62172..c2dd788 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
| @@ -464,7 +464,7 @@ namespace OpenSim.Data.MySQL | |||
| 464 | prim.Name, prim.UUID, prim.GroupPosition, groupID); | 464 | prim.Name, prim.UUID, prim.GroupPosition, groupID); |
| 465 | 465 | ||
| 466 | prim.UUID = groupID; | 466 | prim.UUID = groupID; |
| 467 | } | 467 | } |
| 468 | 468 | ||
| 469 | grp = new SceneObjectGroup(prim); | 469 | grp = new SceneObjectGroup(prim); |
| 470 | } | 470 | } |
| @@ -533,7 +533,7 @@ namespace OpenSim.Data.MySQL | |||
| 533 | /// <summary> | 533 | /// <summary> |
| 534 | /// Load in a prim's persisted inventory. | 534 | /// Load in a prim's persisted inventory. |
| 535 | /// </summary> | 535 | /// </summary> |
| 536 | /// <param name="prim">The prim</param> | 536 | /// <param name="prim">The prim</param> |
| 537 | private void LoadItems(SceneObjectPart prim) | 537 | private void LoadItems(SceneObjectPart prim) |
| 538 | { | 538 | { |
| 539 | lock (m_Connection) | 539 | lock (m_Connection) |