aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-29 07:42:45 +0000
committerMelanie2010-01-29 07:42:45 +0000
commit536a6bac72b33220dc785e70dd703b02330f3812 (patch)
tree5bbd60d884e3a293380d883be5dd8f6600986412
parentRevert "Updates all IRegionModules to the new style region modules." (diff)
downloadopensim-SC-536a6bac72b33220dc785e70dd703b02330f3812.zip
opensim-SC-536a6bac72b33220dc785e70dd703b02330f3812.tar.gz
opensim-SC-536a6bac72b33220dc785e70dd703b02330f3812.tar.bz2
opensim-SC-536a6bac72b33220dc785e70dd703b02330f3812.tar.xz
Resolve one more conflict I overlooked
-rw-r--r--OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs14
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);