diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-08-04 10:59:26 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-08-04 10:59:26 -0700 |
| commit | 38208441db5e969112a4b911aa4d063d5a1031f2 (patch) | |
| tree | 84158d6183058b48737ba9b19304bd4ae5f57afa /indra/newview/llpanelvolume.h | |
| parent | 92b09e3a164e59f5a0c4e436d044590513ddc6bd (diff) | |
| parent | 9dba9f80f4d40ec12a735ddbb66a9d103a959ece (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-559
Diffstat (limited to 'indra/newview/llpanelvolume.h')
| -rw-r--r-- | indra/newview/llpanelvolume.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h index 16d9ac292d..62a6d01b21 100644 --- a/indra/newview/llpanelvolume.h +++ b/indra/newview/llpanelvolume.h @@ -37,6 +37,7 @@ class LLCheckBoxCtrl; class LLTextBox; class LLUICtrl; class LLButton; +class LLMenuButton; class LLViewerObject; class LLComboBox; class LLColorSwatchCtrl; @@ -79,6 +80,13 @@ public: static void setLightTextureID(const LLUUID &asset_id, const LLUUID &item_id, LLVOVolume* volobjp); + void onCopyFeatures(); + void onPasteFeatures(); + void onCopyLight(); + void onPasteLight(); + + void menuDoToSelected(const LLSD& userdata); + bool menuEnableItem(const LLSD& userdata); protected: void getState(); @@ -126,6 +134,11 @@ protected: LLSpinCtrl* mSpinPhysicsFriction; LLSpinCtrl* mSpinPhysicsDensity; LLSpinCtrl* mSpinPhysicsRestitution; + + LLMenuButton* mMenuClipboardFeatures; + LLMenuButton* mMenuClipboardLight; + + LLSD mClipboardParams; }; #endif |