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

30
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());
@ -657,7 +657,7 @@ namespace OpenSim.Region.Environment.Scenes
int primCount = 0; int primCount = 0;
if ((fileName.StartsWith("http:")) | (File.Exists(fileName))) if ((fileName.StartsWith("http:")) | (File.Exists(fileName)))
{ {
XmlTextReader reader = new XmlTextReader(fileName); XmlTextReader reader = new XmlTextReader(fileName);
reader.WhitespaceHandling = WhitespaceHandling.None; reader.WhitespaceHandling = WhitespaceHandling.None;
doc.Load(reader); doc.Load(reader);
@ -1072,7 +1072,7 @@ namespace OpenSim.Region.Environment.Scenes
icon.EndInvoke(iar); icon.EndInvoke(iar);
} }
/// <summary> /// <summary>
/// Async compnent for informing client of which neighbours exists /// Async compnent for informing client of which neighbours exists
/// </summary> /// </summary>
@ -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);
} }
} }
} }
@ -1237,7 +1237,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned,
string message, string url) string message, string url)
{ {
if (m_scenePresences.ContainsKey(avatarID)) if (m_scenePresences.ContainsKey(avatarID))
{ {
@ -1475,22 +1475,22 @@ 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;
} }
} }
} }
avatar = null; avatar = null;
return false; return false;
} }
} }
} }