diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-11-25 12:32:21 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-11-25 12:32:21 -0500 |
| commit | fc4f6e2dacfc8944b1536004fed80c4ca3a24544 (patch) | |
| tree | 3eb7254290b834ae5f2529861a76c41d8decad1e /indra/newview/llblocklist.h | |
| parent | d191585a3eec778e36e5f0c4b620c3d525c86c42 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
Merge. Refresh from viewer-release after 3.6.11 release.
Diffstat (limited to 'indra/newview/llblocklist.h')
| -rwxr-xr-x | indra/newview/llblocklist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llblocklist.h b/indra/newview/llblocklist.h index b1ea7e98e5..bac79f869e 100755 --- a/indra/newview/llblocklist.h +++ b/indra/newview/llblocklist.h @@ -80,7 +80,7 @@ private: void createList(); BlockListActionType getCurrentMuteListActionType(); - + LLHandle<LLToggleableMenu> mContextMenu; LLBlockedListItem* mSelectedItem; |