aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps
diff options
context:
space:
mode:
authorUbitUmarov2016-07-23 01:28:47 +0100
committerUbitUmarov2016-07-23 01:28:57 +0100
commitcdf215f6130b88a0fce9b56075947b539f1043a7 (patch)
tree0cd6e117cdde64641b448e5a2e8451f2cd32c2ca /OpenSim/Region/ClientStack/Linden/Caps
parent don't try to rez a object from a asset with empty data and Let user know abo... (diff)
downloadopensim-SC_OLD-cdf215f6130b88a0fce9b56075947b539f1043a7.zip
opensim-SC_OLD-cdf215f6130b88a0fce9b56075947b539f1043a7.tar.gz
opensim-SC_OLD-cdf215f6130b88a0fce9b56075947b539f1043a7.tar.bz2
opensim-SC_OLD-cdf215f6130b88a0fce9b56075947b539f1043a7.tar.xz
add a missing field to ChatterBoxSessionAgentListUpdates. it is still wrong, and its use even worse
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs14
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs8
2 files changed, 16 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index cc614f3..f3acacd 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -372,7 +372,7 @@ namespace OpenSim.Region.ClientStack.Linden
372 372
373 caps.RegisterPollHandler( 373 caps.RegisterPollHandler(
374 "EventQueueGet", 374 "EventQueueGet",
375 new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, SERVER_EQ_TIME_NO_EVENTS)); 375 new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, Drop, agentID, SERVER_EQ_TIME_NO_EVENTS));
376 } 376 }
377 377
378 public bool HasEvents(UUID requestID, UUID agentID) 378 public bool HasEvents(UUID requestID, UUID agentID)
@@ -403,6 +403,10 @@ namespace OpenSim.Region.ClientStack.Linden
403 ev["message"], m_scene.GetScenePresence(agentId).Name, m_scene.Name); 403 ev["message"], m_scene.GetScenePresence(agentId).Name, m_scene.Name);
404 } 404 }
405 } 405 }
406 public void Drop(UUID requestID, UUID pAgentId)
407 {
408 // do nothing for now, hope client close will do it
409 }
406 410
407 public Hashtable GetEvents(UUID requestID, UUID pAgentId) 411 public Hashtable GetEvents(UUID requestID, UUID pAgentId)
408 { 412 {
@@ -564,12 +568,12 @@ namespace OpenSim.Region.ClientStack.Linden
564 568
565 } 569 }
566 570
567 public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, 571 public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat,
568 bool isModerator, bool textMute) 572 bool isModerator, bool textMute, bool isEnterorLeave)
569 { 573 {
570 OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat, 574 OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat,
571 isModerator, textMute); 575 isModerator, textMute, isEnterorLeave);
572 Enqueue(item, fromAgent); 576 Enqueue(item, toAgent);
573 //m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item); 577 //m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item);
574 } 578 }
575 579
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index 8beeb95..f1c29f6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -308,7 +308,7 @@ namespace OpenSim.Region.ClientStack.Linden
308 } 308 }
309 309
310 public static OSD ChatterBoxSessionAgentListUpdates(UUID sessionID, 310 public static OSD ChatterBoxSessionAgentListUpdates(UUID sessionID,
311 UUID agentID, bool canVoiceChat, bool isModerator, bool textMute) 311 UUID agentID, bool canVoiceChat, bool isModerator, bool textMute, bool isEnterorLeave)
312 { 312 {
313 OSDMap body = new OSDMap(); 313 OSDMap body = new OSDMap();
314 OSDMap agentUpdates = new OSDMap(); 314 OSDMap agentUpdates = new OSDMap();
@@ -321,7 +321,13 @@ namespace OpenSim.Region.ClientStack.Linden
321 infoDetail.Add("mutes", mutes); 321 infoDetail.Add("mutes", mutes);
322 OSDMap info = new OSDMap(); 322 OSDMap info = new OSDMap();
323 info.Add("info", infoDetail); 323 info.Add("info", infoDetail);
324 if(isEnterorLeave)
325 info.Add("transition",OSD.FromString("ENTER"));
326 else
327 info.Add("transition",OSD.FromString("LEAVE"));
324 agentUpdates.Add(agentID.ToString(), info); 328 agentUpdates.Add(agentID.ToString(), info);
329
330
325 body.Add("agent_updates", agentUpdates); 331 body.Add("agent_updates", agentUpdates);
326 body.Add("session_id", OSD.FromUUID(sessionID)); 332 body.Add("session_id", OSD.FromUUID(sessionID));
327 body.Add("updates", new OSD()); 333 body.Add("updates", new OSD());