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

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

slimupdates
John Hurliman 2010-03-12 10:19:57 -08:00
parent 2040649871 ed3288a8db
commit 3fa4988810
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@ -47,9 +47,9 @@ namespace OpenSim.Services.LLLoginService
{ {
public class LLFailedLoginResponse : OpenSim.Services.Interfaces.FailedLoginResponse public class LLFailedLoginResponse : OpenSim.Services.Interfaces.FailedLoginResponse
{ {
string m_key; protected string m_key;
string m_value; protected string m_value;
string m_login; protected string m_login;
public static LLFailedLoginResponse UserProblem; public static LLFailedLoginResponse UserProblem;
public static LLFailedLoginResponse AuthorizationProblem; public static LLFailedLoginResponse AuthorizationProblem;

24
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -51,24 +51,24 @@ namespace OpenSim.Services.LLLoginService
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static bool Initialized = false; private static bool Initialized = false;
private IUserAccountService m_UserAccountService; protected IUserAccountService m_UserAccountService;
private IAuthenticationService m_AuthenticationService; protected IAuthenticationService m_AuthenticationService;
private IInventoryService m_InventoryService; protected IInventoryService m_InventoryService;
private IGridService m_GridService; protected IGridService m_GridService;
private IPresenceService m_PresenceService; protected IPresenceService m_PresenceService;
private ISimulationService m_LocalSimulationService; private ISimulationService m_LocalSimulationService;
private ISimulationService m_RemoteSimulationService; private ISimulationService m_RemoteSimulationService;
private ILibraryService m_LibraryService; protected ILibraryService m_LibraryService;
private IFriendsService m_FriendsService; protected IFriendsService m_FriendsService;
private IAvatarService m_AvatarService; protected IAvatarService m_AvatarService;
private IUserAgentService m_UserAgentService; private IUserAgentService m_UserAgentService;
private GatekeeperServiceConnector m_GatekeeperConnector; private GatekeeperServiceConnector m_GatekeeperConnector;
private string m_DefaultRegionName; private string m_DefaultRegionName;
private string m_WelcomeMessage; protected string m_WelcomeMessage;
private bool m_RequireInventory; private bool m_RequireInventory;
private int m_MinLoginLevel; protected int m_MinLoginLevel;
private string m_GatekeeperURL; private string m_GatekeeperURL;
IConfig m_LoginServerConfig; IConfig m_LoginServerConfig;
@ -286,7 +286,7 @@ namespace OpenSim.Services.LLLoginService
} }
} }
private GridRegion FindDestination(UserAccount account, PresenceInfo pinfo, UUID sessionID, string startLocation, out GridRegion gatekeeper, out string where, out Vector3 position, out Vector3 lookAt) protected GridRegion FindDestination(UserAccount account, PresenceInfo pinfo, UUID sessionID, string startLocation, out GridRegion gatekeeper, out string where, out Vector3 position, out Vector3 lookAt)
{ {
m_log.DebugFormat("[LLOGIN SERVICE]: FindDestination for start location {0}", startLocation); m_log.DebugFormat("[LLOGIN SERVICE]: FindDestination for start location {0}", startLocation);
@ -497,7 +497,7 @@ namespace OpenSim.Services.LLLoginService
} }
} }
private AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar,
UUID session, UUID secureSession, Vector3 position, string currentWhere, out string where, out string reason) UUID session, UUID secureSession, Vector3 position, string currentWhere, out string where, out string reason)
{ {
where = currentWhere; where = currentWhere;

4
OpenSim/Services/PresenceService/PresenceService.cs
View File

@ -72,6 +72,10 @@ namespace OpenSim.Services.PresenceService
data.Data["HomeRegionID"] = d[0].Data["HomeRegionID"]; data.Data["HomeRegionID"] = d[0].Data["HomeRegionID"];
data.Data["HomePosition"] = d[0].Data["HomePosition"]; data.Data["HomePosition"] = d[0].Data["HomePosition"];
data.Data["HomeLookAt"] = d[0].Data["HomeLookAt"]; data.Data["HomeLookAt"] = d[0].Data["HomeLookAt"];
data.Data["Position"] = d[0].Data["Position"];
data.Data["LookAt"] = d[0].Data["LookAt"];
data.RegionID = d[0].RegionID;
} }
else else
{ {