aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie Thielker2014-08-04 02:23:43 +0200
committerMelanie Thielker2014-08-04 02:23:43 +0200
commit2ab0790aa8afd77424644cd5600b24092f4cd80d (patch)
tree50bd804eb228455ccb42453253f088860a698191 /OpenSim/Region/ClientStack/Linden
parentStop deleting objects that have status DIE_AT_EDGE set when they cross regions. (diff)
parentlocal chat gods bug fix (diff)
downloadopensim-SC-2ab0790aa8afd77424644cd5600b24092f4cd80d.zip
opensim-SC-2ab0790aa8afd77424644cd5600b24092f4cd80d.tar.gz
opensim-SC-2ab0790aa8afd77424644cd5600b24092f4cd80d.tar.bz2
opensim-SC-2ab0790aa8afd77424644cd5600b24092f4cd80d.tar.xz
Merge branch 'ubitworkmaster'
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index b0d30b6..ca6c3ca 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Region.ClientStack.Linden
358 return queue.Count > 0; 358 return queue.Count > 0;
359 } 359 }
360 360
361 m_log.WarnFormat("POLLED FOR EVENTS BY {0} unknown agent", agentID); 361 //m_log.WarnFormat("POLLED FOR EVENTS BY {0} unknown agent", agentID);
362 return true; 362 return true;
363 } 363 }
364 364