diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/ApplicationPlugins/CreateCommsManager | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')
| -rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 20cec04..0f827b0 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |||
| @@ -185,11 +185,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) | 187 | protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) |
| 188 | { | 188 | { |
| 189 | m_commsManager | 189 | m_commsManager |
| 190 | = new HGCommunicationsStandalone( | 190 | = new HGCommunicationsStandalone( |
| 191 | m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, | 191 | m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, |
| 192 | libraryRootFolder, false); | 192 | libraryRootFolder, false); |
| 193 | 193 | ||
| 194 | CreateGridInfoService(); | 194 | CreateGridInfoService(); |
| 195 | } | 195 | } |