aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorunknown2010-05-13 14:23:16 -0700
committerunknown2010-05-13 14:23:16 -0700
commit231cc647091451e5a52631493dba8c82857415a4 (patch)
tree7cad3ef5d73fbcc28166fa7f3e0fdc2380adaa0b /OpenSim
parentImplements three new OSSL functions for parcel management: osParcelJoin joins... (diff)
parentMade fields consistently protected. (diff)
downloadopensim-SC_OLD-231cc647091451e5a52631493dba8c82857415a4.zip
opensim-SC_OLD-231cc647091451e5a52631493dba8c82857415a4.tar.gz
opensim-SC_OLD-231cc647091451e5a52631493dba8c82857415a4.tar.bz2
opensim-SC_OLD-231cc647091451e5a52631493dba8c82857415a4.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index f97222e..9e24a39 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -58,21 +58,21 @@ namespace OpenSim.Services.LLLoginService
58 protected IInventoryService m_InventoryService; 58 protected IInventoryService m_InventoryService;
59 protected IGridService m_GridService; 59 protected IGridService m_GridService;
60 protected IPresenceService m_PresenceService; 60 protected IPresenceService m_PresenceService;
61 private ISimulationService m_LocalSimulationService; 61 protected ISimulationService m_LocalSimulationService;
62 private ISimulationService m_RemoteSimulationService; 62 protected ISimulationService m_RemoteSimulationService;
63 protected ILibraryService m_LibraryService; 63 protected ILibraryService m_LibraryService;
64 protected IFriendsService m_FriendsService; 64 protected IFriendsService m_FriendsService;
65 protected IAvatarService m_AvatarService; 65 protected IAvatarService m_AvatarService;
66 private IUserAgentService m_UserAgentService; 66 protected IUserAgentService m_UserAgentService;
67 67
68 private GatekeeperServiceConnector m_GatekeeperConnector; 68 protected GatekeeperServiceConnector m_GatekeeperConnector;
69 69
70 private string m_DefaultRegionName; 70 protected string m_DefaultRegionName;
71 protected string m_WelcomeMessage; 71 protected string m_WelcomeMessage;
72 private bool m_RequireInventory; 72 protected bool m_RequireInventory;
73 protected int m_MinLoginLevel; 73 protected int m_MinLoginLevel;
74 private string m_GatekeeperURL; 74 protected string m_GatekeeperURL;
75 private bool m_AllowRemoteSetLoginLevel; 75 protected bool m_AllowRemoteSetLoginLevel;
76 76
77 IConfig m_LoginServerConfig; 77 IConfig m_LoginServerConfig;
78 78