ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

* You can haz more spring cleaning.

Browse Source 
* Eventually this codebase will be clean. >_>
This commit is contained in:
Adam Frisby
2008-05-08 05:35:01 +00:00
parent 872af8e04d
commit 4fa0cbdfbb
9 changed files with 25 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Data/MSSQL/MSSQLManager.cs
View File

@@ -264,12 +264,7 @@ namespace OpenSim.Data.MSSQL
regionprofile.regionUserURI = (string)reader["regionUserURI"];
regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
try
{
regionprofile.owner_uuid = new LLUUID((string)reader["owner_uuid"]);
}
catch(Exception)
{}
regionprofile.owner_uuid = new LLUUID((string) reader["owner_uuid"]);
// World Map Addition
string tempRegionMap = reader["regionMapTexture"].ToString();
if (tempRegionMap != String.Empty)

10
OpenSim/Data/MySQL/MySQLManager.cs
View File

@@ -253,13 +253,7 @@ namespace OpenSim.Data.MySQL
lock (dbcon)
{
// Close the DB connection
try
{
dbcon.Close();
}
catch
{
}
dbcon.Close();
// Try to reopen it
try
@@ -269,7 +263,7 @@ namespace OpenSim.Data.MySQL
}
catch (Exception e)
{
m_log.Error("Unable to reconnect to database " + e.ToString());
m_log.Error("Unable to reconnect to database " + e);
}
// Run the query again