Bug fix, so that local loginserver (in standalone mode) can set a start position (position inside the region) rather than it always being hardcoded to 128,128. Note: This bug fix is just to allow this to be set. Its not actually used yet (so users will still always start at 128,128).
parent
e0f43cad4b
commit
5bf6b24590
|
@ -40,10 +40,11 @@ namespace OpenSim.Framework.Types
|
||||||
public LLUUID BaseFolder;
|
public LLUUID BaseFolder;
|
||||||
public uint CircuitCode;
|
public uint CircuitCode;
|
||||||
public string CapsPath ="";
|
public string CapsPath ="";
|
||||||
|
public LLVector3 StartPos;
|
||||||
|
|
||||||
public Login()
|
public Login()
|
||||||
{
|
{
|
||||||
|
StartPos = new LLVector3(128, 128, 70);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -200,7 +200,8 @@ namespace OpenSim.Region.Communications.Local
|
||||||
agent.circuitcode = loginData.CircuitCode;
|
agent.circuitcode = loginData.CircuitCode;
|
||||||
agent.BaseFolder = loginData.BaseFolder;
|
agent.BaseFolder = loginData.BaseFolder;
|
||||||
agent.InventoryFolder = loginData.InventoryFolder;
|
agent.InventoryFolder = loginData.InventoryFolder;
|
||||||
agent.startpos = new LLVector3(128, 128, 70);
|
agent.startpos = loginData.StartPos;
|
||||||
|
|
||||||
agent.CapsPath = loginData.CapsPath;
|
agent.CapsPath = loginData.CapsPath;
|
||||||
|
|
||||||
TriggerExpectUser(regionHandle, agent);
|
TriggerExpectUser(regionHandle, agent);
|
||||||
|
|
|
@ -138,6 +138,7 @@ namespace OpenSim.Region.Communications.Local
|
||||||
_login.Session = response.SessionID;
|
_login.Session = response.SessionID;
|
||||||
_login.SecureSession = response.SecureSessionID;
|
_login.SecureSession = response.SecureSessionID;
|
||||||
_login.CircuitCode = (uint)response.CircuitCode;
|
_login.CircuitCode = (uint)response.CircuitCode;
|
||||||
|
_login.StartPos = new LLVector3(128, 128, 70);
|
||||||
_login.CapsPath = capsPath;
|
_login.CapsPath = capsPath;
|
||||||
|
|
||||||
if( OnLoginToRegion != null )
|
if( OnLoginToRegion != null )
|
||||||
|
|
Loading…
Reference in New Issue