diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 06:19:43 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 06:19:43 -0700 |
| commit | f07e0d9760053a9814fc410a7c9f0f8192c8bd39 (patch) | |
| tree | d59f4aa7f4c2c31ff290671cf76a905d14833e72 /indra/newview/lltexturectrl.h | |
| parent | fd447189c5e05df53cd8ec0a4168370c03c3bb16 (diff) | |
| parent | 6f953cc97b90eff43d69c2bda28fc9863fc57214 (diff) | |
Merge viewer-dev-mat and fix llvovolume.cpp missed sunshine merges
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rwxr-xr-x | indra/newview/lltexturectrl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 599d9c70c5..3fd024082e 100755 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -126,6 +126,7 @@ public: // LLTextureCtrl interface void showPicker(BOOL take_focus); + bool isPickerShown() { return !mFloaterHandle.isDead(); } void setLabel(const std::string& label); void setLabelWidth(S32 label_width) {mLabelWidth =label_width;} const std::string& getLabel() const { return mLabel; } |