Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow touching multiple objects in succession

Browse Source
This commit is contained in:
Liru Færs
2020-01-14 19:35:57 -05:00
parent 937c80f694
commit 1c371e7be6
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llviewermenu.cpp
View File

@@ -9702,7 +9702,10 @@ class ListObjectTouch : public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{ {
handle_object_touch(gObjectList.findObject(LFIDBearer::getActiveSelectedID())); for (const auto& id : LFIDBearer::getActiveSelectedIDs())
if (auto obj = gObjectList.findObject(id))
if (enable_object_touch(obj))
handle_object_touch(obj);
return true; return true;
} }
}; };
@@ -9712,8 +9715,16 @@ class ListObjectEnableTouch : public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{ {
const auto& ids = LFIDBearer::getActiveSelectedIDs(); bool value = false;
gMenuHolder->findControl(userdata["control"].asString())->setValue(ids.size() == 1 && enable_object_touch(gObjectList.findObject(ids[0]))); for (const auto& id : LFIDBearer::getActiveSelectedIDs())
{
if (enable_object_touch(gObjectList.findObject(id)))
{
value = true;
break; // First touchable is fine enough, we'll touch all we can
}
}
gMenuHolder->findControl(userdata["control"].asString())->setValue(value);
return true; return true;
} }
}; };