summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-11-05 15:33:33 +0800
committerErik Kundiman <erik@megapahit.org>2024-11-05 15:33:41 +0800
commit42fe5f9444d049505d893f33edcfd522c0a4315e (patch)
tree6abef6a6a288a95e2461957a85a56e68f26bbbea /indra
parentd0232c0008ea81b147ca7505ebffbdf6b9a1a309 (diff)
Option to zoom in using double click
https://megapahit.com/show_bug.cgi?id=102
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/settings.xml11
-rw-r--r--indra/newview/llpanelpeople.cpp6
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_move.xml9
3 files changed, 26 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bd49f003c5..cd82f6122d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2546,6 +2546,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>DoubleClickZoomIn</key>
+ <map>
+ <key>Comment</key>
+ <string>Set double-click to zoom in on instead of IM avatar</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>DynamicCameraStrength</key>
<map>
<key>Comment</key>
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
}
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 0412466b4f..8202bb9de3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -268,6 +268,15 @@
name="sound_on_collisions"
top_pad="10"
width="200" />
+ <check_box
+ control_name="DoubleClickZoomIn"
+ height="20"
+ label="Double click on nearby list to zoom in on avatar"
+ layout="topleft"
+ left="83"
+ name="double_click_zoom_in"
+ top_pad="10"
+ width="200" />
<button
height="23"
label="Other Devices"