* normalized line endings...
parent
373372ca3e
commit
9853db1708
|
@ -439,7 +439,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
/// <returns></returns>
|
||||
internal void Broadcast(Action<IClientAPI> whatToDo)
|
||||
{
|
||||
ForEachScenePresence( delegate( ScenePresence presence )
|
||||
ForEachScenePresence(delegate(ScenePresence presence)
|
||||
{
|
||||
whatToDo(presence.ControllingClient);
|
||||
});
|
||||
|
@ -485,7 +485,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
}
|
||||
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();
|
||||
}
|
||||
storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
|
||||
|
@ -1107,11 +1107,11 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
agent.startpos = new LLVector3(128, 128, 70);
|
||||
agent.child = true;
|
||||
|
||||
InformClientOfNeighbourDelegate d = new InformClientOfNeighbourDelegate(InformClientOfNeighbourAsync);
|
||||
IAsyncResult asyncInform = d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
|
||||
new AsyncCallback(InformClientOfNeighbourCompleted),
|
||||
null);
|
||||
//this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort);
|
||||
InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
|
||||
d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
|
||||
InformClientOfNeighbourCompleted,
|
||||
null);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1475,13 +1475,13 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
|
||||
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;
|
||||
|
||||
if( String.Compare( avatarName, name, true ) == 0 )
|
||||
if (String.Compare(avatarName, name, true) == 0)
|
||||
{
|
||||
avatar = presence;
|
||||
return true;
|
||||
|
|
Loading…
Reference in New Issue