diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:32:26 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:32:26 -0400 |
commit | 4ac1b64665a49c7121411f3db27718f0c37eaf33 (patch) | |
tree | 85d7f3ccdacd6f322fb1fa213aa91c12b2d4abf4 /indra/newview/lltexturectrl.h | |
parent | 972df2587863737eafde9caf6fce89f330358b5e (diff) | |
parent | 2f9edd050669210d651e66a86efb9746c3fa8a34 (diff) |
merge
Diffstat (limited to 'indra/newview/lltexturectrl.h')
-rw-r--r-- | indra/newview/lltexturectrl.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index fdfbee400e..b1312d641f 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -92,11 +92,7 @@ public: multiselect_text("multiselect_text"), caption_text("caption_text"), border("border") - { - name = "texture picker"; - mouse_opaque(true); - follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP); - } + {} }; protected: LLTextureCtrl(const Params&); |