aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie Thielker2015-08-15 02:46:41 +0200
committerMelanie Thielker2015-08-15 02:46:41 +0200
commit1fb2f0296fdaff56745daa1c1e8096cd8e25462b (patch)
tree6b168e1c3b237e219e8bb1c82d5aba271f3bd5cb /OpenSim/Region/ClientStack
parentMaybe reduce incidence of ghost avatars (diff)
downloadopensim-SC_OLD-1fb2f0296fdaff56745daa1c1e8096cd8e25462b.zip
opensim-SC_OLD-1fb2f0296fdaff56745daa1c1e8096cd8e25462b.tar.gz
opensim-SC_OLD-1fb2f0296fdaff56745daa1c1e8096cd8e25462b.tar.bz2
opensim-SC_OLD-1fb2f0296fdaff56745daa1c1e8096cd8e25462b.tar.xz
Track selected objects per client
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 849fec3..7b6889a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -474,6 +474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
474 set { m_disableFacelights = value; } 474 set { m_disableFacelights = value; }
475 } 475 }
476 476
477 public List<uint> SelectedObjects {get; private set;}
477 478
478 public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } 479 public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
479 480
@@ -494,6 +495,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
494// DebugPacketLevel = 1; 495// DebugPacketLevel = 1;
495 496
496 CloseSyncLock = new Object(); 497 CloseSyncLock = new Object();
498 SelectedObjects = new List<uint>();
497 499
498 RegisterInterface<IClientIM>(this); 500 RegisterInterface<IClientIM>(this);
499 RegisterInterface<IClientInventory>(this); 501 RegisterInterface<IClientInventory>(this);
@@ -7347,6 +7349,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7347 7349
7348 for (int i = 0; i < incomingselect.ObjectData.Length; i++) 7350 for (int i = 0; i < incomingselect.ObjectData.Length; i++)
7349 { 7351 {
7352 if (!SelectedObjects.Contains(incomingselect.ObjectData[i].ObjectLocalID))
7353 SelectedObjects.Add(incomingselect.ObjectData[i].ObjectLocalID);
7350 handlerObjectSelect = OnObjectSelect; 7354 handlerObjectSelect = OnObjectSelect;
7351 if (handlerObjectSelect != null) 7355 if (handlerObjectSelect != null)
7352 { 7356 {
@@ -7373,6 +7377,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7373 7377
7374 for (int i = 0; i < incomingdeselect.ObjectData.Length; i++) 7378 for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)
7375 { 7379 {
7380 if (!SelectedObjects.Contains(incomingdeselect.ObjectData[i].ObjectLocalID))
7381 SelectedObjects.Add(incomingdeselect.ObjectData[i].ObjectLocalID);
7376 handlerObjectDeselect = OnObjectDeselect; 7382 handlerObjectDeselect = OnObjectDeselect;
7377 if (handlerObjectDeselect != null) 7383 if (handlerObjectDeselect != null)
7378 { 7384 {