diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-18 16:37:07 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-18 16:37:07 -0500 |
| commit | 3e3fda589b11d53fceb9bbeed9f0333d88c3816f (patch) | |
| tree | 43bfd5e88ede272242db36d9000fcdac84541725 /indra/newview/llpanelpeoplemenus.cpp | |
| parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
| parent | 70722454f6650438c9b659ff08b4d7bc6dfc2e7e (diff) | |
merge up to 3.4.4-release
Diffstat (limited to 'indra/newview/llpanelpeoplemenus.cpp')
| -rw-r--r-- | indra/newview/llpanelpeoplemenus.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp index f12c4de2f7..499dfd36fc 100644 --- a/indra/newview/llpanelpeoplemenus.cpp +++ b/indra/newview/llpanelpeoplemenus.cpp @@ -67,6 +67,7 @@ LLContextMenu* NearbyMenu::createMenu() registrar.add("Avatar.Share", boost::bind(&LLAvatarActions::share, id)); registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, id)); registrar.add("Avatar.BlockUnblock", boost::bind(&LLAvatarActions::toggleBlock, id)); + registrar.add("Avatar.TeleportRequest", boost::bind(&LLAvatarActions::teleportRequest, id)); enable_registrar.add("Avatar.EnableItem", boost::bind(&NearbyMenu::enableContextMenuItem, this, _2)); enable_registrar.add("Avatar.CheckItem", boost::bind(&NearbyMenu::checkContextMenuItem, this, _2)); |