aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorAdam Frisby2008-01-15 02:09:55 +0000
committerAdam Frisby2008-01-15 02:09:55 +0000
commitb25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch)
tree7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Region/Environment/Scenes
parentSet svn:eol-style. (diff)
downloadopensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.zip
opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.gz
opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.bz2
opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.xz
* Mother of all commits:
* Cleaned up copyright notices in AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them * Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs6
8 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index db3da48..31bd0b3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -376,7 +376,7 @@ namespace OpenSim.Region.Environment.Scenes
376 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID); 376 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
377 if (item != null) 377 if (item != null)
378 { 378 {
379 if (newName != "") 379 if (newName != System.String.Empty)
380 { 380 {
381 item.inventoryName = newName; 381 item.inventoryName = newName;
382 } 382 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 575fe01..43486e8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Environment.Scenes
389 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed); 389 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);
390 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes"); 390 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes");
391 m_restartTimer.Start(); 391 m_restartTimer.Start();
392 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in 2 Minutes"); 392 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes");
393 //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes"); 393 //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes");
394 } 394 }
395 } 395 }
@@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Scenes
404 if (m_RestartTimerCounter <= m_incrementsof15seconds) 404 if (m_RestartTimerCounter <= m_incrementsof15seconds)
405 { 405 {
406 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7) 406 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7)
407 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in " + 407 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in " +
408 ((8 - m_RestartTimerCounter) * 15) + " seconds"); 408 ((8 - m_RestartTimerCounter) * 15) + " seconds");
409 409
410 // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) + 410 // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) +
@@ -1408,7 +1408,7 @@ namespace OpenSim.Region.Environment.Scenes
1408 { 1408 {
1409 if (regionHandle == m_regInfo.RegionHandle) 1409 if (regionHandle == m_regInfo.RegionHandle)
1410 { 1410 {
1411 if (agent.CapsPath != "") 1411 if (agent.CapsPath != String.Empty)
1412 { 1412 {
1413 Caps cap = 1413 Caps cap =
1414 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, 1414 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port,
@@ -2004,7 +2004,7 @@ namespace OpenSim.Region.Environment.Scenes
2004 2004
2005 private string CombineParams(string[] commandParams, int pos) 2005 private string CombineParams(string[] commandParams, int pos)
2006 { 2006 {
2007 string result = ""; 2007 string result = String.Empty;
2008 for (int i = pos; i < commandParams.Length; i++) 2008 for (int i = pos; i < commandParams.Length; i++)
2009 { 2009 {
2010 result += commandParams[i] + " "; 2010 result += commandParams[i] + " ";
@@ -2253,7 +2253,7 @@ namespace OpenSim.Region.Environment.Scenes
2253 /// </summary> 2253 /// </summary>
2254 /// <param name="avatarID">AvatarID to lookup</param> 2254 /// <param name="avatarID">AvatarID to lookup</param>
2255 /// <returns></returns> 2255 /// <returns></returns>
2256 public bool PresenceChildStatus(LLUUID avatarID) 2256 public override bool PresenceChildStatus(LLUUID avatarID)
2257 { 2257 {
2258 ScenePresence cp = GetScenePresence(avatarID); 2258 ScenePresence cp = GetScenePresence(avatarID);
2259 return cp.IsChildAgent; 2259 return cp.IsChildAgent;
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 3942397..29747c1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Scenes
54 54
55 55
56 public KillObjectDelegate KillObject; 56 public KillObjectDelegate KillObject;
57 public string _debugRegionName = ""; 57 public string _debugRegionName = String.Empty;
58 58
59 public string debugRegionName 59 public string debugRegionName
60 { 60 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 879e4a3..ffc72c9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1114,7 +1114,7 @@ namespace OpenSim.Region.Environment.Scenes
1114 { 1114 {
1115 return part.Name; 1115 return part.Name;
1116 } 1116 }
1117 return ""; 1117 return String.Empty;
1118 } 1118 }
1119 1119
1120 public string GetPartDescription(uint localID) 1120 public string GetPartDescription(uint localID)
@@ -1124,7 +1124,7 @@ namespace OpenSim.Region.Environment.Scenes
1124 { 1124 {
1125 return part.Description; 1125 return part.Description;
1126 } 1126 }
1127 return ""; 1127 return String.Empty;
1128 } 1128 }
1129 1129
1130 /// <summary> 1130 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 1dd7e35..fc74c4e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Scenes
41{ 41{
42 public partial class SceneObjectPart : IScriptHost 42 public partial class SceneObjectPart : IScriptHost
43 { 43 {
44 private string m_inventoryFileName = ""; 44 private string m_inventoryFileName = String.Empty;
45 45
46 /// <summary> 46 /// <summary>
47 /// The inventory folder for this prim 47 /// The inventory folder for this prim
@@ -334,7 +334,7 @@ namespace OpenSim.Region.Environment.Scenes
334 334
335 public class InventoryStringBuilder 335 public class InventoryStringBuilder
336 { 336 {
337 public string BuildString = ""; 337 public string BuildString = String.Empty;
338 338
339 public InventoryStringBuilder(LLUUID folderID, LLUUID parentID) 339 public InventoryStringBuilder(LLUUID folderID, LLUUID parentID)
340 { 340 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 4456182..f2594a9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -395,7 +395,7 @@ namespace OpenSim.Region.Environment.Scenes
395 set { m_acceleration = value; } 395 set { m_acceleration = value; }
396 } 396 }
397 397
398 private string m_description = ""; 398 private string m_description = String.Empty;
399 399
400 public string Description 400 public string Description
401 { 401 {
@@ -418,7 +418,7 @@ namespace OpenSim.Region.Environment.Scenes
418 } 418 }
419 } 419 }
420 420
421 private string m_text = ""; 421 private string m_text = String.Empty;
422 422
423 public Vector3 SitTargetPosition 423 public Vector3 SitTargetPosition
424 { 424 {
@@ -440,7 +440,7 @@ namespace OpenSim.Region.Environment.Scenes
440 } 440 }
441 } 441 }
442 442
443 private string m_sitName = ""; 443 private string m_sitName = String.Empty;
444 444
445 public string SitName 445 public string SitName
446 { 446 {
@@ -448,7 +448,7 @@ namespace OpenSim.Region.Environment.Scenes
448 set { m_sitName = value; } 448 set { m_sitName = value; }
449 } 449 }
450 450
451 private string m_touchName = ""; 451 private string m_touchName = String.Empty;
452 452
453 public string TouchName 453 public string TouchName
454 { 454 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
index c1bf72b..58cf4c6 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -44,19 +44,19 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
44 44
45 public string SitName 45 public string SitName
46 { 46 {
47 get { return ""; } 47 get { return String.Empty; }
48 set { } 48 set { }
49 } 49 }
50 50
51 public string TouchName 51 public string TouchName
52 { 52 {
53 get { return ""; } 53 get { return String.Empty; }
54 set { } 54 set { }
55 } 55 }
56 56
57 public string Description 57 public string Description
58 { 58 {
59 get { return ""; } 59 get { return String.Empty; }
60 set { } 60 set { }
61 } 61 }
62 62
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 5dbe500..74f9358 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
88 //} 88 //}
89 //catch (Exception e) 89 //catch (Exception e)
90 //{ 90 //{
91 // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString()); 91 // m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString());
92 //} 92 //}
93 93
94 94
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
105 //} 105 //}
106 //catch (Exception e) 106 //catch (Exception e)
107 //{ 107 //{
108 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 108 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
109 //} 109 //}
110 110
111 ScriptEngineInterface ret; 111 ScriptEngineInterface ret;
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
115 //} 115 //}
116 //catch (Exception e) 116 //catch (Exception e)
117 //{ 117 //{
118 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 118 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
119 //} 119 //}
120 120
121 return ret; 121 return ret;