diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLAssetData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 7e6289b..e556352 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Data.MySQL | |||
79 | _dbConnection.Connection); | 79 | _dbConnection.Connection); |
80 | MySqlParameter p = cmd.Parameters.Add("?id", MySqlDbType.Binary, 16); | 80 | MySqlParameter p = cmd.Parameters.Add("?id", MySqlDbType.Binary, 16); |
81 | p.Value = assetID.GetBytes(); | 81 | p.Value = assetID.GetBytes(); |
82 | 82 | ||
83 | try | 83 | try |
84 | { | 84 | { |
85 | using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow)) | 85 | using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow)) |
@@ -111,7 +111,7 @@ namespace OpenSim.Data.MySQL | |||
111 | } | 111 | } |
112 | 112 | ||
113 | override public void CreateAsset(AssetBase asset) | 113 | override public void CreateAsset(AssetBase asset) |
114 | { | 114 | { |
115 | lock (_dbConnection) | 115 | lock (_dbConnection) |
116 | { | 116 | { |
117 | MySqlCommand cmd = | 117 | MySqlCommand cmd = |
@@ -119,10 +119,10 @@ namespace OpenSim.Data.MySQL | |||
119 | "REPLACE INTO assets(id, name, description, assetType, invType, local, temporary, data)" + | 119 | "REPLACE INTO assets(id, name, description, assetType, invType, local, temporary, data)" + |
120 | "VALUES(?id, ?name, ?description, ?assetType, ?invType, ?local, ?temporary, ?data)", | 120 | "VALUES(?id, ?name, ?description, ?assetType, ?invType, ?local, ?temporary, ?data)", |
121 | _dbConnection.Connection); | 121 | _dbConnection.Connection); |
122 | 122 | ||
123 | // need to ensure we dispose | 123 | // need to ensure we dispose |
124 | try | 124 | try |
125 | { | 125 | { |
126 | using (cmd) | 126 | using (cmd) |
127 | { | 127 | { |
128 | MySqlParameter p = cmd.Parameters.Add("?id", MySqlDbType.Binary, 16); | 128 | MySqlParameter p = cmd.Parameters.Add("?id", MySqlDbType.Binary, 16); |
@@ -145,7 +145,7 @@ namespace OpenSim.Data.MySQL | |||
145 | "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString() | 145 | "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString() |
146 | + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name); | 146 | + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name); |
147 | _dbConnection.Reconnect(); | 147 | _dbConnection.Reconnect(); |
148 | } | 148 | } |
149 | } | 149 | } |
150 | } | 150 | } |
151 | 151 | ||