aboutsummaryrefslogtreecommitdiffstatshomepage
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
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs14
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs6
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs20
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs22
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs76
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs64
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs69
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs8
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs4
-rw-r--r--OpenSim/Region/Physics/Meshing/SimpleHull.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs2
35 files changed, 222 insertions, 233 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);
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index cb9e1ae..7e6e84c 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -73,8 +73,8 @@ namespace OpenSim.Grid.AssetServer
73 73
74 if (!LLUUID.TryParse(p[0], out assetID)) 74 if (!LLUUID.TryParse(p[0], out assetID))
75 { 75 {
76 m_log.Info(String.Format( 76 m_log.InfoFormat(
77 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0])); 77 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
78 return result; 78 return result;
79 } 79 }
80 80
@@ -96,9 +96,9 @@ namespace OpenSim.Grid.AssetServer
96 96
97 result = ms.GetBuffer(); 97 result = ms.GetBuffer();
98 98
99 m_log.Info(String.Format( 99 m_log.InfoFormat(
100 "[REST]: GET:/asset found {0} with name {1}, size {2} bytes", 100 "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
101 assetID, asset.Name, result.Length)); 101 assetID, asset.Name, result.Length);
102 102
103 Array.Resize<byte>(ref result, (int) ms.Length); 103 Array.Resize<byte>(ref result, (int) ms.Length);
104 } 104 }
@@ -107,7 +107,7 @@ namespace OpenSim.Grid.AssetServer
107 if (StatsManager.AssetStats != null) 107 if (StatsManager.AssetStats != null)
108 StatsManager.AssetStats.AddNotFoundRequest(); 108 StatsManager.AssetStats.AddNotFoundRequest();
109 109
110 m_log.Info(String.Format("[REST]: GET:/asset failed to find {0}", assetID)); 110 m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
111 } 111 }
112 } 112 }
113 } 113 }
@@ -138,7 +138,7 @@ namespace OpenSim.Grid.AssetServer
138 XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); 138 XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
139 AssetBase asset = (AssetBase) xs.Deserialize(request); 139 AssetBase asset = (AssetBase) xs.Deserialize(request);
140 140
141 m_log.Info(String.Format("[REST]: StoreAndCommitAsset {0}", asset.FullID)); 141 m_log.InfoFormat("[REST]: StoreAndCommitAsset {0}", asset.FullID);
142 m_assetProvider.CreateAsset(asset); 142 m_assetProvider.CreateAsset(asset);
143 m_assetProvider.CommitAssets(); 143 m_assetProvider.CommitAssets();
144 144
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index 35b66b2..a3d8483 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -168,14 +168,14 @@ namespace OpenSim.Grid.InventoryServer
168 168
169 private byte[] GetUserInventory(LLUUID userID) 169 private byte[] GetUserInventory(LLUUID userID)
170 { 170 {
171 m_log.Info(String.Format("[" + OpenInventory_Main.LogName + "]: Getting Inventory for user {0}", userID.ToString())); 171 m_log.InfoFormat("[" + OpenInventory_Main.LogName + "]: Getting Inventory for user {0}", userID.ToString());
172 byte[] result = new byte[] {}; 172 byte[] result = new byte[] {};
173 173
174 InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID); 174 InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID);
175 if (fb == null) 175 if (fb == null)
176 { 176 {
177 m_log.Info(String.Format("[" + OpenInventory_Main.LogName + "]: Inventory not found for user {0}, creating new", 177 m_log.InfoFormat("[" + OpenInventory_Main.LogName + "]: Inventory not found for user {0}, creating new",
178 userID.ToString())); 178 userID.ToString());
179 CreateDefaultInventory(userID); 179 CreateDefaultInventory(userID);
180 } 180 }
181 181
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index c69416a..b093d02 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Grid.UserServer
156 m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY); 156 m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
157 } catch (Exception ex) 157 } catch (Exception ex)
158 { 158 {
159 m_log.Error(String.Format("[SERVER]: Error creating user: {0}", ex.ToString())); 159 m_log.ErrorFormat("[SERVER]: Error creating user: {0}", ex.ToString());
160 } 160 }
161 161
162 try 162 try
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.UserServer
166 } 166 }
167 catch (Exception ex) 167 catch (Exception ex)
168 { 168 {
169 m_log.Error(String.Format("[SERVER]: Error creating inventory for user: {0}", ex.ToString())); 169 m_log.ErrorFormat("[SERVER]: Error creating inventory for user: {0}", ex.ToString());
170 } 170 }
171 m_lastCreatedUser = userID; 171 m_lastCreatedUser = userID;
172 break; 172 break;
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 73cfb9a..2328c49 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -351,7 +351,7 @@ namespace OpenSim
351 m_moduleLoader = new ModuleLoader(m_config); 351 m_moduleLoader = new ModuleLoader(m_config);
352 352
353 ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup"); 353 ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup");
354 m_log.Info(String.Format("[PLUGINS]: Loading {0} OpenSim application plugins", nodes.Count)); 354 m_log.InfoFormat("[PLUGINS]: Loading {0} OpenSim application plugins", nodes.Count);
355 355
356 foreach (TypeExtensionNode node in nodes) 356 foreach (TypeExtensionNode node in nodes)
357 { 357 {
@@ -704,7 +704,7 @@ namespace OpenSim
704 m_console.Notice("set-time [x] - set the current scene time phase"); 704 m_console.Notice("set-time [x] - set the current scene time phase");
705 m_console.Notice("show assets - show state of asset cache."); 705 m_console.Notice("show assets - show state of asset cache.");
706 m_console.Notice("show users - show info about connected users."); 706 m_console.Notice("show users - show info about connected users.");
707 m_console.Notice("show modules - shows info aboutloaded modules."); 707 m_console.Notice("show modules - shows info about loaded modules.");
708 m_console.Notice("show stats - statistical information for this server not displayed in the client"); 708 m_console.Notice("show stats - statistical information for this server not displayed in the client");
709 m_console.Notice("shutdown - disconnect all clients and shutdown."); 709 m_console.Notice("shutdown - disconnect all clients and shutdown.");
710 m_console.Notice("config set section field value - set a config value"); 710 m_console.Notice("config set section field value - set a config value");
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index d7f4c3d..d4af98c 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -240,8 +240,8 @@ namespace OpenSim.Region.ClientStack
240 { 240 {
241 m_scene.RemoveClient(AgentId); 241 m_scene.RemoveClient(AgentId);
242 242
243 //m_log.Info(String.Format("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false))); 243 //m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false));
244 //m_log.Info(String.Format("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true))); 244 //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true));
245 245
246 // Send the STOP packet 246 // Send the STOP packet
247 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); 247 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 656dd70..81689ed 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -73,9 +73,9 @@ namespace OpenSim.Region.Communications.OGS1
73 { 73 {
74 try 74 try
75 { 75 {
76 m_log.Info( 76 m_log.InfoFormat(
77 String.Format("[INVENTORY]: Requesting inventory from {0}/GetInventory/ for user {1}", 77 "[INVENTORY]: Requesting inventory from {0}/GetInventory/ for user {1}",
78 _inventoryServerUrl, userID)); 78 _inventoryServerUrl, userID);
79 79
80 RestObjectPosterResponse<InventoryCollection> requester 80 RestObjectPosterResponse<InventoryCollection> requester
81 = new RestObjectPosterResponse<InventoryCollection>(); 81 = new RestObjectPosterResponse<InventoryCollection>();
@@ -98,9 +98,9 @@ namespace OpenSim.Region.Communications.OGS1
98 LLUUID userID = response.UserID; 98 LLUUID userID = response.UserID;
99 if (m_RequestingInventory.ContainsKey(userID)) 99 if (m_RequestingInventory.ContainsKey(userID))
100 { 100 {
101 m_log.Info(String.Format("[INVENTORY]: " + 101 m_log.InfoFormat("[INVENTORY]: " +
102 "Received inventory response for user {0} containing {1} folders and {2} items", 102 "Received inventory response for user {0} containing {1} folders and {2} items",
103 userID, response.Folders.Count, response.AllItems.Count)); 103 userID, response.Folders.Count, response.AllItems.Count);
104 104
105 InventoryFolderImpl rootFolder = null; 105 InventoryFolderImpl rootFolder = null;
106 InventoryRequest request = m_RequestingInventory[userID]; 106 InventoryRequest request = m_RequestingInventory[userID];
@@ -134,10 +134,10 @@ namespace OpenSim.Region.Communications.OGS1
134 } 134 }
135 else 135 else
136 { 136 {
137 m_log.Warn( 137 m_log.WarnFormat(
138 String.Format("[INVENTORY]: " + 138 "[INVENTORY]: " +
139 "Received inventory response for {0} for which we do not have a record of requesting!", 139 "Received inventory response for {0} for which we do not have a record of requesting!",
140 userID)); 140 userID);
141 } 141 }
142 } 142 }
143 143
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index d4031d9..bc0bbaf 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment
78 DynamicTextureModule dynamicModule = new DynamicTextureModule(); 78 DynamicTextureModule dynamicModule = new DynamicTextureModule();
79 if (m_loadedSharedModules.ContainsKey(dynamicModule.Name)) 79 if (m_loadedSharedModules.ContainsKey(dynamicModule.Name))
80 { 80 {
81 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule")); 81 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule");
82 } 82 }
83 else 83 else
84 { 84 {
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment
88 ChatModule chat = new ChatModule(); 88 ChatModule chat = new ChatModule();
89 if (m_loadedSharedModules.ContainsKey(chat.Name)) 89 if (m_loadedSharedModules.ContainsKey(chat.Name))
90 { 90 {
91 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule")); 91 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule");
92 } 92 }
93 else 93 else
94 { 94 {
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment
98 InstantMessageModule imMod = new InstantMessageModule(); 98 InstantMessageModule imMod = new InstantMessageModule();
99 if (m_loadedSharedModules.ContainsKey(imMod.Name)) 99 if (m_loadedSharedModules.ContainsKey(imMod.Name))
100 { 100 {
101 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule")); 101 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule");
102 } 102 }
103 else 103 else
104 { 104 {
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Environment
108 LoadImageURLModule loadMod = new LoadImageURLModule(); 108 LoadImageURLModule loadMod = new LoadImageURLModule();
109 if (m_loadedSharedModules.ContainsKey(loadMod.Name)) 109 if (m_loadedSharedModules.ContainsKey(loadMod.Name))
110 { 110 {
111 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule")); 111 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule");
112 } 112 }
113 else 113 else
114 { 114 {
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment
118 AvatarFactoryModule avatarFactory = new AvatarFactoryModule(); 118 AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
119 if (m_loadedSharedModules.ContainsKey(avatarFactory.Name)) 119 if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
120 { 120 {
121 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule")); 121 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
122 } 122 }
123 else 123 else
124 { 124 {
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Environment
128 XMLRPCModule xmlRpcMod = new XMLRPCModule(); 128 XMLRPCModule xmlRpcMod = new XMLRPCModule();
129 if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name)) 129 if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
130 { 130 {
131 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule")); 131 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule");
132 } 132 }
133 else 133 else
134 { 134 {
@@ -186,17 +186,17 @@ namespace OpenSim.Region.Environment
186 186
187 if (modules.Length > 0) 187 if (modules.Length > 0)
188 { 188 {
189 m_log.Info(String.Format("[MODULES]: Found Module Library [{0}]", dllName)); 189 m_log.InfoFormat("[MODULES]: Found Module Library [{0}]", dllName);
190 foreach (IRegionModule module in modules) 190 foreach (IRegionModule module in modules)
191 { 191 {
192 if (!module.IsSharedModule) 192 if (!module.IsSharedModule)
193 { 193 {
194 m_log.Info(String.Format("[MODULES]: [{0}]: Initializing.", module.Name)); 194 m_log.InfoFormat("[MODULES]: [{0}]: Initializing.", module.Name);
195 InitializeModule(module, scene); 195 InitializeModule(module, scene);
196 } 196 }
197 else 197 else
198 { 198 {
199 m_log.Info(String.Format("[MODULES]: [{0}]: Loading Shared Module.", module.Name)); 199 m_log.InfoFormat("[MODULES]: [{0}]: Loading Shared Module.", module.Name);
200 LoadSharedModule(module); 200 LoadSharedModule(module);
201 } 201 }
202 } 202 }
@@ -246,7 +246,7 @@ namespace OpenSim.Region.Environment
246 } 246 }
247 catch (BadImageFormatException) 247 catch (BadImageFormatException)
248 { 248 {
249 //m_log.Info(String.Format("[MODULES]: The file [{0}] is not a module assembly.", e.FileName)); 249 //m_log.InfoFormat("[MODULES]: The file [{0}] is not a module assembly.", e.FileName);
250 } 250 }
251 } 251 }
252 252
@@ -270,7 +270,7 @@ namespace OpenSim.Region.Environment
270 } 270 }
271 catch (ReflectionTypeLoadException) 271 catch (ReflectionTypeLoadException)
272 { 272 {
273 m_log.Info(String.Format("[MODULES]: Could not load types for [{0}].", pluginAssembly.FullName)); 273 m_log.InfoFormat("[MODULES]: Could not load types for [{0}].", pluginAssembly.FullName);
274 } 274 }
275 } 275 }
276 276
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 4f877be..cf558e0 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Modules
174 // Make sure that any sender we currently have can get garbage collected 174 // Make sure that any sender we currently have can get garbage collected
175 sender = null; 175 sender = null;
176 176
177 //m_log.Info(String.Format("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count())); 177 //m_log.InfoFormat("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count());
178 } 178 }
179 } 179 }
180 180
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 999f4a2..32bc7c3 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -104,9 +104,9 @@ namespace OpenSim.Region.Environment.Modules
104 EnqueueTextureSender(textureSender); 104 EnqueueTextureSender(textureSender);
105 } 105 }
106 106
107 //m_log.Info(String.Format("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID)); 107 //m_log.InfoFormat("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID);
108 m_textureSenders.Remove(textureID); 108 m_textureSenders.Remove(textureID);
109 //m_log.Info(String.Format("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count)); 109 //m_log.InfoFormat("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count);
110 } 110 }
111 else 111 else
112 { 112 {
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 3a38bd2..19213fd 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -925,9 +925,9 @@ namespace OpenSim.Region.Environment.Scenes
925 } 925 }
926 else 926 else
927 { 927 {
928 m_log.Info(String.Format("[SCENE]: " + 928 m_log.InfoFormat("[SCENE]: " +
929 "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!", 929 "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!",
930 primIds)); 930 primIds);
931 } 931 }
932 } 932 }
933 933
@@ -975,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes
975 } 975 }
976 else 976 else
977 { 977 {
978 m_log.Warn(String.Format("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID)); 978 m_log.WarnFormat("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID);
979 } 979 }
980 } 980 }
981 981
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 28760fd..cc9d294 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -83,8 +83,8 @@ namespace OpenSim.Region.Environment.Scenes
83 83
84 if (!TryGetAvatar(avatarId, out avatar)) 84 if (!TryGetAvatar(avatarId, out avatar))
85 { 85 {
86 m_log.Error(String.Format( 86 m_log.ErrorFormat(
87 "[AGENTINVENTORY]: Could not find avatar {0} to add inventory item", avatarId)); 87 "[AGENTINVENTORY]: Could not find avatar {0} to add inventory item", avatarId);
88 return; 88 return;
89 } 89 }
90 90
@@ -146,10 +146,10 @@ namespace OpenSim.Region.Environment.Scenes
146 } 146 }
147 else 147 else
148 { 148 {
149 m_log.Error(String.Format( 149 m_log.ErrorFormat(
150 "[AGENTINVENTORY]: " + 150 "[AGENTINVENTORY]: " +
151 "Avatar {0} cannot be found to update its inventory item asset", 151 "Avatar {0} cannot be found to update its inventory item asset",
152 avatarId)); 152 avatarId);
153 } 153 }
154 154
155 return LLUUID.Zero; 155 return LLUUID.Zero;
@@ -171,10 +171,10 @@ namespace OpenSim.Region.Environment.Scenes
171 SceneObjectGroup group = part.ParentGroup; 171 SceneObjectGroup group = part.ParentGroup;
172 if (null == group) 172 if (null == group)
173 { 173 {
174 m_log.Error(String.Format( 174 m_log.ErrorFormat(
175 "[PRIMINVENTORY]: " + 175 "[PRIMINVENTORY]: " +
176 "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist", 176 "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist",
177 itemId, primId)); 177 itemId, primId);
178 178
179 return; 179 return;
180 } 180 }
@@ -220,10 +220,10 @@ namespace OpenSim.Region.Environment.Scenes
220 } 220 }
221 else 221 else
222 { 222 {
223 m_log.Error(String.Format( 223 m_log.ErrorFormat(
224 "[PRIMINVENTORY]: " + 224 "[PRIMINVENTORY]: " +
225 "Avatar {0} cannot be found to update its prim item asset", 225 "Avatar {0} cannot be found to update its prim item asset",
226 avatarId)); 226 avatarId);
227 } 227 }
228 } 228 }
229 229
@@ -498,8 +498,8 @@ namespace OpenSim.Region.Environment.Scenes
498 } 498 }
499 else 499 else
500 { 500 {
501 m_log.Error(String.Format( 501 m_log.ErrorFormat(
502 "[PRIMINVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID)); 502 "[PRIMINVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID);
503 } 503 }
504 } 504 }
505 505
@@ -524,11 +524,11 @@ namespace OpenSim.Region.Environment.Scenes
524 } 524 }
525 else 525 else
526 { 526 {
527 m_log.Error(String.Format( 527 m_log.ErrorFormat(
528 "[PRIMINVENTORY]: " + 528 "[PRIMINVENTORY]: " +
529 "Removal of item {0} requested of prim {1} but this prim does not exist", 529 "Removal of item {0} requested of prim {1} but this prim does not exist",
530 itemID, 530 itemID,
531 localID)); 531 localID);
532 } 532 }
533 } 533 }
534 534
@@ -548,18 +548,18 @@ namespace OpenSim.Region.Environment.Scenes
548 { 548 {
549 // TODO Retrieve itemID from client's inventory to pass on 549 // TODO Retrieve itemID from client's inventory to pass on
550 //group.AddInventoryItem(remoteClient, primLocalID, null); 550 //group.AddInventoryItem(remoteClient, primLocalID, null);
551 m_log.Info(String.Format( 551 m_log.InfoFormat(
552 "[PRIMINVENTORY]: " + 552 "[PRIMINVENTORY]: " +
553 "Non script prim inventory not yet implemented!" 553 "Non script prim inventory not yet implemented!"
554 + "\nUpdateTaskInventory called with item {0}, folder {1}, primLocalID {2}, user {3}", 554 + "\nUpdateTaskInventory called with item {0}, folder {1}, primLocalID {2}, user {3}",
555 itemID, folderID, primLocalID, remoteClient.Name)); 555 itemID, folderID, primLocalID, remoteClient.Name);
556 } 556 }
557 else 557 else
558 { 558 {
559 m_log.Warn(String.Format( 559 m_log.WarnFormat(
560 "[PRIMINVENTORY]: " + 560 "[PRIMINVENTORY]: " +
561 "Update with item {0} requested of prim {1} for {2} but this prim does not exist", 561 "Update with item {0} requested of prim {1} for {2} but this prim does not exist",
562 itemID, primLocalID, remoteClient.Name)); 562 itemID, primLocalID, remoteClient.Name);
563 } 563 }
564 } 564 }
565 565
@@ -604,18 +604,18 @@ namespace OpenSim.Region.Environment.Scenes
604 } 604 }
605 else 605 else
606 { 606 {
607 m_log.Error(String.Format( 607 m_log.ErrorFormat(
608 "[PRIMINVENTORY]: " + 608 "[PRIMINVENTORY]: " +
609 "Could not rez script {0} into prim local ID {1} for user {2}" 609 "Could not rez script {0} into prim local ID {1} for user {2}"
610 + " because the prim could not be found in the region!", 610 + " because the prim could not be found in the region!",
611 item.inventoryName, localID, remoteClient.Name)); 611 item.inventoryName, localID, remoteClient.Name);
612 } 612 }
613 } 613 }
614 else 614 else
615 { 615 {
616 m_log.Error(String.Format( 616 m_log.ErrorFormat(
617 "[PRIMINVENTORY]: Could not find script inventory item {0} to rez for {1}!", 617 "[PRIMINVENTORY]: Could not find script inventory item {0} to rez for {1}!",
618 itemID, remoteClient.Name)); 618 itemID, remoteClient.Name);
619 } 619 }
620 } 620 }
621 } 621 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a4f5028..5026688 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1432,7 +1432,7 @@ namespace OpenSim.Region.Environment.Scenes
1432 { 1432 {
1433 if (m_scenePresences.Remove(agentID)) 1433 if (m_scenePresences.Remove(agentID))
1434 { 1434 {
1435 //m_log.Info(String.Format("[SCENE] Removed scene presence {0}", agentID)); 1435 //m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID);
1436 } 1436 }
1437 else 1437 else
1438 { 1438 {
@@ -1445,7 +1445,7 @@ namespace OpenSim.Region.Environment.Scenes
1445 { 1445 {
1446 if (Entities.Remove(agentID)) 1446 if (Entities.Remove(agentID))
1447 { 1447 {
1448 //m_log.Info(String.Format("[SCENE] Removed scene presence {0} from entities list", agentID)); 1448 //m_log.InfoFormat("[SCENE] Removed scene presence {0} from entities list", agentID);
1449 } 1449 }
1450 else 1450 else
1451 { 1451 {
@@ -1470,8 +1470,8 @@ namespace OpenSim.Region.Environment.Scenes
1470 // Remove client agent from profile, so new logins will work 1470 // Remove client agent from profile, so new logins will work
1471 CommsManager.UserService.clearUserAgent(agentID); 1471 CommsManager.UserService.clearUserAgent(agentID);
1472 1472
1473 //m_log.Info(String.Format("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false))); 1473 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
1474 //m_log.Info(String.Format("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true))); 1474 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
1475 } 1475 }
1476 1476
1477 public override void CloseAllAgents(uint circuitcode) 1477 public override void CloseAllAgents(uint circuitcode)
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 17d2959..0b88050 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -296,10 +296,10 @@ namespace OpenSim.Region.Environment.Scenes
296 { 296 {
297 if (!scenePresence.IsChildAgent) 297 if (!scenePresence.IsChildAgent)
298 { 298 {
299 m_log.Error(String.Format("Packet debug for {0} {1} set to {2}", 299 m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
300 scenePresence.Firstname, 300 scenePresence.Firstname,
301 scenePresence.Lastname, 301 scenePresence.Lastname,
302 newDebug)); 302 newDebug);
303 303
304 scenePresence.ControllingClient.SetDebug(newDebug); 304 scenePresence.ControllingClient.SetDebug(newDebug);
305 } 305 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 6bd0575..e26ed5c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -55,10 +55,10 @@ namespace OpenSim.Region.Environment.Scenes
55 } 55 }
56 else 56 else
57 { 57 {
58 m_log.Error(String.Format( 58 m_log.ErrorFormat(
59 "[PRIMINVENTORY]: " + 59 "[PRIMINVENTORY]: " +
60 "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", 60 "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
61 localID, Name, UUID, itemID)); 61 localID, Name, UUID, itemID);
62 } 62 }
63 } 63 }
64 64
@@ -76,10 +76,10 @@ namespace OpenSim.Region.Environment.Scenes
76// } 76// }
77// else 77// else
78// { 78// {
79// m_log.Error(String.Format( 79// m_log.ErrorFormat(
80// "[PRIMINVENTORY]: " + 80// "[PRIMINVENTORY]: " +
81// "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", 81// "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
82// localID, Name, UUID, itemID)); 82// localID, Name, UUID, itemID);
83// } 83// }
84// } 84// }
85 85
@@ -123,10 +123,10 @@ namespace OpenSim.Region.Environment.Scenes
123 } 123 }
124 else 124 else
125 { 125 {
126 m_log.Error(String.Format( 126 m_log.ErrorFormat(
127 "[PRIMINVENTORY]: " + 127 "[PRIMINVENTORY]: " +
128 "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}", 128 "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}",
129 partID, Name, UUID, itemID)); 129 partID, Name, UUID, itemID);
130 } 130 }
131 } 131 }
132 132
@@ -144,10 +144,10 @@ namespace OpenSim.Region.Environment.Scenes
144 } 144 }
145 else 145 else
146 { 146 {
147 m_log.Error(String.Format( 147 m_log.ErrorFormat(
148 "[PRIMINVENTORY]: " + 148 "[PRIMINVENTORY]: " +
149 "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory", 149 "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory",
150 localID, Name, UUID)); 150 localID, Name, UUID);
151 } 151 }
152 return false; 152 return false;
153 } 153 }
@@ -161,10 +161,10 @@ namespace OpenSim.Region.Environment.Scenes
161 } 161 }
162 else 162 else
163 { 163 {
164 m_log.Error(String.Format( 164 m_log.ErrorFormat(
165 "[PRIMINVENTORY]: " + 165 "[PRIMINVENTORY]: " +
166 "Couldn't find part {0} in object group {1}, {2} to request inventory data", 166 "Couldn't find part {0} in object group {1}, {2} to request inventory data",
167 localID, Name, UUID)); 167 localID, Name, UUID);
168 } 168 }
169 } 169 }
170 170
@@ -200,10 +200,10 @@ namespace OpenSim.Region.Environment.Scenes
200 } 200 }
201 else 201 else
202 { 202 {
203 m_log.Error(String.Format( 203 m_log.ErrorFormat(
204 "[PRIMINVENTORY]: " + 204 "[PRIMINVENTORY]: " +
205 "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}", 205 "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}",
206 localID, Name, UUID, newItemId)); 206 localID, Name, UUID, newItemId);
207 } 207 }
208 208
209 return false; 209 return false;
@@ -224,10 +224,10 @@ namespace OpenSim.Region.Environment.Scenes
224 } 224 }
225 else 225 else
226 { 226 {
227 m_log.Error(String.Format( 227 m_log.ErrorFormat(
228 "[PRIMINVENTORY]: " + 228 "[PRIMINVENTORY]: " +
229 "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}", 229 "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}",
230 primID, part.Name, part.UUID, itemID)); 230 primID, part.Name, part.UUID, itemID);
231 } 231 }
232 232
233 return null; 233 return null;
@@ -250,10 +250,10 @@ namespace OpenSim.Region.Environment.Scenes
250 } 250 }
251 else 251 else
252 { 252 {
253 m_log.Error(String.Format( 253 m_log.ErrorFormat(
254 "[PRIMINVENTORY]: " + 254 "[PRIMINVENTORY]: " +
255 "Couldn't find prim ID {0} to update item {1}, {2}", 255 "Couldn't find prim ID {0} to update item {1}, {2}",
256 item.ParentPartID, item.Name, item.ItemID)); 256 item.ParentPartID, item.Name, item.ItemID);
257 } 257 }
258 258
259 return false; 259 return false;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 5ae657e..c204389 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1003,9 +1003,9 @@ namespace OpenSim.Region.Environment.Scenes
1003 } 1003 }
1004 else 1004 else
1005 { 1005 {
1006 m_log.Info(String.Format("[SCENE]: " + 1006 m_log.InfoFormat("[SCENE]: " +
1007 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}", 1007 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}",
1008 partID, LocalId)); 1008 partID, LocalId);
1009 } 1009 }
1010 } 1010 }
1011 1011
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 62c3436..a27432d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -147,10 +147,10 @@ namespace OpenSim.Region.Environment.Scenes
147 /// <returns></returns> 147 /// <returns></returns>
148 public void StartScript(TaskInventoryItem item) 148 public void StartScript(TaskInventoryItem item)
149 { 149 {
150// m_log.Info(String.Format( 150// m_log.InfoFormat(
151// "[PRIMINVENTORY]: " + 151// "[PRIMINVENTORY]: " +
152// "Starting script {0}, {1} in prim {2}, {3}", 152// "Starting script {0}, {1} in prim {2}, {3}",
153// item.Name, item.ItemID, Name, UUID)); 153// item.Name, item.ItemID, Name, UUID);
154 AddFlag(LLObject.ObjectFlags.Scripted); 154 AddFlag(LLObject.ObjectFlags.Scripted);
155 155
156 if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts)) 156 if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts))
@@ -166,10 +166,10 @@ namespace OpenSim.Region.Environment.Scenes
166 } 166 }
167 else 167 else
168 { 168 {
169 m_log.Error(String.Format( 169 m_log.ErrorFormat(
170 "[PRIMINVENTORY]: " + 170 "[PRIMINVENTORY]: " +
171 "Couldn't start script {0}, {1} since asset ID {2} could not be found", 171 "Couldn't start script {0}, {1} since asset ID {2} could not be found",
172 item.Name, item.ItemID, item.AssetID)); 172 item.Name, item.ItemID, item.AssetID);
173 } 173 }
174 } 174 }
175 ScheduleFullUpdate(); 175 ScheduleFullUpdate();
@@ -192,10 +192,10 @@ namespace OpenSim.Region.Environment.Scenes
192 } 192 }
193 else 193 else
194 { 194 {
195 m_log.Error(String.Format( 195 m_log.ErrorFormat(
196 "[PRIMINVENTORY]: " + 196 "[PRIMINVENTORY]: " +
197 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}", 197 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}",
198 itemId, Name, UUID)); 198 itemId, Name, UUID);
199 } 199 }
200 } 200 }
201 } 201 }
@@ -206,27 +206,18 @@ namespace OpenSim.Region.Environment.Scenes
206 /// <param name="itemId"></param> 206 /// <param name="itemId"></param>
207 public void StopScript(LLUUID itemId) 207 public void StopScript(LLUUID itemId)
208 { 208 {
209
210
211 if (m_taskInventory.ContainsKey(itemId)) 209 if (m_taskInventory.ContainsKey(itemId))
212 { 210 {
213
214 m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalID, itemId); 211 m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalID, itemId);
215 m_parentGroup.AddActiveScriptCount(-1); 212 m_parentGroup.AddActiveScriptCount(-1);
216
217
218
219
220
221 } 213 }
222 else 214 else
223 { 215 {
224 m_log.Error(String.Format( 216 m_log.ErrorFormat(
225 "[PRIMINVENTORY]: " + 217 "[PRIMINVENTORY]: " +
226 "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}", 218 "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}",
227 itemId, Name, UUID)); 219 itemId, Name, UUID);
228 } 220 }
229
230 } 221 }
231 222
232 /// <summary> 223 /// <summary>
@@ -285,10 +276,10 @@ namespace OpenSim.Region.Environment.Scenes
285 } 276 }
286 else 277 else
287 { 278 {
288 m_log.Error(String.Format( 279 m_log.ErrorFormat(
289 "[PRIMINVENTORY]: " + 280 "[PRIMINVENTORY]: " +
290 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 281 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
291 itemID, Name, UUID)); 282 itemID, Name, UUID);
292 } 283 }
293 } 284 }
294 285
@@ -317,10 +308,10 @@ namespace OpenSim.Region.Environment.Scenes
317 } 308 }
318 else 309 else
319 { 310 {
320 m_log.Error(String.Format( 311 m_log.ErrorFormat(
321 "[PRIMINVENTORY]: " + 312 "[PRIMINVENTORY]: " +
322 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 313 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
323 item.ItemID, Name, UUID)); 314 item.ItemID, Name, UUID);
324 } 315 }
325 } 316 }
326 317
@@ -374,10 +365,10 @@ namespace OpenSim.Region.Environment.Scenes
374 } 365 }
375 else 366 else
376 { 367 {
377 m_log.Error(String.Format( 368 m_log.ErrorFormat(
378 "[PRIMINVENTORY]: " + 369 "[PRIMINVENTORY]: " +
379 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 370 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
380 itemID, Name, UUID)); 371 itemID, Name, UUID);
381 } 372 }
382 } 373 }
383 374
@@ -442,8 +433,8 @@ namespace OpenSim.Region.Environment.Scenes
442 433
443 fileData = Helpers.StringToField(invString.BuildString); 434 fileData = Helpers.StringToField(invString.BuildString);
444 435
445// m_log.Info(String.Format( 436// m_log.InfoFormat(
446// "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData))); 437// "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData));
447 438
448 if (fileData.Length > 2) 439 if (fileData.Length > 2)
449 { 440 {
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index acaa389b..82eef35 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Physics.Manager
67 } 67 }
68 else 68 else
69 { 69 {
70 m_log.Warn(String.Format("[PHYSICS]: couldn't find meshingEngine: {0}", meshEngineName)); 70 m_log.WarnFormat("[PHYSICS]: couldn't find meshingEngine: {0}", meshEngineName);
71 throw new ArgumentException(String.Format("couldn't find meshingEngine: {0}", meshEngineName)); 71 throw new ArgumentException(String.Format("couldn't find meshingEngine: {0}", meshEngineName));
72 } 72 }
73 73
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index bd2ad99..00c0ff1 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Physics.Manager
95 95
96 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 96 public override PhysicsActor AddAvatar(string avName, PhysicsVector position)
97 { 97 {
98 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position)); 98 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
99 return PhysicsActor.Null; 99 return PhysicsActor.Null;
100 } 100 }
101 101
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.Manager
110/* 110/*
111 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) 111 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
112 { 112 {
113 m_log.Info(String.Format("NullPhysicsScene : AddPrim({0},{1})", position, size)); 113 m_log.InfoFormat("NullPhysicsScene : AddPrim({0},{1})", position, size);
114 return PhysicsActor.Null; 114 return PhysicsActor.Null;
115 } 115 }
116*/ 116*/
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Physics.Manager
124 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, 124 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
125 PhysicsVector size, Quaternion rotation, bool isPhysical) 125 PhysicsVector size, Quaternion rotation, bool isPhysical)
126 { 126 {
127 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size)); 127 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size);
128 return PhysicsActor.Null; 128 return PhysicsActor.Null;
129 } 129 }
130 130
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Physics.Manager
146 146
147 public override void SetTerrain(float[] heightMap) 147 public override void SetTerrain(float[] heightMap)
148 { 148 {
149 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length)); 149 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
150 } 150 }
151 151
152 public override void DeleteTerrain() 152 public override void DeleteTerrain()
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 641e25d..a394ffb 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Physics.Meshing
245 // Calculated separately to avoid errors 245 // Calculated separately to avoid errors
246 cutHull.AddVertex(legEnd); 246 cutHull.AddVertex(legEnd);
247 247
248 //m_log.Debug(String.Format("Starting cutting of the hollow shape from the prim {1}", 0, primName)); 248 //m_log.DebugFormat("Starting cutting of the hollow shape from the prim {1}", 0, primName);
249 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull); 249 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull);
250 250
251 outerHull = cuttedHull; 251 outerHull = cuttedHull;
@@ -520,7 +520,7 @@ namespace OpenSim.Region.Physics.Meshing
520 // Calculated separately to avoid errors 520 // Calculated separately to avoid errors
521 cutHull.AddVertex(legEnd); 521 cutHull.AddVertex(legEnd);
522 522
523 m_log.Debug(String.Format("Starting cutting of the hollow shape from the prim {1}", 0, primName)); 523 m_log.DebugFormat("Starting cutting of the hollow shape from the prim {1}", 0, primName);
524 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull); 524 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull);
525 525
526 outerHull = cuttedHull; 526 outerHull = cuttedHull;
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
index e9cce3b..91df98f 100644
--- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs
+++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
@@ -246,8 +246,8 @@ namespace OpenSim.Region.Physics.Meshing
246 bool intersects = false; 246 bool intersects = false;
247 247
248 //m_log.Debug("State before intersection detection"); 248 //m_log.Debug("State before intersection detection");
249 //m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString())); 249 //m_log.DebugFormat("The baseHull is:\n{1}", 0, baseHullClone.ToString());
250 //m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString())); 250 //m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString());
251 251
252 { 252 {
253 int iBase, iOther; 253 int iBase, iOther;
@@ -277,7 +277,7 @@ namespace OpenSim.Region.Physics.Meshing
277 } 277 }
278 278
279 //m_log.Debug("State after intersection detection for the base hull"); 279 //m_log.Debug("State after intersection detection for the base hull");
280 //m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString())); 280 //m_log.DebugFormat("The baseHull is:\n{1}", 0, baseHullClone.ToString());
281 281
282 { 282 {
283 int iOther, iBase; 283 int iOther, iBase;
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Physics.Meshing
306 } 306 }
307 307
308 //m_log.Debug("State after intersection detection for the base hull"); 308 //m_log.Debug("State after intersection detection for the base hull");
309 //m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString())); 309 //m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString());
310 310
311 311
312 bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone); 312 bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone);
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Physics.Meshing
389 done = true; 389 done = true;
390 } 390 }
391 391
392 //m_log.Debug(String.Format("The resulting Hull is:\n{1}", 0, result.ToString())); 392 //m_log.DebugFormat("The resulting Hull is:\n{1}", 0, result.ToString());
393 393
394 return result; 394 return result;
395 } 395 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index b407f8d..68ac99c 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
86 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource); 86 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource);
87 87
88#if DEBUG 88#if DEBUG
89 m_scriptEngine.Log.Debug(String.Format("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before)); 89 m_scriptEngine.Log.DebugFormat("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);
90#endif 90#endif
91 91
92 CompiledScript.Source = Script; 92 CompiledScript.Source = Script;
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 6a79c8a..0343b79 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -142,7 +142,7 @@ namespace OpenSim.DataStore.MSSQL
142 142
143 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 143 public void RemoveObject(LLUUID obj, LLUUID regionUUID)
144 { 144 {
145 m_log.Info(String.Format("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID)); 145 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
146 146
147 DataTable prims = ds.Tables["prims"]; 147 DataTable prims = ds.Tables["prims"];
148 DataTable shapes = ds.Tables["primshapes"]; 148 DataTable shapes = ds.Tables["primshapes"];
generated by cgit v1.1 at 2024-07-05 04:28:52 +0000