diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-11 12:59:23 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-11 12:59:23 -0500 |
commit | 32a9255d8ce7515be0fd8c566cb4085a03d99e2b (patch) | |
tree | ed2136972d17069173468c128231e14fc3dd1796 /indra/llui/llview.h | |
parent | bfe6e94f5388b887253ba77f633ae332affe9f92 (diff) | |
parent | 3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (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; |