ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't overlap Select and Deselect, fix deselect prims account

Browse Source
This commit is contained in:
UbitUmarov
2016-07-13 15:56:01 +01:00
parent 981980150c
commit acebfeb5c9
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -7681,15 +7681,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#endregion
ObjectSelect handlerObjectSelect = null;
for (int i = 0; i < incomingselect.ObjectData.Length; i++)
uint objID;
lock(SelectedObjects)
{
if (!SelectedObjects.Contains(incomingselect.ObjectData[i].ObjectLocalID))
SelectedObjects.Add(incomingselect.ObjectData[i].ObjectLocalID);
handlerObjectSelect = OnObjectSelect;
if (handlerObjectSelect != null)
for (int i = 0; i < incomingselect.ObjectData.Length; i++)
{
handlerObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);
objID = incomingselect.ObjectData[i].ObjectLocalID;
if (!SelectedObjects.Contains(objID))
{
SelectedObjects.Add(objID);
handlerObjectSelect = OnObjectSelect;
if (handlerObjectSelect != null)
{
handlerObjectSelect(objID, this);
}
}
}
}
return true;
@@ -7709,15 +7717,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#endregion
ObjectDeselect handlerObjectDeselect = null;
for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)
uint objID;
lock(SelectedObjects)
{
if (!SelectedObjects.Contains(incomingdeselect.ObjectData[i].ObjectLocalID))
SelectedObjects.Add(incomingdeselect.ObjectData[i].ObjectLocalID);
handlerObjectDeselect = OnObjectDeselect;
if (handlerObjectDeselect != null)
for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)
{
OnObjectDeselect(incomingdeselect.ObjectData[i].ObjectLocalID, this);
objID = incomingdeselect.ObjectData[i].ObjectLocalID;
if (SelectedObjects.Contains(objID))
{
SelectedObjects.Remove(objID);
handlerObjectDeselect = OnObjectDeselect;
if (handlerObjectDeselect != null)
{
OnObjectDeselect(objID, this);
}
}
}
}
return true;