diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-15 15:45:02 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-15 15:45:02 -0800 |
| commit | e775e95416234f9a6abdb00a792b8ba392eeb607 (patch) | |
| tree | 7f1f74791afe6bfcd3928aa955f0bf99748a74d0 /indra/newview/llinventorybridge.cpp | |
| parent | d3474c6eaf5f26986e7988f4ca773f67e034c49d (diff) | |
| parent | 37d7f469055d3ba4b81815fa2ac8459022e1e3cf (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 280a1775e9..52f2897788 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -5453,6 +5453,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) p.on_enable.parameter = cbparams; LLView* parent = attachment->getIsHUDAttachment() ? attach_hud_menu : attach_menu; LLUICtrlFactory::create<LLMenuItemCallGL>(p, parent); + items.push_back(p.name); } } } |