aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs12
-rw-r--r--OpenSim/Framework/ClientManager.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs6
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/GridAssetClient.cs6
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Framework/Communications/RestClient/RestClient.cs6
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLAssetData.cs14
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs31
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs17
13 files changed, 53 insertions, 55 deletions
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 9026331..d1f7044 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -55,13 +55,13 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
55 55
56 if (!String.IsNullOrEmpty(path)) 56 if (!String.IsNullOrEmpty(path))
57 { 57 {
58 m_log.Info(String.Format("[ASSETS]: Loading: [{0}][{1}]", name, path)); 58 m_log.InfoFormat("[ASSETS]: Loading: [{0}][{1}]", name, path);
59 59
60 LoadAsset(asset, isImage, path); 60 LoadAsset(asset, isImage, path);
61 } 61 }
62 else 62 else
63 { 63 {
64 m_log.Info(String.Format("[ASSETS]: Instantiated: [{0}]", name)); 64 m_log.InfoFormat("[ASSETS]: Instantiated: [{0}]", name);
65 } 65 }
66 66
67 return asset; 67 return asset;
@@ -108,7 +108,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
108 } 108 }
109 catch (XmlException e) 109 catch (XmlException e)
110 { 110 {
111 m_log.Error(String.Format("[ASSETS]: Error loading {0} : {1}", assetSetPath, e)); 111 m_log.ErrorFormat("[ASSETS]: Error loading {0} : {1}", assetSetPath, e);
112 } 112 }
113 } 113 }
114 else 114 else
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
126 /// <param name="assets"></param> 126 /// <param name="assets"></param>
127 protected void LoadXmlAssetSet(string assetSetPath, List<AssetBase> assets) 127 protected void LoadXmlAssetSet(string assetSetPath, List<AssetBase> assets)
128 { 128 {
129 m_log.Info(String.Format("[ASSETS]: Loading asset set {0}", assetSetPath)); 129 m_log.InfoFormat("[ASSETS]: Loading asset set {0}", assetSetPath);
130 130
131 if (File.Exists(assetSetPath)) 131 if (File.Exists(assetSetPath))
132 { 132 {
@@ -152,12 +152,12 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
152 } 152 }
153 catch (XmlException e) 153 catch (XmlException e)
154 { 154 {
155 m_log.Error(String.Format("[ASSETS]: Error loading {0} : {1}", assetSetPath, e)); 155 m_log.ErrorFormat("[ASSETS]: Error loading {0} : {1}", assetSetPath, e);
156 } 156 }
157 } 157 }
158 else 158 else
159 { 159 {
160 m_log.Error(String.Format("[ASSETS]: Asset set file {0} does not exist!", assetSetPath)); 160 m_log.ErrorFormat("[ASSETS]: Asset set file {0} does not exist!", assetSetPath);
161 } 161 }
162 } 162 }
163 } 163 }
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 064b82d..51ebc9b 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -71,9 +71,9 @@ namespace OpenSim.Framework
71 71
72 public void Remove(uint id) 72 public void Remove(uint id)
73 { 73 {
74 //m_log.Info(String.Format("[CLIENT]: Removing client with code {0}, current count {1}", id, m_clients.Count)); 74 //m_log.InfoFormat("[CLIENT]: Removing client with code {0}, current count {1}", id, m_clients.Count);
75 m_clients.Remove(id); 75 m_clients.Remove(id);
76 m_log.Info(String.Format("[CLIENT]: Removed client with code {0}, new client count {1}", id, m_clients.Count)); 76 m_log.InfoFormat("[CLIENT]: Removed client with code {0}, new client count {1}", id, m_clients.Count);
77 } 77 }
78 78
79 public void Add(uint id, IClientAPI client) 79 public void Add(uint id, IClientAPI client)
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index e81a581..2b06d4f 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -335,7 +335,7 @@ namespace OpenSim.Framework.Communications.Cache
335 } 335 }
336 } 336 }
337 337
338 m_log.Info(String.Format("[ASSETCACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result)); 338 m_log.InfoFormat("[ASSETCACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result);
339 } 339 }
340 340
341 public void DeleteAsset(LLUUID assetID) 341 public void DeleteAsset(LLUUID assetID)
@@ -431,7 +431,7 @@ namespace OpenSim.Framework.Communications.Cache
431 { 431 {
432 //if (this.RequestedTextures.ContainsKey(assetID)) 432 //if (this.RequestedTextures.ContainsKey(assetID))
433 //{ 433 //{
434 // m_log.Warn(String.Format("[ASSET CACHE]: sending image not found for {0}", assetID)); 434 // m_log.WarnFormat("[ASSET CACHE]: sending image not found for {0}", assetID);
435 // AssetRequest req = this.RequestedTextures[assetID]; 435 // AssetRequest req = this.RequestedTextures[assetID];
436 // ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); 436 // ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
437 // notFound.ImageID.ID = assetID; 437 // notFound.ImageID.ID = assetID;
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Communications.Cache
440 //} 440 //}
441 //else 441 //else
442 //{ 442 //{
443 // m_log.Error(String.Format("[ASSET CACHE]: Cound not send image not found for {0}", assetID)); 443 // m_log.ErrorFormat("[ASSET CACHE]: Cound not send image not found for {0}", assetID);
444 //} 444 //}
445 } 445 }
446 446
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 1d8f6ba..6cded49 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Framework.Communications.Cache
133 req.IsTexture = isTexture; 133 req.IsTexture = isTexture;
134 m_assetRequests.Enqueue(req); 134 m_assetRequests.Enqueue(req);
135 135
136 m_log.Info(String.Format("[ASSET]: Added {0} to request queue", assetID)); 136 m_log.InfoFormat("[ASSET]: Added {0} to request queue", assetID);
137 } 137 }
138 138
139 public virtual void UpdateAsset(AssetBase asset) 139 public virtual void UpdateAsset(AssetBase asset)
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
index 33681fd..e78e209 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Communications.Cache
106 // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary 106 // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary
107 transactions.XferUploaders.Remove(uploader.TransactionID); 107 transactions.XferUploaders.Remove(uploader.TransactionID);
108 108
109 //m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count)); 109 //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count);
110 } 110 }
111 } 111 }
112 } 112 }
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index 3799510..da10f85 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.Communications.Cache
115 115
116 XferUploaders.Remove(uploaderFound.TransactionID); 116 XferUploaders.Remove(uploaderFound.TransactionID);
117 117
118 //m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count)); 118 //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count);
119 } 119 }
120 } 120 }
121 } 121 }
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 48d9ec8..8114eb0 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Communications.Cache
52 Stream s = null; 52 Stream s = null;
53 try 53 try
54 { 54 {
55 m_log.Debug(String.Format("[ASSETCACHE]: Querying for {0}", req.AssetID.ToString())); 55 m_log.DebugFormat("[ASSETCACHE]: Querying for {0}", req.AssetID.ToString());
56 56
57 RestClient rc = new RestClient(_assetServerUrl); 57 RestClient rc = new RestClient(_assetServerUrl);
58 rc.AddResourcePath("assets"); 58 rc.AddResourcePath("assets");
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Communications.Cache
73 catch (Exception e) 73 catch (Exception e)
74 { 74 {
75 m_log.Error("[ASSETCACHE]: " + e.Message); 75 m_log.Error("[ASSETCACHE]: " + e.Message);
76 m_log.Debug(String.Format("[ASSETCACHE]: Getting asset {0}", req.AssetID.ToString())); 76 m_log.DebugFormat("[ASSETCACHE]: Getting asset {0}", req.AssetID.ToString());
77 m_log.Error("[ASSETCACHE]: " + e.StackTrace); 77 m_log.Error("[ASSETCACHE]: " + e.StackTrace);
78 } 78 }
79 79
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications.Cache
100 100
101 // rc.RequestMethod = "POST"; 101 // rc.RequestMethod = "POST";
102 // rc.Request(s); 102 // rc.Request(s);
103 //m_log.Info(String.Format("[ASSET]: Stored {0}", rc)); 103 //m_log.InfoFormat("[ASSET]: Stored {0}", rc);
104 m_log.Info("[ASSET]: Sending to " + _assetServerUrl + "/assets/"); 104 m_log.Info("[ASSET]: Sending to " + _assetServerUrl + "/assets/");
105 RestObjectPoster.BeginPostObject<AssetBase>(_assetServerUrl + "/assets/", asset); 105 RestObjectPoster.BeginPostObject<AssetBase>(_assetServerUrl + "/assets/", asset);
106 106
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 79c0c86..e9765a7 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Communications.Cache
73 } 73 }
74 else 74 else
75 { 75 {
76 m_log.Error(String.Format("[USERCACHE]: User profile for user {0} not found", userID)); 76 m_log.ErrorFormat("[USERCACHE]: User profile for user {0} not found", userID);
77 } 77 }
78 } 78 }
79 } 79 }
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 6473c26..1398184 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -277,7 +277,7 @@ namespace OpenSim.Region.Capabilities
277 { 277 {
278 try 278 try
279 { 279 {
280// m_log.Debug(String.Format("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param)); 280// m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param);
281 281
282 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); 282 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request));
283 LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); 283 LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate();
@@ -709,7 +709,7 @@ namespace OpenSim.Region.Capabilities
709 SaveAssetToFile("updatedtaskscript" + Util.RandomClass.Next(1, 1000) + ".dat", data); 709 SaveAssetToFile("updatedtaskscript" + Util.RandomClass.Next(1, 1000) + ".dat", data);
710 } 710 }
711 711
712// m_log.Info(String.Format("[CAPS]: TaskInventoryScriptUpdater.uploaderCaps res: {0}", res)); 712// m_log.InfoFormat("[CAPS]: TaskInventoryScriptUpdater.uploaderCaps res: {0}", res);
713 713
714 return res; 714 return res;
715 } 715 }
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs
index f968c9a..bf81565 100644
--- a/OpenSim/Framework/Communications/RestClient/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs
@@ -240,7 +240,7 @@ namespace OpenSim.Framework.Communications
240 } 240 }
241 } 241 }
242 realuri = sb.ToString(); 242 realuri = sb.ToString();
243 m_log.Info(String.Format("[REST]: RestURL: {0}", realuri)); 243 m_log.InfoFormat("[REST]: RestURL: {0}", realuri);
244 return new Uri(sb.ToString()); 244 return new Uri(sb.ToString());
245 } 245 }
246 246
@@ -376,8 +376,8 @@ namespace OpenSim.Framework.Communications
376 _asyncException = null; 376 _asyncException = null;
377 _request.ContentLength = src.Length; 377 _request.ContentLength = src.Length;
378 378
379 m_log.Info(String.Format("[REST]: Request Length {0}", _request.ContentLength)); 379 m_log.InfoFormat("[REST]: Request Length {0}", _request.ContentLength);
380 m_log.Info(String.Format("[REST]: Sending Web Request {0}", buildUri())); 380 m_log.InfoFormat("[REST]: Sending Web Request {0}", buildUri());
381 src.Seek(0, SeekOrigin.Begin); 381 src.Seek(0, SeekOrigin.Begin);
382 m_log.Info("[REST]: Seek is ok"); 382 m_log.Info("[REST]: Seek is ok");
383 Stream dst = _request.GetRequestStream(); 383 Stream dst = _request.GetRequestStream();
diff --git a/OpenSim/Framework/Data.MySQL/MySQLAssetData.cs b/OpenSim/Framework/Data.MySQL/MySQLAssetData.cs
index f9ef699..0dfe671 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLAssetData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLAssetData.cs
@@ -100,9 +100,9 @@ namespace OpenSim.Framework.Data.MySQL
100 } 100 }
101 catch (Exception e) 101 catch (Exception e)
102 { 102 {
103 m_log.Error(String.Format( 103 m_log.ErrorFormat(
104 "[ASSETS]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString() 104 "[ASSETS]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
105 + Environment.NewLine + "Attempting reconnection", assetID)); 105 + Environment.NewLine + "Attempting reconnection", assetID);
106 _dbConnection.Reconnect(); 106 _dbConnection.Reconnect();
107 } 107 }
108 } 108 }
@@ -139,10 +139,10 @@ namespace OpenSim.Framework.Data.MySQL
139 } 139 }
140 catch (Exception e) 140 catch (Exception e)
141 { 141 {
142 m_log.Error(String.Format( 142 m_log.ErrorFormat(
143 "[ASSETS]: " + 143 "[ASSETS]: " +
144 "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString() 144 "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString()
145 + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name)); 145 + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
146 _dbConnection.Reconnect(); 146 _dbConnection.Reconnect();
147 } 147 }
148 } 148 }
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index e2ea018..fcc7cc1 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Framework.Data.MySQL
165 165
166 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 166 public void RemoveObject(LLUUID obj, LLUUID regionUUID)
167 { 167 {
168 m_log.Info(String.Format("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID)); 168 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
169 169
170 DataTable prims = m_primTable; 170 DataTable prims = m_primTable;
171 DataTable shapes = m_shapeTable; 171 DataTable shapes = m_shapeTable;
@@ -304,7 +304,7 @@ namespace OpenSim.Framework.Data.MySQL
304 /// <param name="prim"></param> 304 /// <param name="prim"></param>
305 private void LoadItems(SceneObjectPart prim) 305 private void LoadItems(SceneObjectPart prim)
306 { 306 {
307 //m_log.Info(String.Format("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID)); 307 //m_log.InfoFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID);
308 308
309 DataTable dbItems = m_itemsTable; 309 DataTable dbItems = m_itemsTable;
310 310
@@ -318,7 +318,7 @@ namespace OpenSim.Framework.Data.MySQL
318 TaskInventoryItem item = buildItem(row); 318 TaskInventoryItem item = buildItem(row);
319 inventory.Add(item); 319 inventory.Add(item);
320 320
321 m_log.Info(String.Format("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID)); 321 m_log.InfoFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID);
322 } 322 }
323 323
324 prim.RestoreInventoryItems(inventory); 324 prim.RestoreInventoryItems(inventory);
@@ -1216,7 +1216,7 @@ namespace OpenSim.Framework.Data.MySQL
1216 if (!persistPrimInventories) 1216 if (!persistPrimInventories)
1217 return; 1217 return;
1218 1218
1219 m_log.Info(String.Format("[DATASTORE]: Persisting Prim Inventory with prim ID {0}", primID)); 1219 m_log.InfoFormat("[DATASTORE]: Persisting Prim Inventory with prim ID {0}", primID);
1220 1220
1221 // For now, we're just going to crudely remove all the previous inventory items 1221 // For now, we're just going to crudely remove all the previous inventory items
1222 // no matter whether they have changed or not, and replace them with the current set. 1222 // no matter whether they have changed or not, and replace them with the current set.
@@ -1227,10 +1227,10 @@ namespace OpenSim.Framework.Data.MySQL
1227 // repalce with current inventory details 1227 // repalce with current inventory details
1228 foreach (TaskInventoryItem newItem in items) 1228 foreach (TaskInventoryItem newItem in items)
1229 { 1229 {
1230// m_log.Info(String.Format( 1230// m_log.InfoFormat(
1231// "[DATASTORE]: " + 1231// "[DATASTORE]: " +
1232// "Adding item {0}, {1} to prim ID {2}", 1232// "Adding item {0}, {1} to prim ID {2}",
1233// newItem.Name, newItem.ItemID, newItem.ParentPartID)); 1233// newItem.Name, newItem.ItemID, newItem.ParentPartID);
1234 1234
1235 DataRow newItemRow = m_itemsTable.NewRow(); 1235 DataRow newItemRow = m_itemsTable.NewRow();
1236 fillItemRow(newItemRow, newItem); 1236 fillItemRow(newItemRow, newItem);
@@ -1313,7 +1313,6 @@ namespace OpenSim.Framework.Data.MySQL
1313 return cmd; 1313 return cmd;
1314 } 1314 }
1315 1315
1316
1317 private string defineTable(DataTable dt) 1316 private string defineTable(DataTable dt)
1318 { 1317 {
1319 string sql = "create table " + dt.TableName + "("; 1318 string sql = "create table " + dt.TableName + "(";
@@ -1334,7 +1333,7 @@ namespace OpenSim.Framework.Data.MySQL
1334 sql += subsql; 1333 sql += subsql;
1335 sql += ")"; 1334 sql += ")";
1336 1335
1337 //m_log.Info(String.Format("[DATASTORE]: defineTable() sql {0}", sql)); 1336 //m_log.InfoFormat("[DATASTORE]: defineTable() sql {0}", sql);
1338 1337
1339 return sql; 1338 return sql;
1340 } 1339 }
@@ -1477,7 +1476,7 @@ namespace OpenSim.Framework.Data.MySQL
1477 } 1476 }
1478 catch (MySqlException e) 1477 catch (MySqlException e)
1479 { 1478 {
1480 m_log.Warn(String.Format("[MySql]: Primitives Table Already Exists: {0}", e)); 1479 m_log.WarnFormat("[MySql]: Primitives Table Already Exists: {0}", e);
1481 } 1480 }
1482 1481
1483 try 1482 try
@@ -1486,7 +1485,7 @@ namespace OpenSim.Framework.Data.MySQL
1486 } 1485 }
1487 catch (MySqlException e) 1486 catch (MySqlException e)
1488 { 1487 {
1489 m_log.Warn(String.Format("[MySql]: Shapes Table Already Exists: {0}", e)); 1488 m_log.WarnFormat("[MySql]: Shapes Table Already Exists: {0}", e);
1490 } 1489 }
1491 1490
1492 try 1491 try
@@ -1495,7 +1494,7 @@ namespace OpenSim.Framework.Data.MySQL
1495 } 1494 }
1496 catch (MySqlException e) 1495 catch (MySqlException e)
1497 { 1496 {
1498 m_log.Warn(String.Format("[MySql]: Items Table Already Exists: {0}", e)); 1497 m_log.WarnFormat("[MySql]: Items Table Already Exists: {0}", e);
1499 } 1498 }
1500 1499
1501 try 1500 try
@@ -1504,7 +1503,7 @@ namespace OpenSim.Framework.Data.MySQL
1504 } 1503 }
1505 catch (MySqlException e) 1504 catch (MySqlException e)
1506 { 1505 {
1507 m_log.Warn(String.Format("[MySql]: Terrain Table Already Exists: {0}", e)); 1506 m_log.WarnFormat("[MySql]: Terrain Table Already Exists: {0}", e);
1508 } 1507 }
1509 1508
1510 try 1509 try
@@ -1513,7 +1512,7 @@ namespace OpenSim.Framework.Data.MySQL
1513 } 1512 }
1514 catch (MySqlException e) 1513 catch (MySqlException e)
1515 { 1514 {
1516 m_log.Warn(String.Format("[MySql]: Land Table Already Exists: {0}", e)); 1515 m_log.WarnFormat("[MySql]: Land Table Already Exists: {0}", e);
1517 } 1516 }
1518 1517
1519 try 1518 try
@@ -1522,7 +1521,7 @@ namespace OpenSim.Framework.Data.MySQL
1522 } 1521 }
1523 catch (MySqlException e) 1522 catch (MySqlException e)
1524 { 1523 {
1525 m_log.Warn(String.Format("[MySql]: LandAccessList Table Already Exists: {0}", e)); 1524 m_log.WarnFormat("[MySql]: LandAccessList Table Already Exists: {0}", e);
1526 } 1525 }
1527 conn.Close(); 1526 conn.Close();
1528 } 1527 }
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
index 69dc3f5..a724875 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.Data.SQLite
207 207
208 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 208 public void RemoveObject(LLUUID obj, LLUUID regionUUID)
209 { 209 {
210 m_log.Info(String.Format("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID)); 210 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
211 211
212 DataTable prims = ds.Tables["prims"]; 212 DataTable prims = ds.Tables["prims"];
213 DataTable shapes = ds.Tables["primshapes"]; 213 DataTable shapes = ds.Tables["primshapes"];
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Data.SQLite
350 /// <param name="prim"></param> 350 /// <param name="prim"></param>
351 private void LoadItems(SceneObjectPart prim) 351 private void LoadItems(SceneObjectPart prim)
352 { 352 {
353 m_log.Info(String.Format("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID)); 353 m_log.InfoFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID);
354 354
355 DataTable dbItems = ds.Tables["primitems"]; 355 DataTable dbItems = ds.Tables["primitems"];
356 356
@@ -364,7 +364,7 @@ namespace OpenSim.Framework.Data.SQLite
364 TaskInventoryItem item = buildItem(row); 364 TaskInventoryItem item = buildItem(row);
365 inventory.Add(item); 365 inventory.Add(item);
366 366
367 m_log.Info(String.Format("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID)); 367 m_log.InfoFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID);
368 } 368 }
369 369
370 prim.RestoreInventoryItems(inventory); 370 prim.RestoreInventoryItems(inventory);
@@ -1174,7 +1174,6 @@ namespace OpenSim.Framework.Data.SQLite
1174 byte[] textureEntry = (byte[]) row["Texture"]; 1174 byte[] textureEntry = (byte[]) row["Texture"];
1175 s.TextureEntry = textureEntry; 1175 s.TextureEntry = textureEntry;
1176 1176
1177
1178 s.ExtraParams = (byte[]) row["ExtraParams"]; 1177 s.ExtraParams = (byte[]) row["ExtraParams"];
1179 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); 1178 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
1180 // string texture = encoding.GetString((Byte[])row["Texture"]); 1179 // string texture = encoding.GetString((Byte[])row["Texture"]);
@@ -1267,7 +1266,7 @@ namespace OpenSim.Framework.Data.SQLite
1267 if (!persistPrimInventories) 1266 if (!persistPrimInventories)
1268 return; 1267 return;
1269 1268
1270 m_log.Info(String.Format("[DATASTORE]: Entered StorePrimInventory with prim ID {0}", primID)); 1269 m_log.InfoFormat("[DATASTORE]: Entered StorePrimInventory with prim ID {0}", primID);
1271 1270
1272 DataTable dbItems = ds.Tables["primitems"]; 1271 DataTable dbItems = ds.Tables["primitems"];
1273 1272
@@ -1280,10 +1279,10 @@ namespace OpenSim.Framework.Data.SQLite
1280 // repalce with current inventory details 1279 // repalce with current inventory details
1281 foreach (TaskInventoryItem newItem in items) 1280 foreach (TaskInventoryItem newItem in items)
1282 { 1281 {
1283// m_log.Info(String.Format( 1282// m_log.InfoFormat(
1284// "[DATASTORE]: ", 1283// "[DATASTORE]: ",
1285// "Adding item {0}, {1} to prim ID {2}", 1284// "Adding item {0}, {1} to prim ID {2}",
1286// newItem.Name, newItem.ItemID, newItem.ParentPartID)); 1285// newItem.Name, newItem.ItemID, newItem.ParentPartID);
1287 1286
1288 DataRow newItemRow = dbItems.NewRow(); 1287 DataRow newItemRow = dbItems.NewRow();
1289 fillItemRow(newItemRow, newItem); 1288 fillItemRow(newItemRow, newItem);
generated by cgit v1.1 at 2024-12-19 05:26:47 +0000