diff options
| author | Richard Linden <none@none> | 2012-01-05 10:59:29 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-05 10:59:29 -0800 |
| commit | 66fcc2da3925cd16939e4438dad749b2c22dbc27 (patch) | |
| tree | 771fe7786750454ad478773d7045accb4a353b53 /indra/llui/llview.h | |
| parent | 570d562f5871f40bd7f8c683db5316ffd0133335 (diff) | |
| parent | 9c8f6ba6a51b799d16e89e995bbcf3b0dcc15c62 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
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; |