diff options
| author | opensim mirror account | 2010-10-15 15:50:04 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-15 15:50:04 -0700 |
| commit | 1341ad1c91c42447c5265f36852e31d8f1ff2ef3 (patch) | |
| tree | 3ce36e8c3d21bbabd5bf300589dcc8effe82cc8c | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | UPdated the MySql driver to 6.2.4. Also established a much larger MySqlComman... (diff) | |
| download | opensim-SC-1341ad1c91c42447c5265f36852e31d8f1ff2ef3.zip opensim-SC-1341ad1c91c42447c5265f36852e31d8f1ff2ef3.tar.gz opensim-SC-1341ad1c91c42447c5265f36852e31d8f1ff2ef3.tar.bz2 opensim-SC-1341ad1c91c42447c5265f36852e31d8f1ff2ef3.tar.xz | |
Merge branch 'master' of /var/git/opensim/
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 1 | ||||
| -rw-r--r-- | bin/MySql.Data.dll | bin | 335872 -> 360448 bytes |
2 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 | { |
diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll index 7aa95ec..c28c618 100644 --- a/bin/MySql.Data.dll +++ b/bin/MySql.Data.dll | |||
| Binary files differ | |||