diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-13 15:17:51 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-13 15:17:51 -0700 |
| commit | 4c663ca8b997bd74fb3b646c3cb3870555dfeb91 (patch) | |
| tree | 7edea4e2b1970083f9e8b92e9097bc340ff0dd61 /indra/newview/llviewermenu.cpp | |
| parent | 6b7ea2f198e9ec721b6e01aaeba3b6c7a44db7d2 (diff) | |
EXP-1314 FIX -- No floater for Marketplace
EXP-1338 FIX -- Clicking on active Toybox buttons triggers clicking sound
EXP-1339 FIX -- No minimum resize dimension for Place floater
EXP-1340 FIX -- No minimum resize demension for Appearance floater
EXP-1341 FIX -- Places Floater doesn't have Help button
* Toybox buttons no longer have click sounds
* Marketplace button opens external browser to marketplace url
* Minimum sizes for places and appearance floaters
* Marketplace URL's now all use https
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 4b90f1952a..5d215c7f6d 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8259,6 +8259,8 @@ void initialize_menus() view_listener_t::addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse"); view_listener_t::addMenu(new LLAvatarToggleMyProfile(), "Avatar.ToggleMyProfile"); enable.add("Avatar.IsMyProfileOpen", boost::bind(&my_profile_visible)); + + commit.add("Avatar.OpenMarketplace", boost::bind(&LLWeb::loadURLExternal, gSavedSettings.getString("MarketplaceURL"))); view_listener_t::addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend"); enable.add("Avatar.EnableFreezeEject", boost::bind(&enable_freeze_eject, _2)); |