diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-24 11:03:22 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-24 11:03:22 -0500 |
commit | 361efbc07e83ec79a19d96b34aa1913dce1d0e1d (patch) | |
tree | 9d0655556ae0011fdc2ed4f8917faeb5efe29616 /indra/llui/llview.h | |
parent | 9e6a5d721193f181c39e58fe00073bece74b081a (diff) | |
parent | 79f1cd0a73bd86ff545ad78b9b1878e350d77416 (diff) |
merge
Diffstat (limited to 'indra/llui/llview.h')
-rw-r--r-- | indra/llui/llview.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index f21fb37e18..f1fac5f69c 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -612,6 +612,8 @@ private: S32 mNextInsertionOrdinal; + bool mInDraw; + static LLWindow* sWindow; // All root views must know about their window. typedef std::map<std::string, LLView*> default_widget_map_t; |