diff options
author | Mikko Pallari | 2010-03-10 14:44:53 +0200 |
---|---|---|
committer | Diva Canto | 2010-03-11 07:56:44 -0800 |
commit | 265c24ec33f53681e6b03684d9c453d0b1e91ce5 (patch) | |
tree | 0a060ed570fdac3e3f003bf07160198b9f7f7956 /OpenSim | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-265c24ec33f53681e6b03684d9c453d0b1e91ce5.zip opensim-SC_OLD-265c24ec33f53681e6b03684d9c453d0b1e91ce5.tar.gz opensim-SC_OLD-265c24ec33f53681e6b03684d9c453d0b1e91ce5.tar.bz2 opensim-SC_OLD-265c24ec33f53681e6b03684d9c453d0b1e91ce5.tar.xz |
Changed some properties and methods from private to protected in LLLoginResponse and LLLoginService so they could be inherited better.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 6 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 1a59213..ee30fa3 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -47,9 +47,9 @@ namespace OpenSim.Services.LLLoginService | |||
47 | { | 47 | { |
48 | public class LLFailedLoginResponse : OpenSim.Services.Interfaces.FailedLoginResponse | 48 | public class LLFailedLoginResponse : OpenSim.Services.Interfaces.FailedLoginResponse |
49 | { | 49 | { |
50 | string m_key; | 50 | protected string m_key; |
51 | string m_value; | 51 | protected string m_value; |
52 | string m_login; | 52 | protected string m_login; |
53 | 53 | ||
54 | public static LLFailedLoginResponse UserProblem; | 54 | public static LLFailedLoginResponse UserProblem; |
55 | public static LLFailedLoginResponse AuthorizationProblem; | 55 | public static LLFailedLoginResponse AuthorizationProblem; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 1578873..1eaf4d4 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -51,24 +51,24 @@ namespace OpenSim.Services.LLLoginService | |||
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | private static bool Initialized = false; | 52 | private static bool Initialized = false; |
53 | 53 | ||
54 | private IUserAccountService m_UserAccountService; | 54 | protected IUserAccountService m_UserAccountService; |
55 | private IAuthenticationService m_AuthenticationService; | 55 | protected IAuthenticationService m_AuthenticationService; |
56 | private IInventoryService m_InventoryService; | 56 | protected IInventoryService m_InventoryService; |
57 | private IGridService m_GridService; | 57 | protected IGridService m_GridService; |
58 | private IPresenceService m_PresenceService; | 58 | protected IPresenceService m_PresenceService; |
59 | private ISimulationService m_LocalSimulationService; | 59 | private ISimulationService m_LocalSimulationService; |
60 | private ISimulationService m_RemoteSimulationService; | 60 | private ISimulationService m_RemoteSimulationService; |
61 | private ILibraryService m_LibraryService; | 61 | protected ILibraryService m_LibraryService; |
62 | private IFriendsService m_FriendsService; | 62 | protected IFriendsService m_FriendsService; |
63 | private IAvatarService m_AvatarService; | 63 | protected IAvatarService m_AvatarService; |
64 | private IUserAgentService m_UserAgentService; | 64 | private IUserAgentService m_UserAgentService; |
65 | 65 | ||
66 | private GatekeeperServiceConnector m_GatekeeperConnector; | 66 | private GatekeeperServiceConnector m_GatekeeperConnector; |
67 | 67 | ||
68 | private string m_DefaultRegionName; | 68 | private string m_DefaultRegionName; |
69 | private string m_WelcomeMessage; | 69 | protected string m_WelcomeMessage; |
70 | private bool m_RequireInventory; | 70 | private bool m_RequireInventory; |
71 | private int m_MinLoginLevel; | 71 | protected int m_MinLoginLevel; |
72 | private string m_GatekeeperURL; | 72 | private string m_GatekeeperURL; |
73 | 73 | ||
74 | IConfig m_LoginServerConfig; | 74 | IConfig m_LoginServerConfig; |
@@ -286,7 +286,7 @@ namespace OpenSim.Services.LLLoginService | |||
286 | } | 286 | } |
287 | } | 287 | } |
288 | 288 | ||
289 | private GridRegion FindDestination(UserAccount account, PresenceInfo pinfo, UUID sessionID, string startLocation, out GridRegion gatekeeper, out string where, out Vector3 position, out Vector3 lookAt) | 289 | protected GridRegion FindDestination(UserAccount account, PresenceInfo pinfo, UUID sessionID, string startLocation, out GridRegion gatekeeper, out string where, out Vector3 position, out Vector3 lookAt) |
290 | { | 290 | { |
291 | m_log.DebugFormat("[LLOGIN SERVICE]: FindDestination for start location {0}", startLocation); | 291 | m_log.DebugFormat("[LLOGIN SERVICE]: FindDestination for start location {0}", startLocation); |
292 | 292 | ||
@@ -497,7 +497,7 @@ namespace OpenSim.Services.LLLoginService | |||
497 | } | 497 | } |
498 | } | 498 | } |
499 | 499 | ||
500 | private AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, | 500 | protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, |
501 | UUID session, UUID secureSession, Vector3 position, string currentWhere, out string where, out string reason) | 501 | UUID session, UUID secureSession, Vector3 position, string currentWhere, out string where, out string reason) |
502 | { | 502 | { |
503 | where = currentWhere; | 503 | where = currentWhere; |