diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-06 17:29:27 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-06 17:29:27 +0800 |
| commit | 8af4df0022a484c3ea0b1fedb3a36235e2742e3b (patch) | |
| tree | d6eb110a2656e4bb9d5a4c9863f99c67523e9238 /indra/newview/llpanelpeople.cpp | |
| parent | 569fc58358a49d6eb8007ea987969c449db43834 (diff) | |
| parent | 42fe5f9444d049505d893f33edcfd522c0a4315e (diff) | |
Merge branch 'main' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 366c80f580..72fa553023 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -1127,6 +1127,12 @@ void LLPanelPeople::onAvatarListDoubleClicked(LLUICtrl* ctrl) #if 0 // SJB: Useful for testing, but not currently functional or to spec LLAvatarActions::showProfile(clicked_id); #else // spec says open IM window + if (item->getParentUICtrl()->getParentUICtrl() == mNearbyList + && gSavedSettings.getBOOL("DoubleClickZoomIn")) + { + handle_zoom_to_object(clicked_id); + return; + } LLAvatarActions::startIM(clicked_id); #endif } |