diff options
author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-11 19:43:29 +0200 |
---|---|---|
committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-11 19:43:29 +0200 |
commit | 679a0d752193c757b70e39ad4408fa8492ad47f9 (patch) | |
tree | c76a878d71927c6433d3ec8a3cecbfb4d6d1826b /indra/newview/llfloateravatarpicker.h | |
parent | 56105df3999cee7a86c4338d105358875967225a (diff) |
Backed out changeset: 19f3fa6e3e63
Diffstat (limited to 'indra/newview/llfloateravatarpicker.h')
-rw-r--r-- | indra/newview/llfloateravatarpicker.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h index 7d94199786..fbee61b054 100644 --- a/indra/newview/llfloateravatarpicker.h +++ b/indra/newview/llfloateravatarpicker.h @@ -28,7 +28,6 @@ #define LLFLOATERAVATARPICKER_H #include "llfloater.h" -#include "lldrawfrustum.h" #include "lleventcoro.h" #include "llcoros.h" @@ -37,7 +36,7 @@ class LLAvatarName; class LLScrollListCtrl; -class LLFloaterAvatarPicker :public LLFloater, public LLDrawFrustum +class LLFloaterAvatarPicker :public LLFloater { public: typedef boost::signals2::signal<bool(const uuid_vec_t&), boost_boolean_combiner> validate_signal_t; @@ -92,6 +91,7 @@ private: void setAllowMultiple(BOOL allow_multiple); LLScrollListCtrl* getActiveList(); + void drawFrustum(); virtual void draw(); virtual BOOL handleKeyHere(KEY key, MASK mask); @@ -100,6 +100,11 @@ private: BOOL mNearMeListComplete; BOOL mCloseOnSelect; BOOL mExcludeAgentFromSearchResults; + LLHandle <LLView> mFrustumOrigin; + F32 mContextConeOpacity; + F32 mContextConeInAlpha; + F32 mContextConeOutAlpha; + F32 mContextConeFadeTime; validate_signal_t mOkButtonValidateSignal; select_callback_t mSelectionCallback; |