aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-02-13 03:38:18 +0000
committerJeff Ames2008-02-13 03:38:18 +0000
commit001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6 (patch)
tree35f528caf55171c0c53cd81501ebaa22f31e0d2a
parent* Clean up LIBRARY INVENTORY messages (diff)
downloadopensim-SC-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.zip
opensim-SC-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.tar.gz
opensim-SC-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.tar.bz2
opensim-SC-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.tar.xz
Clean up more unnecessary String.Format calls
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs7
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs9
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs16
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs13
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs21
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs5
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs6
-rw-r--r--OpenSim/Framework/Data.MySQL/Resources/AvatarAppearance.sql84
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs16
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs2
12 files changed, 83 insertions, 107 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs
index d40c354..3882ade 100644
--- a/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs
@@ -113,10 +113,9 @@ namespace OpenSim.Framework.Communications.Cache
113 // [or maybe we can if we do more checking like data lenght checks] 113 // [or maybe we can if we do more checking like data lenght checks]
114 if (uploaderFound != null) 114 if (uploaderFound != null)
115 { 115 {
116// m_log.Info( 116// m_log.InfoFormat(
117// String.Format( 117// "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}",
118// "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", 118// xferID, uploaderFound.TransactionID);
119// xferID, uploaderFound.TransactionID));
120 119
121 // XferUploaders.Remove(uploaderFound.TransactionID); 120 // XferUploaders.Remove(uploaderFound.TransactionID);
122 121
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 2b06d4f..effaa82 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -266,9 +266,7 @@ namespace OpenSim.Framework.Communications.Cache
266 } 266 }
267 } while (--maxPolls > 0); 267 } while (--maxPolls > 0);
268 268
269 m_log.Warn( 269 m_log.WarnFormat("[ASSETCACHE]: Asset {0} was not received before the retrieval timeout was reached", assetID.ToString());
270 String.Format("[ASSETCACHE]: Asset {0} was not received before the retrieval timeout was reached", assetID.ToString())
271 );
272 270
273 return null; 271 return null;
274 } 272 }
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 6cded49..6820027 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -70,15 +70,13 @@ namespace OpenSim.Framework.Communications.Cache
70 70
71 if (asset != null) 71 if (asset != null)
72 { 72 {
73 //m_log.Info( 73 //m_log.InfoFormat("[ASSET]: Asset {0} received from asset server", req.AssetID);
74 // String.Format("[ASSET]: Asset {0} received from asset server", req.AssetID));
75 74
76 m_receiver.AssetReceived(asset, req.IsTexture); 75 m_receiver.AssetReceived(asset, req.IsTexture);
77 } 76 }
78 else 77 else
79 { 78 {
80 m_log.Error( 79 m_log.ErrorFormat("[ASSET]: Asset {0} not found by asset server", req.AssetID);
81 String.Format("[ASSET]: Asset {0} not found by asset server", req.AssetID));
82 80
83 m_receiver.AssetNotFound(req.AssetID); 81 m_receiver.AssetNotFound(req.AssetID);
84 } 82 }
@@ -93,7 +91,6 @@ namespace OpenSim.Framework.Communications.Cache
93 CommitAssets(); 91 CommitAssets();
94 } 92 }
95 93
96
97 public AssetServerBase() 94 public AssetServerBase()
98 { 95 {
99 m_log.Info("[ASSETSERVER]: Starting asset storage system"); 96 m_log.Info("[ASSETSERVER]: Starting asset storage system");
@@ -163,4 +160,4 @@ namespace OpenSim.Framework.Communications.Cache
163 { 160 {
164 } 161 }
165 } 162 }
166} \ No newline at end of file 163}
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 604cd2c..b3d3c7c 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -140,9 +140,8 @@ namespace OpenSim.Framework.Communications.Cache
140 /// <param name="assets"></param> 140 /// <param name="assets"></param>
141 protected void LoadLibraries(string librariesControlPath) 141 protected void LoadLibraries(string librariesControlPath)
142 { 142 {
143 m_log.Info( 143 m_log.InfoFormat(
144 String.Format( 144 "[LIBRARY INVENTORY]: Loading libraries control file {0}", librariesControlPath);
145 "[LIBRARY INVENTORY]: Loading libraries control file {0}", librariesControlPath));
146 145
147 LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig); 146 LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig);
148 } 147 }
@@ -188,9 +187,8 @@ namespace OpenSim.Framework.Communications.Cache
188 187
189 libraryFolders.Add(folderInfo.folderID, folderInfo); 188 libraryFolders.Add(folderInfo.folderID, folderInfo);
190 parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); 189 parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
191 190
192// m_log.Info( 191// m_log.InfoFormat("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID);
193// String.Format("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID));
194 } 192 }
195 else 193 else
196 { 194 {
@@ -258,14 +256,12 @@ namespace OpenSim.Framework.Communications.Cache
258 } 256 }
259 catch (XmlException e) 257 catch (XmlException e)
260 { 258 {
261 m_log.Error( 259 m_log.ErrorFormat("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e);
262 String.Format("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e));
263 } 260 }
264 } 261 }
265 else 262 else
266 { 263 {
267 m_log.Error( 264 m_log.ErrorFormat("[LIBRARY INVENTORY]: {0} file {1} does not exist!", fileDescription, path);
268 String.Format("[LIBRARY INVENTORY]: {0} file {1} does not exist!", fileDescription, path));
269 } 265 }
270 } 266 }
271 267
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 257747b..455f722 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -233,28 +233,25 @@ namespace OpenSim.Framework.Communications.Cache
233 } 233 }
234 else 234 else
235 { 235 {
236 m_log.Error( 236 m_log.ErrorFormat("[INVENTORYCACHE]: Could not find root folder for user {0}", remoteClient.Name);
237 String.Format("[INVENTORYCACHE]: Could not find root folder for user {0}", remoteClient.Name));
238 237
239 return; 238 return;
240 } 239 }
241 } 240 }
242 else 241 else
243 { 242 {
244 m_log.Error( 243 m_log.ErrorFormat("[INVENTORYCACHE]: " +
245 String.Format("[INVENTORYCACHE]: " +
246 "Could not find user profile for {0} for folder {1}", 244 "Could not find user profile for {0} for folder {1}",
247 remoteClient.Name, folderID)); 245 remoteClient.Name, folderID);
248 246
249 return; 247 return;
250 } 248 }
251 249
252 // If we've reached this point then we couldn't find the folder, even though the client thinks 250 // If we've reached this point then we couldn't find the folder, even though the client thinks
253 // it exists 251 // it exists
254 m_log.Error( 252 m_log.ErrorFormat("[INVENTORYCACHE]: " +
255 String.Format("[INVENTORYCACHE]: " +
256 "Could not find folder {0} for user {1}", 253 "Could not find folder {0} for user {1}",
257 folderID, remoteClient.Name)); 254 folderID, remoteClient.Name);
258 } 255 }
259 256
260 public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, LLUUID folderID) 257 public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, LLUUID folderID)
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 1398184..a360dc3 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -305,10 +305,9 @@ namespace OpenSim.Region.Capabilities
305 uploadResponse.uploader = uploaderURL; 305 uploadResponse.uploader = uploaderURL;
306 uploadResponse.state = "upload"; 306 uploadResponse.state = "upload";
307 307
308// m_log.Info( 308// m_log.InfoFormat("[CAPS]: " +
309// String.Format("[CAPS]: " + 309// "ScriptTaskInventory response: {0}",
310// "ScriptTaskInventory response: {0}", 310// LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
311// LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
312 311
313 return LLSDHelpers.SerialiseLLSDReply(uploadResponse); 312 return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
314 } 313 }
@@ -351,10 +350,9 @@ namespace OpenSim.Region.Capabilities
351 uploadResponse.uploader = uploaderURL; 350 uploadResponse.uploader = uploaderURL;
352 uploadResponse.state = "upload"; 351 uploadResponse.state = "upload";
353 352
354// m_log.Info( 353// m_log.InfoFormat("[CAPS]: " +
355// String.Format("[CAPS]: " + 354// "NoteCardAgentInventory response: {0}",
356// "NoteCardAgentInventory response: {0}", 355// LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
357// LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
358 356
359 return LLSDHelpers.SerialiseLLSDReply(uploadResponse); 357 return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
360 } 358 }
@@ -683,10 +681,9 @@ namespace OpenSim.Region.Capabilities
683 { 681 {
684 try 682 try
685 { 683 {
686// m_log.Info( 684// m_log.InfoFormat("[CAPS]: " +
687// String.Format("[CAPS]: " + 685// "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}",
688// "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}", 686// data, path, param));
689// data, path, param));
690 687
691 string res = String.Empty; 688 string res = String.Empty;
692 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); 689 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index fd9ab1b..74c07e1 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -147,10 +147,9 @@ namespace OpenSim.Framework.Communications
147 147
148 if (null != existingRootFolder) 148 if (null != existingRootFolder)
149 { 149 {
150 m_log.Error( 150 m_log.ErrorFormat("[AGENTINVENTORY]: " +
151 String.Format("[AGENTINVENTORY]: " +
152 "Did not create a new inventory for user {0} since they already have " 151 "Did not create a new inventory for user {0} since they already have "
153 + "a root inventory folder with id {1}", user, existingRootFolder)); 152 + "a root inventory folder with id {1}", user, existingRootFolder);
154 } 153 }
155 else 154 else
156 { 155 {
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index db86a97..e14eccf 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -601,8 +601,7 @@ namespace OpenSim.Framework.UserManagement
601 public virtual bool AuthenticateUser(UserProfileData profile, string password) 601 public virtual bool AuthenticateUser(UserProfileData profile, string password)
602 { 602 {
603 bool passwordSuccess = false; 603 bool passwordSuccess = false;
604 m_log.Info( 604 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.username, profile.surname, profile.UUID);
605 String.Format("[LOGIN]: Authenticating {0} {1} ({2})", profile.username, profile.surname, profile.UUID));
606 605
607 // Web Login method seems to also occasionally send the hashed password itself 606 // Web Login method seems to also occasionally send the hashed password itself
608 607
@@ -627,8 +626,7 @@ namespace OpenSim.Framework.UserManagement
627 public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey) 626 public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey)
628 { 627 {
629 bool passwordSuccess = false; 628 bool passwordSuccess = false;
630 m_log.Info( 629 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.username, profile.surname, profile.UUID);
631 String.Format("[LOGIN]: Authenticating {0} {1} ({2})", profile.username, profile.surname, profile.UUID));
632 630
633 // Match web login key unless it's the default weblogin key LLUUID.Zero 631 // Match web login key unless it's the default weblogin key LLUUID.Zero
634 passwordSuccess = ((profile.webLoginKey==webloginkey) && profile.webLoginKey != LLUUID.Zero); 632 passwordSuccess = ((profile.webLoginKey==webloginkey) && profile.webLoginKey != LLUUID.Zero);
diff --git a/OpenSim/Framework/Data.MySQL/Resources/AvatarAppearance.sql b/OpenSim/Framework/Data.MySQL/Resources/AvatarAppearance.sql
index d9d3de0..b638ee2 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/AvatarAppearance.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/AvatarAppearance.sql
@@ -1,42 +1,42 @@
1-- 1--
2-- Create schema avatar_appearance 2-- Create schema avatar_appearance
3-- 3--
4 4
5CREATE DATABASE IF NOT EXISTS avatar_appearance; 5CREATE DATABASE IF NOT EXISTS avatar_appearance;
6USE avatar_appearance; 6USE avatar_appearance;
7 7
8DROP TABLE IF EXISTS `avatarappearance`; 8DROP TABLE IF EXISTS `avatarappearance`;
9CREATE TABLE `avatarappearance` ( 9CREATE TABLE `avatarappearance` (
10 `UUID` char(36) NOT NULL, 10 `UUID` char(36) NOT NULL,
11 `Serial` int(10) unsigned NOT NULL, 11 `Serial` int(10) unsigned NOT NULL,
12 `WearableItem0` char(36) NOT NULL, 12 `WearableItem0` char(36) NOT NULL,
13 `WearableAsset0` char(36) NOT NULL, 13 `WearableAsset0` char(36) NOT NULL,
14 `WearableItem1` char(36) NOT NULL, 14 `WearableItem1` char(36) NOT NULL,
15 `WearableAsset1` char(36) NOT NULL, 15 `WearableAsset1` char(36) NOT NULL,
16 `WearableItem2` char(36) NOT NULL, 16 `WearableItem2` char(36) NOT NULL,
17 `WearableAsset2` char(36) NOT NULL, 17 `WearableAsset2` char(36) NOT NULL,
18 `WearableItem3` char(36) NOT NULL, 18 `WearableItem3` char(36) NOT NULL,
19 `WearableAsset3` char(36) NOT NULL, 19 `WearableAsset3` char(36) NOT NULL,
20 `WearableItem4` char(36) NOT NULL, 20 `WearableItem4` char(36) NOT NULL,
21 `WearableAsset4` char(36) NOT NULL, 21 `WearableAsset4` char(36) NOT NULL,
22 `WearableItem5` char(36) NOT NULL, 22 `WearableItem5` char(36) NOT NULL,
23 `WearableAsset5` char(36) NOT NULL, 23 `WearableAsset5` char(36) NOT NULL,
24 `WearableItem6` char(36) NOT NULL, 24 `WearableItem6` char(36) NOT NULL,
25 `WearableAsset6` char(36) NOT NULL, 25 `WearableAsset6` char(36) NOT NULL,
26 `WearableItem7` char(36) NOT NULL, 26 `WearableItem7` char(36) NOT NULL,
27 `WearableAsset7` char(36) NOT NULL, 27 `WearableAsset7` char(36) NOT NULL,
28 `WearableItem8` char(36) NOT NULL, 28 `WearableItem8` char(36) NOT NULL,
29 `WearableAsset8` char(36) NOT NULL, 29 `WearableAsset8` char(36) NOT NULL,
30 `WearableItem9` char(36) NOT NULL, 30 `WearableItem9` char(36) NOT NULL,
31 `WearableAsset9` char(36) NOT NULL, 31 `WearableAsset9` char(36) NOT NULL,
32 `WearableItem10` char(36) NOT NULL, 32 `WearableItem10` char(36) NOT NULL,
33 `WearableAsset10` char(36) NOT NULL, 33 `WearableAsset10` char(36) NOT NULL,
34 `WearableItem11` char(36) NOT NULL, 34 `WearableItem11` char(36) NOT NULL,
35 `WearableAsset11` char(36) NOT NULL, 35 `WearableAsset11` char(36) NOT NULL,
36 `WearableItem12` char(36) NOT NULL, 36 `WearableItem12` char(36) NOT NULL,
37 `WearableAsset12` char(36) NOT NULL, 37 `WearableAsset12` char(36) NOT NULL,
38 38
39 39
40 PRIMARY KEY (`UUID`) 40 PRIMARY KEY (`UUID`)
41) ENGINE=InnoDB DEFAULT CHARSET=utf8; 41) ENGINE=InnoDB DEFAULT CHARSET=utf8;
42 42
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 6800d5f..952b039 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -600,10 +600,9 @@ namespace OpenSim.Region.Environment.Scenes
600 group.StartScript(localID, copyID); 600 group.StartScript(localID, copyID);
601 group.GetProperties(remoteClient); 601 group.GetProperties(remoteClient);
602 602
603 // m_log.Info( 603 // m_log.InfoFormat("[PRIMINVENTORY]: " +
604 // String.Format("[PRIMINVENTORY]: " + 604 // "Rezzed script {0} into prim local ID {1} for user {2}",
605 // "Rezzed script {0} into prim local ID {1} for user {2}", 605 // item.inventoryName, localID, remoteClient.Name);
606 // item.inventoryName, localID, remoteClient.Name));
607 } 606 }
608 else 607 else
609 { 608 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d763d35..c41979c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1477,8 +1477,7 @@ namespace OpenSim.Region.Environment.Scenes
1477 } 1477 }
1478 else 1478 else
1479 { 1479 {
1480 m_log.Warn( 1480 m_log.WarnFormat("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene ScenePresences list", agentID);
1481 String.Format("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene ScenePresences list", agentID));
1482 } 1481 }
1483 } 1482 }
1484 1483
@@ -1490,8 +1489,7 @@ namespace OpenSim.Region.Environment.Scenes
1490 } 1489 }
1491 else 1490 else
1492 { 1491 {
1493 m_log.Warn( 1492 m_log.WarnFormat("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene Entities list", agentID);
1494 String.Format("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene Entities list", agentID));
1495 } 1493 }
1496 } 1494 }
1497 1495
@@ -2302,21 +2300,19 @@ namespace OpenSim.Region.Environment.Scenes
2302 { 2300 {
2303 case "users": 2301 case "users":
2304 m_log.Error("Current Region: " + RegionInfo.RegionName); 2302 m_log.Error("Current Region: " + RegionInfo.RegionName);
2305 m_log.Error( 2303 m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname",
2306 String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", 2304 "Agent ID", "Session ID", "Circuit", "IP", "World");
2307 "Agent ID", "Session ID", "Circuit", "IP", "World"));
2308 2305
2309 foreach (ScenePresence scenePrescence in GetAvatars()) 2306 foreach (ScenePresence scenePrescence in GetAvatars())
2310 { 2307 {
2311 m_log.Error( 2308 m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
2312 String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
2313 scenePrescence.Firstname, 2309 scenePrescence.Firstname,
2314 scenePrescence.Lastname, 2310 scenePrescence.Lastname,
2315 scenePrescence.UUID, 2311 scenePrescence.UUID,
2316 scenePrescence.ControllingClient.AgentId, 2312 scenePrescence.ControllingClient.AgentId,
2317 "Unknown", 2313 "Unknown",
2318 "Unknown", 2314 "Unknown",
2319 RegionInfo.RegionName)); 2315 RegionInfo.RegionName);
2320 } 2316 }
2321 break; 2317 break;
2322 case "modules": 2318 case "modules":
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 82eef35..76ea503 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Physics.Manager
80 } 80 }
81 else 81 else
82 { 82 {
83 m_log.Warn(String.Format("[PHYSICS]: couldn't find physicsEngine: {0}", physEngineName)); 83 m_log.WarnFormat("[PHYSICS]: couldn't find physicsEngine: {0}", physEngineName);
84 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}", physEngineName)); 84 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}", physEngineName));
85 } 85 }
86 } 86 }
generated by cgit v1.1 at 2024-12-18 06:24:33 +0000