diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-11 23:34:37 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-11 23:34:37 +0200 |
| commit | 92af5af736c2d6f3ac2f3ae5539da4bdea22e2a5 (patch) | |
| tree | 888a19c6343d37ff1fc8fd22362799c143671a93 /indra/newview/llcolorswatch.h | |
| parent | b1f84f13a8a1d0404e4593ac413b66af8d135f40 (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
Diffstat (limited to 'indra/newview/llcolorswatch.h')
| -rw-r--r-- | indra/newview/llcolorswatch.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h index 380fdccfa3..a17cab486a 100644 --- a/indra/newview/llcolorswatch.h +++ b/indra/newview/llcolorswatch.h @@ -36,7 +36,6 @@ // Classes // class LLColor4; -class LLFloaterColorPicker; class LLColorSwatchCtrl : public LLUICtrl |