diff options
| author | Melanie | 2010-10-16 10:52:56 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-16 10:52:56 +0100 |
| commit | 46e5c8e919076835fb0f7118b6a0e0269c01b671 (patch) | |
| tree | e222bf427a984b377ae405e6cbc9ff42e8aa7a39 /OpenSim/Data | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Drop max oar loading version back to 0 from 1 (diff) | |
| download | opensim-SC-46e5c8e919076835fb0f7118b6a0e0269c01b671.zip opensim-SC-46e5c8e919076835fb0f7118b6a0e0269c01b671.tar.gz opensim-SC-46e5c8e919076835fb0f7118b6a0e0269c01b671.tar.bz2 opensim-SC-46e5c8e919076835fb0f7118b6a0e0269c01b671.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 3450e2f..e2b6953 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -424,6 +424,7 @@ namespace OpenSim.Data.MySQL | |||
| 424 | cmd.CommandText = | 424 | cmd.CommandText = |
| 425 | "SELECT * FROM prims LEFT JOIN primshapes ON prims.UUID = primshapes.UUID WHERE RegionUUID = ?RegionUUID"; | 425 | "SELECT * FROM prims LEFT JOIN primshapes ON prims.UUID = primshapes.UUID WHERE RegionUUID = ?RegionUUID"; |
| 426 | cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); | 426 | cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); |
| 427 | cmd.CommandTimeout = 3600; | ||
| 427 | 428 | ||
| 428 | using (IDataReader reader = ExecuteReader(cmd)) | 429 | using (IDataReader reader = ExecuteReader(cmd)) |
| 429 | { | 430 | { |