diff options
author | Melanie | 2010-01-29 07:42:45 +0000 |
---|---|---|
committer | Melanie | 2010-01-29 07:47:50 +0000 |
commit | 44c86cedcf8ddba1ca4c9e3ff4f1e39ceb59be06 (patch) | |
tree | a15c42e1fca2e91ef89230581148928415ca9e1d /OpenSim | |
parent | Revert "Updates all IRegionModules to the new style region modules." (diff) | |
download | opensim-SC-44c86cedcf8ddba1ca4c9e3ff4f1e39ceb59be06.zip opensim-SC-44c86cedcf8ddba1ca4c9e3ff4f1e39ceb59be06.tar.gz opensim-SC-44c86cedcf8ddba1ca4c9e3ff4f1e39ceb59be06.tar.bz2 opensim-SC-44c86cedcf8ddba1ca4c9e3ff4f1e39ceb59be06.tar.xz |
Resolve one more conflict I overlooked
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index 93aa88c..60df2e7 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | |||
@@ -120,20 +120,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm | |||
120 | if (maxlisteners < 1) maxlisteners = int.MaxValue; | 120 | if (maxlisteners < 1) maxlisteners = int.MaxValue; |
121 | if (maxhandles < 1) maxhandles = int.MaxValue; | 121 | if (maxhandles < 1) maxhandles = int.MaxValue; |
122 | 122 | ||
123 | <<<<<<< HEAD:OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | ||
124 | m_listenerManager = new ListenerManager(maxlisteners, maxhandles); | ||
125 | m_pendingQ = new Queue(); | ||
126 | m_pending = Queue.Synchronized(m_pendingQ); | ||
127 | } | ||
128 | |||
129 | public void PostInitialise() | ||
130 | { | ||
131 | } | ||
132 | |||
133 | public void AddRegion(Scene scene) | ||
134 | { | ||
135 | ======= | ||
136 | >>>>>>> ec3c31e... Updates all IRegionModules to the new style region modules.:OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | ||
137 | m_scene = scene; | 123 | m_scene = scene; |
138 | m_scene.RegisterModuleInterface<IWorldComm>(this); | 124 | m_scene.RegisterModuleInterface<IWorldComm>(this); |
139 | m_listenerManager = new ListenerManager(maxlisteners, maxhandles); | 125 | m_listenerManager = new ListenerManager(maxlisteners, maxhandles); |