diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:07:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:07:05 +0300 |
| commit | 56101002a460ecd9bb7a264d55b6f8ecb9a348a0 (patch) | |
| tree | da613ed4e420551235416b8f68e0ed87204469a3 /indra/newview/llpanelwearing.cpp | |
| parent | dcb5cf5bc21ba2e316cc2889b2c1371860b0348d (diff) | |
| parent | 25b19eb6b8b8482d5f6cff0cae8665a0f7518eb1 (diff) | |
Merge commit '25b19eb6b8' into marchcat/c-develop
# Conflicts:
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/newview/llpanelwearing.cpp')
| -rw-r--r-- | indra/newview/llpanelwearing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp index 5646c8b80c..200eb38ac1 100644 --- a/indra/newview/llpanelwearing.cpp +++ b/indra/newview/llpanelwearing.cpp @@ -113,7 +113,7 @@ protected: boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), mUUIDs, no_op)); registrar.add("Wearing.Detach", boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), mUUIDs, no_op)); - registrar.add("Wearing.Favorite", boost::bind(toggle_linked_favorite, mUUIDs.front())); + registrar.add("Wearing.Favorite", boost::bind(toggle_favorite, mUUIDs.front())); LLContextMenu* menu = createFromFile("menu_wearing_tab.xml"); updateMenuItemsVisibility(menu); |