aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorRobert Adams2013-12-20 06:52:28 -0800
committerRobert Adams2013-12-20 06:52:28 -0800
commita01862509ee3317dde34ffb5cdbaf98672b510c3 (patch)
tree335fe6b6be7e796b33f11f3e939605ba28af1df3 /OpenSim/Region/ClientStack
parentMerge branch 'master' into varregion (diff)
parentMerge branch 'justincc-master' (diff)
downloadopensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.zip
opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.tar.gz
opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.tar.bz2
opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index c28ba94..0dbdbaf 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -295,9 +295,9 @@ namespace OpenSim.Region.ClientStack.Linden
295 { 295 {
296 // Register an event queue for the client 296 // Register an event queue for the client
297 297
298 //m_log.DebugFormat( 298 m_log.DebugFormat(
299 // "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}", 299 "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
300 // agentID, caps, m_scene.RegionInfo.RegionName); 300 agentID, caps, m_scene.RegionInfo.RegionName);
301 301
302 // Let's instantiate a Queue for this agent right now 302 // Let's instantiate a Queue for this agent right now
303 TryGetQueue(agentID); 303 TryGetQueue(agentID);