diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-10-16 11:52:43 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-10-16 11:52:43 -0400 |
commit | 1f8b37e9ad65f8064b83adac295d9eb162976e4c (patch) | |
tree | 3ced849ad5750b7884d291e17e89fec419e03382 /indra/llui/llfloater.h | |
parent | 2331b9a93b12eb0a2f5fb6109f990d81b29d0584 (diff) | |
parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) |
merge
Diffstat (limited to 'indra/llui/llfloater.h')
-rwxr-xr-x | indra/llui/llfloater.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 71979bd95a..f5c3079204 100755 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -112,6 +112,8 @@ struct LLCoordFloater : LLCoord<LL_COORD_FLOATER> bool operator!=(const LLCoordFloater& other) const { return !(*this == other); } void setFloater(LLFloater& floater); + + }; class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater> @@ -121,6 +123,7 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater> friend class LLMultiFloater; public: + struct KeyCompare { // static bool compare(const LLSD& a, const LLSD& b); |