diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-29 19:34:39 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-29 19:34:39 +0300 |
| commit | b6441bf09b9058a799e7581878ee21007323ee0c (patch) | |
| tree | bad6f8f26b83643dc0f603a8c774a9ddaedd13c2 /indra/newview/llavataractions.h | |
| parent | de696d0213b98110f930cae35a8db005e3d1a061 (diff) | |
| parent | f20b22e325ef15e0aa6eef950ba96538bb015568 (diff) | |
Merge branch 'DRTVWR-500' into DRTVWR-501-maint
Diffstat (limited to 'indra/newview/llavataractions.h')
| -rw-r--r-- | indra/newview/llavataractions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index b56d5b0fb9..7c721076c8 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -244,7 +244,7 @@ public: */ static void viewChatHistory(const LLUUID& id); - static std::set<LLUUID> getInventorySelectedUUIDs(); + static std::set<LLUUID> getInventorySelectedUUIDs(LLInventoryPanel* active_panel = NULL); private: static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response); |