aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-06-12 15:41:53 +0000
committerJustin Clarke Casey2009-06-12 15:41:53 +0000
commit45342067f5f5d5f6ca86f9ed179f275ed6131fea (patch)
tree837791d248127f5605ea3dacefb6bee6763863ed /OpenSim
parentGive m_test* methods more reasonable names (diff)
downloadopensim-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 'OpenSim')
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginModule.cs51
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs11
2 files changed, 34 insertions, 28 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"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
index 69a37a9..bc833c3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
105 //} 105 //}
106 106
107 m_Enabled = true; 107 m_Enabled = true;
108 m_log.Info("[INVENTORY CONNECTOR]: Local asset connector enabled"); 108 m_log.Info("[INVENTORY CONNECTOR]: Local inventory connector enabled");
109 } 109 }
110 } 110 }
111 } 111 }
@@ -120,6 +120,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
120 120
121 public void AddRegion(Scene scene) 121 public void AddRegion(Scene scene)
122 { 122 {
123 m_log.DebugFormat("HEEEERE");
123 if (!m_Enabled) 124 if (!m_Enabled)
124 return; 125 return;
125 126
@@ -131,8 +132,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
131 m_Initialized = true; 132 m_Initialized = true;
132 } 133 }
133 134
135 m_log.DebugFormat(
136 "[INVENTORY CONNECTOR]: Registering IInventoryService to scene {0}", scene.RegionInfo.RegionName);
137
134 scene.RegisterModuleInterface<IInventoryService>(this); 138 scene.RegisterModuleInterface<IInventoryService>(this);
135
136 } 139 }
137 140
138 public void RemoveRegion(Scene scene) 141 public void RemoveRegion(Scene scene)
@@ -144,8 +147,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
144 if (!m_Enabled) 147 if (!m_Enabled)
145 return; 148 return;
146 149
147 m_log.InfoFormat("[INVENTORY CONNECTOR]: Enabled local assets for region {0}", scene.RegionInfo.RegionName); 150 m_log.InfoFormat(
148 151 "[INVENTORY CONNECTOR]: Enabled local invnetory for region {0}", scene.RegionInfo.RegionName);
149 } 152 }
150 153
151 #region IInventoryService 154 #region IInventoryService