diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:45:17 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:45:17 +0200 |
| commit | 098c4c0371f63b2b827131a13bfc623b8cb73f25 (patch) | |
| tree | 778bd8bc6f9a557fed93e040ea58c0b73bea0dbb /indra/newview/llpanelvolume.h | |
| parent | d734105446182b17a91f6590eaa23ac690032817 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-486
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelvolume.h
Diffstat (limited to 'indra/newview/llpanelvolume.h')
| -rw-r--r-- | indra/newview/llpanelvolume.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h index 1651108093..d9198f3693 100644 --- a/indra/newview/llpanelvolume.h +++ b/indra/newview/llpanelvolume.h @@ -41,6 +41,7 @@ class LLMenuButton; class LLViewerObject; class LLComboBox; class LLColorSwatchCtrl; +class LLVOVolume; class LLPanelVolume : public LLPanel { @@ -74,6 +75,8 @@ public: void onLightCancelTexture(const LLSD& data); void onLightSelectTexture(const LLSD& data); + static void setLightTextureID(const LLUUID &asset_id, const LLUUID &item_id, LLVOVolume* volobjp); + void onCopyFeatures(); void onPasteFeatures(); void onCopyLight(); |