diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-11-16 16:41:15 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-11-16 17:44:15 +0200 |
| commit | 132c536d9c05be2d2fd2dcef3ea6c7ae135fa5d2 (patch) | |
| tree | 376ae6246fce7ebbb9b7c620ca9c64bab51ca163 /indra/newview/llpanelvolume.h | |
| parent | 83ae032ff349581199212129a03a7c44899a3e17 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-539
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 66117316cf..6e49ccb742 100644 --- a/indra/newview/llpanelvolume.h +++ b/indra/newview/llpanelvolume.h @@ -40,6 +40,7 @@ class LLButton; class LLViewerObject; class LLComboBox; class LLColorSwatchCtrl; +class LLVOVolume; class LLPanelVolume : public LLPanel { @@ -73,6 +74,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); + protected: void getState(); |