diff options
| author | James Cook <james@lindenlab.com> | 2010-01-04 16:30:07 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-04 16:30:07 -0800 |
| commit | 4f75d7936064290f5d99019eb2ff0c226d199dc9 (patch) | |
| tree | 01312d51a094bdee18356b2e670dbf96a7766080 /indra/newview/llviewermenu.cpp | |
| parent | ad6ff3a44c649779037182266b14649607c79fa4 (diff) | |
| parent | 53abe3c7802b8c8579ce868b4ecb05d9ebdd20ef (diff) | |
Merge with Leyla's stuff and some XML changes
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 15855f154d..40c74ccf82 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7953,8 +7953,8 @@ void initialize_menus() enable.add("Avatar.EnableMute", boost::bind(&enable_object_mute)); enable.add("Object.EnableMute", boost::bind(&enable_object_mute)); - enable.add("Object.EnableBuy", boost::bind(&enable_buy_object)); + commit.add("Object.ZoomIn", boost::bind(&handle_look_at_selection, "zoom")); // Attachment pie menu enable.add("Attachment.Label", boost::bind(&onEnableAttachmentLabel, _1, _2)); |