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

Hopefully undid the murder I committed in the last commit

0.1-prestable
MW 2007-04-17 12:25:20 +00:00
parent d5406fe773
commit 2180bdf64a
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim.RegionServer/SimClient.cs
View File

@ -144,7 +144,9 @@ namespace OpenSim
public void CrossSimBorder(LLVector3 avatarpos) public void CrossSimBorder(LLVector3 avatarpos)
{ // VERY VERY BASIC { // VERY VERY BASIC
LLVector3 newpos = this.m_regionData.RegionLocX;
LLVector3 newpos = avatarpos;
uint neighbourx = this.m_regionData.RegionLocX;
uint neighboury = this.m_regionData.RegionLocY; uint neighboury = this.m_regionData.RegionLocY;
if (avatarpos.X < 0) if (avatarpos.X < 0)

43
OpenSim.RegionServer/world/World.cs
View File

@ -24,7 +24,7 @@ namespace OpenSim.world
public Dictionary<libsecondlife.LLUUID, Entity> Entities; public Dictionary<libsecondlife.LLUUID, Entity> Entities;
public Dictionary<libsecondlife.LLUUID, Avatar> Avatars; public Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
public Dictionary<libsecondlife.LLUUID, Primitive> Prims; public Dictionary<libsecondlife.LLUUID, Primitive> Prims;
// public float[] LandMap; // public float[] LandMap;
public ScriptEngine Scripts; public ScriptEngine Scripts;
public TerrainEngine Terrain; //TODO: Replace TerrainManager with this. public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
public uint _localNumber = 0; public uint _localNumber = 0;
@ -88,21 +88,21 @@ namespace OpenSim.world
ScriptFactory scriptFactory; ScriptFactory scriptFactory;
//Console.WriteLine("script string is " + substring); //Console.WriteLine("script string is " + substring);
if(substring.StartsWith("<ScriptEngine:")) if (substring.StartsWith("<ScriptEngine:"))
{ {
string substring1 = ""; string substring1 = "";
string script = ""; string script = "";
// Console.WriteLine("searching for script engine"); // Console.WriteLine("searching for script engine");
substring1 = substring.Remove(0, 14); substring1 = substring.Remove(0, 14);
int dev = substring1.IndexOf(','); int dev = substring1.IndexOf(',');
string sEngine = substring1.Substring(0, dev); string sEngine = substring1.Substring(0, dev);
substring1 = substring1.Remove(0, dev+1); substring1 = substring1.Remove(0, dev + 1);
int end = substring1.IndexOf('>'); int end = substring1.IndexOf('>');
string sName = substring1.Substring(0, end); string sName = substring1.Substring(0, end);
//Console.WriteLine(" script info : " + sEngine + " , " + sName); //Console.WriteLine(" script info : " + sEngine + " , " + sName);
int startscript = substring.IndexOf('>'); int startscript = substring.IndexOf('>');
script = substring.Remove(0, startscript + 1); script = substring.Remove(0, startscript + 1);
// Console.WriteLine("script data is " + script); // Console.WriteLine("script data is " + script);
if (this.scriptEngines.ContainsKey(sEngine)) if (this.scriptEngines.ContainsKey(sEngine))
{ {
this.scriptEngines[sEngine].LoadScript(script, sName, entity.localid); this.scriptEngines[sEngine].LoadScript(script, sName, entity.localid);
@ -281,7 +281,7 @@ namespace OpenSim.world
{ {
Console.WriteLine("creating new terrain"); Console.WriteLine("creating new terrain");
this.Terrain.hills(); this.Terrain.hills();
//this.localStorage.SaveMap(this.Terrain.map); //this.localStorage.SaveMap(this.Terrain.map);
} }
else else
@ -371,21 +371,22 @@ namespace OpenSim.world
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake "); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
newAvatar.SendRegionHandshake(this); newAvatar.SendRegionHandshake(this);
if(!agentClient.m_child) { if (!agentClient.m_child)
PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); {
lock (this.LockPhysicsEngine) PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
{ lock (this.LockPhysicsEngine)
newAvatar.PhysActor = this.phyScene.AddAvatar(pVec); {
} newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
} }
lock (Entities) }
{ lock (Entities)
this.Entities.Add(agentClient.AgentID, newAvatar); {
} this.Entities.Add(agentClient.AgentID, newAvatar);
lock (Avatars) }
{ lock (Avatars)
this.Avatars.Add(agentClient.AgentID, newAvatar); {
} this.Avatars.Add(agentClient.AgentID, newAvatar);
}
} }