diff options
author | Justin Clarke Casey | 2009-06-12 15:41:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-06-12 15:41:53 +0000 |
commit | 45342067f5f5d5f6ca86f9ed179f275ed6131fea (patch) | |
tree | 837791d248127f5605ea3dacefb6bee6763863ed /OpenSim/Client/Linden/LLStandaloneLoginModule.cs | |
parent | Give m_test* methods more reasonable names (diff) | |
download | opensim-SC_OLD-45342067f5f5d5f6ca86f9ed179f275ed6131fea.zip opensim-SC_OLD-45342067f5f5d5f6ca86f9ed179f275ed6131fea.tar.gz opensim-SC_OLD-45342067f5f5d5f6ca86f9ed179f275ed6131fea.tar.bz2 opensim-SC_OLD-45342067f5f5d5f6ca86f9ed179f275ed6131fea.tar.xz |
* Move standalone login setup in LLStandaloneLoginmodule to RegionLoaded() from AddRegion()
* This is necessary to avoid a dependency problem where LLStandaloneLoginModule references IInventoryService before the LocalInventoryServiceConnector is registered
* Correct some copypasta log messages in LocalInventoryServiceConnector
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index bfafdc3..cc5f5ff 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs | |||
@@ -98,6 +98,28 @@ namespace OpenSim.Client.Linden | |||
98 | 98 | ||
99 | public void AddRegion(Scene scene) | 99 | public void AddRegion(Scene scene) |
100 | { | 100 | { |
101 | } | ||
102 | |||
103 | public void RemoveRegion(Scene scene) | ||
104 | { | ||
105 | if (m_enabled) | ||
106 | { | ||
107 | RemoveScene(scene); | ||
108 | } | ||
109 | } | ||
110 | |||
111 | public void PostInitialise() | ||
112 | { | ||
113 | |||
114 | } | ||
115 | |||
116 | public void Close() | ||
117 | { | ||
118 | |||
119 | } | ||
120 | |||
121 | public void RegionLoaded(Scene scene) | ||
122 | { | ||
101 | if (m_firstScene == null) | 123 | if (m_firstScene == null) |
102 | { | 124 | { |
103 | m_firstScene = scene; | 125 | m_firstScene = scene; |
@@ -111,7 +133,11 @@ namespace OpenSim.Client.Linden | |||
111 | IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; | 133 | IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; |
112 | 134 | ||
113 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference | 135 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference |
114 | m_loginService = new LLStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, m_firstScene.InventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); | 136 | m_loginService |
137 | = new LLStandaloneLoginService( | ||
138 | (UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, | ||
139 | m_firstScene.InventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, | ||
140 | rootFolder, this); | ||
115 | 141 | ||
116 | httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); | 142 | httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); |
117 | 143 | ||
@@ -129,29 +155,6 @@ namespace OpenSim.Client.Linden | |||
129 | } | 155 | } |
130 | } | 156 | } |
131 | 157 | ||
132 | public void RemoveRegion(Scene scene) | ||
133 | { | ||
134 | if (m_enabled) | ||
135 | { | ||
136 | RemoveScene(scene); | ||
137 | } | ||
138 | } | ||
139 | |||
140 | public void PostInitialise() | ||
141 | { | ||
142 | |||
143 | } | ||
144 | |||
145 | public void Close() | ||
146 | { | ||
147 | |||
148 | } | ||
149 | |||
150 | public void RegionLoaded(Scene scene) | ||
151 | { | ||
152 | |||
153 | } | ||
154 | |||
155 | public string Name | 158 | public string Name |
156 | { | 159 | { |
157 | get { return "LLStandaloneLoginModule"; } | 160 | get { return "LLStandaloneLoginModule"; } |