aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-10-19 12:57:40 +0000
committerlbsa712007-10-19 12:57:40 +0000
commit9853db170884ba5e3d90583ad35c1aed81978b14 (patch)
tree252381cd3ea9c1623e5ad046aff2f70c9a0f597a
parentcouple of tiny changes to what is outputted to the console during the start u... (diff)
downloadopensim-SC_OLD-9853db170884ba5e3d90583ad35c1aed81978b14.zip
opensim-SC_OLD-9853db170884ba5e3d90583ad35c1aed81978b14.tar.gz
opensim-SC_OLD-9853db170884ba5e3d90583ad35c1aed81978b14.tar.bz2
opensim-SC_OLD-9853db170884ba5e3d90583ad35c1aed81978b14.tar.xz
* normalized line endings...
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs30
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a3857c6..83432d4 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -439,7 +439,7 @@ namespace OpenSim.Region.Environment.Scenes
439 /// <returns></returns> 439 /// <returns></returns>
440 internal void Broadcast(Action<IClientAPI> whatToDo) 440 internal void Broadcast(Action<IClientAPI> whatToDo)
441 { 441 {
442 ForEachScenePresence( delegate( ScenePresence presence ) 442 ForEachScenePresence(delegate(ScenePresence presence)
443 { 443 {
444 whatToDo(presence.ControllingClient); 444 whatToDo(presence.ControllingClient);
445 }); 445 });
@@ -485,7 +485,7 @@ namespace OpenSim.Region.Environment.Scenes
485 } 485 }
486 catch 486 catch
487 { 487 {
488 MainLog.Instance.Verbose("TERRAIN","No terrain found in database or default. Generating a new terrain."); 488 MainLog.Instance.Verbose("TERRAIN", "No terrain found in database or default. Generating a new terrain.");
489 Terrain.HillsGenerator(); 489 Terrain.HillsGenerator();
490 } 490 }
491 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD()); 491 storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
@@ -657,7 +657,7 @@ namespace OpenSim.Region.Environment.Scenes
657 int primCount = 0; 657 int primCount = 0;
658 if ((fileName.StartsWith("http:")) | (File.Exists(fileName))) 658 if ((fileName.StartsWith("http:")) | (File.Exists(fileName)))
659 { 659 {
660 660
661 XmlTextReader reader = new XmlTextReader(fileName); 661 XmlTextReader reader = new XmlTextReader(fileName);
662 reader.WhitespaceHandling = WhitespaceHandling.None; 662 reader.WhitespaceHandling = WhitespaceHandling.None;
663 doc.Load(reader); 663 doc.Load(reader);
@@ -1072,7 +1072,7 @@ namespace OpenSim.Region.Environment.Scenes
1072 1072
1073 icon.EndInvoke(iar); 1073 icon.EndInvoke(iar);
1074 } 1074 }
1075 1075
1076 /// <summary> 1076 /// <summary>
1077 /// Async compnent for informing client of which neighbours exists 1077 /// Async compnent for informing client of which neighbours exists
1078 /// </summary> 1078 /// </summary>
@@ -1107,11 +1107,11 @@ namespace OpenSim.Region.Environment.Scenes
1107 agent.startpos = new LLVector3(128, 128, 70); 1107 agent.startpos = new LLVector3(128, 128, 70);
1108 agent.child = true; 1108 agent.child = true;
1109 1109
1110 InformClientOfNeighbourDelegate d = new InformClientOfNeighbourDelegate(InformClientOfNeighbourAsync); 1110 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
1111 IAsyncResult asyncInform = d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, 1111 d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
1112 new AsyncCallback(InformClientOfNeighbourCompleted), 1112 InformClientOfNeighbourCompleted,
1113 null); 1113 null);
1114 //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort); 1114
1115 } 1115 }
1116 } 1116 }
1117 } 1117 }
@@ -1237,7 +1237,7 @@ namespace OpenSim.Region.Environment.Scenes
1237 } 1237 }
1238 1238
1239 public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, 1239 public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned,
1240 string message, string url) 1240 string message, string url)
1241 { 1241 {
1242 if (m_scenePresences.ContainsKey(avatarID)) 1242 if (m_scenePresences.ContainsKey(avatarID))
1243 { 1243 {
@@ -1475,22 +1475,22 @@ namespace OpenSim.Region.Environment.Scenes
1475 1475
1476 internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar) 1476 internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
1477 { 1477 {
1478 foreach( ScenePresence presence in m_scenePresences.Values ) 1478 foreach (ScenePresence presence in m_scenePresences.Values)
1479 { 1479 {
1480 if( !presence.IsChildAgent ) 1480 if (!presence.IsChildAgent)
1481 { 1481 {
1482 string name = presence.ControllingClient.FirstName + " " + presence.ControllingClient.LastName; 1482 string name = presence.ControllingClient.FirstName + " " + presence.ControllingClient.LastName;
1483 1483
1484 if( String.Compare( avatarName, name, true ) == 0 ) 1484 if (String.Compare(avatarName, name, true) == 0)
1485 { 1485 {
1486 avatar = presence; 1486 avatar = presence;
1487 return true; 1487 return true;
1488 } 1488 }
1489 } 1489 }
1490 } 1490 }
1491 1491
1492 avatar = null; 1492 avatar = null;
1493 return false; 1493 return false;
1494 } 1494 }
1495 } 1495 }
1496} 1496}