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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-10-06 23:47:41 +01:00
parent 95910f03d4 9a16e76f51
commit 4c812884be
3 changed files with 312 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -699,7 +699,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
} }
else else
{ {
agent.InTransit(); agent.IsInTransit = true;
neighboury = b.TriggerRegionY; neighboury = b.TriggerRegionY;
neighbourx = b.TriggerRegionX; neighbourx = b.TriggerRegionX;
@ -722,7 +722,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
} }
else else
{ {
agent.InTransit(); agent.IsInTransit = true;
neighboury = ba.TriggerRegionY; neighboury = ba.TriggerRegionY;
neighbourx = ba.TriggerRegionX; neighbourx = ba.TriggerRegionX;
@ -756,7 +756,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
} }
else else
{ {
agent.InTransit(); agent.IsInTransit = true;
neighboury = ba.TriggerRegionY; neighboury = ba.TriggerRegionY;
neighbourx = ba.TriggerRegionX; neighbourx = ba.TriggerRegionX;
@ -788,7 +788,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
} }
else else
{ {
agent.InTransit(); agent.IsInTransit = true;
neighboury = b.TriggerRegionY; neighboury = b.TriggerRegionY;
neighbourx = b.TriggerRegionX; neighbourx = b.TriggerRegionX;
@ -876,7 +876,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return false; return false;
} }
agent.InTransit(); agent.IsInTransit = true;
CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync; CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync;
d.BeginInvoke(agent, newpos, neighbourx, neighboury, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d); d.BeginInvoke(agent, newpos, neighbourx, neighboury, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
@ -1066,7 +1066,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
agent.RestoreInCurrentScene(); agent.RestoreInCurrentScene();
// In any case // In any case
agent.NotInTransit(); agent.IsInTransit = false;
//m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname); //m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
} }

590
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

File diff suppressed because it is too large Load Diff

11
OpenSim/Services/Interfaces/IUserAccountService.cs
View File

@ -44,6 +44,17 @@ namespace OpenSim.Services.Interfaces
PrincipalID = principalID; PrincipalID = principalID;
} }
public UserAccount(UUID scopeID, string firstName, string lastName, string email)
{
PrincipalID = UUID.Random();
ScopeID = scopeID;
FirstName = firstName;
LastName = lastName;
Email = email;
ServiceURLs = new Dictionary<string, object>();
Created = Util.UnixTimeSinceEpoch();
}
public UserAccount(UUID scopeID, UUID principalID, string firstName, string lastName, string email) public UserAccount(UUID scopeID, UUID principalID, string firstName, string lastName, string email)
{ {
PrincipalID = principalID; PrincipalID = principalID;