diff options
author | Merov Linden <merov@lindenlab.com> | 2014-06-17 09:50:48 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-06-17 09:50:48 -0700 |
commit | 9c792f03b4f006f5083c9fc98047bfad6bee8e16 (patch) | |
tree | 5e15865f837e4d7815000b79452f4bdd7245d511 /indra/llui/llmenugl.cpp | |
parent | f79b1139fd28b29c51a0c001960ef3f0bb999ec0 (diff) | |
parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llui/llmenugl.cpp')
-rwxr-xr-x | indra/llui/llmenugl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 7383a8c307..604dc92789 100755 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -63,6 +63,7 @@ // static LLMenuHolderGL *LLMenuGL::sMenuContainer = NULL; +view_listener_t::listener_map_t view_listener_t::sListeners; S32 MENU_BAR_HEIGHT = 0; S32 MENU_BAR_WIDTH = 0; |