* Removed ClientThreads from avatar

* Deleted SimpleApp2 as it's getting wonkier and wonkier by the minute
* Added avatar handling to SimpleApp, still don't have any avatar out on the playing field
* Removed some warnings
* Went from IWorld to Scene
*
This commit is contained in:
lbsa71
2007-06-20 15:18:54 +00:00
parent 8edcc844c4
commit 64ed1e1b3b
20 changed files with 80 additions and 598 deletions

View File

@@ -107,7 +107,7 @@ namespace OpenSim.Region.Scenes
{
if(this.scriptEngines.ContainsKey(scriptType))
{
this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.localid);
this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.LocalId);
}
}
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Scenes
// Console.WriteLine("script- getting entity " + localID + " position");
foreach (Entity entity in this.Entities.Values)
{
if (entity.localid == localID)
if (entity.LocalId == localID)
{
res.X = entity.Pos.X;
res.Y = entity.Pos.Y;
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Scenes
{
foreach (Entity entity in this.Entities.Values)
{
if (entity.localid == localID && entity is Primitive)
if (entity.LocalId == localID && entity is Primitive)
{
LLVector3 pos = entity.Pos;
pos.X = x;
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Scenes
{
if (entity is Avatar)
{
res = entity.localid;
res = entity.LocalId;
}
}
return res;