diff options
author | John Hurliman | 2009-10-19 15:19:37 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-19 15:19:37 -0700 |
commit | bd03cbd8156e2044eed89ba2774bab43b9931aa1 (patch) | |
tree | c6dc15d4028b2d103b89296ac68b84482b77f5e8 /OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |
parent | * Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This... (diff) | |
parent | Minor formatting cleanup. (diff) | |
download | opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.zip opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.gz opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.bz2 opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs index e2ae5cb..cff6b00 100644 --- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |||
@@ -146,7 +146,7 @@ namespace OpenSim.Data.MSSQL | |||
146 | sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID); | 146 | sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID); |
147 | 147 | ||
148 | sceneObjectPart.UUID = groupID; | 148 | sceneObjectPart.UUID = groupID; |
149 | } | 149 | } |
150 | 150 | ||
151 | grp = new SceneObjectGroup(sceneObjectPart); | 151 | grp = new SceneObjectGroup(sceneObjectPart); |
152 | } | 152 | } |