diff options
author | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
commit | 6542ffe2f05c47d74dfbe659041d956d609f91f3 (patch) | |
tree | 7794c0737c5a78b0339c2c34b47c9d32c44de749 /indra/newview/llpanelpeoplemenus.cpp | |
parent | 431bfca2ade364dc1165e402537e5e2d3616ebfd (diff) | |
parent | eda8634b17133df5f3104d96ad56d3626a90aad8 (diff) |
Merge viewer 2-0 into media
Diffstat (limited to 'indra/newview/llpanelpeoplemenus.cpp')
-rw-r--r-- | indra/newview/llpanelpeoplemenus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp index 57f3d86d53..04fe42de9f 100644 --- a/indra/newview/llpanelpeoplemenus.cpp +++ b/indra/newview/llpanelpeoplemenus.cpp @@ -100,7 +100,7 @@ LLContextMenu* NearbyMenu::createMenu() registrar.add("Avatar.Call", boost::bind(&LLAvatarActions::startCall, id)); registrar.add("Avatar.OfferTeleport", boost::bind(&NearbyMenu::offerTeleport, this)); registrar.add("Avatar.ShowOnMap", boost::bind(&LLAvatarActions::startIM, id)); // *TODO: unimplemented - registrar.add("Avatar.Share", boost::bind(&LLAvatarActions::startIM, id)); // *TODO: unimplemented + 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)); |