OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* normalized line endings...

afrisby
lbsa71 2007-10-19 12:57:40 +00:00
parent 373372ca3e
commit 9853db1708
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -439,7 +439,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns></returns> /// <returns></returns>
internal void Broadcast(Action<IClientAPI> whatToDo) internal void Broadcast(Action<IClientAPI> whatToDo)
{ {
ForEachScenePresence( delegate( ScenePresence presence ) ForEachScenePresence(delegate(ScenePresence presence)
{ {
whatToDo(presence.ControllingClient); whatToDo(presence.ControllingClient);
}); });
@ -485,7 +485,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
catch catch
{ {
MainLog.Instance.Verbose("TERRAIN","No terrain found in database or default. Generating a new terrain."); MainLog.Instance.Verbose("TERRAIN", "No terrain found in database or default. Generating a new terrain.");
Terrain.HillsGenerator(); Terrain.HillsGenerator();
} }
storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD()); storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
@ -1107,11 +1107,11 @@ namespace OpenSim.Region.Environment.Scenes
agent.startpos = new LLVector3(128, 128, 70); agent.startpos = new LLVector3(128, 128, 70);
agent.child = true; agent.child = true;
InformClientOfNeighbourDelegate d = new InformClientOfNeighbourDelegate(InformClientOfNeighbourAsync); InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
IAsyncResult asyncInform = d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
new AsyncCallback(InformClientOfNeighbourCompleted), InformClientOfNeighbourCompleted,
null); null);
//this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort);
} }
} }
} }
@ -1475,13 +1475,13 @@ namespace OpenSim.Region.Environment.Scenes
internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar) internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
{ {
foreach( ScenePresence presence in m_scenePresences.Values ) foreach (ScenePresence presence in m_scenePresences.Values)
{ {
if( !presence.IsChildAgent ) if (!presence.IsChildAgent)
{ {
string name = presence.ControllingClient.FirstName + " " + presence.ControllingClient.LastName; string name = presence.ControllingClient.FirstName + " " + presence.ControllingClient.LastName;
if( String.Compare( avatarName, name, true ) == 0 ) if (String.Compare(avatarName, name, true) == 0)
{ {
avatar = presence; avatar = presence;
return true; return true;